From dc6fe7159666b9ed5bf2dc70a6159cc62d91ad6a Mon Sep 17 00:00:00 2001 From: Philippe Merle Date: Mon, 23 May 2022 11:50:38 +0200 Subject: [PATCH 1/2] Add namespace keyname to each OASIS TOSCA Simple Profile in YAML file --- profiles/org.oasis-open/simple/1.0/artifact.yaml | 2 ++ profiles/org.oasis-open/simple/1.0/capability.yaml | 2 ++ profiles/org.oasis-open/simple/1.0/data.yaml | 2 ++ profiles/org.oasis-open/simple/1.0/group.yaml | 2 ++ profiles/org.oasis-open/simple/1.0/interface.yaml | 4 +++- profiles/org.oasis-open/simple/1.0/node.yaml | 2 ++ profiles/org.oasis-open/simple/1.0/policy.yaml | 2 ++ profiles/org.oasis-open/simple/1.0/profile.yaml | 2 ++ profiles/org.oasis-open/simple/1.0/relationship.yaml | 2 ++ profiles/org.oasis-open/simple/1.1/artifact.yaml | 2 ++ profiles/org.oasis-open/simple/1.1/capability.yaml | 2 ++ profiles/org.oasis-open/simple/1.1/data.yaml | 2 ++ profiles/org.oasis-open/simple/1.1/group.yaml | 2 ++ profiles/org.oasis-open/simple/1.1/interface.yaml | 4 +++- profiles/org.oasis-open/simple/1.1/node.yaml | 2 ++ profiles/org.oasis-open/simple/1.1/policy.yaml | 2 ++ profiles/org.oasis-open/simple/1.1/profile.yaml | 2 ++ profiles/org.oasis-open/simple/1.1/relationship.yaml | 2 ++ profiles/org.oasis-open/simple/1.2/artifact.yaml | 2 ++ profiles/org.oasis-open/simple/1.2/capability.yaml | 2 ++ profiles/org.oasis-open/simple/1.2/data.yaml | 2 ++ profiles/org.oasis-open/simple/1.2/group.yaml | 2 ++ profiles/org.oasis-open/simple/1.2/interface.yaml | 4 +++- profiles/org.oasis-open/simple/1.2/node.yaml | 2 ++ profiles/org.oasis-open/simple/1.2/policy.yaml | 2 ++ profiles/org.oasis-open/simple/1.2/profile.yaml | 2 ++ profiles/org.oasis-open/simple/1.2/relationship.yaml | 2 ++ profiles/org.oasis-open/simple/1.3/artifact.yaml | 3 ++- profiles/org.oasis-open/simple/1.3/capability.yaml | 2 ++ profiles/org.oasis-open/simple/1.3/data.yaml | 2 ++ profiles/org.oasis-open/simple/1.3/group.yaml | 2 ++ profiles/org.oasis-open/simple/1.3/interface.yaml | 4 +++- profiles/org.oasis-open/simple/1.3/node.yaml | 2 ++ profiles/org.oasis-open/simple/1.3/policy.yaml | 2 ++ profiles/org.oasis-open/simple/1.3/profile.yaml | 2 ++ profiles/org.oasis-open/simple/1.3/relationship.yaml | 2 ++ 36 files changed, 76 insertions(+), 5 deletions(-) diff --git a/profiles/org.oasis-open/simple/1.0/artifact.yaml b/profiles/org.oasis-open/simple/1.0/artifact.yaml index 1872844..0ae055a 100644 --- a/profiles/org.oasis-open/simple/1.0/artifact.yaml +++ b/profiles/org.oasis-open/simple/1.0/artifact.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-artifact-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.0/capability.yaml b/profiles/org.oasis-open/simple/1.0/capability.yaml index c351c2e..4e30de2 100644 --- a/profiles/org.oasis-open/simple/1.0/capability.yaml +++ b/profiles/org.oasis-open/simple/1.0/capability.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-capability-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.0/data.yaml b/profiles/org.oasis-open/simple/1.0/data.yaml index c822df9..ddd8db5 100644 --- a/profiles/org.oasis-open/simple/1.0/data.yaml +++ b/profiles/org.oasis-open/simple/1.0/data.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-data-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.0/group.yaml b/profiles/org.oasis-open/simple/1.0/group.yaml index 3c552ba..9a907c7 100644 --- a/profiles/org.oasis-open/simple/1.0/group.yaml +++ b/profiles/org.oasis-open/simple/1.0/group.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-group-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.0/interface.yaml b/profiles/org.oasis-open/simple/1.0/interface.yaml index 0826b7f..fb7174a 100644 --- a/profiles/org.oasis-open/simple/1.0/interface.yaml +++ b/profiles/org.oasis-open/simple/1.0/interface.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-interface-types template_author: TOSCA TC @@ -63,4 +65,4 @@ interface_types: target changed remove_target: description: >- - Operation to remove a target node. + Operation to remove a target node. diff --git a/profiles/org.oasis-open/simple/1.0/node.yaml b/profiles/org.oasis-open/simple/1.0/node.yaml index e1ffe48..8c26e9a 100644 --- a/profiles/org.oasis-open/simple/1.0/node.yaml +++ b/profiles/org.oasis-open/simple/1.0/node.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-node-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.0/policy.yaml b/profiles/org.oasis-open/simple/1.0/policy.yaml index 565b735..8de1c40 100644 --- a/profiles/org.oasis-open/simple/1.0/policy.yaml +++ b/profiles/org.oasis-open/simple/1.0/policy.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-policy-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.0/profile.yaml b/profiles/org.oasis-open/simple/1.0/profile.yaml index 745af0e..0f03fda 100644 --- a/profiles/org.oasis-open/simple/1.0/profile.yaml +++ b/profiles/org.oasis-open/simple/1.0/profile.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.0/relationship.yaml b/profiles/org.oasis-open/simple/1.0/relationship.yaml index cf015e7..1a7d106 100644 --- a/profiles/org.oasis-open/simple/1.0/relationship.yaml +++ b/profiles/org.oasis-open/simple/1.0/relationship.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0 + metadata: template_name: tosca-normative-relationship-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.1/artifact.yaml b/profiles/org.oasis-open/simple/1.1/artifact.yaml index fa61439..3d314d5 100644 --- a/profiles/org.oasis-open/simple/1.1/artifact.yaml +++ b/profiles/org.oasis-open/simple/1.1/artifact.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-artifact-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.1/capability.yaml b/profiles/org.oasis-open/simple/1.1/capability.yaml index 7599d3d..77632c9 100644 --- a/profiles/org.oasis-open/simple/1.1/capability.yaml +++ b/profiles/org.oasis-open/simple/1.1/capability.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-capability-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.1/data.yaml b/profiles/org.oasis-open/simple/1.1/data.yaml index 271b295..c8a91b4 100644 --- a/profiles/org.oasis-open/simple/1.1/data.yaml +++ b/profiles/org.oasis-open/simple/1.1/data.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-data-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.1/group.yaml b/profiles/org.oasis-open/simple/1.1/group.yaml index f01a216..e2d77b0 100644 --- a/profiles/org.oasis-open/simple/1.1/group.yaml +++ b/profiles/org.oasis-open/simple/1.1/group.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-group-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.1/interface.yaml b/profiles/org.oasis-open/simple/1.1/interface.yaml index 7d2314f..c70b1d3 100644 --- a/profiles/org.oasis-open/simple/1.1/interface.yaml +++ b/profiles/org.oasis-open/simple/1.1/interface.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-interface-types template_author: TOSCA TC @@ -63,4 +65,4 @@ interface_types: target changed remove_target: description: >- - Operation to remove a target node. + Operation to remove a target node. diff --git a/profiles/org.oasis-open/simple/1.1/node.yaml b/profiles/org.oasis-open/simple/1.1/node.yaml index e9e1962..c885fd7 100644 --- a/profiles/org.oasis-open/simple/1.1/node.yaml +++ b/profiles/org.oasis-open/simple/1.1/node.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-node-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.1/policy.yaml b/profiles/org.oasis-open/simple/1.1/policy.yaml index 738d865..07c652f 100644 --- a/profiles/org.oasis-open/simple/1.1/policy.yaml +++ b/profiles/org.oasis-open/simple/1.1/policy.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-policy-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.1/profile.yaml b/profiles/org.oasis-open/simple/1.1/profile.yaml index a737b3f..65efd71 100644 --- a/profiles/org.oasis-open/simple/1.1/profile.yaml +++ b/profiles/org.oasis-open/simple/1.1/profile.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.1/relationship.yaml b/profiles/org.oasis-open/simple/1.1/relationship.yaml index 2d2e08f..bae2d0d 100644 --- a/profiles/org.oasis-open/simple/1.1/relationship.yaml +++ b/profiles/org.oasis-open/simple/1.1/relationship.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.1 + metadata: template_name: tosca-normative-relationship-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.2/artifact.yaml b/profiles/org.oasis-open/simple/1.2/artifact.yaml index 56d9d5e..2077b35 100644 --- a/profiles/org.oasis-open/simple/1.2/artifact.yaml +++ b/profiles/org.oasis-open/simple/1.2/artifact.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-artifact-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.2/capability.yaml b/profiles/org.oasis-open/simple/1.2/capability.yaml index a7a6ebf..cbadee3 100644 --- a/profiles/org.oasis-open/simple/1.2/capability.yaml +++ b/profiles/org.oasis-open/simple/1.2/capability.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-capability-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.2/data.yaml b/profiles/org.oasis-open/simple/1.2/data.yaml index 881ea21..1b7c09d 100644 --- a/profiles/org.oasis-open/simple/1.2/data.yaml +++ b/profiles/org.oasis-open/simple/1.2/data.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-data-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.2/group.yaml b/profiles/org.oasis-open/simple/1.2/group.yaml index ab33644..a0139ae 100644 --- a/profiles/org.oasis-open/simple/1.2/group.yaml +++ b/profiles/org.oasis-open/simple/1.2/group.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-group-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.2/interface.yaml b/profiles/org.oasis-open/simple/1.2/interface.yaml index 43cacfe..a69b546 100644 --- a/profiles/org.oasis-open/simple/1.2/interface.yaml +++ b/profiles/org.oasis-open/simple/1.2/interface.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-interface-types template_author: TOSCA TC @@ -63,4 +65,4 @@ interface_types: target changed remove_target: description: >- - Operation to remove a target node. + Operation to remove a target node. diff --git a/profiles/org.oasis-open/simple/1.2/node.yaml b/profiles/org.oasis-open/simple/1.2/node.yaml index e8e20bd..4cba880 100644 --- a/profiles/org.oasis-open/simple/1.2/node.yaml +++ b/profiles/org.oasis-open/simple/1.2/node.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-node-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.2/policy.yaml b/profiles/org.oasis-open/simple/1.2/policy.yaml index 09a45cf..c1cc10d 100644 --- a/profiles/org.oasis-open/simple/1.2/policy.yaml +++ b/profiles/org.oasis-open/simple/1.2/policy.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-policy-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.2/profile.yaml b/profiles/org.oasis-open/simple/1.2/profile.yaml index 587535d..1e700ce 100644 --- a/profiles/org.oasis-open/simple/1.2/profile.yaml +++ b/profiles/org.oasis-open/simple/1.2/profile.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.2/relationship.yaml b/profiles/org.oasis-open/simple/1.2/relationship.yaml index f3428de..6839491 100644 --- a/profiles/org.oasis-open/simple/1.2/relationship.yaml +++ b/profiles/org.oasis-open/simple/1.2/relationship.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.2 + metadata: template_name: tosca-normative-relationship-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.3/artifact.yaml b/profiles/org.oasis-open/simple/1.3/artifact.yaml index 86c48f3..d70648c 100644 --- a/profiles/org.oasis-open/simple/1.3/artifact.yaml +++ b/profiles/org.oasis-open/simple/1.3/artifact.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-artifact-types template_author: TOSCA TC @@ -72,4 +74,3 @@ artifact_types: derived_from: tosca.artifacts.Root description: >- TOSCA base type for template artifacts - \ No newline at end of file diff --git a/profiles/org.oasis-open/simple/1.3/capability.yaml b/profiles/org.oasis-open/simple/1.3/capability.yaml index 87826e1..7cdfd3d 100644 --- a/profiles/org.oasis-open/simple/1.3/capability.yaml +++ b/profiles/org.oasis-open/simple/1.3/capability.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-capability-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.3/data.yaml b/profiles/org.oasis-open/simple/1.3/data.yaml index eab71a1..2ecfef2 100644 --- a/profiles/org.oasis-open/simple/1.3/data.yaml +++ b/profiles/org.oasis-open/simple/1.3/data.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-data-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.3/group.yaml b/profiles/org.oasis-open/simple/1.3/group.yaml index 9a549b4..5d99174 100644 --- a/profiles/org.oasis-open/simple/1.3/group.yaml +++ b/profiles/org.oasis-open/simple/1.3/group.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-group-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.3/interface.yaml b/profiles/org.oasis-open/simple/1.3/interface.yaml index aa5494d..39bacef 100644 --- a/profiles/org.oasis-open/simple/1.3/interface.yaml +++ b/profiles/org.oasis-open/simple/1.3/interface.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-interface-types template_author: TOSCA TC @@ -65,4 +67,4 @@ interface_types: target changed remove_target: description: >- - Operation to remove a target node. + Operation to remove a target node. diff --git a/profiles/org.oasis-open/simple/1.3/node.yaml b/profiles/org.oasis-open/simple/1.3/node.yaml index 9105ae8..176cb1e 100644 --- a/profiles/org.oasis-open/simple/1.3/node.yaml +++ b/profiles/org.oasis-open/simple/1.3/node.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-node-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.3/policy.yaml b/profiles/org.oasis-open/simple/1.3/policy.yaml index 9c0d2e3..499623d 100644 --- a/profiles/org.oasis-open/simple/1.3/policy.yaml +++ b/profiles/org.oasis-open/simple/1.3/policy.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-policy-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.3/profile.yaml b/profiles/org.oasis-open/simple/1.3/profile.yaml index d720172..0a18869 100644 --- a/profiles/org.oasis-open/simple/1.3/profile.yaml +++ b/profiles/org.oasis-open/simple/1.3/profile.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-types template_author: TOSCA TC diff --git a/profiles/org.oasis-open/simple/1.3/relationship.yaml b/profiles/org.oasis-open/simple/1.3/relationship.yaml index c7d4cb9..2baa47c 100644 --- a/profiles/org.oasis-open/simple/1.3/relationship.yaml +++ b/profiles/org.oasis-open/simple/1.3/relationship.yaml @@ -1,5 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3 +namespace: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.3 + metadata: template_name: tosca-normative-relationship-types template_author: TOSCA TC From 7a0aad81ccd237d611393a900a93897e2eb6c65b Mon Sep 17 00:00:00 2001 From: Philippe Merle Date: Mon, 23 May 2022 11:51:35 +0200 Subject: [PATCH 2/2] Add profile keyname to each TOSCA 2.0 profile file --- .../simple/2.0/artifact_types.yaml | 6 ++- .../simple/2.0/capability_types.yaml | 26 +++++----- .../org.oasis-open/simple/2.0/data_types.yaml | 50 ++++++++++--------- .../simple/2.0/group_types.yaml | 4 +- .../simple/2.0/interface_types.yaml | 10 ++-- .../org.oasis-open/simple/2.0/node_types.yaml | 2 + .../simple/2.0/policy_types.yaml | 4 +- .../org.oasis-open/simple/2.0/profile.yaml | 6 +-- .../simple/2.0/relationship_types.yaml | 8 +-- 9 files changed, 65 insertions(+), 51 deletions(-) diff --git a/profiles/org.oasis-open/simple/2.0/artifact_types.yaml b/profiles/org.oasis-open/simple/2.0/artifact_types.yaml index c6513b1..ea1cb1f 100644 --- a/profiles/org.oasis-open/simple/2.0/artifact_types.yaml +++ b/profiles/org.oasis-open/simple/2.0/artifact_types.yaml @@ -9,10 +9,12 @@ metadata: template_name: artifact_types.yaml template_author: Oasis Open template_version: 2.0 - + description: > TOSCA Simple Profile artifact type definitions +profile: org.oasis-open.tosca.simple:2.0 + artifact_types: Root: @@ -57,7 +59,7 @@ artifact_types: Implementation.Bash: description: > - Script artifact for the Unix Bash shell. + Script artifact for the Unix Bash shell. derived_from: Implementation mime_type: application/x-sh file_ext: [ sh ] diff --git a/profiles/org.oasis-open/simple/2.0/capability_types.yaml b/profiles/org.oasis-open/simple/2.0/capability_types.yaml index 320a54c..c870a40 100644 --- a/profiles/org.oasis-open/simple/2.0/capability_types.yaml +++ b/profiles/org.oasis-open/simple/2.0/capability_types.yaml @@ -5,6 +5,8 @@ tosca_definitions_version: tosca_2_0 +profile: org.oasis-open.tosca.simple:2.0 + metadata: template_name: capability_types.yaml template_author: Oasis Open @@ -12,7 +14,7 @@ metadata: imports: - data_types.yaml - + description: > TOSCA Simple Profile capability type definitions @@ -37,7 +39,7 @@ capability_types: named compute resource. derived_from: Container properties: - num_cpus: + num_cpus: description: >- Number of (actual or virtual) CPUs associated with the Compute node. @@ -54,7 +56,7 @@ capability_types: required: false constraints: - greater_or_equal: '0.1 GHz' - disk_size: + disk_size: description: >- Size of the local disk available to applications running on the Compute node. @@ -62,7 +64,7 @@ capability_types: required: false constraints: - greater_or_equal: 0 MB - mem_size: + mem_size: description: >- Size of memory available to applications running on the Compute node. @@ -93,7 +95,7 @@ capability_types: type: boolean required: false default: false - url_path: + url_path: description: >- The optional URL path of the endpoint’s address if applicable for the protocol. @@ -110,7 +112,7 @@ capability_types: The optional name (or ID) of the network to which this endpoint should be bound. type: string - required: false + required: false default: PRIVATE initiator: description: >- @@ -121,7 +123,7 @@ capability_types: - valid_values: [ source, target, peer ] ports: description: >- - The optional map of ports the Endpoint supports (if more than one). + The optional map of ports the Endpoint supports (if more than one). type: map required: false constraints: @@ -142,11 +144,11 @@ capability_types: address ranges). derived_from: Endpoint properties: - # Change network_name to use the default public network for the node + # Change network_name to use the default public network for the node # this capability will be declared in. network_name: PUBLIC floating: - description: > + description: > Indicates that the public address should be allocated from the pool of floating IPs that are associated with the PUBLIC network. @@ -156,7 +158,7 @@ capability_types: dns_name: description: The optional name to register with DNS. type: string - required: false + required: false status: experimental Endpoint.Admin: @@ -190,7 +192,7 @@ capability_types: The Operating System (OS) architecture. Examples of valid values include: x86_32, x86_64, etc. type: string - required: false + required: false type: description: >- The Operating System (OS) type. Examples of valid values @@ -206,7 +208,7 @@ capability_types: required: false version: description: >- - The Operating System version. + The Operating System version. type: version required: false diff --git a/profiles/org.oasis-open/simple/2.0/data_types.yaml b/profiles/org.oasis-open/simple/2.0/data_types.yaml index 6ef45b4..21f767f 100644 --- a/profiles/org.oasis-open/simple/2.0/data_types.yaml +++ b/profiles/org.oasis-open/simple/2.0/data_types.yaml @@ -5,11 +5,13 @@ tosca_definitions_version: tosca_2_0 +profile: org.oasis-open.tosca.simple:2.0 + metadata: template_name: data_types.yaml template_author: Oasis Open template_version: 2.0 - + description: > TOSCA Simple Profile data type definitions @@ -43,22 +45,22 @@ data_types: Markup Language (XML) format. derived_from: string - Credential: + Credential: description: >- The Credential type describes authorization credentials used to access network-accessible resources. - properties: - protocol: + properties: + protocol: description: >- The optional protocol name. type: string required: false - token_type: + token_type: description: >- The required token type. type: string default: password - token: + token: description: >- The required token used as a credential for authorization or access to a networked resource. @@ -77,25 +79,25 @@ data_types: type: string required: false - TimeInterval: + TimeInterval: properties: - start_time: + start_time: type: timestamp required: true - end_time: + end_time: type: timestamp required: true NetworkInfo: description: >- The Network type describes logical network information. - properties: - network_name: + properties: + network_name: description: >- The name of the logical network (e.g., “public”, “private”, “admin”. etc.). type: string - network_id: + network_id: description: >- The unique ID of the network generated by the network provider. type: string @@ -106,23 +108,23 @@ data_types: entry_schema: type: string - PortInfo: + PortInfo: description: >- The PortInfo type describes network port information. - properties: - port_name: + properties: + port_name: description: >- The logical network port name. type: string - port_id: + port_id: description: >- The unique ID for the network port generated by the network provider. type: string - network_id: + network_id: description: >- The unique ID for the network. type: string - mac_address: + mac_address: description: >- The unique media access control (MAC) address assigned to the port. type: string @@ -137,15 +139,15 @@ data_types: description: >- The PortDef type defines a network port. derived_from: integer - constraints: + constraints: - in_range: [ 1, 65535 ] - PortSpec: + PortSpec: description: >- The PortSpec type is used when describing port specifications for a network connection. - properties: - protocol: + properties: + protocol: description: >- The required protocol used on the port. type: string @@ -153,7 +155,7 @@ data_types: default: tcp constraints: - valid_values: [ udp, tcp, igmp ] - target: + target: description: >- The optional target port. type: PortDef @@ -161,7 +163,7 @@ data_types: target_range: description: >- The optional range for target port. - type: range + type: range required: false constraints: - in_range: [ 1, 65535 ] diff --git a/profiles/org.oasis-open/simple/2.0/group_types.yaml b/profiles/org.oasis-open/simple/2.0/group_types.yaml index 1741c13..44c78ac 100644 --- a/profiles/org.oasis-open/simple/2.0/group_types.yaml +++ b/profiles/org.oasis-open/simple/2.0/group_types.yaml @@ -4,6 +4,8 @@ tosca_definitions_version: tosca_2_0 +profile: org.oasis-open.tosca.simple:2.0 + description: > TOSCA Simple Profile group type definitions @@ -14,7 +16,7 @@ metadata: imports: - node_types.yaml - + group_types: Root: diff --git a/profiles/org.oasis-open/simple/2.0/interface_types.yaml b/profiles/org.oasis-open/simple/2.0/interface_types.yaml index a132cfa..641f9d2 100644 --- a/profiles/org.oasis-open/simple/2.0/interface_types.yaml +++ b/profiles/org.oasis-open/simple/2.0/interface_types.yaml @@ -5,11 +5,13 @@ tosca_definitions_version: tosca_2_0 +profile: org.oasis-open.tosca.simple:2.0 + metadata: template_name: interface_types.yaml template_author: Oasis Open template_version: 2.0 - + description: > TOSCA Simple Profile interface type definitions @@ -55,7 +57,7 @@ interface_types: description: >- Operation to notify the source node of a target node being added via a relationship. - add_source: + add_source: description: >- Operation to notify the target node of a source node which is now available via a relationship. @@ -65,6 +67,4 @@ interface_types: attribute of the target node changed. remove_target: description: >- - Operation to remove a target node. - - + Operation to remove a target node. diff --git a/profiles/org.oasis-open/simple/2.0/node_types.yaml b/profiles/org.oasis-open/simple/2.0/node_types.yaml index a134731..e7d2bbf 100644 --- a/profiles/org.oasis-open/simple/2.0/node_types.yaml +++ b/profiles/org.oasis-open/simple/2.0/node_types.yaml @@ -5,6 +5,8 @@ tosca_definitions_version: tosca_2_0 +profile: org.oasis-open.tosca.simple:2.0 + metadata: template_name: node_types.yaml template_author: Oasis Open diff --git a/profiles/org.oasis-open/simple/2.0/policy_types.yaml b/profiles/org.oasis-open/simple/2.0/policy_types.yaml index 1973bcf..e4aaeea 100644 --- a/profiles/org.oasis-open/simple/2.0/policy_types.yaml +++ b/profiles/org.oasis-open/simple/2.0/policy_types.yaml @@ -5,11 +5,13 @@ tosca_definitions_version: tosca_2_0 +profile: org.oasis-open.tosca.simple:2.0 + metadata: template_name: policy_types.yaml template_author: Oasis Open template_version: 2.0 - + description: > TOSCA Simple Profile Version policy type definitions diff --git a/profiles/org.oasis-open/simple/2.0/profile.yaml b/profiles/org.oasis-open/simple/2.0/profile.yaml index b265818..8c4de45 100644 --- a/profiles/org.oasis-open/simple/2.0/profile.yaml +++ b/profiles/org.oasis-open/simple/2.0/profile.yaml @@ -4,14 +4,14 @@ tosca_definitions_version: tosca_2_0 +profile: org.oasis-open.simple:2.0 + metadata: template_name: profile.yaml template_author: Oasis Open template_version: 2.0 - -description: TOSCA Simple Profile type definitions -profile: org.oasis-open.simple:2.0 +description: TOSCA Simple Profile type definitions imports: - data_types.yaml diff --git a/profiles/org.oasis-open/simple/2.0/relationship_types.yaml b/profiles/org.oasis-open/simple/2.0/relationship_types.yaml index 046eb6a..752fd0e 100644 --- a/profiles/org.oasis-open/simple/2.0/relationship_types.yaml +++ b/profiles/org.oasis-open/simple/2.0/relationship_types.yaml @@ -5,6 +5,8 @@ tosca_definitions_version: tosca_2_0 +profile: org.oasis-open.tosca.simple:2.0 + description: > TOSCA Simple Profile relationship type definitions @@ -17,7 +19,7 @@ imports: - data_types.yaml - capability_types.yaml - interface_types.yaml - + relationship_types: Root: @@ -25,7 +27,7 @@ relationship_types: The TOSCA base relationship type from which all other normative TOSCA relationship types derive. interfaces: - Configure: + Configure: type: Relationship.Configure DependsOn: @@ -49,7 +51,7 @@ relationship_types: derived_from: Root valid_target_types: [ Endpoint ] properties: - credential: + credential: description: >- The security credential to present to the target endpoint for either authentication or authorization purposes.