Merge "Seagate/Lenovo drivers: Update get_driver_options"

cinder/volume/drivers/lenovo/lenovo_common.py

@@ -17,6 +17,7 @@
 from oslo_config import cfg
 
 from cinder.volume import configuration
+from cinder.volume import driver
 import cinder.volume.drivers.lenovo.lenovo_client as lenovo_client
 import cinder.volume.drivers.stx.common as common
 
@@ -83,3 +84,10 @@ class LenovoCommon(common.STXCommon):
                                                  self.config.san_password,
                                                  self.api_protocol,
                                                  ssl_verify)
+
+    @staticmethod
+    def get_driver_options():
+        additional_opts = driver.BaseVD._get_oslo_driver_opts(
+            'san_ip', 'san_login', 'san_password', 'driver_use_ssl',
+            'driver_ssl_cert_verify', 'driver_ssl_cert_path')
+        return common_opts + additional_opts

cinder/volume/drivers/lenovo/lenovo_fc.py

@@ -46,7 +46,7 @@ class LenovoFCDriver(fc.STXFCDriver):
 
     @staticmethod
     def get_driver_options():
-        return lenovo_common.common_opts
+        return lenovo_common.LenovoCommon.get_driver_options()
 
     def _init_common(self):
         return lenovo_common.LenovoCommon(self.configuration)

cinder/volume/drivers/lenovo/lenovo_iscsi.py

@@ -48,7 +48,8 @@ class LenovoISCSIDriver(iscsi.STXISCSIDriver):
 
     @staticmethod
     def get_driver_options():
-        return lenovo_common.common_opts + lenovo_common.iscsi_opts
+        return (lenovo_common.LenovoCommon.get_driver_options() +
+                lenovo_common.iscsi_opts)
 
     def _init_common(self):
         return lenovo_common.LenovoCommon(self.configuration)

cinder/volume/drivers/stx/common.py

@@ -27,6 +27,7 @@ from cinder import exception
 from cinder.i18n import _
 from cinder.objects import fields
 from cinder.volume import configuration
+from cinder.volume import driver
 import cinder.volume.drivers.stx.client as client
 import cinder.volume.drivers.stx.exception as stx_exception
 from cinder.volume import volume_utils
@@ -618,3 +619,10 @@ class STXCommon(object):
         return self._get_manageable_vols(cinder_snapshots, 'snapshot',
                                          marker, limit,
                                          offset, sort_keys, sort_dirs)
+
+    @staticmethod
+    def get_driver_options():
+        additional_opts = driver.BaseVD._get_oslo_driver_opts(
+            'san_ip', 'san_login', 'san_password', 'driver_use_ssl',
+            'driver_ssl_cert_verify', 'driver_ssl_cert_path')
+        return common_opts + additional_opts

cinder/volume/drivers/stx/fc.py

@@ -205,3 +205,7 @@ class STXFCDriver(cinder.volume.driver.FibreChannelDriver):
         return self.common.get_manageable_snapshots(cinder_snapshots,
                                                     marker, limit, offset,
                                                     sort_keys, sort_dirs)
+
+    @staticmethod
+    def get_driver_options():
+        return common.STXCommon.get_driver_options()

cinder/volume/drivers/stx/iscsi.py

@@ -231,3 +231,7 @@ class STXISCSIDriver(cinder.volume.driver.ISCSIDriver):
         return self.common.get_manageable_snapshots(cinder_snapshots,
                                                     marker, limit, offset,
                                                     sort_keys, sort_dirs)
+
+    @staticmethod
+    def get_driver_options():
+        return (common.STXCommon.get_driver_options() + common.iscsi_opts)

releasenotes/notes/get-driver-opts-924f72346ca1e459.yaml

@@ -0,0 +1,5 @@
+features: 
+  - |
+    Seagate driver: Added support for ``get_driver_options`` api call 
+  - |
+    Lenovo driver: Return additional configuration options from ``get_driver_options`` call