Move EMC drivers to dell_emc folder

This patch moves EMC drivers under dell_emc folder and
changes vendor name to "Dell EMC".

The base driver remains as EMCShareDriver.

DocImpact
UpgradeImpact
Implements-blueprint: move-emc-driver-to-dell-emc-folder
Change-Id: I799c7fcb59fbe887045fe81beb1e257586ba2f0e

doc/source/adminref/multi_backends.rst

@@ -42,7 +42,7 @@ The following example shows five configured back ends::
     enabled_share_backends=backendEMC1,backendEMC2,backendGeneric1,backendGeneric2,backendNetApp
 
     [backendEMC1]
-    share_driver=manila.share.drivers.emc.driver.EMCShareDriver
+    share_driver=manila.share.drivers.dell_emc.driver.EMCShareDriver
     share_backend_name=backendEMC1
     emc_share_backend=vnx
     emc_nas_server=1.1.1.1
@@ -52,7 +52,7 @@ The following example shows five configured back ends::
     emc_nas_pool_name="Pool 1"
 
     [backendEMC2]
-    share_driver=manila.share.drivers.emc.driver.EMCShareDriver
+    share_driver=manila.share.drivers.dell_emc.driver.EMCShareDriver
     share_backend_name=backendEMC2
     emc_share_backend=vnx
     emc_nas_server=1.1.1.1

doc/source/devref/emc_isilon_driver.rst

@@ -57,7 +57,7 @@ Backend Configuration
 The following parameters need to be configured in the manila configuration file
 for the Isilon driver:
 
-* share_driver = manila.share.drivers.emc.driver.EMCShareDriver
+* share_driver = manila.share.drivers.dell_emc.driver.EMCShareDriver
 * driver_handles_share_servers = False
 * emc_share_backend = isilon
 * emc_nas_server = <IP address of Isilon cluster>
@@ -78,19 +78,19 @@ The Isilon driver has the following restrictions:
 
 - Only FLAT network is supported.
 
-The :mod:`manila.share.drivers.emc.driver` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The :mod:`manila.share.drivers.dell_emc.driver` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: manila.share.drivers.emc.driver
+.. automodule:: manila.share.drivers.dell_emc.driver
     :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
-The :mod:`manila.share.drivers.emc.plugins.isilon.isilon` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The :mod:`manila.share.drivers.dell_emc.plugins.isilon.isilon` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: manila.share.drivers.emc.plugins.isilon.isilon
+.. automodule:: manila.share.drivers.dell_emc.plugins.isilon.isilon
     :noindex:
     :members:
     :undoc-members:

doc/source/devref/emc_unity_driver.rst

@@ -114,7 +114,7 @@ for the Unity driver.
 
 .. code-block:: ini
 
-    share_driver = manila.share.drivers.emc.driver.EMCShareDriver
+    share_driver = manila.share.drivers.dell_emc.driver.EMCShareDriver
     emc_share_backend = unity
     emc_nas_server = <management IP address of the Unity system>
     emc_nas_login = <user with administrator privilege>
@@ -178,19 +178,19 @@ Following driver features are implemented in the plugin.
 * teardown_server: Tear down the share server.
 
 
-The :mod:`manila.share.drivers.emc.driver` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The :mod:`manila.share.drivers.dell_emc.driver` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: manila.share.drivers.emc.driver
+.. automodule:: manila.share.drivers.dell_emc.driver
     :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
-The :mod:`manila.share.drivers.emc.plugins.unity.connection` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The :mod:`manila.share.drivers.dell_emc.plugins.unity.connection` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: manila.share.drivers.emc.plugins.unity.connection
+.. automodule:: manila.share.drivers.dell_emc.plugins.unity.connection
     :noindex:
     :members:
     :undoc-members:

doc/source/devref/emc_vnx_driver.rst

@@ -188,7 +188,7 @@ for the VNX driver:
     emc_nas_server_container = <Data Mover name>
     emc_nas_pool_name = <pool name>
     emc_interface_ports = <Comma separated ports list>
-    share_driver = manila.share.drivers.emc.driver.EMCShareDriver
+    share_driver = manila.share.drivers.dell_emc.driver.EMCShareDriver
 
 - `emc_share_backend` is the plugin name. Set it to `vnx` for the VNX driver.
 - `emc_nas_server` is the control station IP address of the VNX system to be
