Move "server_profile_template_uri" to REQUIRED_ON_PROPERTIES

According to the description in [1], "server_profile_template_uri"
is now stored in properties/capabilities instead of driver_info.
And also, gabriel-bezerra has commented that we should move
"server_profile_template_uri" to REQUIRED_ON_PROPERTIES and remove
the related unit tests after Mitaka.

So this patch does it.

[1] http://docs.openstack.org/developer/ironic/drivers/oneview.html#registering-a-oneview-node-in-ironic

Change-Id: Idea37b157ec0537a55a7c77f9bef284ff2bb94d5

1 files changed, 5 insertions, 35 deletions

diff --git a/ironic/drivers/modules/oneview/common.py b/ironic/drivers/modules/oneview/common.py
index 20e0307ce..7114a5cd3 100644
--- a/ironic/drivers/modules/oneview/common.py
+++ b/ironic/drivers/modules/oneview/common.py
@@ -19,7 +19,6 @@ from oslo_utils import importutils
 from ironic.common import exception
 from ironic.common.i18n import _
 from ironic.common.i18n import _LE
-from ironic.common.i18n import _LW
 from ironic.common import states
 from ironic.conf import CONF
 from ironic.drivers import utils
@@ -39,20 +38,15 @@ REQUIRED_ON_PROPERTIES = {
     'server_hardware_type_uri': _(
         "Server Hardware Type URI. Required in properties/capabilities."
     ),
+    'server_profile_template_uri': _(
+        "Server Profile Template URI to clone from. "
+        "Required in properties/capabilities."
+    ),
 }
 
-# TODO(gabriel-bezerra): Move 'server_profile_template_uri' to
-# REQUIRED_ON_PROPERTIES after Mitaka. See methods get_oneview_info,
-# verify_node_info from this file; and test_verify_node_info_missing_spt
-# and test_deprecated_spt_in_driver_info* from test_common tests.
 OPTIONAL_ON_PROPERTIES = {
     'enclosure_group_uri': _(
         "Enclosure Group URI. Optional in properties/capabilities."),
-
-    'server_profile_template_uri': _(
-        "Server Profile Template URI to clone from. "
-        "Deprecated in driver_info. "
-        "Required in properties/capabilities."),
 }
 
 COMMON_PROPERTIES = {}
@@ -109,29 +103,6 @@ def verify_node_info(node):
     _verify_node_info('properties/capabilities', capabilities_dict,
                       REQUIRED_ON_PROPERTIES)
 
-    # TODO(gabriel-bezerra): Remove this after Mitaka
-    try:
-        _verify_node_info('properties/capabilities', capabilities_dict,
-                          ['server_profile_template_uri'])
-
-    except exception.MissingParameterValue:
-        try:
-            _verify_node_info('driver_info', driver_info,
-                              ['server_profile_template_uri'])
-
-            LOG.warning(
-                _LW("Using 'server_profile_template_uri' in driver_info is "
-                    "now deprecated and will be ignored in future releases. "
-                    "Node %s should have it in its properties/capabilities "
-                    "instead."),
-                node.uuid
-            )
-        except exception.MissingParameterValue:
-            raise exception.MissingParameterValue(
-                _("Missing 'server_profile_template_uri' parameter value in "
-                  "properties/capabilities")
-            )
-    # end
     _verify_node_info('driver_info', driver_info,
                       REQUIRED_ON_DRIVER_INFO)
 
@@ -168,8 +139,7 @@ def get_oneview_info(node):
         'enclosure_group_uri':
             capabilities_dict.get('enclosure_group_uri'),
         'server_profile_template_uri':
-            capabilities_dict.get('server_profile_template_uri') or
-            driver_info.get('server_profile_template_uri'),
+            capabilities_dict.get('server_profile_template_uri'),
         'applied_server_profile_uri':
             driver_info.get('applied_server_profile_uri'),
     }