From 5b17594ce250bec1581429559224d8463db7f9c5 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Wed, 25 Feb 2015 11:03:01 -0800
Subject: [PATCH] Expanded event_definitions to UsageHandler required traits.

Otherwise the CUF Yagi handler will not be able to create and
publish the CUF records.

Change-Id: Iaac5aaee7d6c17ee58a26f9a64d8fd7148b44b80
---
 .../roles/stv3-common/files/event_definitions.yaml   | 11 +++++++++++
 winchester/event_definitions.yaml                    | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/ansible/roles/stv3-common/files/event_definitions.yaml b/ansible/roles/stv3-common/files/event_definitions.yaml
index 92dec52..b92d3ab 100644
--- a/ansible/roles/stv3-common/files/event_definitions.yaml
+++ b/ansible/roles/stv3-common/files/event_definitions.yaml
@@ -57,12 +57,20 @@
       fields: payload.instance_type
     state:
       fields: payload.state
+    state_description:
+      fields: payload.state_description
+    bandwidth_in:
+      fields: payload.bandwidth.public.bw_in
+    bandwidth_out:
+      fields: payload.bandwidth.public.bw_out
     os_architecture:
       fields: payload.image_meta.'org.openstack__1__architecture'
     os_version:
       fields: payload.image_meta.'org.openstack__1__os_version'
     os_distro:
       fields: payload.image_meta.'org.openstack__1__os_distro'
+    rax_options:
+      fields: payload.image_meta.'com.rackspace__1__options'
     launched_at:
       type: datetime
       fields: payload.launched_at
@@ -71,6 +79,9 @@
       fields: 
         - payload.deleted_at
         - payload.terminated_at
+    display_name:
+      fields: payload.display_name
+
 - event_type: compute.instance.exists
   traits:
     <<: *instance_traits
diff --git a/winchester/event_definitions.yaml b/winchester/event_definitions.yaml
index 8ac7306..b92d3ab 100644
--- a/winchester/event_definitions.yaml
+++ b/winchester/event_definitions.yaml
@@ -1,3 +1,4 @@
+---
 - event_type: compute.instance.*
   traits: &instance_traits
     tenant_id:
@@ -56,12 +57,20 @@
       fields: payload.instance_type
     state:
       fields: payload.state
+    state_description:
+      fields: payload.state_description
+    bandwidth_in:
+      fields: payload.bandwidth.public.bw_in
+    bandwidth_out:
+      fields: payload.bandwidth.public.bw_out
     os_architecture:
       fields: payload.image_meta.'org.openstack__1__architecture'
     os_version:
       fields: payload.image_meta.'org.openstack__1__os_version'
     os_distro:
       fields: payload.image_meta.'org.openstack__1__os_distro'
+    rax_options:
+      fields: payload.image_meta.'com.rackspace__1__options'
     launched_at:
       type: datetime
       fields: payload.launched_at
@@ -70,6 +79,9 @@
       fields: 
         - payload.deleted_at
         - payload.terminated_at
+    display_name:
+      fields: payload.display_name
+
 - event_type: compute.instance.exists
   traits:
     <<: *instance_traits