You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2018/08/24 13:30:21 UTC
[1/2] brooklyn-docs git commit: some blueprinting tweaks
Repository: brooklyn-docs
Updated Branches:
refs/heads/master d210db300 -> 740913fd6
some blueprinting tweaks
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/5d819cfb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/5d819cfb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/5d819cfb
Branch: refs/heads/master
Commit: 5d819cfb6e363a4c7aba8dea1e1e5072286c151c
Parents: 29c1168
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Jun 26 13:46:54 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Jun 26 13:46:54 2018 +0100
----------------------------------------------------------------------
guide/blueprints/entity-configuration.md | 3 +-
guide/blueprints/yaml-reference.md | 41 ++++++++++++++-------------
2 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5d819cfb/guide/blueprints/entity-configuration.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/entity-configuration.md b/guide/blueprints/entity-configuration.md
index 9b5dd2a..cf38a1b 100644
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@ -73,7 +73,8 @@ services:
- type: entity-config-example
```
-For details of how to write and add catalog items, see [Catalog]({{book.path.docs}}/blueprints/catalog/index.md).
+For details of how to write and add catalog items, see [Catalog]({{book.path.docs}}/blueprints/catalog/index.md),
+and for a complete reference on the syntax of `brooklyn.parameters` see that section of the [YAML Reference]({{book.path.docs}}/blueprints/yaml-reference.md).
#### Config Key Constraints
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5d819cfb/guide/blueprints/yaml-reference.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/yaml-reference.md b/guide/blueprints/yaml-reference.md
index aa06f9d..21201df 100644
--- a/guide/blueprints/yaml-reference.md
+++ b/guide/blueprints/yaml-reference.md
@@ -62,12 +62,14 @@ the entity being defined, with these being the most common:
the given name by running the given command (on an entity which as an winrm-able machine).<br/>
_`"~"` will use the default execution directory for the WinRm session which is usually `%USERPROFILE%`_
-* `brooklyn.parameters`: documents a list of typed parameters the entity accepts. If none
- are specified the config keys declared in the entity's class are used (including the
- information from the `@CatalogConfig` annotation). The items have the following properties:
+* `brooklyn.parameters`: documents a list of typed parameters the entity accepts.
+ These define config keys exposed on the type, including metadata for prompting a user to supply them.
+ All config keys inherited from supertypes are available as parameters by default,
+ and their properties (e.g. default values) can be overridden.
+ Parameters (config keys) have the following properties:
* `name` (required): identifier by which to reference the parameter when setting
or retrieving its value
- * `label`: a value to present to the user, same as `name` if empty
+ * `label`: an identifier string to present to the user when prompting for a value, same as `name` if empty
* `description`: short text describing the parameter behaviour/usage, presented
to the user
* `type`: the type of the parameter, one of `string`, `integer`, `long`, `float`,
@@ -77,29 +79,30 @@ the entity being defined, with these being the most common:
`timestamp` accepts most common ISO date formats, `duration` accepts `5m`, and port accepts `8080+`
* `default`: a default value; this will be coerced to the declared `type`
* `pinned`: mark the parameter as pinned (always displayed) for the UI. The default is `true`
+ (unless an ancestor sets false; config keys from Java types are _not_ pinned)
* `constraints`: a list of constraints the parameter should meet;
for details, see [Entity Configuration]({{book.path.docs}}/blueprints/entity-configuration.md#config-key-constraints).
- A shorthand notation is also supported where just the name of the parameter is supplied
+ A shorthand notation is also supported where just the name of the parameter can be supplied
as an item in the list, with the other values being unset or the default.
See `displayName` in the following example for an illustration of this:
~~~ yaml
brooklyn.parameters:
- # user.age parameter is required, pinned and fully specified
- - name: user.age
- type: integer
- label: Age
- description: the age of the user
- pinned: true
- constraints:
- - required
- # user.name is optional, is not pinned and has a default
- - name: user.name
- default: You
- pinned: false
- # shorthand notation: displayName will be an optional config of type string with no default
- - displayName
+ # user.age parameter is required, pinned and fully specified
+ - name: user.age
+ type: integer
+ label: Age
+ description: the age of the user
+ pinned: true
+ constraints:
+ - required
+ # user.name is optional, is not pinned and has a default
+ - name: user.name
+ default: You
+ pinned: false
+ # shorthand notation: displayName will be an optional config of type string with no default
+ - displayName
~~~
Entities, policies, and initializers may accept additional key-value pairs,
[2/2] brooklyn-docs git commit: This closes #262
Posted by al...@apache.org.
This closes #262
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/740913fd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/740913fd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/740913fd
Branch: refs/heads/master
Commit: 740913fd652273a68763a3a833ca7d539868390e
Parents: d210db3 5d819cf
Author: Aled Sage <al...@gmail.com>
Authored: Fri Aug 24 14:30:07 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Aug 24 14:30:07 2018 +0100
----------------------------------------------------------------------
guide/blueprints/entity-configuration.md | 3 +-
guide/blueprints/yaml-reference.md | 41 ++++++++++++++-------------
2 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------