From 676638ede872decf0d037a7edaf13b0b9bad047a Mon Sep 17 00:00:00 2001 From: liusheng Date: Tue, 1 Dec 2015 11:43:37 +0800 Subject: [PATCH] Fix ceilometer-test-event.py script The ceilometer/tools/ceilometer-test-event.py script has been broken by changes about yaml configuration loading. Change-Id: I15b6bb053cf93847886c35e6af5c3eccb2984dba --- tools/ceilometer-test-event.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/ceilometer-test-event.py b/tools/ceilometer-test-event.py index 9e4da48c..dedc7ac0 100755 --- a/tools/ceilometer-test-event.py +++ b/tools/ceilometer-test-event.py @@ -49,7 +49,6 @@ TYPES = {1: 'text', service.prepare_service() -config_file = converter.get_config_file() output_file = cfg.CONF.output_file input_file = cfg.CONF.input_file @@ -64,7 +63,7 @@ else: with open(input_file, 'r') as 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)) event_converter = converter.setup_events( @@ -77,7 +76,7 @@ for notification in notifications: out.write("Dropped notification: %s\n" % notification['message_id']) 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: dtype = TYPES[trait.dtype] out.write(" Trait: name: %s, type: %s, value: %s\n" % (