creating audittemplate failed with old scope format

[licanwei]

In https://specs.openstack.org/openstack/watcher-specs/specs/queens/implemented/cdm-scoping.html, we changed the scope format, when creating audittemplate with old scope, there is an exception Additional properties are not allowed ('host_aggregates' was unexpected).
for example, scope file:[{"host_aggregates": [
                                    {"id": 1}]},
                               {"availability_zones": [
                                    {"name": "AZ1"},
                                    {"name": "AZ2"}]},
                               {"exclude": [
                                    {"instances": [
                                    ]},
                                    {"compute_nodes": [
                                    ]}
                               ]}]

CLI: watcher audittemplate create --scope /home/scope.json at1 dummy
return HTTP 500

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/733487

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/733487
Committed: https://git.openstack.org/cgit/openstack/watcher/commit/?id=4a1915bec4c53f6aa893e649d14cd7106a983817
Submitter: Zuul
Branch: master

commit 4a1915bec4c53f6aa893e649d14cd7106a983817
Author: licanwei <email address hidden>
Date: Thu Jun 4 16:45:01 2020 +0800

    Compatible with old scope format

    Scope format changed from old to new after bp cdm-scoping.

    old format:
      - availability_zones:
        - name: nova
      - host_aggregates:
        - id: 1
        - name: agg
      - exclude:
        - compute_nodes:
          - name: w012

    new format:
    - compute:
      - availability_zones:
        - name: nova
      - host_aggregates:
        - id: 1
        - name: agg
      - exclude:
        - compute_nodes:
          - name: w012

    Change-Id: I2b5cd4d1cee19f5588e4d2185eb074343fff1187
    Closed-Bug: #1882049

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/735037

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/train
Review: https://review.opendev.org/735038

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/735038
Committed: https://git.openstack.org/cgit/openstack/watcher/commit/?id=4422878ec73c8b5612e5875ba35f198e951d2c26
Submitter: Zuul
Branch: stable/train

commit 4422878ec73c8b5612e5875ba35f198e951d2c26
Author: licanwei <email address hidden>
Date: Thu Jun 4 16:45:01 2020 +0800

    Compatible with old scope format

    Scope format changed from old to new after bp cdm-scoping.

    old format:
      - availability_zones:
        - name: nova
      - host_aggregates:
        - id: 1
        - name: agg
      - exclude:
        - compute_nodes:
          - name: w012

    new format:
    - compute:
      - availability_zones:
        - name: nova
      - host_aggregates:
        - id: 1
        - name: agg
      - exclude:
        - compute_nodes:
          - name: w012

    Change-Id: I2b5cd4d1cee19f5588e4d2185eb074343fff1187
    Closed-Bug: #1882049
    (cherry picked from commit 4a1915bec4c53f6aa893e649d14cd7106a983817)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/735037
Committed: https://git.openstack.org/cgit/openstack/watcher/commit/?id=6e1be3cca4f725e5e4bac5e600de6179a1cfb9bc
Submitter: Zuul
Branch: stable/ussuri

commit 6e1be3cca4f725e5e4bac5e600de6179a1cfb9bc
Author: licanwei <email address hidden>
Date: Thu Jun 4 16:45:01 2020 +0800

    Compatible with old scope format

    Scope format changed from old to new after bp cdm-scoping.

    old format:
      - availability_zones:
        - name: nova
      - host_aggregates:
        - id: 1
        - name: agg
      - exclude:
        - compute_nodes:
          - name: w012

    new format:
    - compute:
      - availability_zones:
        - name: nova
      - host_aggregates:
        - id: 1
        - name: agg
      - exclude:
        - compute_nodes:
          - name: w012

    Change-Id: I2b5cd4d1cee19f5588e4d2185eb074343fff1187
    Closed-Bug: #1882049
    (cherry picked from commit 4a1915bec4c53f6aa893e649d14cd7106a983817)