Merge "Remove deprecated resolve_runtime_data"

heat/engine/stack.py

@@ -16,7 +16,6 @@ import copy
 import datetime
 import itertools
 import re
-import warnings
 
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -1569,13 +1568,6 @@ class Stack(collections.Mapping):
             raise exception.StackValidationFailed(
                 message=encodeutils.safe_decode(six.text_type(ex)))
 
-    def resolve_runtime_data(self, snippet):
-        """DEPRECATED. Use heat.engine.function.resolve() instead."""
-        warnings.warn('Stack.resolve_runtime_data() is deprecated. '
-                      'Use heat.engine.function.resolve() instead',
-                      DeprecationWarning)
-        return function.resolve(snippet)
-
     def reset_resource_attributes(self):
         # nothing is cached if no resources exist
         if not self._resources:

heat/tests/test_template.py

@@ -1015,18 +1015,6 @@ class ResolveDataTest(common.HeatTestCase):
     def resolve(self, snippet):
         return function.resolve(self.stack.t.parse(self.stack, snippet))
 
-    def test_stack_resolve_runtime_data_deprecated(self):
-        stk = stack.Stack(self.ctx, 'test_stack',
-                          template.Template(empty_template),
-                          tenant_id='bar')
-
-        test_data = {'foo': 'bar'}
-        msg = ('Stack.resolve_runtime_data\(\) is deprecated.'
-               ' Use heat.engine.function.resolve\(\) instead')
-        with self.assertWarnsRegex(DeprecationWarning, msg):
-            resolved = stk.resolve_runtime_data(test_data)
-        self.assertEqual(test_data, resolved)
-
     def test_join_split(self):
         # join
         snippet = {'Fn::Join': [';', ['one', 'two', 'three']]}