@@ -258,19 +258,19 @@ The VNX driver has the following restrictions:
   support site](http://support.emc.com) for the limitations and configure the
   quotas accordingly.
 
-The :mod:`manila.share.drivers.emc.driver` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The :mod:`manila.share.drivers.dell_emc.driver` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: manila.share.drivers.emc.driver
+.. automodule:: manila.share.drivers.dell_emc.driver
     :noindex:
     :members:
     :undoc-members:
     :show-inheritance:
 
-The :mod:`manila.share.drivers.emc.plugins.vnx.connection` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The :mod:`manila.share.drivers.dell_emc.plugins.vnx.connection` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: manila.share.drivers.emc.plugins.vnx.connection
+.. automodule:: manila.share.drivers.dell_emc.plugins.vnx.connection
     :noindex:
     :members:
     :undoc-members:

manila/opts.py

@@ -53,8 +53,8 @@ import manila.share.driver
 import manila.share.drivers.cephfs.cephfs_native
 import manila.share.drivers.container.driver
 import manila.share.drivers.container.storage_helper
-import manila.share.drivers.emc.driver
-import manila.share.drivers.emc.plugins.isilon.isilon
+import manila.share.drivers.dell_emc.driver
+import manila.share.drivers.dell_emc.plugins.isilon.isilon
 import manila.share.drivers.generic
 import manila.share.drivers.glusterfs
 import manila.share.drivers.glusterfs.common
@@ -123,7 +123,7 @@ _global_opt_lists = [
     manila.share.drivers.cephfs.cephfs_native.cephfs_native_opts,
     manila.share.drivers.container.driver.container_opts,
     manila.share.drivers.container.storage_helper.lv_opts,
-    manila.share.drivers.emc.driver.EMC_NAS_OPTS,
+    manila.share.drivers.dell_emc.driver.EMC_NAS_OPTS,
     manila.share.drivers.generic.share_opts,
     manila.share.drivers.glusterfs.common.glusterfs_common_opts,
     manila.share.drivers.glusterfs.GlusterfsManilaShare_opts,

manila/share/drivers/dell_emc/driver.py

@@ -24,7 +24,7 @@ from oslo_config import cfg
 from oslo_log import log
 
 from manila.share import driver
-from manila.share.drivers.emc import plugin_manager as manager
+from manila.share.drivers.dell_emc import plugin_manager as manager
 
 LOG = log.getLogger(__name__)
 
@@ -77,7 +77,7 @@ class EMCShareDriver(driver.ShareDriver):
             self.backend_name = CONF.emc_share_backend
         self.backend_name = self.backend_name or 'EMC_NAS_Storage'
         self.plugin_manager = manager.EMCPluginManager(
-            namespace='manila.share.drivers.emc.plugins')
+            namespace='manila.share.drivers.dell_emc.plugins')
         self.plugin = self.plugin_manager.load_plugin(self.backend_name, LOG)
         super(EMCShareDriver, self).__init__(
             self.plugin.driver_handles_share_servers, *args, **kwargs)
@@ -139,7 +139,7 @@ class EMCShareDriver(driver.ShareDriver):
             'share_backend_name') or "EMC_NAS_Storage"
         data = dict(
             share_backend_name=backend_name,
-            vendor_name='EMC',
+            vendor_name='Dell EMC',
             storage_protocol='NFS_CIFS')
         self.plugin.update_share_stats(data)
         super(EMCShareDriver, self)._update_share_stats(data)

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

@@ -25,8 +25,8 @@ import six
 from manila.common import constants as const
 from manila import exception
 from manila.i18n import _, _LW
-from manila.share.drivers.emc.plugins import base
-from manila.share.drivers.emc.plugins.isilon import isilon_api
+from manila.share.drivers.dell_emc.plugins import base
+from manila.share.drivers.dell_emc.plugins.isilon import isilon_api
 
 CONF = cfg.CONF
 VERSION = "0.1.0"

manila/share/drivers/dell_emc/plugins/unity/connection.py

@@ -27,10 +27,10 @@ if storops:
 from manila.common import constants as const
 from manila import exception
 from manila.i18n import _, _LE, _LW, _LI
-from manila.share.drivers.emc.plugins import base as driver
-from manila.share.drivers.emc.plugins.unity import client
-from manila.share.drivers.emc.plugins.unity import utils as unity_utils
-from manila.share.drivers.emc.plugins.vnx import utils as emc_utils
+from manila.share.drivers.dell_emc.plugins import base as driver
+from manila.share.drivers.dell_emc.plugins.unity import client
+from manila.share.drivers.dell_emc.plugins.unity import utils as unity_utils
+from manila.share.drivers.dell_emc.plugins.vnx import utils as emc_utils
 from manila.share import utils as share_utils
 from manila import utils
 

