Aggregate metadata filtering by key returns unrelated metadata

[Kieran Spear]

Filtering metadata by key using these two DB functions doesn't work correctly:

aggregate_metadata_get_by_host
aggregate_host_get_by_metadata_key

In both cases the function returns metadata from keys other than the target key. This looks due to the code following the Aggregate._metadata relationship which is independent from any filtering done in the original query due to the joinedload().

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/37069
Committed: http://github.com/openstack/nova/commit/7e8fa8f3e6acac0e510cd1fc5af591f9a321d03a
Submitter: Jenkins
Branch: master

commit 7e8fa8f3e6acac0e510cd1fc5af591f9a321d03a
Author: Kieran Spear <email address hidden>
Date: Mon Jul 15 22:00:19 2013 +1000

    Fix filtering aggregate metadata by key

    Filtering by metadata key has no effect in the following two functions:

        aggregate_metadata_get_by_host
        aggregate_host_get_by_metadata_key

    Rely on the explicit join instead of joinedload to load the _metadata
    relationship in these functions (indicated by the contains_eager
    option), so that filtering by key still applies when the metadata is
    collected.

    Fixes bug 1201283.

    Change-Id: I3e44b5db8d67787bfa14f0e57d30a02a271a8833

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/grizzly
Review: https://review.openstack.org/38587

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/38587
Committed: http://github.com/openstack/nova/commit/c30e03e2aa1acc0207be47b3acc156ddcfd94947
Submitter: Jenkins
Branch: stable/grizzly

commit c30e03e2aa1acc0207be47b3acc156ddcfd94947
Author: Kieran Spear <email address hidden>
Date: Mon Jul 15 22:00:19 2013 +1000

    Fix filtering aggregate metadata by key

    Filtering by metadata key has no effect in the following two functions:

        aggregate_metadata_get_by_host
        aggregate_host_get_by_metadata_key

    Rely on the explicit join instead of joinedload to load the _metadata
    relationship in these functions (indicated by the contains_eager
    option), so that filtering by key still applies when the metadata is
    collected.

    Fixes bug 1201283.

    Conflicts:

     nova/tests/db/test_db_api.py

    Change-Id: I3e44b5db8d67787bfa14f0e57d30a02a271a8833
    (cherry picked from commit 7e8fa8f3e6acac0e510cd1fc5af591f9a321d03a)