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

diff --git a/etc/heat/environment.d/default.yaml b/etc/heat/environment.d/default.yaml
index 678f888f4f6a39ee299279ce24b6a85c33f0cb69..1f4c848a6b16a02ec8ab4ad281b30d249508a415 100644 (file)
--- a/etc/heat/environment.d/default.yaml
+++ b/etc/heat/environment.d/default.yaml
@@ -5,3 +5,4 @@ resource_registry:
     # Choose your implementation of AWS::CloudWatch::Alarm
     #"AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml"
     "AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm"
+    "OS::Metering::Alarm": "OS::Ceilometer::Alarm"

diff --git a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml
index 1f8fea96dcd085538dde24ff38c5dffc87073ec6..bfdf565e3da6742dfcb2f88d043c8d59cf6215ed 100644 (file)
--- a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml
+++ b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml
@@ -59,7 +59,7 @@ Mappings:
 
 Resources:
   __alarm__:
-    Type: OS::Metering::Alarm
+    Type: OS::Ceilometer::Alarm
     Properties:
       description:
         Ref: AlarmDescription

diff --git a/heat/engine/resources/ceilometer/alarm.py b/heat/engine/resources/ceilometer/alarm.py
index 646fd8d7b20b7749a57d03b5a9d6d67dd71b9f29..487a56b75faa8047af358c3006742fd0700d921c 100644 (file)
--- a/heat/engine/resources/ceilometer/alarm.py
+++ b/heat/engine/resources/ceilometer/alarm.py
@@ -130,5 +130,5 @@ class CeilometerAlarm(resource.Resource):
 
 def resource_mapping():
     return {
-        'OS::Metering::Alarm': CeilometerAlarm,
+        'OS::Ceilometer::Alarm': CeilometerAlarm,
     }

diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py
index 141df1fcc287e5960fb853dfebcfe18b8fdcd8d8..9261720a207ecf8c9874c195e4524d80f1daaf41 100644 (file)
--- a/heat/tests/test_ceilometer_alarm.py
+++ b/heat/tests/test_ceilometer_alarm.py
@@ -44,7 +44,7 @@ alarm_template = '''
   "Parameters" : {},
   "Resources" : {
     "MEMAlarmHigh": {
-     "Type": "OS::Metering::Alarm",
+     "Type": "OS::Ceilometer::Alarm",
      "Properties": {
         "description": "Scale-up if MEM > 50% for 1 minute",
         "counter_name": "MemoryUtilization",