manila/share/drivers/dell_emc/plugins/vnx/connection.py

@@ -24,10 +24,10 @@ from oslo_utils import units
 from manila.common import constants as const
 from manila import exception
 from manila.i18n import _, _LE, _LI, _LW
-from manila.share.drivers.emc.plugins import base as driver
-from manila.share.drivers.emc.plugins.vnx import constants
-from manila.share.drivers.emc.plugins.vnx import object_manager as manager
-from manila.share.drivers.emc.plugins.vnx import utils as vnx_utils
+from manila.share.drivers.dell_emc.plugins import base as driver
+from manila.share.drivers.dell_emc.plugins.vnx import constants
+from manila.share.drivers.dell_emc.plugins.vnx import object_manager as manager
+from manila.share.drivers.dell_emc.plugins.vnx import utils as vnx_utils
 from manila.share import utils as share_utils
 from manila import utils
 

manila/share/drivers/dell_emc/plugins/vnx/connector.py

@@ -26,7 +26,7 @@ from six.moves.urllib import request as url_request  # pylint: disable=E0611
 from manila import exception
 from manila.i18n import _
 from manila.i18n import _LE
-from manila.share.drivers.emc.plugins.vnx import constants
+from manila.share.drivers.dell_emc.plugins.vnx import constants
 from manila import utils
 
 LOG = log.getLogger(__name__)

manila/share/drivers/dell_emc/plugins/vnx/object_manager.py

@@ -25,10 +25,10 @@ import six
 from manila.common import constants as const
 from manila import exception
 from manila.i18n import _, _LI, _LW
-from manila.share.drivers.emc.plugins.vnx import connector
-from manila.share.drivers.emc.plugins.vnx import constants
-from manila.share.drivers.emc.plugins.vnx import utils as vnx_utils
-from manila.share.drivers.emc.plugins.vnx import xml_api_parser as parser
+from manila.share.drivers.dell_emc.plugins.vnx import connector
+from manila.share.drivers.dell_emc.plugins.vnx import constants
+from manila.share.drivers.dell_emc.plugins.vnx import utils as vnx_utils
+from manila.share.drivers.dell_emc.plugins.vnx import xml_api_parser as parser
 from manila import utils
 
 LOG = log.getLogger(__name__)

manila/share/manager.py

@@ -121,6 +121,8 @@ MAPPING = {
     'manila.share.drivers.glusterfs_native.GlusterfsNativeShareDriver':
     'manila.share.drivers.glusterfs.glusterfs_native.'
     'GlusterfsNativeShareDriver',
+    'manila.share.drivers.emc.driver.EMCShareDriver':
+    'manila.share.drivers.dell_emc.driver.EMCShareDriver',
 }
 
 QUOTAS = quota.QUOTAS

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

@@ -21,8 +21,8 @@ import six
 
 from manila.common import constants as const
 from manila import exception
-from manila.share.drivers.emc.plugins.isilon import isilon
-from manila.share.drivers.emc.plugins.isilon import isilon_api
+from manila.share.drivers.dell_emc.plugins.isilon import isilon
+from manila.share.drivers.dell_emc.plugins.isilon import isilon_api
 from manila import test
 
 LOG = log.getLogger(__name__)
@@ -59,7 +59,8 @@ class IsilonTest(test.TestCase):
                 return None
 
     @mock.patch(
-        'manila.share.drivers.emc.plugins.isilon.isilon.isilon_api.IsilonApi',
+        'manila.share.drivers.dell_emc.plugins.isilon.isilon.isilon_api.'
+        'IsilonApi',
         autospec=True)
     def setUp(self, mock_isi_api):
         super(IsilonTest, self).setUp()
@@ -694,7 +695,8 @@ class IsilonTest(test.TestCase):
         self.storage_connection.ensure_share(self.mock_context, share, None)
 
     @mock.patch(
-        'manila.share.drivers.emc.plugins.isilon.isilon.isilon_api.IsilonApi',
+        'manila.share.drivers.dell_emc.plugins.isilon.isilon.isilon_api.'
+        'IsilonApi',
         autospec=True)
     def test_connect(self, mock_isi_api):
         storage_connection = isilon.IsilonStorageConnection(LOG)
