From ba1e0d7940f2268c72b017f6f6ea19c784c617c0 Mon Sep 17 00:00:00 2001
From: Kazumasa Nomura <kazumasa.nomura.rx@hitachi.com>
Date: Thu, 17 Nov 2016 13:34:42 +0900
Subject: [PATCH] Deprecate Hitachi Block Storage Driver

We deprecate the HBSD driver that isn't maintained. The HBSD driver is
deprecated and will be removed in P release.
We are going to move to a new enterprise driver with many bug fixes.

DocImpact
Implements: blueprint hbsd-driver-deletion

Change-Id: I19b425e0b81952ab93fcc780721a2f720376ca3a
---
 cinder/volume/drivers/hitachi/hbsd_fc.py                    | 6 +++++-
 cinder/volume/drivers/hitachi/hbsd_iscsi.py                 | 6 +++++-
 .../notes/hbsd-driver-deletion-d81f7c4513f45d7b.yaml        | 6 ++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/hbsd-driver-deletion-d81f7c4513f45d7b.yaml

diff --git a/cinder/volume/drivers/hitachi/hbsd_fc.py b/cinder/volume/drivers/hitachi/hbsd_fc.py
index 14eedd88e52..b4d07b6fca4 100644
--- a/cinder/volume/drivers/hitachi/hbsd_fc.py
+++ b/cinder/volume/drivers/hitachi/hbsd_fc.py
@@ -21,11 +21,12 @@ import threading
 
 from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_log import versionutils
 from oslo_utils import excutils
 import six
 
 from cinder import exception
-from cinder.i18n import _LI, _LW
+from cinder.i18n import _, _LI, _LW
 from cinder import interface
 from cinder import utils
 import cinder.volume.driver
@@ -310,6 +311,9 @@ class HBSDFCDriver(cinder.volume.driver.FibreChannelDriver):
         self.context = context
         self.common = common.HBSDCommon(self.configuration, self,
                                         context, self.db)
+        msg = _("The HBSD FC driver is deprecated and "
+                "will be removed in P release.")
+        versionutils.report_deprecated_feature(LOG, msg)
 
         self.check_param()
 
diff --git a/cinder/volume/drivers/hitachi/hbsd_iscsi.py b/cinder/volume/drivers/hitachi/hbsd_iscsi.py
index 263cf6732c5..f33c15340d5 100644
--- a/cinder/volume/drivers/hitachi/hbsd_iscsi.py
+++ b/cinder/volume/drivers/hitachi/hbsd_iscsi.py
@@ -21,10 +21,11 @@ import threading
 
 from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_log import versionutils
 import six
 
 from cinder import exception
-from cinder.i18n import _LE, _LI
+from cinder.i18n import _, _LE, _LI
 from cinder import interface
 from cinder import utils
 import cinder.volume.driver
@@ -262,6 +263,9 @@ class HBSDISCSIDriver(cinder.volume.driver.ISCSIDriver):
         self.context = context
         self.common = common.HBSDCommon(self.configuration, self,
                                         context, self.db)
+        msg = _("The HBSD iSCSI driver is deprecated and "
+                "will be removed in P release")
+        versionutils.report_deprecated_feature(LOG, msg)
 
         self.check_param()
 
diff --git a/releasenotes/notes/hbsd-driver-deletion-d81f7c4513f45d7b.yaml b/releasenotes/notes/hbsd-driver-deletion-d81f7c4513f45d7b.yaml
new file mode 100644
index 00000000000..a05d6a6e27c
--- /dev/null
+++ b/releasenotes/notes/hbsd-driver-deletion-d81f7c4513f45d7b.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+  - The HBSD (Hitachi Block Storage Driver) volume drivers which supports
+    Hitachi Storages HUS100 and VSP family are deprecated. Support for HUS110
+    family will be no longer provided. Support on VSP will be provided as
+    hitachi.vsp_* drivers.
\ No newline at end of file