From 0dee4cd6c46f9855df74f7bb423bf09d001e873c Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Mon, 11 Dec 2017 11:19:25 +0900 Subject: [PATCH] [placement] Fix API reference for microversion 1.14 It is a follow-up for I4db74e4dc682bc03df6ec94cd1c3a5f5dc927a7b. Fix description of placement microversion 1.14. Change-Id: I7a7ffc395d444fe7cf0434ea6745dde0dae11ad5 blueprint nested-resource-providers --- placement-api-ref/source/parameters.yaml | 15 ++------------- placement-api-ref/source/resource_providers.inc | 5 ++--- .../source/update-resource_provider.json | 4 +++- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/placement-api-ref/source/parameters.yaml b/placement-api-ref/source/parameters.yaml index faca4471015f..d9c1e51d06d4 100644 --- a/placement-api-ref/source/parameters.yaml +++ b/placement-api-ref/source/parameters.yaml @@ -298,7 +298,7 @@ resource_provider_object: required: true description: > A dictionary which contains the UUID of the resource provider. -resource_provider_parent_provider_uuid: +resource_provider_parent_provider_uuid: &resource_provider_parent_provider_uuid type: string in: body required: false @@ -306,19 +306,8 @@ resource_provider_parent_provider_uuid: The UUID of the immediate parent of the resource provider. min_version: 1.14 resource_provider_parent_provider_uuid_required: - type: string - in: body + <<: *resource_provider_parent_provider_uuid required: true - description: > - The UUID of the immediate parent of the resource provider. - min_version: 1.14 -resource_provider_root_provider_uuid: - type: string - in: body - required: false - description: > - Read-only UUID of the top-most provider in this provider tree. - min_version: 1.14 resource_provider_root_provider_uuid_required: type: string in: body diff --git a/placement-api-ref/source/resource_providers.inc b/placement-api-ref/source/resource_providers.inc index cffd98a7a191..817671514d7f 100644 --- a/placement-api-ref/source/resource_providers.inc +++ b/placement-api-ref/source/resource_providers.inc @@ -40,8 +40,8 @@ Response - uuid: resource_provider_uuid - links: resource_provider_links - name: resource_provider_name - - parent_provider_uuid: resource_provider_parent_provider_uuid - - root_provider_uuid: resource_provider_root_provider_uuid + - parent_provider_uuid: resource_provider_parent_provider_uuid_required + - root_provider_uuid: resource_provider_root_provider_uuid_required Response Example ---------------- @@ -72,7 +72,6 @@ Request - name: resource_provider_name - uuid: resource_provider_uuid_opt - parent_provider_uuid: resource_provider_parent_provider_uuid - - root_provider_uuid: resource_provider_root_provider_uuid Request example --------------- diff --git a/placement-api-ref/source/update-resource_provider.json b/placement-api-ref/source/update-resource_provider.json index f0da912a0216..b159a3b12324 100644 --- a/placement-api-ref/source/update-resource_provider.json +++ b/placement-api-ref/source/update-resource_provider.json @@ -27,5 +27,7 @@ } ], "name": "Shared storage", - "uuid": "33f26ae0-dbf2-485b-a24a-244d8280e29f" + "uuid": "33f26ae0-dbf2-485b-a24a-244d8280e29f", + "parent_provider_uuid": "542df8ed-9be2-49b9-b4db-6d3183ff8ec8", + "root_provider_uuid": "d0b381e9-8761-42de-8e6c-bba99a96d5f5" }