diff options
author | 2019-09-26 13:20:28 +0100 | |
---|---|---|
committer | 2019-10-29 14:15:57 +0000 | |
commit | c42c9f75adb72f80e57694b5bf67db7c94f33a89 (patch) | |
tree | f5e16e64400af3f795061dceb02fee8522ed4245 /openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca | |
parent | 145e960db3614cf499aa0be0dbb4f19b3ba3183e (diff) |
Fix for status properties value.
These changes were made to align the normative types to the TOSCA property definition requirements.
Issue-ID: SDC-322
Change-Id: I32e815dd26990dd6c82c859ad051b271db3c8029
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca')
4 files changed, 93 insertions, 93 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/capabilities.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/capabilities.yml index 34f78c4ec8..53364d86fb 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/capabilities.yml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/capabilities.yml @@ -19,28 +19,28 @@ capability_types: type: integer description: Number of (actual or virtual) CPUs associated with the Compute node. required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 1 cpu_frequency: type: scalar-unit.frequency description: Specifies the operating frequency of CPU's core. This property expresses the expected frequency of one (1) CPU as provided by the property "num_cpus". required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 0.1 GHz disk_size: type: scalar-unit.size description: Size of the local disk available to applications running on the Compute node (default unit is MB). required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 0 MB mem_size: type: scalar-unit.size description: Size of memory available to applications running on the Compute node (default unit is MB). required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 0 MB tosca.capabilities.Endpoint: @@ -54,41 +54,41 @@ capability_types: tcp, udp, etc.' required: true default: tcp - status: SUPPORTED + status: supported port: type: tosca.datatypes.network.PortDef description: The optional port of the endpoint. required: false - status: SUPPORTED + status: supported secure: type: boolean description: Requests for the endpoint to be secure and use credentials supplied on the ConnectsTo relationship. required: false default: false - status: SUPPORTED + status: supported url_path: type: string description: The optional URL path of the endpoint's address if applicable for the protocol. required: false - status: SUPPORTED + status: supported port_name: type: string description: The optional name (or ID) of the network port this endpoint should be bound to. required: false - status: SUPPORTED + status: supported network_name: type: string description: 'The optional name (or ID) of the network this endpoint should be bound to. network_name: PRIVATE | PUBLIC | <network_name> | <network_id>.' required: false default: PRIVATE - status: SUPPORTED + status: supported initiator: type: string description: The optional indicator of the direction of the connection. required: false default: source - status: SUPPORTED + status: supported constraints: - valid_values: - source @@ -98,7 +98,7 @@ capability_types: type: map description: The optional map of ports the Endpoint supports (if more than one). required: false - status: SUPPORTED + status: supported constraints: - min_length: 1 entry_schema: @@ -108,7 +108,7 @@ capability_types: type: string description: 'Note: This is the IP address as propagated up by the associated node''s host (Compute) container.' - status: SUPPORTED + status: supported tosca.capabilities.Endpoint.Public: derived_from: tosca.capabilities.Endpoint description: |- @@ -119,7 +119,7 @@ capability_types: type: string required: true default: PUBLIC - status: SUPPORTED + status: supported constraints: - equal: PUBLIC tosca.capabilities.Endpoint.Admin: @@ -131,7 +131,7 @@ capability_types: description: Requests for the endpoint to be secure and use credentials supplied on the ConnectsTo relationship. required: true default: true - status: SUPPORTED + status: supported constraints: - equal: true tosca.capabilities.Endpoint.Database: @@ -149,24 +149,24 @@ capability_types: description: 'The Operating System (OS) architecture. Examples of valid values include: x86_32, x86_64, etc.' required: false - status: SUPPORTED + status: supported type: type: string description: 'The Operating System (OS) type. Examples of valid values include: linux, aix, mac, windows, etc.' required: false - status: SUPPORTED + status: supported distribution: type: string description: 'The Operating System (OS) distribution. Examples of valid values for a "type" of "Linux" would include: debian, fedora, rhel and ubuntu.' required: false - status: SUPPORTED + status: supported version: type: version description: The Operating System version. required: false - status: SUPPORTED + status: supported tosca.capabilities.Scalable: derived_from: tosca.capabilities.Root description: This is the default TOSCA type that should be used to express a scalability capability for a node. @@ -176,13 +176,13 @@ capability_types: description: This property is used to indicate the minimum number of instances that should be created for the associated TOSCA Node Template by a TOSCA orchestrator. required: true default: 1 - status: SUPPORTED + status: supported max_instances: type: integer description: This property is used to indicate the maximum number of instances that should be created for the associated TOSCA Node Template by a TOSCA orchestrator. required: true default: 1 - status: SUPPORTED + status: supported default_instances: type: integer description: 'An optional property that indicates the requested default number @@ -191,7 +191,7 @@ capability_types: the range between the values set for "min_instances" and "max_instances" properties.' required: false - status: SUPPORTED + status: supported tosca.capabilities.network.Bindable: derived_from: tosca.capabilities.Node description: A node type that includes the Bindable capability indicates that it can be bound to a logical network association via a network port. @@ -204,29 +204,29 @@ capability_types: version: type: list required: false - status: SUPPORTED + status: supported entry_schema: type: version publish_all: type: boolean required: false default: false - status: SUPPORTED + status: supported publish_ports: type: list required: false - status: SUPPORTED + status: supported entry_schema: type: PortSpec expose_ports: type: list required: false - status: SUPPORTED + status: supported entry_schema: type: PortSpec volumes: type: list required: false - status: SUPPORTED + status: supported entry_schema: type: string diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml index 88042193f5..68e3363e31 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/data.yml @@ -40,17 +40,17 @@ data_types: type: string description: The name of the logical network. e.g., "public", "private", "admin". etc. required: false - status: SUPPORTED + status: supported network_id: type: string description: The unique ID of for the network generated by the network provider. required: false - status: SUPPORTED + status: supported addresses: type: list description: The list of IP addresses assigned from the underlying network. required: false - status: SUPPORTED + status: supported entry_schema: type: string tosca.datatypes.TimeInterval: @@ -59,11 +59,11 @@ data_types: start_time: type: timestamp required: true - status: SUPPORTED + status: supported end_time: type: timestamp required: true - status: SUPPORTED + status: supported tosca.datatypes.network.PortSpec: derived_from: tosca.datatypes.Root description: The PortSpec type is a complex TOSCA data Type used when describing port specifications for a network connection. @@ -73,7 +73,7 @@ data_types: description: The required protocol used on the port. required: true default: tcp - status: SUPPORTED + status: supported constraints: - valid_values: - udp @@ -83,12 +83,12 @@ data_types: type: tosca.datatypes.network.PortDef description: The optional source port. required: false - status: SUPPORTED + status: supported source_range: type: range description: The optional range for source port. required: false - status: SUPPORTED + status: supported constraints: - in_range: - 1 @@ -97,12 +97,12 @@ data_types: type: tosca.datatypes.network.PortDef description: The optional target port. required: false - status: SUPPORTED + status: supported target_range: type: range description: The optional range for target port. required: false - status: SUPPORTED + status: supported constraints: - in_range: - 1 @@ -122,27 +122,27 @@ data_types: type: string description: The logical network port name. required: false - status: SUPPORTED + status: supported port_id: type: string description: The unique ID for the network port generated by the network provider. required: false - status: SUPPORTED + status: supported network_id: type: string description: The unique ID for the network. required: false - status: SUPPORTED + status: supported mac_address: type: string description: The unique media access control address (MAC address) assigned to the port. required: false - status: SUPPORTED + status: supported addresses: type: list description: The list of IP address(es) assigned to the port. required: false - status: SUPPORTED + status: supported entry_schema: type: string tosca.datatypes.Credential: @@ -153,27 +153,27 @@ data_types: type: string description: The optional protocol name. required: false - status: SUPPORTED + status: supported token_type: type: string description: The required token type. required: true default: password - status: SUPPORTED + status: supported token: type: string description: The required token used as a credential for authorization or access to a networked resource. required: true - status: SUPPORTED + status: supported keys: type: map description: The optional list of protocol-specific keys or assertions. required: false - status: SUPPORTED + status: supported entry_schema: type: string user: type: string description: The optional user (name or ID) used for non-token based credentials. required: false - status: SUPPORTED + status: supported diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/nodes.yml index bb61619217..4172f13bd6 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/nodes.yml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/nodes.yml @@ -12,16 +12,16 @@ node_types: tosca_id: type: string description: A unique identifier of the realized instance of a Node Template that derives from any TOSCA normative type. - status: SUPPORTED + status: supported tosca_name: type: string description: This attribute reflects the name of the Node Template as defined in the TOSCA service template. This name is not unique to the realized instance model of corresponding deployed application as each template in the model can result in one or more instances (e.g., scaled) when orchestrated to a provider environment. - status: SUPPORTED + status: supported state: type: string description: The state of the node instance. default: initial - status: SUPPORTED + status: supported requirements: - dependency: capability: tosca.capabilities.Node @@ -47,19 +47,19 @@ node_types: type: string description: The logical name of the object store (or container). required: true - status: SUPPORTED + status: supported size: type: scalar-unit.size description: The requested initial storage size (default unit is in Gigabytes). required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 0 GB maxsize: type: scalar-unit.size description: The requested maximum storage size (default unit is in Gigabytes). required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 0 GB capabilities: @@ -76,12 +76,12 @@ node_types: type: string description: The optional root password for the DBMS server. required: false - status: SUPPORTED + status: supported port: type: integer description: The DBMS server's port. required: false - status: SUPPORTED + status: supported capabilities: host: type: tosca.capabilities.Container @@ -98,7 +98,7 @@ node_types: type: string description: The web application's context root which designates the application's URL path within the web server it is hosted on. required: false - status: SUPPORTED + status: supported requirements: - host: capability: tosca.capabilities.Container @@ -117,21 +117,21 @@ node_types: private_address: type: string description: The primary private IP address assigned by the cloud provider that applications may use to access the Compute node. - status: SUPPORTED + status: supported public_address: type: string description: The primary public IP address assigned by the cloud provider that applications may use to access the Compute node. - status: SUPPORTED + status: supported networks: type: map description: The list of logical networks assigned to the compute host instance and information about them. - status: SUPPORTED + status: supported entry_schema: type: tosca.datatypes.network.NetworkInfo ports: type: map description: The list of logical ports assigned to the compute host instance and information about them. - status: SUPPORTED + status: supported entry_schema: type: tosca.datatypes.network.PortInfo requirements: @@ -179,7 +179,7 @@ node_types: description: The IP version of the requested network. required: false default: 4 - status: SUPPORTED + status: supported constraints: - valid_values: - 4 @@ -188,53 +188,53 @@ node_types: type: string description: The cidr block of the requested network. required: false - status: SUPPORTED + status: supported start_ip: type: string description: The IP address to be used as the 1st one in a pool of addresses derived from the cidr block full IP range. required: false - status: SUPPORTED + status: supported end_ip: type: string description: The IP address to be used as the last one in a pool of addresses derived from the cidr block full IP range. required: false - status: SUPPORTED + status: supported gateway_ip: type: string description: The gateway IP address. required: false - status: SUPPORTED + status: supported network_name: type: string description: An Identifier that represents an existing Network instance in the underlying cloud infrastructure - OR - be used as the name of the new created network. required: false - status: SUPPORTED + status: supported network_id: type: string description: An Identifier that represents an existing Network instance in the underlying cloud infrastructure. This property is mutually exclusive with all other properties except network_name. required: false - status: SUPPORTED + status: supported segmentation_id: type: string description: A segmentation identifier in the underlying cloud infrastructure (e.g., VLAN id, GRE tunnel id). If the segmentation_id is specified, the network_type or physical_network properties should be provided as well. required: false - status: SUPPORTED + status: supported network_type: type: string description: Optionally, specifies the nature of the physical network in the underlying cloud infrastructure. Examples are flat, vlan, gre or vxlan. For flat and vlan types, physical_network should be provided too. required: false - status: SUPPORTED + status: supported physical_network: type: string description: Optionally, identifies the physical network on top of which the network is implemented, e.g. physnet1. This property is required if network_type is flat or vlan. required: false - status: SUPPORTED + status: supported dhcp_enabled: type: boolean description: Indicates the TOSCA container to create a virtual network instance with or without a DHCP service. required: false default: true - status: SUPPORTED + status: supported capabilities: link: type: tosca.capabilities.network.Linkable @@ -291,12 +291,12 @@ node_types: type: version description: The optional software component's version. required: false - status: SUPPORTED + status: supported admin_credential: type: tosca.datatypes.Credential description: The optional credential that can be used to authenticate to the software component. required: false - status: SUPPORTED + status: supported requirements: - host: capability: tosca.capabilities.Container @@ -310,19 +310,19 @@ node_types: type: scalar-unit.size description: The requested storage size (default unit is MB). required: true - status: SUPPORTED + status: supported constraints: - greater_or_equal: 1 MB volume_id: type: string description: ID of an existing volume (that is in the accessible scope of the requesting application). required: false - status: SUPPORTED + status: supported snapshot_id: type: string description: Some identifier that represents an existing snapshot that should be used when creating the block storage (volume). required: false - status: SUPPORTED + status: supported capabilities: attachment: type: tosca.capabilities.Attachment @@ -339,7 +339,7 @@ node_types: type: string description: Allow the user to set a fixed IP address. Note that this address is a request to the provider which they will attempt to fulfill but may not be able to dependent on the network the port is associated with. required: false - status: SUPPORTED + status: supported order: type: integer description: 'The order of the NIC on the compute instance (e.g. eth2). Note: @@ -349,7 +349,7 @@ node_types: progression that starts with 0 (e.g. 0, 1, 2, ..., n).' required: false default: 0 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 0 is_default: @@ -357,22 +357,22 @@ node_types: description: Set is_default=true to apply a default gateway route on the running compute instance to the associated network gateway. Only one port that is associated to single compute node can set as default=true. required: false default: false - status: SUPPORTED + status: supported ip_range_start: type: string description: Defines the starting IP of a range to be allocated for the compute instances that are associated by this Port. Without setting this property the IP allocation is done from the entire CIDR block of the network. required: false - status: SUPPORTED + status: supported ip_range_end: type: string description: Defines the ending IP of a range to be allocated for the compute instances that are associated by this Port. Without setting this property the IP allocation is done from the entire CIDR block of the network. required: false - status: SUPPORTED + status: supported attributes: ip_address: type: string description: The IP address would be assigned to the associated compute instance. - status: SUPPORTED + status: supported requirements: - link: capability: tosca.capabilities.network.Linkable @@ -405,22 +405,22 @@ node_types: type: string description: The logical database Name. required: true - status: SUPPORTED + status: supported port: type: integer description: The port the database service will use to listen for incoming data and requests. required: false - status: SUPPORTED + status: supported user: type: string description: The special user account used for database administration. required: false - status: SUPPORTED + status: supported password: type: string description: The password associated with the user account provided in the 'user' property. required: false - status: SUPPORTED + status: supported requirements: - host: capability: tosca.capabilities.Container diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/relationships.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/relationships.yml index 07a9bf5bd9..8ba1b1e107 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/relationships.yml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/tosca/relationships.yml @@ -12,16 +12,16 @@ relationship_types: tosca_id: type: string description: A unique identifier of the realized instance of a Relationship Template that derives from any TOSCA normative type. - status: SUPPORTED + status: supported tosca_name: type: string description: This attribute reflects the name of the Relationship Template as defined in the TOSCA service template. This name is not unique to the realized instance model of corresponding deployed application as each template in the model can result in one or more instances (e.g., scaled) when orchestrated to a provider environment. - status: SUPPORTED + status: supported state: type: string description: The state of the relationship instance. default: initial - status: SUPPORTED + status: supported interfaces: Configure: type: tosca.interfaces.relationship.Configure @@ -46,21 +46,21 @@ relationship_types: / path such as ''/usr/data''. Note: The user must provide it and it cannot be "root".' required: true - status: SUPPORTED + status: supported constraints: - min_length: 1 device: type: string description: The logical device name which for the attached device (which is represented by the target node in the model). e.g., '/dev/hda1'. required: false - status: SUPPORTED + status: supported attributes: device: type: string description: 'The logical name of the device as exposed to the instance. Note: A runtime property that gets set when the model gets instantiated by the orchestrator.' - status: SUPPORTED + status: supported valid_target_types: - tosca.capabilities.Attachment tosca.relationships.network.BindsTo: @@ -85,6 +85,6 @@ relationship_types: credential: type: tosca.datatypes.Credential required: false - status: SUPPORTED + status: supported valid_target_types: - tosca.capabilities.Endpoint |