@@ -718,7 +720,8 @@ class IsilonTest(test.TestCase):
         self.assertFalse(storage_connection._verify_ssl_cert)
 
     @mock.patch(
-        'manila.share.drivers.emc.plugins.isilon.isilon.isilon_api.IsilonApi',
+        'manila.share.drivers.dell_emc.plugins.isilon.isilon.isilon_api.'
+        'IsilonApi',
         autospec=True)
     def test_connect_root_dir_does_not_exist(self, mock_isi_api):
         mock_isilon_api = mock_isi_api.return_value

manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon_api.py

@@ -20,7 +20,7 @@ import requests_mock
 import six
 
 from manila import exception
-from manila.share.drivers.emc.plugins.isilon import isilon_api
+from manila.share.drivers.dell_emc.plugins.isilon import isilon_api
 from manila import test
 
 

manila/tests/share/drivers/dell_emc/plugins/unity/res_mock.py

@@ -17,12 +17,12 @@ import mock
 from oslo_log import log
 
 from manila.share import configuration as conf
-from manila.share.drivers.emc.plugins.unity import client
-from manila.share.drivers.emc.plugins.unity import connection
+from manila.share.drivers.dell_emc.plugins.unity import client
+from manila.share.drivers.dell_emc.plugins.unity import connection
 from manila.tests.db import fakes as db_fakes
 from manila.tests import fake_share
-from manila.tests.share.drivers.emc.plugins.unity import fake_exceptions
-from manila.tests.share.drivers.emc.plugins.unity import utils
+from manila.tests.share.drivers.dell_emc.plugins.unity import fake_exceptions
+from manila.tests.share.drivers.dell_emc.plugins.unity import utils
 
 client.storops_ex = fake_exceptions
 connection.storops_ex = fake_exceptions

manila/tests/share/drivers/dell_emc/plugins/unity/test_client.py

@@ -15,7 +15,7 @@
 
 from manila import exception
 from manila import test
-from manila.tests.share.drivers.emc.plugins.unity import res_mock
+from manila.tests.share.drivers.dell_emc.plugins.unity import res_mock
 
 
 class TestClient(test.TestCase):

manila/tests/share/drivers/dell_emc/plugins/unity/test_connection.py

@@ -21,8 +21,8 @@ import six
 
 from manila import exception
 from manila import test
-from manila.tests.share.drivers.emc.plugins.unity import fake_exceptions
-from manila.tests.share.drivers.emc.plugins.unity import res_mock
+from manila.tests.share.drivers.dell_emc.plugins.unity import fake_exceptions
+from manila.tests.share.drivers.dell_emc.plugins.unity import res_mock
 
 
 @ddt.ddt

manila/tests/share/drivers/dell_emc/plugins/unity/test_utils.py

@@ -15,7 +15,7 @@
 
 import ddt
 
-from manila.share.drivers.emc.plugins.unity import utils
+from manila.share.drivers.dell_emc.plugins.unity import utils
 from manila import test
 
 

manila/tests/share/drivers/dell_emc/plugins/vnx/test_connection.py

@@ -20,13 +20,13 @@ import mock
 from oslo_log import log
 
 from manila import exception
-from manila.share.drivers.emc.plugins.vnx import connection
-from manila.share.drivers.emc.plugins.vnx import connector
-from manila.share.drivers.emc.plugins.vnx import object_manager
+from manila.share.drivers.dell_emc.plugins.vnx import connection
+from manila.share.drivers.dell_emc.plugins.vnx import connector
+from manila.share.drivers.dell_emc.plugins.vnx import object_manager
 from manila import test
 from manila.tests import fake_share
-from manila.tests.share.drivers.emc.plugins.vnx import fakes
-from manila.tests.share.drivers.emc.plugins.vnx import utils
+from manila.tests.share.drivers.dell_emc.plugins.vnx import fakes
+from manila.tests.share.drivers.dell_emc.plugins.vnx import utils
 
 LOG = log.getLogger(__name__)
 

manila/tests/share/drivers/dell_emc/plugins/vnx/test_connector.py

@@ -21,10 +21,10 @@ from six.moves.urllib import request as url_request  # pylint: disable=E0611
 
 from manila import exception
 from manila.share import configuration as conf
-from manila.share.drivers.emc.plugins.vnx import connector
+from manila.share.drivers.dell_emc.plugins.vnx import connector
 from manila import test
-from manila.tests.share.drivers.emc.plugins.vnx import fakes
-from manila.tests.share.drivers.emc.plugins.vnx import utils as emc_utils
+from manila.tests.share.drivers.dell_emc.plugins.vnx import fakes
+from manila.tests.share.drivers.dell_emc.plugins.vnx import utils as emc_utils
 from manila import utils
 
 

