Merge "Add {get_,set_}aggregates to objects.ResourceProvider"

diff --cc nova/objects/resource_provider.py
Simple merge

diff --cc nova/tests/functional/db/test_resource_provider.py
Simple merge

diff --cc nova/tests/unit/objects/test_objects.py
index 73c9e82970ab069e21e61806a80c5fff1701fdb9,3fde6d954a411d5ff5d439fa91cff02a0c192005..a2f2baa9867ee8dbfb9a9c157cd9ea28a077455d
--- 1/nova/tests/unit/objects/test_objects.py
--- 2/nova/tests/unit/objects/test_objects.py
+++ b/nova/tests/unit/objects/test_objects.py
@@@ -1179,10 -1179,10 +1179,10 @@@ object_data = 
      'PciDevicePoolList': '1.1-15ecf022a68ddbb8c2a6739cfc9f8f5e',
      'Quotas': '1.2-1fe4cd50593aaf5d36a6dc5ab3f98fb3',
      'QuotasNoOp': '1.2-e041ddeb7dc8188ca71706f78aad41c1',
 -    'RequestSpec': '1.7-5ff3e9df208bf25f8215f1b87624970d',
 +    'RequestSpec': '1.8-35033ecef47a880f9a5e46e2269e2b97',
      'ResourceClass': '1.0-e6b367e2cf1733c5f3526f20a3286fe9',
      'ResourceClassList': '1.0-4ee0d9efdfd681fed822da88376e04d2',
-     'ResourceProvider': '1.1-7bbcd5ea1c51782692f55489ab08dea6',
+     'ResourceProvider': '1.2-7bbcd5ea1c51782692f55489ab08dea6',
      'ResourceProviderList': '1.0-82bd48d8d0f7913bbe7266f3835c81bf',
      'S3ImageMapping': '1.0-7dd7366a890d82660ed121de9092276e',
      'SchedulerLimits': '1.0-249c4bd8e62a9b327b7026b7f19cc641',