From b9112a11996d7e9b98306cd1da6c93bef90ffa87 Mon Sep 17 00:00:00 2001 From: aditi Date: Thu, 18 Jan 2018 17:03:48 +0530 Subject: [PATCH] Audit Template Help Message This patch updates help message of "watcher audittemplate create" It updates help about storage scoper. Change-Id: I46be98c2819c2dfb2a7ef3fe1aa98caa90ececfd Implements: blueprint audit-scoper-for-storage-data-model --- watcherclient/v1/audit_template_shell.py | 77 ++++++++++++++++++------ 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/watcherclient/v1/audit_template_shell.py b/watcherclient/v1/audit_template_shell.py index 8844bc9..4cb6ebb 100644 --- a/watcherclient/v1/audit_template_shell.py +++ b/watcherclient/v1/audit_template_shell.py @@ -183,26 +183,67 @@ class CreateAuditTemplate(command.ShowOne): " - uuid: UUID2\n" " - compute_nodes:\n" " - name: compute1\n" + " - storage: \n" + " - availability_zones:\n" + " - name: AZ1\n" + " - name: AZ2\n" + " - volume_types:\n" + " - name: lvm1\n" + " - name: lvm2\n" + " - exclude:\n" + " - storage_pools:\n" + " - name: host0@backend0#pool0\n" + " - name: host1@backend1#pool1\n" + " - volumes:\n" + " - uuid: UUID1\n" + " - uuid: UUID2\n" + " - projects:\n" + " - uuid: UUID1\n" + " - uuid: UUID2\n" "\n" "JSON example:\n" - "[{\"compute\":\n" - " [{\"host_aggregates\": [\n" - " {\"id\": 1},\n" - " {\"id\": 2},\n" - " {\"id\": 3}]},\n" - " {\"availability_zones\": [\n" - " {\"name\": \"AZ1\"},\n" - " {\"name\": \"AZ2\"}]},\n" - " {\"exclude\": [\n" - " {\"instances\": [\n" - " {\"uuid\": \"UUID1\"},\n" - " {\"uuid\": \"UUID2\"}\n" - " ]},\n" - " {\"compute_nodes\": [\n" - " {\"name\": \"compute1\"}\n" - " ]}\n" - " ]}]\n" - "}]\n" + "[\n" + " {\"compute\":\n" + " [{\"host_aggregates\": [\n" + " {\"id\": 1},\n" + " {\"id\": 2},\n" + " {\"id\": 3}]},\n" + " {\"availability_zones\": [\n" + " {\"name\": \"AZ1\"},\n" + " {\"name\": \"AZ2\"}]},\n" + " {\"exclude\": [\n" + " {\"instances\": [\n" + " {\"uuid\": \"UUID1\"},\n" + " {\"uuid\": \"UUID2\"}\n" + " ]},\n" + " {\"compute_nodes\": [\n" + " {\"name\": \"compute1\"}\n" + " ]}\n" + " ]}]\n" + " },\n" + " {\"storage\":\n" + " [{\"availability_zones\": [\n" + " {\"name\": \"AZ1\"},\n" + " {\"name\": \"AZ2\"}]},\n" + " {\"volume_types\": [\n" + " {\"name\": \"lvm1\"},\n" + " {\"name\": \"lvm2\"}]},\n" + " {\"exclude\": [\n" + " {\"storage_pools\": [\n" + " {\"name\": \"host0@backend0#pool0\"},\n" + " {\"name\": \"host1@backend1#pool1\"}\n" + " ]},\n" + " {\"volumes\": [\n" + " {\"uuid\": \"UUID1\"},\n" + " {\"uuid\": \"UUID2\"}\n" + " ]},\n" + " {\"projects\": [\n" + " {\"uuid\": \"UUID1\"},\n" + " {\"uuid\": \"UUID2\"}\n" + " ]},\n" + " ]}]\n" + " }\n" + " ]\n" ) )