openstack/ceilometer
Code Issues Proposed changes

Fix ceilometer-test-event.py script

Browse Source 
The ceilometer/tools/ceilometer-test-event.py script has been broken by
changes about yaml configuration loading.

Change-Id: I15b6bb053cf93847886c35e6af5c3eccb2984dba
This commit is contained in:
liusheng
2015-12-01 11:43:37 +08:00
parent e568d8db38
commit 676638ede8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/ceilometer-test-event.py
View File

@@ -49,7 +49,6 @@ TYPES = {1: 'text',
service.prepare_service() service.prepare_service()
config_file = converter.get_config_file()
output_file = cfg.CONF.output_file output_file = cfg.CONF.output_file
input_file = cfg.CONF.input_file input_file = cfg.CONF.input_file
@@ -64,7 +63,7 @@ else:
with open(input_file, 'r') as f: with open(input_file, 'r') as f:
notifications = json.load(f) notifications = json.load(f)
out.write("Definitions file: %s\n" % config_file) out.write("Definitions file: %s\n" % cfg.CONF.event.definitions_cfg_file)
out.write("Notifications tested: %s\n" % len(notifications)) out.write("Notifications tested: %s\n" % len(notifications))
event_converter = converter.setup_events( event_converter = converter.setup_events(
@@ -77,7 +76,7 @@ for notification in notifications:
out.write("Dropped notification: %s\n" % out.write("Dropped notification: %s\n" %
notification['message_id']) notification['message_id'])
continue continue
out.write("Event: %s at %s\n" % (event.event_name, event.generated)) out.write("Event: %s at %s\n" % (event.event_type, event.generated))
for trait in event.traits: for trait in event.traits:
dtype = TYPES[trait.dtype] dtype = TYPES[trait.dtype]
out.write(" Trait: name: %s, type: %s, value: %s\n" % ( out.write(" Trait: name: %s, type: %s, value: %s\n" % (