From: Rushil Chugh <rushil@netapp.com>
Date: Thu, 19 Mar 2015 01:00:36 +0000 (-0400)
Subject: The value of netapp_storage_protocol should default to none
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=995116acf8483367b1b9cb956f24b07c7f47bd26;p=openstack-build%2Fcinder-build.git

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 71157af1a..3df7f3459 100644
--- 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 2da37dafb..bc8459cfc 100644
--- 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.')), ]