From 0295570d3186ce64bbb17ae254720c0c15251458 Mon Sep 17 00:00:00 2001
From: Tetiana Lashchova <tlashchova@mirantis.com>
Date: Fri, 22 May 2015 18:25:33 +0300
Subject: [PATCH] Remove deprecated resolve_runtime_data

Remove unused resolve_runtime_data according to
https://etherpad.openstack.org/p/YVR-heat-liberty-deprecation

Change-Id: Iaf3731ccf5e4693f26a068191cfbb26088dd516c
---
 heat/engine/stack.py        |  8 --------
 heat/tests/test_template.py | 12 ------------
 2 files changed, 20 deletions(-)

diff --git a/heat/engine/stack.py b/heat/engine/stack.py
index b566bca04b..4f50a8d4c1 100755
--- a/heat/engine/stack.py
+++ b/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
@@ -1559,13 +1558,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:
diff --git a/heat/tests/test_template.py b/heat/tests/test_template.py
index 1801ab03d5..f6909ee615 100644
--- a/heat/tests/test_template.py
+++ b/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']]}