resource_id is null when using Swift with a custom reseller_prefix

[Christian Schwede]

The ceilometer plugin for Swift uses the prefix "AUTH_" to get the account ID from Swift.
However, sometimes it is usefull to set a different prefix; in Swift this is done by setting reseller_prefix in the authentication middleware. If Swift is used with a different reseller_prefix the ceilometer middleware returns an empty resource_id.

+----------------------------------+---------------------+-------+--------+---------+----------------------------+
| Resource ID | Name | Type | Volume | Unit | Timestamp |
+----------------------------------+---------------------+-------+--------+---------+----------------------------+
| None | storage.api.request | delta | 1.0 | request | 2013-12-14T11:11:53.174040 |
| None | storage.api.request | delta | 1.0 | request | 2013-12-14T11:11:53.121883 |

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/62155

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/62155
Committed: https://git.openstack.org/cgit/openstack/ceilometer/commit/?id=263522d2296ef0c78a81f0e9ed48c3d80355f045
Submitter: Jenkins
Branch: master

commit 263522d2296ef0c78a81f0e9ed48c3d80355f045
Author: Christian Schwede <email address hidden>
Date: Sat Dec 14 12:00:02 2013 +0000

    Allow customized reseller_prefix in Ceilometer middleware for Swift

    Swift can be configured to use a different reseller prefix than AUTH_.
    In this case Ceilometer returns None as resource_id.

    This patch allows to set the reseller prefix, with a fallback to AUTH_
    if not set. It also ensures that the reseller prefix ends with ``_``.
    Two additional tests to verify this were added.

    Change-Id: I1ba40091582da46c0385a71d1828bb3820a5e2b5
    Closes-Bug: #1260965