manila/tests/share/drivers/dell_emc/plugins/vnx/test_object_manager.py

@@ -22,13 +22,13 @@ from oslo_concurrency import processutils
 
 from manila.common import constants as const
 from manila import exception
-from manila.share.drivers.emc.plugins.vnx import connector
-from manila.share.drivers.emc.plugins.vnx import constants
-from manila.share.drivers.emc.plugins.vnx import object_manager as manager
-from manila.share.drivers.emc.plugins.vnx import xml_api_parser as parser
+from manila.share.drivers.dell_emc.plugins.vnx import connector
+from manila.share.drivers.dell_emc.plugins.vnx import constants
+from manila.share.drivers.dell_emc.plugins.vnx import object_manager as manager
+from manila.share.drivers.dell_emc.plugins.vnx import xml_api_parser as parser
 from manila import test
-from manila.tests.share.drivers.emc.plugins.vnx import fakes
-from manila.tests.share.drivers.emc.plugins.vnx import utils
+from manila.tests.share.drivers.dell_emc.plugins.vnx import fakes
+from manila.tests.share.drivers.dell_emc.plugins.vnx import utils
 
 
 class StorageObjectManagerTestCase(test.TestCase):

manila/tests/share/drivers/dell_emc/plugins/vnx/test_utils.py

@@ -15,7 +15,7 @@
 
 import ddt
 
-from manila.share.drivers.emc.plugins.vnx import utils
+from manila.share.drivers.dell_emc.plugins.vnx import utils
 from manila import test
 
 

manila/tests/share/drivers/dell_emc/plugins/vnx/utils.py

@@ -153,6 +153,6 @@ class EMCNFSShareMock(mock.Mock):
 
 
 def patch_get_managed_ports(*arg, **kwargs):
-    return mock.patch('manila.share.drivers.emc.plugins.vnx.connection.'
+    return mock.patch('manila.share.drivers.dell_emc.plugins.vnx.connection.'
                       'VNXStorageConnection.get_managed_ports',
                       mock.Mock(*arg, **kwargs))

manila/tests/share/drivers/dell_emc/test_driver.py

@@ -18,8 +18,8 @@ from stevedore import extension
 
 from manila import network
 from manila.share import configuration as conf
-from manila.share.drivers.emc import driver as emcdriver
-from manila.share.drivers.emc.plugins import base
+from manila.share.drivers.dell_emc import driver as emcdriver
+from manila.share.drivers.dell_emc.plugins import base
 from manila import test
 
 
@@ -115,7 +115,7 @@ class EMCShareFrameworkTestCase(test.TestCase):
         self.driver._update_share_stats()
         data["share_backend_name"] = FAKE_BACKEND
         data["driver_handles_share_servers"] = True
-        data["vendor_name"] = 'EMC'
+        data["vendor_name"] = 'Dell EMC'
         data["driver_version"] = '1.0'
         data["storage_protocol"] = 'NFS_CIFS'
         data['total_capacity_gb'] = 'unknown'

releasenotes/notes/move-emc-share-driver-to-dell-emc-dir-1ec34dee0544270d.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - The EMCShareDriver is moved to the dell_emc directory.
+    share_driver entry in manila.conf needs to be changed to
+    manila.share.drivers.dell_emc.driver.EMCShareDriver.
+    Vendor name is changed to "Dell EMC".

setup.cfg

@@ -58,10 +58,10 @@ oslo.config.opts =
     manila = manila.opts:list_opts
 oslo.config.opts.defaults =
     manila = manila.common.config:set_middleware_defaults
-manila.share.drivers.emc.plugins =
-    vnx = manila.share.drivers.emc.plugins.vnx.connection:VNXStorageConnection
-    unity = manila.share.drivers.emc.plugins.unity.connection:UnityStorageConnection
-    isilon = manila.share.drivers.emc.plugins.isilon.isilon:IsilonStorageConnection
+manila.share.drivers.dell_emc.plugins =
+    vnx = manila.share.drivers.dell_emc.plugins.vnx.connection:VNXStorageConnection
+    unity = manila.share.drivers.dell_emc.plugins.unity.connection:UnityStorageConnection
+    isilon = manila.share.drivers.dell_emc.plugins.isilon.isilon:IsilonStorageConnection
 manila.tests.scheduler.fakes =
     FakeWeigher1 = manila.tests.scheduler.fakes:FakeWeigher1
     FakeWeigher2 = manila.tests.scheduler.fakes:FakeWeigher2