From d57548952d1fee60680b530b0cb2895c6a2facc8 Mon Sep 17 00:00:00 2001
From: Helen Walsh <helen.walsh@emc.com>
Date: Mon, 8 Oct 2018 17:26:00 +0100
Subject: [PATCH] VMAX manila - deprecate old tags correctly

Aligning with VNX/Unity terminology in
https://github.com/openstack/manila/commit/966b1621d3be351b8ab5c831a2688a997b8281c8
Old tags were replaced without deprecating correctly.  Also adding a
release note for this change

Change-Id: If180f1a2ea8c307c8a40f2a17b35796357306c03
Closes-Bug: #1798393
(cherry picked from commit ff3857b563c05c92d073f8c6529dcfd4e7f7957d)
---
 .../share/drivers/dell_emc/plugins/vmax/connection.py  |  7 +++++--
 .../notes/vmax-rename-options-44d8123d14a23f94.yaml    | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/vmax-rename-options-44d8123d14a23f94.yaml

diff --git a/manila/share/drivers/dell_emc/plugins/vmax/connection.py b/manila/share/drivers/dell_emc/plugins/vmax/connection.py
index 999b6c0d35..2a1b193775 100644
--- a/manila/share/drivers/dell_emc/plugins/vmax/connection.py
+++ b/manila/share/drivers/dell_emc/plugins/vmax/connection.py
@@ -39,11 +39,14 @@ LOG = log.getLogger(__name__)
 
 VMAX_OPTS = [
     cfg.StrOpt('vmax_server_container',
+               deprecated_name='emc_nas_server_container',
                help='Data mover to host the NAS server.'),
     cfg.ListOpt('vmax_share_data_pools',
+                deprecated_name='emc_nas_pool_names',
                 help='Comma separated list of pools that can be used to '
                      'persist share data.'),
     cfg.ListOpt('vmax_ethernet_ports',
+                deprecated_name='emc_interface_ports',
                 help='Comma separated list of ports that can be used for '
                      'share server interfaces. Members of the list '
                      'can be Unix-style glob expressions.')
@@ -570,7 +573,7 @@ class VMAXStorageConnection(driver.StorageConnection):
             self.reserved_percentage = 0
 
         self.manager = manager.StorageObjectManager(config)
-        self.port_conf = config.safe_get('emc_interface_ports')
+        self.port_conf = config.safe_get('vmax_ethernet_ports')
 
     def get_managed_ports(self):
         # Get the real ports(devices) list from the backend storage
@@ -586,7 +589,7 @@ class VMAXStorageConnection(driver.StorageConnection):
 
         if not matched_ports:
             msg = (_("None of the specified network ports exist. "
-                     "Please check your configuration emc_interface_ports "
+                     "Please check your configuration vmax_ethernet_ports "
                      "in manila.conf. The available ports on the Data Mover "
                      "are %s.") %
                    ",".join(real_ports))
diff --git a/releasenotes/notes/vmax-rename-options-44d8123d14a23f94.yaml b/releasenotes/notes/vmax-rename-options-44d8123d14a23f94.yaml
new file mode 100644
index 0000000000..204bd5e75b
--- /dev/null
+++ b/releasenotes/notes/vmax-rename-options-44d8123d14a23f94.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - For Dell EMC VMAX Manila driver, replaced
+    emc_nas_pool_names with vmax_share_data_pools,
+    emc_interface_ports with vmax_ethernet_ports,
+    emc_nas_server_container with vmax_server_container.
+deprecations:
+  - For Dell EMC VMAX Manila driver, options emc_nas_pool_names,
+    emc_interface_ports, emc_nas_server_container are
+    deprecated.