Browse Source

Newer clients use id and not uuid as a parameter

make sure it works with id as a parameter

Change-Id: Ifc5e9d3dfb79548bff273655ad812de507876c1c
changes/09/747209/3
Eyal 1 month ago
parent
commit
fc1de82c66
2 changed files with 8 additions and 1 deletions
  1. +5
    -0
      .zuul.yaml
  2. +3
    -1
      vitrage/api/controllers/v1/template.py

+ 5
- 0
.zuul.yaml View File

@@ -29,6 +29,7 @@
- job:
name: vitrage-dsvm-api-py27
parent: legacy-dsvm-base
voting: false
run: playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
post-run: playbooks/legacy/vitrage-dsvm-api-py27/post.yaml
timeout: 7800
@@ -47,6 +48,7 @@
- job:
name: vitrage-dsvm-api-py35
parent: legacy-dsvm-base
voting: false
run: playbooks/legacy/vitrage-dsvm-api-py35/run.yaml
post-run: playbooks/legacy/vitrage-dsvm-api-py35/post.yaml
timeout: 7800
@@ -65,6 +67,7 @@
- job:
name: vitrage-dsvm-datasources-py27
parent: legacy-dsvm-base
voting: false
run: playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
post-run: playbooks/legacy/vitrage-dsvm-datasources-py27/post.yaml
timeout: 7800
@@ -83,6 +86,7 @@
- job:
name: vitrage-dsvm-datasources-py35
parent: legacy-dsvm-base
voting: false
run: playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml
post-run: playbooks/legacy/vitrage-dsvm-datasources-py35/post.yaml
timeout: 7800
@@ -135,6 +139,7 @@
- job:
name: grenade-vitrage
parent: legacy-dsvm-base
voting: false
run: playbooks/legacy/vitrage-grenade/run.yaml
post-run: playbooks/legacy/vitrage-grenade/post.yaml
timeout: 7800


+ 3
- 1
vitrage/api/controllers/v1/template.py View File

@@ -66,7 +66,9 @@ class TemplateController(RootRestController):

@pecan.expose('json')
def delete(self, **kwargs):
uuid = kwargs['uuid']
# for forward computability
uuid = kwargs['uuid'] if 'uuid' in kwargs else kwargs['id']

LOG.info("delete template. uuid: %s", uuid)

enforce("template delete",


Loading…
Cancel
Save