From ce181708705122d7e2d056eef9d933d539ead1b9 Mon Sep 17 00:00:00 2001 From: Atsushi SAKAI Date: Wed, 5 Aug 2015 11:37:21 +0900 Subject: [PATCH] Update metadata property flags add following flags operators 1) default 2) readonly 1430051 I cannot found two bugs in launchpad/api-site. Instead, I refer two patches. 1) Add operators to provide multivalue support https://github.com/openstack/glance/commit/473ac5fff6ff6b159d1523c9a35dfc62e561bc19 Glance 2) Metadata Definitions Catalog - API https://github.com/openstack/glance/commit/2e7de07c5a7c8f9d11c00499f7e85ac30f71d025 Change-Id: I409bc1424cfd196384bdbaace22ba0ef27b0a54b Closes-Bug: #1430051 --- api-ref/src/wadls/image-api/src/v2/common.ent | 179 ++++++++++++++- .../src/v2/os-metadef-property-v2.wadl | 213 +++++------------- 2 files changed, 230 insertions(+), 162 deletions(-) diff --git a/api-ref/src/wadls/image-api/src/v2/common.ent b/api-ref/src/wadls/image-api/src/v2/common.ent index 4aefb7804..d7c64196a 100644 --- a/api-ref/src/wadls/image-api/src/v2/common.ent +++ b/api-ref/src/wadls/image-api/src/v2/common.ent @@ -283,7 +283,7 @@ style="plain" required="true" type="xsd:boolean"> - Defines whether the image can be deleted. + Indicates whether the image can be deleted. '> - The name of the property. + The name of the property. '> - The title of the property. + The title of the property. '> - Property type. + The property type. '> Enumeration of property values. '> + + + Enumeration of property values. + +'> @@ -874,12 +882,68 @@ Schema for the items in an array. '> + + + Schema for the items in an array. + +'> - Property description. + The description of the property. + +'> + + + The description of the property. + +'> + + + Operators property description. + +'> + + + Operators property description. + +'> + + + Default property description. + +'> + + + Default property description. + +'> + + + Indicates whether this is a read-only property. '> '> + + + Default property description. + +'> + + + Indicates whether this is a read-only property. + +'> + + + Minimum allowed numerical value. + +'> + + + Maximum allowed numerical value. + +'> + + + Minimum allowed string length. + +'> + + + Maximum allowed string length. + +'> + + + A regular expression (ECMA 262) that a string value + must match. + + +'> + + + Minimum length of an array. + +'> + + + Maximum length of an array. + +'> + + + + Indicates whether all values in the array must be distinct. + + +'> + + + + Describes extra items, if you use tuple typing. If the value of + items is an array (tuple typing) and the instance is longer + than the list of schemas in items, the additional items are + described by the schema in this property. + + + If this value is false, the instance cannot be longer than + the list of schemas in items. + + + If this value is true, that is equivalent to the empty + schema (anything goes). + + +'> diff --git a/api-ref/src/wadls/image-api/src/v2/os-metadef-property-v2.wadl b/api-ref/src/wadls/image-api/src/v2/os-metadef-property-v2.wadl index 1efccafd5..e3e9a552a 100644 --- a/api-ref/src/wadls/image-api/src/v2/os-metadef-property-v2.wadl +++ b/api-ref/src/wadls/image-api/src/v2/os-metadef-property-v2.wadl @@ -58,8 +58,11 @@ - Creates a property definition within a - namespace. Schema is subset of JSON Property definition schema + + Creates a property definition within a namespace. + + + The schema is a subset of JSON property definition schema. @@ -69,156 +72,17 @@ xmlns="http://docbook.org/ns/docbook"> - - Name of the property. - - - - Property title. - - - - Property type - - - - - Enumeration of property values. - - - - - specifies schema for the items in an - array. - - - - - Property description. - - - - - Minimum allowed numerical value. - - - - - Maximum allowed numerical value. - - - - - Minimum allowed string length. - - - - - Maximum allowed string length. - - - - - A regular expression (ECMA 262) that - a string value must match. - - - - - Minimum length of an array. - - - - - Maximum length of an array. - - - - - whether all the values in the array - must be distinct. - - - - - - If you use tuple-typing, describes extra - items. If the value of items is an - array and the instance is longer than the list of - schemas in items, the schema in this - property describes the additional items. - - - If this value is false, the instance cannot be - longer than the number of schemas listed in - items. - - - A value of true indicates an empty schema, or - anything goes. - - - + &metadefPropertyNameParameter; + &metadefPropertyTitleParameter; &metadefPropertyTypeParameter; + &metadefPropertyEnumOptionalParameter; &metadefPropertyItemsOptionalParameter; + &metadefPropertyDescOptionalParameter; &metadefPropertyOperOptionalParameter; + &metadefPropertyDfltOptionalParameter; &metadefPropertyReadOptionalParameter; + &metadefPropertyMinOptionalParameter; + &metadefPropertyMaxOptionalParameter; &metadefPropertyMinLengthOptionalParameter; + &metadefPropertyMaxLengthOptionalParameter; &metadefPropertyPatternOptionalParameter; + &metadefPropertyMinItemsOptionalParameter; &metadefPropertyMaxItemsOptionalParameter; + &metadefPropertyUniqueItemsOptionalParameter; + &metadefPropertyAdditionalItemsOptionalParameter; @@ -230,7 +94,9 @@ &metadefPropertyNameParameter; &metadefPropertyTitleParameter; &metadefPropertyTypeParameter; &metadefPropertyEnumParameter; &metadefPropertyItemsParameter; - &metadefPropertyDescParameter; &metadefPropertyMinParameter; + &metadefPropertyDescParameter; &metadefPropertyOperParameter; + &metadefPropertyDfltParameter; &metadefPropertyReadParameter; + &metadefPropertyMinParameter; &metadefPropertyMaxParameter; &metadefPropertyMinLengthParameter; &metadefPropertyMaxLengthParameter; &metadefPropertyPatternParameter; &metadefPropertyMinItemsParameter; &metadefPropertyMaxItemsParameter; @@ -261,7 +127,9 @@ &metadefPropertyNameParameter; &metadefPropertyTitleParameter; &metadefPropertyTypeParameter; &metadefPropertyEnumParameter; &metadefPropertyItemsParameter; - &metadefPropertyDescParameter; &metadefPropertyMinParameter; + &metadefPropertyDescParameter; &metadefPropertyOperParameter; + &metadefPropertyDfltParameter; &metadefPropertyReadParameter; + &metadefPropertyMinParameter; &metadefPropertyMaxParameter; &metadefPropertyMinLengthParameter; &metadefPropertyMaxLengthParameter; &metadefPropertyPatternParameter; &metadefPropertyMinItemsParameter; &metadefPropertyMaxItemsParameter; @@ -273,7 +141,7 @@ - Gets definition for a specified property. + Gets the definition for a specified property. If you include the resource_type query @@ -317,7 +185,9 @@ &metadefPropertyNameParameter; &metadefPropertyTitleParameter; &metadefPropertyTypeParameter; &metadefPropertyEnumParameter; &metadefPropertyItemsParameter; - &metadefPropertyDescParameter; &metadefPropertyMinParameter; + &metadefPropertyDescParameter; &metadefPropertyOperParameter; + &metadefPropertyDfltParameter; &metadefPropertyReadParameter; + &metadefPropertyMinParameter; &metadefPropertyMaxParameter; &metadefPropertyMinLengthParameter; &metadefPropertyMaxLengthParameter; &metadefPropertyPatternParameter; &metadefPropertyMinItemsParameter; &metadefPropertyMaxItemsParameter; @@ -391,6 +261,33 @@ Property description. + + + Operators property description. + + + + + Default property description. + + + + + Indicates whether this is a read-only property. + + @@ -501,7 +398,9 @@ &metadefPropertyNameParameter; &metadefPropertyTitleParameter; &metadefPropertyTypeParameter; &metadefPropertyEnumParameter; &metadefPropertyItemsParameter; - &metadefPropertyDescParameter; &metadefPropertyMinParameter; + &metadefPropertyDescParameter; &metadefPropertyOperParameter; + &metadefPropertyDfltParameter; &metadefPropertyReadParameter; + &metadefPropertyMinParameter; &metadefPropertyMaxParameter; &metadefPropertyMinLengthParameter; &metadefPropertyMaxLengthParameter; &metadefPropertyPatternParameter; &metadefPropertyMinItemsParameter; &metadefPropertyMaxItemsParameter;