Aodh gnocchi_aggregation_by_resources_threshold alarm update will change alarm query unintentionally

[Shi Yan]

I am using Pike version AODH.
When updating aodh alarm the alarm query will also be modified, which is not my intention.

For example, I update the granularity of an alarm by using CLI:
aodh alarm update --granularity 60 36973010-5af1-4688-bbeb-2827cd09c547
The update is successful but the query of alarm is also changed as below.
Actually every update action will incur the query with more unnecessary condition.

{"and": [{"or": [{"=": {"created_by_project_id": "5fd0366d75b64acb8c4781cbe4adac41"}}, {"and": [{"=": {"created_by_project_id": "d9db663f26604e59a8980296b140aacf"}}, {"=": {"project_id": "5fd0366d75b64acb8c4781cbe4adac41"}}]}]}, {"=": {"server_group": "86f667d9-d85f-4028-915a-e8c464a72aa3"}}]}
------------>
{"and": [{"or": [{"=": {"created_by_project_id": "5fd0366d75b64acb8c4781cbe4adac41"}}, {"and": [{"=": {"created_by_project_id": "d9db663f26604e59a8980296b140aacf"}}, {"=": {"project_id": "5fd0366d75b64acb8c4781cbe4adac41"}}]}]}, {"and": [{"or": [{"=": {"created_by_project_id": "5fd0366d75b64acb8c4781cbe4adac41"}}, {"and": [{"=": {"created_by_project_id": "d9db663f26604e59a8980296b140aacf"}}, {"=": {"project_id": "5fd0366d75b64acb8c4781cbe4adac41"}}]}]}, {"=": {"server_group": "86f667d9-d85f-4028-915a-e8c464a72aa3"}}]}]}

[OpenStack Infra (hudson-openstack)]

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