From d9be8fa62ba9baf50337821bfa20d9894739e765 Mon Sep 17 00:00:00 2001
From: xing-yang <xing.yang@emc.com>
Date: Mon, 14 Nov 2016 09:52:01 -0500
Subject: [PATCH] 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             |  4 ++--
 doc/source/devref/emc_isilon_driver.rst            | 14 +++++++-------
 doc/source/devref/emc_unity_driver.rst             | 14 +++++++-------
 doc/source/devref/emc_vnx_driver.rst               | 14 +++++++-------
 manila/opts.py                                     |  6 +++---
 manila/share/drivers/{emc => dell_emc}/__init__.py |  0
 manila/share/drivers/{emc => dell_emc}/driver.py   |  6 +++---
 .../drivers/{emc => dell_emc}/plugin_manager.py    |  0
 .../drivers/{emc => dell_emc}/plugins/__init__.py  |  0
 .../drivers/{emc => dell_emc}/plugins/base.py      |  0
 .../{emc => dell_emc}/plugins/isilon/__init__.py   |  0
 .../{emc => dell_emc}/plugins/isilon/isilon.py     |  4 ++--
 .../{emc => dell_emc}/plugins/isilon/isilon_api.py |  0
 .../{emc => dell_emc}/plugins/unity/__init__.py    |  0
 .../{emc => dell_emc}/plugins/unity/client.py      |  0
 .../{emc => dell_emc}/plugins/unity/connection.py  |  8 ++++----
 .../{emc => dell_emc}/plugins/unity/utils.py       |  0
 .../{emc => dell_emc}/plugins/vnx/__init__.py      |  0
 .../{emc => dell_emc}/plugins/vnx/connection.py    |  8 ++++----
 .../{emc => dell_emc}/plugins/vnx/connector.py     |  2 +-
 .../{emc => dell_emc}/plugins/vnx/constants.py     |  0
 .../plugins/vnx/object_manager.py                  |  8 ++++----
 .../drivers/{emc => dell_emc}/plugins/vnx/utils.py |  0
 .../plugins/vnx/xml_api_parser.py                  |  0
 manila/share/manager.py                            |  2 ++
 .../share/drivers/{emc => dell_emc}/__init__.py    |  0
 .../drivers/{emc => dell_emc}/plugins/__init__.py  |  0
 .../{emc => dell_emc}/plugins/isilon/__init__.py   |  0
 .../plugins/isilon/test_isilon.py                  | 13 ++++++++-----
 .../plugins/isilon/test_isilon_api.py              |  2 +-
 .../{emc => dell_emc}/plugins/unity/__init__.py    |  0
 .../plugins/unity/fake_exceptions.py               |  0
 .../plugins/unity/mocked_manila.yaml               |  0
 .../plugins/unity/mocked_unity.yaml                |  0
 .../{emc => dell_emc}/plugins/unity/res_mock.py    |  8 ++++----
 .../{emc => dell_emc}/plugins/unity/test_client.py |  2 +-
 .../plugins/unity/test_connection.py               |  4 ++--
 .../{emc => dell_emc}/plugins/unity/test_utils.py  |  2 +-
 .../{emc => dell_emc}/plugins/unity/utils.py       |  0
 .../{emc => dell_emc}/plugins/vnx/__init__.py      |  0
 .../drivers/{emc => dell_emc}/plugins/vnx/fakes.py |  0
 .../plugins/vnx/test_connection.py                 | 10 +++++-----
 .../plugins/vnx/test_connector.py                  |  6 +++---
 .../plugins/vnx/test_object_manager.py             | 12 ++++++------
 .../{emc => dell_emc}/plugins/vnx/test_utils.py    |  2 +-
 .../drivers/{emc => dell_emc}/plugins/vnx/utils.py |  2 +-
 .../share/drivers/{emc => dell_emc}/test_driver.py |  6 +++---
 ...re-driver-to-dell-emc-dir-1ec34dee0544270d.yaml |  6 ++++++
 setup.cfg                                          |  8 ++++----
 49 files changed, 92 insertions(+), 81 deletions(-)
 rename manila/share/drivers/{emc => dell_emc}/__init__.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/driver.py (97%)
 rename manila/share/drivers/{emc => dell_emc}/plugin_manager.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/__init__.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/base.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/isilon/__init__.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/isilon/isilon.py (99%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/isilon/isilon_api.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/unity/__init__.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/unity/client.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/unity/connection.py (98%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/unity/utils.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/vnx/__init__.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/vnx/connection.py (99%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/vnx/connector.py (98%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/vnx/constants.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/vnx/object_manager.py (99%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/vnx/utils.py (100%)
 rename manila/share/drivers/{emc => dell_emc}/plugins/vnx/xml_api_parser.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/__init__.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/__init__.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/isilon/__init__.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/isilon/test_isilon.py (98%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/isilon/test_isilon_api.py (99%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/__init__.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/fake_exceptions.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/mocked_manila.yaml (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/mocked_unity.yaml (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/res_mock.py (97%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/test_client.py (98%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/test_connection.py (99%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/test_utils.py (96%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/unity/utils.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/vnx/__init__.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/vnx/fakes.py (100%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/vnx/test_connection.py (99%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/vnx/test_connector.py (97%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/vnx/test_object_manager.py (99%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/vnx/test_utils.py (96%)
 rename manila/tests/share/drivers/{emc => dell_emc}/plugins/vnx/utils.py (98%)
 rename manila/tests/share/drivers/{emc => dell_emc}/test_driver.py (96%)
 create mode 100644 releasenotes/notes/move-emc-share-driver-to-dell-emc-dir-1ec34dee0544270d.yaml

diff --git a/doc/source/adminref/multi_backends.rst b/doc/source/adminref/multi_backends.rst
index 6eeb0ef2d6..4affb45480 100644
--- a/doc/source/adminref/multi_backends.rst
+++ b/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
diff --git a/doc/source/devref/emc_isilon_driver.rst b/doc/source/devref/emc_isilon_driver.rst
index d9f76a401f..8290a1fed7 100644
--- a/doc/source/devref/emc_isilon_driver.rst
+++ b/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:
diff --git a/doc/source/devref/emc_unity_driver.rst b/doc/source/devref/emc_unity_driver.rst
index 3c5fd52543..1694ce9db9 100644
--- a/doc/source/devref/emc_unity_driver.rst
+++ b/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:
diff --git a/doc/source/devref/emc_vnx_driver.rst b/doc/source/devref/emc_vnx_driver.rst
index cf71d0b012..5f4b16b6d5 100644
--- a/doc/source/devref/emc_vnx_driver.rst
+++ b/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:
diff --git a/manila/opts.py b/manila/opts.py
index 109d9493b9..fe92c86094 100644
--- a/manila/opts.py
+++ b/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,
diff --git a/manila/share/drivers/emc/__init__.py b/manila/share/drivers/dell_emc/__init__.py
similarity index 100%
rename from manila/share/drivers/emc/__init__.py
rename to manila/share/drivers/dell_emc/__init__.py
diff --git a/manila/share/drivers/emc/driver.py b/manila/share/drivers/dell_emc/driver.py
similarity index 97%
rename from manila/share/drivers/emc/driver.py
rename to manila/share/drivers/dell_emc/driver.py
index 715104f423..9568eaf4c3 100644
--- a/manila/share/drivers/emc/driver.py
+++ b/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)
diff --git a/manila/share/drivers/emc/plugin_manager.py b/manila/share/drivers/dell_emc/plugin_manager.py
similarity index 100%
rename from manila/share/drivers/emc/plugin_manager.py
rename to manila/share/drivers/dell_emc/plugin_manager.py
diff --git a/manila/share/drivers/emc/plugins/__init__.py b/manila/share/drivers/dell_emc/plugins/__init__.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/__init__.py
rename to manila/share/drivers/dell_emc/plugins/__init__.py
diff --git a/manila/share/drivers/emc/plugins/base.py b/manila/share/drivers/dell_emc/plugins/base.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/base.py
rename to manila/share/drivers/dell_emc/plugins/base.py
diff --git a/manila/share/drivers/emc/plugins/isilon/__init__.py b/manila/share/drivers/dell_emc/plugins/isilon/__init__.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/isilon/__init__.py
rename to manila/share/drivers/dell_emc/plugins/isilon/__init__.py
diff --git a/manila/share/drivers/emc/plugins/isilon/isilon.py b/manila/share/drivers/dell_emc/plugins/isilon/isilon.py
similarity index 99%
rename from manila/share/drivers/emc/plugins/isilon/isilon.py
rename to manila/share/drivers/dell_emc/plugins/isilon/isilon.py
index 8a399a5360..42d735d4f0 100644
--- a/manila/share/drivers/emc/plugins/isilon/isilon.py
+++ b/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"
diff --git a/manila/share/drivers/emc/plugins/isilon/isilon_api.py b/manila/share/drivers/dell_emc/plugins/isilon/isilon_api.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/isilon/isilon_api.py
rename to manila/share/drivers/dell_emc/plugins/isilon/isilon_api.py
diff --git a/manila/share/drivers/emc/plugins/unity/__init__.py b/manila/share/drivers/dell_emc/plugins/unity/__init__.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/unity/__init__.py
rename to manila/share/drivers/dell_emc/plugins/unity/__init__.py
diff --git a/manila/share/drivers/emc/plugins/unity/client.py b/manila/share/drivers/dell_emc/plugins/unity/client.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/unity/client.py
rename to manila/share/drivers/dell_emc/plugins/unity/client.py
diff --git a/manila/share/drivers/emc/plugins/unity/connection.py b/manila/share/drivers/dell_emc/plugins/unity/connection.py
similarity index 98%
rename from manila/share/drivers/emc/plugins/unity/connection.py
rename to manila/share/drivers/dell_emc/plugins/unity/connection.py
index 86bc80efa7..bfe7d058fd 100644
--- a/manila/share/drivers/emc/plugins/unity/connection.py
+++ b/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
 
diff --git a/manila/share/drivers/emc/plugins/unity/utils.py b/manila/share/drivers/dell_emc/plugins/unity/utils.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/unity/utils.py
rename to manila/share/drivers/dell_emc/plugins/unity/utils.py
diff --git a/manila/share/drivers/emc/plugins/vnx/__init__.py b/manila/share/drivers/dell_emc/plugins/vnx/__init__.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/vnx/__init__.py
rename to manila/share/drivers/dell_emc/plugins/vnx/__init__.py
diff --git a/manila/share/drivers/emc/plugins/vnx/connection.py b/manila/share/drivers/dell_emc/plugins/vnx/connection.py
similarity index 99%
rename from manila/share/drivers/emc/plugins/vnx/connection.py
rename to manila/share/drivers/dell_emc/plugins/vnx/connection.py
index 38d74ae83f..41ab366a37 100644
--- a/manila/share/drivers/emc/plugins/vnx/connection.py
+++ b/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
 
diff --git a/manila/share/drivers/emc/plugins/vnx/connector.py b/manila/share/drivers/dell_emc/plugins/vnx/connector.py
similarity index 98%
rename from manila/share/drivers/emc/plugins/vnx/connector.py
rename to manila/share/drivers/dell_emc/plugins/vnx/connector.py
index 9a74432a39..fd0b9a709f 100644
--- a/manila/share/drivers/emc/plugins/vnx/connector.py
+++ b/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__)
diff --git a/manila/share/drivers/emc/plugins/vnx/constants.py b/manila/share/drivers/dell_emc/plugins/vnx/constants.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/vnx/constants.py
rename to manila/share/drivers/dell_emc/plugins/vnx/constants.py
diff --git a/manila/share/drivers/emc/plugins/vnx/object_manager.py b/manila/share/drivers/dell_emc/plugins/vnx/object_manager.py
similarity index 99%
rename from manila/share/drivers/emc/plugins/vnx/object_manager.py
rename to manila/share/drivers/dell_emc/plugins/vnx/object_manager.py
index 372505ed31..687bad383b 100644
--- a/manila/share/drivers/emc/plugins/vnx/object_manager.py
+++ b/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__)
diff --git a/manila/share/drivers/emc/plugins/vnx/utils.py b/manila/share/drivers/dell_emc/plugins/vnx/utils.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/vnx/utils.py
rename to manila/share/drivers/dell_emc/plugins/vnx/utils.py
diff --git a/manila/share/drivers/emc/plugins/vnx/xml_api_parser.py b/manila/share/drivers/dell_emc/plugins/vnx/xml_api_parser.py
similarity index 100%
rename from manila/share/drivers/emc/plugins/vnx/xml_api_parser.py
rename to manila/share/drivers/dell_emc/plugins/vnx/xml_api_parser.py
diff --git a/manila/share/manager.py b/manila/share/manager.py
index 92afc87e2c..d1550d8f72 100644
--- a/manila/share/manager.py
+++ b/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
diff --git a/manila/tests/share/drivers/emc/__init__.py b/manila/tests/share/drivers/dell_emc/__init__.py
similarity index 100%
rename from manila/tests/share/drivers/emc/__init__.py
rename to manila/tests/share/drivers/dell_emc/__init__.py
diff --git a/manila/tests/share/drivers/emc/plugins/__init__.py b/manila/tests/share/drivers/dell_emc/plugins/__init__.py
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/__init__.py
rename to manila/tests/share/drivers/dell_emc/plugins/__init__.py
diff --git a/manila/tests/share/drivers/emc/plugins/isilon/__init__.py b/manila/tests/share/drivers/dell_emc/plugins/isilon/__init__.py
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/isilon/__init__.py
rename to manila/tests/share/drivers/dell_emc/plugins/isilon/__init__.py
diff --git a/manila/tests/share/drivers/emc/plugins/isilon/test_isilon.py b/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon.py
similarity index 98%
rename from manila/tests/share/drivers/emc/plugins/isilon/test_isilon.py
rename to manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon.py
index 5e340c6759..777a18bc60 100644
--- a/manila/tests/share/drivers/emc/plugins/isilon/test_isilon.py
+++ b/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
diff --git a/manila/tests/share/drivers/emc/plugins/isilon/test_isilon_api.py b/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon_api.py
similarity index 99%
rename from manila/tests/share/drivers/emc/plugins/isilon/test_isilon_api.py
rename to manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon_api.py
index a8fc894390..968943c6d7 100644
--- a/manila/tests/share/drivers/emc/plugins/isilon/test_isilon_api.py
+++ b/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
 
 
diff --git a/manila/tests/share/drivers/emc/plugins/unity/__init__.py b/manila/tests/share/drivers/dell_emc/plugins/unity/__init__.py
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/unity/__init__.py
rename to manila/tests/share/drivers/dell_emc/plugins/unity/__init__.py
diff --git a/manila/tests/share/drivers/emc/plugins/unity/fake_exceptions.py b/manila/tests/share/drivers/dell_emc/plugins/unity/fake_exceptions.py
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/unity/fake_exceptions.py
rename to manila/tests/share/drivers/dell_emc/plugins/unity/fake_exceptions.py
diff --git a/manila/tests/share/drivers/emc/plugins/unity/mocked_manila.yaml b/manila/tests/share/drivers/dell_emc/plugins/unity/mocked_manila.yaml
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/unity/mocked_manila.yaml
rename to manila/tests/share/drivers/dell_emc/plugins/unity/mocked_manila.yaml
diff --git a/manila/tests/share/drivers/emc/plugins/unity/mocked_unity.yaml b/manila/tests/share/drivers/dell_emc/plugins/unity/mocked_unity.yaml
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/unity/mocked_unity.yaml
rename to manila/tests/share/drivers/dell_emc/plugins/unity/mocked_unity.yaml
diff --git a/manila/tests/share/drivers/emc/plugins/unity/res_mock.py b/manila/tests/share/drivers/dell_emc/plugins/unity/res_mock.py
similarity index 97%
rename from manila/tests/share/drivers/emc/plugins/unity/res_mock.py
rename to manila/tests/share/drivers/dell_emc/plugins/unity/res_mock.py
index da5943639c..aef265126e 100644
--- a/manila/tests/share/drivers/emc/plugins/unity/res_mock.py
+++ b/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
diff --git a/manila/tests/share/drivers/emc/plugins/unity/test_client.py b/manila/tests/share/drivers/dell_emc/plugins/unity/test_client.py
similarity index 98%
rename from manila/tests/share/drivers/emc/plugins/unity/test_client.py
rename to manila/tests/share/drivers/dell_emc/plugins/unity/test_client.py
index 15f20096a0..e67b7e0670 100644
--- a/manila/tests/share/drivers/emc/plugins/unity/test_client.py
+++ b/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):
diff --git a/manila/tests/share/drivers/emc/plugins/unity/test_connection.py b/manila/tests/share/drivers/dell_emc/plugins/unity/test_connection.py
similarity index 99%
rename from manila/tests/share/drivers/emc/plugins/unity/test_connection.py
rename to manila/tests/share/drivers/dell_emc/plugins/unity/test_connection.py
index 6ea2826c3e..943d400a26 100644
--- a/manila/tests/share/drivers/emc/plugins/unity/test_connection.py
+++ b/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
diff --git a/manila/tests/share/drivers/emc/plugins/unity/test_utils.py b/manila/tests/share/drivers/dell_emc/plugins/unity/test_utils.py
similarity index 96%
rename from manila/tests/share/drivers/emc/plugins/unity/test_utils.py
rename to manila/tests/share/drivers/dell_emc/plugins/unity/test_utils.py
index 3d97024bde..6312089dce 100644
--- a/manila/tests/share/drivers/emc/plugins/unity/test_utils.py
+++ b/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
 
 
diff --git a/manila/tests/share/drivers/emc/plugins/unity/utils.py b/manila/tests/share/drivers/dell_emc/plugins/unity/utils.py
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/unity/utils.py
rename to manila/tests/share/drivers/dell_emc/plugins/unity/utils.py
diff --git a/manila/tests/share/drivers/emc/plugins/vnx/__init__.py b/manila/tests/share/drivers/dell_emc/plugins/vnx/__init__.py
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/vnx/__init__.py
rename to manila/tests/share/drivers/dell_emc/plugins/vnx/__init__.py
diff --git a/manila/tests/share/drivers/emc/plugins/vnx/fakes.py b/manila/tests/share/drivers/dell_emc/plugins/vnx/fakes.py
similarity index 100%
rename from manila/tests/share/drivers/emc/plugins/vnx/fakes.py
rename to manila/tests/share/drivers/dell_emc/plugins/vnx/fakes.py
diff --git a/manila/tests/share/drivers/emc/plugins/vnx/test_connection.py b/manila/tests/share/drivers/dell_emc/plugins/vnx/test_connection.py
similarity index 99%
rename from manila/tests/share/drivers/emc/plugins/vnx/test_connection.py
rename to manila/tests/share/drivers/dell_emc/plugins/vnx/test_connection.py
index b88172ce94..0c71d8beec 100644
--- a/manila/tests/share/drivers/emc/plugins/vnx/test_connection.py
+++ b/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__)
 
diff --git a/manila/tests/share/drivers/emc/plugins/vnx/test_connector.py b/manila/tests/share/drivers/dell_emc/plugins/vnx/test_connector.py
similarity index 97%
rename from manila/tests/share/drivers/emc/plugins/vnx/test_connector.py
rename to manila/tests/share/drivers/dell_emc/plugins/vnx/test_connector.py
index 7e055b62ea..6cea7e7253 100644
--- a/manila/tests/share/drivers/emc/plugins/vnx/test_connector.py
+++ b/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
 
 
diff --git a/manila/tests/share/drivers/emc/plugins/vnx/test_object_manager.py b/manila/tests/share/drivers/dell_emc/plugins/vnx/test_object_manager.py
similarity index 99%
rename from manila/tests/share/drivers/emc/plugins/vnx/test_object_manager.py
rename to manila/tests/share/drivers/dell_emc/plugins/vnx/test_object_manager.py
index 77ec0a991c..bdd6cd414c 100644
--- a/manila/tests/share/drivers/emc/plugins/vnx/test_object_manager.py
+++ b/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):
diff --git a/manila/tests/share/drivers/emc/plugins/vnx/test_utils.py b/manila/tests/share/drivers/dell_emc/plugins/vnx/test_utils.py
similarity index 96%
rename from manila/tests/share/drivers/emc/plugins/vnx/test_utils.py
rename to manila/tests/share/drivers/dell_emc/plugins/vnx/test_utils.py
index 00d3ef89c0..5771f0275c 100644
--- a/manila/tests/share/drivers/emc/plugins/vnx/test_utils.py
+++ b/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
 
 
diff --git a/manila/tests/share/drivers/emc/plugins/vnx/utils.py b/manila/tests/share/drivers/dell_emc/plugins/vnx/utils.py
similarity index 98%
rename from manila/tests/share/drivers/emc/plugins/vnx/utils.py
rename to manila/tests/share/drivers/dell_emc/plugins/vnx/utils.py
index 985ec9f117..67fce8814b 100644
--- a/manila/tests/share/drivers/emc/plugins/vnx/utils.py
+++ b/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))
diff --git a/manila/tests/share/drivers/emc/test_driver.py b/manila/tests/share/drivers/dell_emc/test_driver.py
similarity index 96%
rename from manila/tests/share/drivers/emc/test_driver.py
rename to manila/tests/share/drivers/dell_emc/test_driver.py
index 5a7b92e2a7..00e4383bdc 100644
--- a/manila/tests/share/drivers/emc/test_driver.py
+++ b/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'
diff --git a/releasenotes/notes/move-emc-share-driver-to-dell-emc-dir-1ec34dee0544270d.yaml b/releasenotes/notes/move-emc-share-driver-to-dell-emc-dir-1ec34dee0544270d.yaml
new file mode 100644
index 0000000000..cb3aee05c0
--- /dev/null
+++ b/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".
diff --git a/setup.cfg b/setup.cfg
index c98db5ff75..420051e066 100644
--- a/setup.cfg
+++ b/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