← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty-security

« back to all changes in this revision

Viewing changes to heat/db/api.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Yolanda Robla, Chuck Short
  • Date: 2013-07-22 16:22:29 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20130722162229-zzvfu40id94ii0hc
Tags: 2013.2~b2-0ubuntu1
[ Yolanda Robla ]
* debian/tests: added autopkg tests

[ Chuck Short ]
* New upstream release
* debian/control:
  - Add python-pbr to build-depends.
  - Add python-d2to to build-depends.
  - Dropped python-argparse.
  - Add python-six to build-depends.
  - Dropped python-sendfile.
  - Dropped python-nose.
  - Added testrepository.
  - Added python-testtools.
* debian/rules: Run testrepository instead of nosetets.
* debian/patches/removes-lxml-version-limitation-from-pip-requires.patch: Dropped
  no longer needed.
* debian/patches/fix-package-version-detection-when-building-doc.patch: Dropped
  no longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/db/api.py
28
28
 
29
29
from oslo.config import cfg
30
30
 
 
31
from heat.common import config
31
32
from heat.db import utils
32
33
 
33
34
SQL_CONNECTION = 'sqlite://'
44
45
def configure():
45
46
    global SQL_CONNECTION
46
47
    global SQL_IDLE_TIMEOUT
 
48
    config.register_db_opts()
47
49
    SQL_CONNECTION = cfg.CONF.sql_connection
48
50
    SQL_IDLE_TIMEOUT = cfg.CONF.sql_idle_timeout
49
51
 
64
66
    return IMPL.raw_template_create(context, values)
65
67
 
66
68
 
 
69
def resource_data_get(resource, key):
 
70
    return IMPL.resource_data_get(resource, key)
 
71
 
 
72
 
 
73
def resource_data_set(resource, key, value, redact=False):
 
74
    return IMPL.resource_data_set(resource, key, value, redact=redact)
 
75
 
 
76
 
 
77
def resource_data_get_by_key(context, resource_id, key):
 
78
    return IMPL.resource_data_get_by_key(context, resource_id, key)
 
79
 
 
80
 
67
81
def resource_get(context, resource_id):
68
82
    return IMPL.resource_get(context, resource_id)
69
83
 
170
184
    return IMPL.watch_rule_update(context, watch_id, values)
171
185
 
172
186
 
173
 
def watch_rule_delete(context, watch_rule_name):
174
 
    return IMPL.watch_rule_delete(context, watch_rule_name)
 
187
def watch_rule_delete(context, watch_id):
 
188
    return IMPL.watch_rule_delete(context, watch_id)
175
189
 
176
190
 
177
191
def watch_data_create(context, values):