From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 23 Jan 2015 21:50:00 +0000 (+0000)
Subject: Merge "Fix HNAS driver confusing error message (iSCSI driver)"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9906718cc2de3d6be518a3013cf53f718c899876;p=openstack-build%2Fcinder-build.git

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

9906718cc2de3d6be518a3013cf53f718c899876
diff --cc cinder/volume/drivers/hds/iscsi.py
index 24d2b2ad4,8a3334ec2..9ebab41ff
--- a/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