From 52f2ebe6e356a9ddf60bf31f6b124ee7bf03441a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 6 Jul 2021 21:12:52 +0900
Subject: [PATCH] Replace oslo_utils.fnmatch with fnmatch

The oslo_utils.fnmatch module was added to solve an issue in py2.7 but
it is no longer required because py2.7 is no longer supported.
The module was deprecated since oslo.utils 4.9.1[1] and the stdlib's
fnmatch module should be used instead.

[1] 4c893c92f551c9dd2a7cfbe7ae8171ad8139df0b

Change-Id: Ie1601bfe79f744c553c25d7724cc9bf1894bc59b
---
 manila/share/drivers/dell_emc/common/enas/utils.py   | 2 +-
 manila/share/drivers/dell_emc/plugins/unity/utils.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manila/share/drivers/dell_emc/common/enas/utils.py b/manila/share/drivers/dell_emc/common/enas/utils.py
index a1faf6e193..7482f4ff9d 100644
--- a/manila/share/drivers/dell_emc/common/enas/utils.py
+++ b/manila/share/drivers/dell_emc/common/enas/utils.py
@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import fnmatch
 import types
 
 from oslo_config import cfg
 from oslo_log import log
-from oslo_utils import fnmatch
 from oslo_utils import netutils
 from oslo_utils import timeutils
 from oslo_utils import units
diff --git a/manila/share/drivers/dell_emc/plugins/unity/utils.py b/manila/share/drivers/dell_emc/plugins/unity/utils.py
index 564fa543d7..433918906d 100644
--- a/manila/share/drivers/dell_emc/plugins/unity/utils.py
+++ b/manila/share/drivers/dell_emc/plugins/unity/utils.py
@@ -14,8 +14,9 @@
 #    under the License.
 """ Utility module for EMC Unity Manila Driver """
 
+import fnmatch
+
 from oslo_log import log
-from oslo_utils import fnmatch
 from oslo_utils import units
 
 from manila import exception