Merge "Introduce new resource_data_delete db api"

heat/db/api.py

@@ -78,6 +78,11 @@ def resource_data_get_by_key(context, resource_id, key):
     return IMPL.resource_data_get_by_key(context, resource_id, key)
 
 
+def resource_data_delete(resource, key):
+    """Remove a resource_data element associated to a resource."""
+    return IMPL.resource_data_delete(resource, key)
+
+
 def resource_get(context, resource_id):
     return IMPL.resource_get(context, resource_id)
 

heat/db/sqlalchemy/api.py

@@ -144,6 +144,11 @@ def resource_data_set(resource, key, value, redact=False):
     return current
 
 
+def resource_data_delete(resource, key):
+    result = resource_data_get_by_key(resource.context, resource.id, key)
+    result.delete()
+
+
 def resource_create(context, values):
     resource_ref = models.Resource()
     resource_ref.update(values)

heat/tests/test_sqlalchemy_api.py

@@ -16,6 +16,7 @@ from heat.db.sqlalchemy import api as db_api
 from heat.engine import environment
 from heat.tests.v1_1 import fakes
 from heat.engine.resource import Resource
+from heat.common import exception
 from heat.common import template_format
 from heat.engine.resources import instance as instances
 from heat.engine import parser
@@ -137,6 +138,18 @@ class SqlAlchemyTest(HeatTestCase):
         self.assertEqual(decrypted_key, "fake secret")
         cs.destroy()
 
+    def test_resource_data_delete(self):
+        stack = self._setup_test_stack('stack', UUID1)[1]
+        self._mock_create(self.m)
+        self.m.ReplayAll()
+        stack.create()
+        rsrc = stack.resources['WebServer']
+        db_api.resource_data_set(rsrc, 'test', 'test_data')
+        self.assertEqual('test_data', db_api.resource_data_get(rsrc, 'test'))
+        db_api.resource_data_delete(rsrc, 'test')
+        self.assertRaises(exception.NotFound,
+                          db_api.resource_data_get, rsrc, 'test')
+
     def test_stack_get_by_name(self):
         stack = self._setup_test_stack('stack', UUID1)[1]