openstack
/
heat
Code Issues Proposed changes

Rename OS::Metering::Alarm to OS::Ceilometer::Alarm 

The other resources are named by project so this is to
try and be more consistent.

There is a mapping to allow the original name to work.

Change-Id: If60cc577a5a770bdaada70c7eae1ae3fc1776056
This commit is contained in:
Angus Salkeld 2013-08-23 16:30:12 +10:00
parent fb4e4a34dc
commit c60a60614b
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/heat/environment.d/default.yaml
View File

@ -5,3 +5,4 @@ resource_registry:
# Choose your implementation of AWS::CloudWatch::Alarm # Choose your implementation of AWS::CloudWatch::Alarm
#"AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml" #"AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml"
"AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm" "AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm"
"OS::Metering::Alarm": "OS::Ceilometer::Alarm"

2
etc/heat/templates/AWS_CloudWatch_Alarm.yaml
View File

@ -59,7 +59,7 @@ Mappings:
Resources: Resources:
__alarm__: __alarm__:
Type: OS::Metering::Alarm Type: OS::Ceilometer::Alarm
Properties: Properties:
description: description:
Ref: AlarmDescription Ref: AlarmDescription

2
heat/engine/resources/ceilometer/alarm.py
View File

@ -130,5 +130,5 @@ class CeilometerAlarm(resource.Resource):
def resource_mapping(): def resource_mapping():
return { return {
'OS::Metering::Alarm': CeilometerAlarm, 'OS::Ceilometer::Alarm': CeilometerAlarm,
} }

2
heat/tests/test_ceilometer_alarm.py
View File

@ -44,7 +44,7 @@ alarm_template = '''
"Parameters" : {}, "Parameters" : {},
"Resources" : { "Resources" : {
"MEMAlarmHigh": { "MEMAlarmHigh": {
"Type": "OS::Metering::Alarm", "Type": "OS::Ceilometer::Alarm",
"Properties": { "Properties": {
"description": "Scale-up if MEM > 50% for 1 minute", "description": "Scale-up if MEM > 50% for 1 minute",
"counter_name": "MemoryUtilization", "counter_name": "MemoryUtilization",