diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-08-06 14:01:01 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-08-06 14:01:01 +0000 |
commit | 0d09af45334a5c6b9ab8d432792e240cf82f6698 (patch) | |
tree | 9f4b8569b353f05d4e38b8092da1f2d13796a1b1 /tools | |
parent | 18b95a34b88b9ebe63a73880f975f7d92ae5f12d (diff) | |
parent | db04f196bdcefac0601ff0841e970e810df6a05d (diff) | |
download | ceilometer-0d09af45334a5c6b9ab8d432792e240cf82f6698.tar.gz |
Merge "Fix make_test_data tools script"
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/make_test_data.py | 8 | ||||
-rwxr-xr-x | tools/show_data.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/make_test_data.py b/tools/make_test_data.py index 4d2f3d81..e163eb12 100755 --- a/tools/make_test_data.py +++ b/tools/make_test_data.py @@ -100,14 +100,14 @@ def main(): root_logger.setLevel(logging.DEBUG) # Connect to the metering database - conn = storage.get_connection(cfg.CONF) + conn = storage.get_connection_from_config(cfg.CONF) # Find the user and/or project for a real resource if not (args.user or args.project): for r in conn.get_resources(): - if r['resource_id'] == args.resource: - args.user = r['user_id'] - args.project = r['project_id'] + if r.resource_id == args.resource: + args.user = r.user_id + args.project = r.project_id break # Compute start and end timestamps for the diff --git a/tools/show_data.py b/tools/show_data.py index 1cea68eb..d07c14e9 100755 --- a/tools/show_data.py +++ b/tools/show_data.py @@ -118,7 +118,7 @@ def main(argv): #ceilometer collector by default. default_config_files=['/etc/ceilometer/ceilometer.conf'], ) - db = storage.get_connection(cfg.CONF) + db = storage.get_connection_from_config(cfg.CONF) command = extra_args[0] if extra_args else 'help' COMMANDS[command](db, extra_args[1:]) |