Image cache aging: change to objects causes invalid data to be passed

[Gary Kotton]

An extra entry of invalid data is passes to the image cache aging:
USED: {'': (2, 0, ['instance-0000000a', 'instance-0000000a']), '7ee53435-b6d5-4c15-bce4-2f3dfac96ffd': (1, 0, ['instance-0000000a'])}
This is due to the change to objects.

[Gary Kotton (garyk)]

https://review.openstack.org/#/c/111996/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/111996
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=23340b49b1adee5cb9592b8e6a8471969b9341c7
Submitter: Jenkins
Branch: master

commit 23340b49b1adee5cb9592b8e6a8471969b9341c7
Author: Gary Kotton <email address hidden>
Date: Tue Aug 5 05:11:17 2014 -0700

    Image caching: update image caching to use objects

    Commit 1023e703bd41c2a42b1159af0d9e907e94440b34 added support
    for objects. This patch ensures that the parsing of the instances
    is correct.

    The patch does the following:
    1. In the method _list_running_instances it treats all instances
       as an object
    2. Fixes the bug mentioned below. The code was making a string from
       None. This would lead to invalid image details.
    3. Ensures that the unit tests actually pass instance objects instead
       of an instance dict
    4. In relevant tests updates assertEquals to have the expected parameter
       first

    Closes-bug: #1354664

    Change-Id: Ib028baab4d4c823f22c371a83f7a813c24d77570