The value of netapp_storage_protocol should default to none

The value of netapp_storage_protocol was changed from 'None' to 'iscsi'
in a recent commit. It needs to be reverted back to its correct default
value of 'None'.

Closes-bug: 1433842

Change-Id: I7f7bff8d8cbd8671ee52cb9225f496ff6e679398

diff --git a/cinder/tests/volume/drivers/netapp/test_common.py b/cinder/tests/volume/drivers/netapp/test_common.py
index 71157af1ac73f6e9ba0216370c54678bb8137ece..3df7f3459af0ebd90eedff78d9de19a391e26917 100644 (file)
--- a/cinder/tests/volume/drivers/netapp/test_common.py
+++ b/cinder/tests/volume/drivers/netapp/test_common.py
@@ -73,7 +73,6 @@ class NetAppDriverFactoryTestCase(test.TestCase):
         self.mock_object(na_common.NetAppDriver, 'create_driver')
 
         config = na_fakes.create_configuration()
-        config.netapp_storage_protocol = None
         config.netapp_storage_family = 'fake_family'
 
         kwargs = {'configuration': config}

diff --git a/cinder/volume/drivers/netapp/options.py b/cinder/volume/drivers/netapp/options.py
index 2da37dafbde1a9456cbce7447926046b29f7dce1..bc8459cfc22998aeebacb7c4a7d0d34fbae4ff3d 100644 (file)
--- a/cinder/volume/drivers/netapp/options.py
+++ b/cinder/volume/drivers/netapp/options.py
@@ -35,7 +35,6 @@ netapp_proxy_opts = [
                      'operating in 7-Mode, ontap_cluster for using '
                      'clustered Data ONTAP, or eseries for using E-Series.')),
     cfg.StrOpt('netapp_storage_protocol',
-               default='iscsi',
                choices=['iscsi', 'fc', 'nfs'],
                help=('The storage protocol to be used on the data path with '
                      'the storage system.')), ]