Fix for Isilon driver failing to connect

Fixes a bug where the Isilon driver fails to connect due to an Isilon
configuration option ('isilon_share_root_dir') not being added to the
parent (EMC) driver.

Change-Id: Iff7f2b0dd66d427f366c961e5a3d8ce499a3ffe3
Closes-Bug: #1484238

manila/opts.py

@@ -106,7 +106,6 @@ _global_opt_lists = [
     manila.share.driver.ssh_opts,
     manila.share.drivers_private_data.private_data_opts,
     manila.share.drivers.emc.driver.EMC_NAS_OPTS,
-    manila.share.drivers.emc.plugins.isilon.isilon.ISILON_OPTS,
     manila.share.drivers.generic.share_opts,
     manila.share.drivers.glusterfs.GlusterfsManilaShare_opts,
     manila.share.drivers.glusterfs_native.glusterfs_native_manila_share_opts,

manila/share/drivers/emc/driver.py

@@ -54,6 +54,8 @@ EMC_NAS_OPTS = [
     cfg.StrOpt('emc_nas_pool_name',
                default=None,
                help='EMC pool name.'),
+    cfg.StrOpt('emc_nas_root_dir', default=None,
+               help='The root directory where shares will be located.'),
 ]
 
 CONF = cfg.CONF

manila/share/drivers/emc/plugins/isilon/isilon.py

@@ -30,12 +30,6 @@ from manila.share.drivers.emc.plugins.isilon import isilon_api
 CONF = cfg.CONF
 VERSION = "0.1.0"
 
-ISILON_OPTS = [
-    cfg.StrOpt('isilon_share_root_dir', default='/ifs/manila-shares',
-               help='The path on Isilon where the manila shares will be '
-                    'created.')]
-CONF.register_opts(ISILON_OPTS)
-
 LOG = log.getLogger(__name__)
 
 
@@ -304,7 +298,7 @@ class IsilonStorageConnection(base.StorageConnection):
         self._password = emc_share_driver.configuration.safe_get(
             "emc_nas_password")
         self._root_dir = emc_share_driver.configuration.safe_get(
-            "isilon_share_root_dir")
+            "emc_nas_root_dir")
         # TODO(Shaun Edwards): make verify ssl a config variable?
         self._verify_ssl_cert = False
         self._isilon_api = self._isilon_api_class(self._server_url, auth=(

manila/tests/share/drivers/emc/plugins/isilon/test_isilon.py

@@ -47,7 +47,7 @@ class IsilonTest(test.TestCase):
                 return 'admin'
             elif value == 'emc_nas_password':
                 return 'a'
-            elif value == 'isilon_share_root_dir':
+            elif value == 'emc_nas_root_dir':
                 return '/ifs/manila-test'
             else:
                 return None