summaryrefslogtreecommitdiffstats
path: root/common/onap-tosca-datatype
diff options
context:
space:
mode:
Diffstat (limited to 'common/onap-tosca-datatype')
-rw-r--r--common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java4
-rw-r--r--common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java6
-rw-r--r--common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java2
-rw-r--r--common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java22
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml200
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml4
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml386
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml18
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml28
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml2
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml98
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml8
-rw-r--r--common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java2
-rw-r--r--common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java6
-rw-r--r--common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java6
15 files changed, 391 insertions, 401 deletions
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
index aa1392e2ce..1b72cbc030 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
@@ -31,11 +31,11 @@ public class AttributeDefinition implements Cloneable {
private String type;
private String description;
private Object _default;
- private Status status;
+ private String status;
private EntrySchema entry_schema;
public AttributeDefinition() {
- status = Status.SUPPORTED;
+ status = Status.SUPPORTED.getName();
}
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
index 44da720fc4..310f9004af 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
@@ -27,7 +27,7 @@ public class DefinitionOfDataType implements Cloneable {
private Object value;
private Boolean required;
private Object _default;
- private Status status;
+ private String status;
private List<Constraint> constraints;
private EntrySchema entry_schema;
@@ -71,11 +71,11 @@ public class DefinitionOfDataType implements Cloneable {
this._default = _default;
}
- public Status getStatus() {
+ public String getStatus() {
return status;
}
- public void setStatus(Status status) {
+ public void setStatus(String status) {
this.status = status;
}
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
index 0c1f804efa..331b7b0e64 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
@@ -39,7 +39,7 @@ package org.onap.sdc.tosca.datatypes.model;
public class PropertyDefinition extends DefinitionOfDataType {
public PropertyDefinition() {
- setStatus(Status.SUPPORTED);
+ setStatus(Status.SUPPORTED.getName());
setRequired(true);
}
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
index b58f13c3a5..c25a6adbaa 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
@@ -20,27 +20,17 @@
package org.onap.sdc.tosca.datatypes.model;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
-
+@Getter
+@AllArgsConstructor
public enum Status {
-
SUPPORTED("supported"),
- supported("supported"),
UNSUPPORTED("unsupported"),
- unsupported("unsupported"),
EXPERIMENTAL("experimental"),
- experimental("experimental"),
- DEPRECATED("deprecated"),
- deprecated("deprecated");
- private String displayName;
-
- Status(String displayName) {
- this.displayName = displayName;
- }
-
- public String getDisplayName() {
- return displayName;
- }
+ DEPRECATED("deprecated");
+ private final String name;
}
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
index bc1f5efd68..f2e142b03d 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/data.yml
@@ -31,12 +31,12 @@ data_types:
mac_address:
description: MAC address
type: string
- status: SUPPORTED
+ status: supported
required: false
ip_address:
description: IP address
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
@@ -46,35 +46,35 @@ data_types:
port_security_enabled:
description: Flag to enable/disable port security on the port
type: boolean
- status: SUPPORTED
+ status: supported
required: false
mac_address:
description: MAC address to give to this port
type: string
- status: SUPPORTED
+ status: supported
required: false
admin_state_up:
description: The administrative state of this port
type: boolean
- status: SUPPORTED
+ status: supported
default: true
required: false
qos_policy:
description: The name or ID of QoS policy to attach to this port
type: string
- status: SUPPORTED
+ status: supported
required: false
allowed_address_pairs:
description: Additional MAC/IP address pairs allowed to pass through the port
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.AddressPair
required: false
binding:vnic_type:
description: The vnic type to be bound on the neutron port
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -84,7 +84,7 @@ data_types:
value_specs:
description: Extra parameters to include in the request
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
default: {}
@@ -97,12 +97,12 @@ data_types:
network_policy_entries_policy_rule_src_ports_start_port:
description: Start port
type: string
- status: SUPPORTED
+ status: supported
required: false
network_policy_entries_policy_rule_src_ports_end_port:
description: End port
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair:
@@ -112,17 +112,17 @@ data_types:
address_mode:
description: Address Mode.
type: string
- status: SUPPORTED
+ status: supported
required: false
ip:
description: IP.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp
- status: SUPPORTED
+ status: supported
required: false
mac:
description: Mac.
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
@@ -132,7 +132,7 @@ data_types:
network_policy_entries_policy_rule_dst_addresses_virtual_network:
description: Destination addresses Virtual network
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
@@ -142,45 +142,45 @@ data_types:
network_policy_entries_policy_rule_dst_addresses:
description: Destination addresses
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork
required: false
network_policy_entries_policy_rule_dst_ports:
description: Destination ports
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs
required: false
network_policy_entries_policy_rule_protocol:
description: Protocol
type: string
- status: SUPPORTED
+ status: supported
required: false
network_policy_entries_policy_rule_src_addresses:
description: Source addresses
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork
required: false
network_policy_entries_policy_rule_direction:
description: Direction
type: string
- status: SUPPORTED
+ status: supported
required: false
network_policy_entries_policy_rule_src_ports:
description: Source ports
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs
required: false
network_policy_entries_policy_rule_action_list:
description: Action list
type: org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
@@ -190,12 +190,12 @@ data_types:
remote_group_id:
description: The remote group ID to be associated with this security group rule
type: string
- status: SUPPORTED
+ status: supported
required: false
protocol:
description: The protocol that is matched by the security group rule
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -205,7 +205,7 @@ data_types:
ethertype:
description: Ethertype of the traffic
type: string
- status: SUPPORTED
+ status: supported
default: IPv4
required: false
constraints:
@@ -216,7 +216,7 @@ data_types:
description: 'The maximum port number in the range that is matched by the
security group rule. '
type: integer
- status: SUPPORTED
+ status: supported
required: false
constraints:
- in_range:
@@ -225,12 +225,12 @@ data_types:
remote_ip_prefix:
description: The remote IP prefix (CIDR) to be associated with this security group rule
type: string
- status: SUPPORTED
+ status: supported
required: false
remote_mode:
description: Whether to specify a remote group or a remote IP prefix
type: string
- status: SUPPORTED
+ status: supported
default: remote_ip_prefix
required: false
constraints:
@@ -240,7 +240,7 @@ data_types:
direction:
description: The direction in which the security group rule is applied
type: string
- status: SUPPORTED
+ status: supported
default: ingress
required: false
constraints:
@@ -250,7 +250,7 @@ data_types:
port_range_min:
description: The minimum port number in the range that is matched by the security group rule.
type: integer
- status: SUPPORTED
+ status: supported
required: false
constraints:
- in_range:
@@ -264,12 +264,12 @@ data_types:
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
description: Network ipam refs data ipam subnets ip prefix len
type: string
- status: SUPPORTED
+ status: supported
required: false
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
description: Network ipam refs data ipam subnets ip prefix
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties:
@@ -279,7 +279,7 @@ data_types:
sub_interface_vlan_tag:
description: Sub Interface VLAN Tag.
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp:
@@ -289,12 +289,12 @@ data_types:
ip_prefix:
description: IP Prefix.
type: string
- status: SUPPORTED
+ status: supported
required: false
ip_prefix_len:
description: IP Prefix Len.
type: integer
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork:
@@ -304,7 +304,7 @@ data_types:
network_policy_entries_policy_rule_src_addresses_virtual_network:
description: Source addresses Virtual network
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
@@ -314,12 +314,12 @@ data_types:
network_policy_entries_policy_rule_action_list_simple_action:
description: Simple Action
type: string
- status: SUPPORTED
+ status: supported
required: false
network_policy_entries_policy_rule_action_list_apply_service:
description: Apply Service
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
@@ -331,7 +331,7 @@ data_types:
network_ipam_refs_data_ipam_subnets:
description: Network ipam refs data ipam subnets
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList
required: false
@@ -343,12 +343,12 @@ data_types:
file:
description: The required URI string (relative or absolute) which can be used to locate the file
type: string
- status: SUPPORTED
+ status: supported
required: true
file_type:
description: The type of the file
type: string
- status: SUPPORTED
+ status: supported
required: true
constraints:
- valid_values:
@@ -364,26 +364,26 @@ data_types:
static_routes:
description: An ordered list of static routes to be added to this interface
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
required: false
virtual_network:
description: Virtual Network for this interface
type: string
- status: SUPPORTED
+ status: supported
required: true
allowed_address_pairs:
description: List of allowed address pair for this interface
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.contrail.AddressPair
required: false
ip_address:
description: IP for this interface
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
@@ -393,7 +393,7 @@ data_types:
network_policy_refs_data_sequence:
description: Network Policy ref data sequence
type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
@@ -403,12 +403,12 @@ data_types:
network_policy_entries_policy_rule_dst_ports_start_port:
description: Start port
type: string
- status: SUPPORTED
+ status: supported
required: false
network_policy_entries_policy_rule_dst_ports_end_port:
description: End port
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.network.AllocationPool:
@@ -418,12 +418,12 @@ data_types:
start:
description: Start address for the allocation pool
type: string
- status: SUPPORTED
+ status: supported
required: false
end:
description: End address for the allocation pool
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrail.network.rule.PortPairs:
@@ -433,12 +433,12 @@ data_types:
start_port:
description: Start port
type: string
- status: SUPPORTED
+ status: supported
required: false
end_port:
description: End port
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
@@ -448,7 +448,7 @@ data_types:
virtual_network:
description: Virtual network
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
@@ -458,7 +458,7 @@ data_types:
policy_rule:
description: Contrail network rule
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
required: false
@@ -470,7 +470,7 @@ data_types:
address_mode:
description: Address mode active-active or active-standy
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -479,12 +479,12 @@ data_types:
prefix:
description: IP address prefix
type: string
- status: SUPPORTED
+ status: supported
required: false
mac_address:
description: Mac address
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress:
@@ -494,7 +494,7 @@ data_types:
mac_address:
description: Mac Addresses List.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
@@ -506,12 +506,12 @@ data_types:
network_ipam_refs_data_ipam_subnets_subnet:
description: Network ipam refs data ipam subnets
type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
- status: SUPPORTED
+ status: supported
required: false
network_ipam_refs_data_ipam_subnets_addr_from_start:
description: Network ipam refs data ipam subnets addr from start
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
@@ -521,7 +521,7 @@ data_types:
network_policy_entries_policy_rule:
description: Contrail network rule
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
required: false
@@ -533,7 +533,7 @@ data_types:
port_id:
description: Port id
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs:
@@ -543,7 +543,7 @@ data_types:
allowed_address_pair:
description: Addresses pair List.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
required: false
@@ -555,18 +555,18 @@ data_types:
subnet:
description: Subnet in which to allocate the IP address for this port
type: string
- status: SUPPORTED
+ status: supported
required: false
ip_address:
description: IP address desired in the subnet for this port
type: string
- status: SUPPORTED
+ status: supported
required: false
subnet_id:
type: string
description: Subnet in which to allocate the IP address for this port
required: false
- status: SUPPORTED
+ status: supported
org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties:
@@ -576,7 +576,7 @@ data_types:
service_interface_type:
description: Service Interface Type.
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.network.subnet.HostRoute:
@@ -586,12 +586,12 @@ data_types:
destination:
description: The destination for static route
type: string
- status: SUPPORTED
+ status: supported
required: false
nexthop:
description: The next hop for the destination
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.network.contrail.port.StaticRoute:
@@ -601,17 +601,17 @@ data_types:
prefix:
description: Route prefix
type: string
- status: SUPPORTED
+ status: supported
required: false
next_hop:
description: Next hop
type: string
- status: SUPPORTED
+ status: supported
required: false
next_hop_type:
description: Next hop type
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
@@ -621,12 +621,12 @@ data_types:
substitute_service_template:
description: Substitute Service Template
type: string
- status: SUPPORTED
+ status: supported
required: true
index_value:
description: Index value of the substitution service template runtime instance
type: integer
- status: SUPPORTED
+ status: supported
default: 0
required: false
constraints:
@@ -634,19 +634,19 @@ data_types:
count:
description: Count
type: integer
- status: SUPPORTED
+ status: supported
default: 1
required: false
scaling_enabled:
description: Indicates whether service scaling is enabled
type: boolean
- status: SUPPORTED
+ status: supported
default: true
required: false
mandatory:
description: Mandatory
type: boolean
- status: SUPPORTED
+ status: supported
default: true
required: false
@@ -657,18 +657,18 @@ data_types:
tenant_id:
description: The ID of the tenant who owns the network
type: string
- status: SUPPORTED
+ status: supported
required: false
enable_dhcp:
description: Set to true if DHCP is enabled and false if DHCP is disabled
type: boolean
- status: SUPPORTED
+ status: supported
default: true
required: false
ipv6_address_mode:
description: IPv6 address mode
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -678,7 +678,7 @@ data_types:
ipv6_ra_mode:
description: IPv6 RA (Router Advertisement) mode
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -688,7 +688,7 @@ data_types:
value_specs:
description: Extra parameters to include in the request
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
default: {}
@@ -696,19 +696,19 @@ data_types:
allocation_pools:
description: The start and end addresses for the allocation pools
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.AllocationPool
required: false
subnetpool:
description: The name or ID of the subnet pool
type: string
- status: SUPPORTED
+ status: supported
required: false
dns_nameservers:
description: A specified set of DNS name servers to be used
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
default: []
@@ -716,14 +716,14 @@ data_types:
host_routes:
description: The gateway IP address
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.subnet.HostRoute
required: false
ip_version:
description: The gateway IP address
type: integer
- status: SUPPORTED
+ status: supported
default: 4
required: false
constraints:
@@ -733,24 +733,24 @@ data_types:
name:
description: The name of the subnet
type: string
- status: SUPPORTED
+ status: supported
required: false
prefixlen:
description: Prefix length for subnet allocation from subnet pool
type: integer
- status: SUPPORTED
+ status: supported
required: false
constraints:
- greater_or_equal: 0
cidr:
description: The CIDR
type: string
- status: SUPPORTED
+ status: supported
required: false
gateway_ip:
description: The gateway IP address
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrail.network.rule.Rule:
@@ -760,45 +760,45 @@ data_types:
src_ports:
description: Source ports
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
required: false
protocol:
description: Protocol
type: string
- status: SUPPORTED
+ status: supported
required: false
dst_addresses:
description: Destination addresses
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
required: false
apply_service:
description: Service to apply
type: string
- status: SUPPORTED
+ status: supported
required: false
dst_ports:
description: Destination ports
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
required: false
src_addresses:
description: Source addresses
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
required: false
direction:
description: Direction
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
@@ -808,10 +808,10 @@ data_types:
network_policy_refs_data_sequence_major:
description: Network Policy ref data sequence Major
type: integer
- status: SUPPORTED
+ status: supported
required: false
network_policy_refs_data_sequence_minor:
description: Network Policy ref data sequence Minor
type: integer
- status: SUPPORTED
+ status: supported
required: false
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
index ded2373e50..36e32a6a9e 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/groups.yml
@@ -31,10 +31,10 @@ group_types:
heat_file:
description: Heat file which associate to this group/heat stack
type: string
- status: SUPPORTED
+ status: supported
required: true
description:
description: group description
type: string
- status: SUPPORTED
+ status: supported
required: true
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
index c26eaf0bc6..a7fc263750 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
@@ -30,46 +30,46 @@ node_types:
availability_zone:
description: Availability zone to create servers in
type: string
- status: SUPPORTED
+ status: supported
required: false
static_routes_list:
description: Static routes enabled
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: boolean
required: false
availability_zone_enable:
description: Indicates availability zone is enabled
type: boolean
- status: SUPPORTED
+ status: supported
default: false
required: false
service_template_name:
description: Service template name
type: string
- status: SUPPORTED
+ status: supported
required: false
ordered_interfaces:
description: Indicates if service interface are ordered
type: boolean
- status: SUPPORTED
+ status: supported
default: false
required: false
flavor:
description: flavor
type: string
- status: SUPPORTED
+ status: supported
required: false
image_name:
description: Image name
type: string
- status: SUPPORTED
+ status: supported
required: true
service_type:
description: Service type
type: string
- status: SUPPORTED
+ status: supported
required: true
constraints:
- valid_values:
@@ -80,7 +80,7 @@ node_types:
service_interface_type_list:
description: List of interface types
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
constraints:
@@ -93,19 +93,19 @@ node_types:
service_instance_name:
description: Service instance name
type: string
- status: SUPPORTED
+ status: supported
required: true
interface_list:
description: List of interfaces
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
required: false
service_mode:
description: Service mode
type: string
- status: SUPPORTED
+ status: supported
required: true
constraints:
- valid_values:
@@ -115,7 +115,7 @@ node_types:
shared_ip_list:
description: Shared ips enabled
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: boolean
required: false
@@ -123,35 +123,35 @@ node_types:
tenant_id:
description: Tenant id of the Service Instance
type: string
- status: SUPPORTED
+ status: supported
fq_name:
description: The FQ name of the service instance
type: string
- status: SUPPORTED
+ status: supported
service_template_name:
description: Service Template of the Service Instance
type: string
- status: SUPPORTED
+ status: supported
show:
description: All attributes
type: string
- status: SUPPORTED
+ status: supported
active_vms:
description: Number of service VMs active for this Service Instance
type: string
- status: SUPPORTED
+ status: supported
service_instance_name:
description: The name of the service instance
type: string
- status: SUPPORTED
+ status: supported
virtual_machines:
description: Service VMs for the Service Instance
type: string
- status: SUPPORTED
+ status: supported
status:
description: Status of the service instance
type: string
- status: SUPPORTED
+ status: supported
org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface:
@@ -160,56 +160,56 @@ node_types:
name:
description: Virtual Machine Interface name
type: string
- status: SUPPORTED
+ status: supported
required: false
security_group_refs:
description: List of security groups.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_network_refs:
description: List of virtual networks.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_machine_interface_properties:
description: virtual machine interface properties.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
- status: SUPPORTED
+ status: supported
required: false
port_tuple_refs:
description: List of port tuples.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_machine_interface_mac_addresses:
description: List of mac addresses.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_machine_interface_allowed_address_pairs:
description: Virtual Machine Interface allowed address pairs.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- status: SUPPORTED
+ status: supported
required: false
attributes:
fq_name:
description: The FQ name of the Virtual Network.
type: string
- status: SUPPORTED
+ status: supported
show:
description: All attributes.
type: string
- status: SUPPORTED
+ status: supported
capabilities:
binding:
type: tosca.capabilities.network.Bindable
@@ -227,30 +227,30 @@ node_types:
entries:
description: A symbolic name for this contrail network rule
type: org.openecomp.datatypes.heat.contrail.network.rule.RuleList
- status: SUPPORTED
+ status: supported
required: false
name:
description: A symbolic name for this contrail network rule
type: string
- status: SUPPORTED
+ status: supported
required: false
attributes:
tenant_id:
description: tenant_id
type: string
- status: SUPPORTED
+ status: supported
fq_name:
description: fq_name
type: string
- status: SUPPORTED
+ status: supported
show:
description: All attributes.
type: string
- status: SUPPORTED
+ status: supported
rules:
description: List of rules
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
requirements:
@@ -268,17 +268,17 @@ node_types:
description:
description: Description of the security group
type: string
- status: SUPPORTED
+ status: supported
required: false
name:
description: A symbolic name for this security group, which is not required to be unique.
type: string
- status: SUPPORTED
+ status: supported
required: false
rules:
description: List of security group rules
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule
required: false
@@ -286,7 +286,7 @@ node_types:
show:
description: Detailed information about resource
type: string
- status: SUPPORTED
+ status: supported
requirements:
- port:
capability: tosca.capabilities.Attachment
@@ -302,39 +302,39 @@ node_types:
shared:
description: Is virtual network shared
type: string
- status: SUPPORTED
+ status: supported
required: false
forwarding_mode:
description: forwarding mode of the virtual network
type: string
- status: SUPPORTED
+ status: supported
required: false
external:
description: Is virtual network external
type: string
- status: SUPPORTED
+ status: supported
required: false
allow_transit:
description: Whether this network should be transitive.
type: string
- status: SUPPORTED
+ status: supported
required: false
flood_unknown_unicast:
description: flood L2 packets on network
type: string
- status: SUPPORTED
+ status: supported
required: false
route_targets:
description: route targets associated with the virtual network
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
subnets:
description: Network related subnets
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.neutron.Subnet
required: false
@@ -342,27 +342,27 @@ node_types:
fq_name:
description: fq_name
type: string
- status: SUPPORTED
+ status: supported
show:
description: All attributes.
type: string
- status: SUPPORTED
+ status: supported
subnets_name:
description: Subnets name of this network
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
subnets_show:
description: Detailed information about each subnet
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
subnets:
description: Network related subnets
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.neutron.Subnet
capabilities:
@@ -378,22 +378,22 @@ node_types:
admin_pass:
description: The administrator password for the server
type: string
- status: SUPPORTED
+ status: supported
required: false
availability_zone:
description: Availability zone to create servers in
type: string
- status: SUPPORTED
+ status: supported
required: false
image:
description: The ID or name of the image to boot with
type: string
- status: SUPPORTED
+ status: supported
required: false
image_update_policy:
description: Policy on how to apply an image-id update
type: string
- status: SUPPORTED
+ status: supported
default: REBUILD
required: false
constraints:
@@ -404,18 +404,18 @@ node_types:
metadata:
description: Arbitrary JSON metadata to store for this server
type: json
- status: SUPPORTED
+ status: supported
required: false
contrail_service_instance_ind:
description: Nova server related to service instance indicator
type: boolean
- status: SUPPORTED
+ status: supported
default: false
required: false
user_data_update_policy:
description: Policy on how to apply a user_data update
type: string
- status: SUPPORTED
+ status: supported
default: REPLACE
required: false
constraints:
@@ -425,7 +425,7 @@ node_types:
flavor_update_policy:
description: Policy on how to apply a flavor update
type: string
- status: SUPPORTED
+ status: supported
default: RESIZE
required: false
constraints:
@@ -435,28 +435,28 @@ node_types:
user_data:
description: User data script to be executed by cloud-init
type: string
- status: SUPPORTED
+ status: supported
default: ''
required: false
flavor:
description: The ID or name of the flavor to boot onto
type: string
- status: SUPPORTED
+ status: supported
required: true
key_name:
description: Name of keypair to inject into the server
type: string
- status: SUPPORTED
+ status: supported
required: false
reservation_id:
description: A UUID for the set of servers being requested
type: string
- status: SUPPORTED
+ status: supported
required: false
security_groups:
description: List of security group names or IDs
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
default: []
@@ -464,12 +464,12 @@ node_types:
config_drive:
description: enable config drive on the server
type: boolean
- status: SUPPORTED
+ status: supported
required: false
personality:
description: A map of files to create/overwrite on the server upon boot
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
default: {}
@@ -477,7 +477,7 @@ node_types:
software_config_transport:
description: How the server should receive the metadata required for software configuration
type: string
- status: SUPPORTED
+ status: supported
default: POLL_SERVER_CFN
required: false
constraints:
@@ -489,7 +489,7 @@ node_types:
user_data_format:
description: How the user_data should be formatted for the server
type: string
- status: SUPPORTED
+ status: supported
default: HEAT_CFNTOOLS
required: false
constraints:
@@ -500,7 +500,7 @@ node_types:
diskConfig:
description: Control how the disk is partitioned when the server is created
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -509,12 +509,12 @@ node_types:
name:
description: Server name
type: string
- status: SUPPORTED
+ status: supported
required: false
scheduler_hints:
description: Arbitrary key-value pairs specified by the client to help boot a server
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
@@ -522,33 +522,33 @@ node_types:
accessIPv4:
description: The manually assigned alternative public IPv4 address of the server
type: string
- status: SUPPORTED
+ status: supported
addresses:
description: A dict of all network addresses with corresponding port_id
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
accessIPv6:
description: The manually assigned alternative public IPv6 address of the server
type: string
- status: SUPPORTED
+ status: supported
instance_name:
description: AWS compatible instance name
type: string
- status: SUPPORTED
+ status: supported
name:
description: Name of the server
type: string
- status: SUPPORTED
+ status: supported
show:
description: Detailed information about resource
type: string
- status: SUPPORTED
+ status: supported
console_urls:
description: URLs of servers consoles
type: string
- status: SUPPORTED
+ status: supported
org.openecomp.resource.vfc.rules.nodes.heat.network.contrailV2.NetworkRules:
derived_from: tosca.nodes.Root
@@ -556,18 +556,18 @@ node_types:
name:
description: A symbolic name for this contrail v2 network rule
type: string
- status: SUPPORTED
+ status: supported
required: false
network_policy_entries:
description: A symbolic name for this contrail v2 network rule
type: org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList
- status: SUPPORTED
+ status: supported
required: false
attributes:
fq_name:
description: fq_name
type: string
- status: SUPPORTED
+ status: supported
requirements:
- network:
capability: tosca.capabilities.Attachment
@@ -583,29 +583,29 @@ node_types:
port_security_enabled:
description: Flag to enable/disable port security on the network
type: boolean
- status: SUPPORTED
+ status: supported
required: false
device_id:
description: Device ID of this port
type: string
- status: SUPPORTED
+ status: supported
required: false
qos_policy:
description: The name or ID of QoS policy to attach to this network
type: string
- status: SUPPORTED
+ status: supported
required: false
allowed_address_pairs:
description: Additional MAC/IP address pairs allowed to pass through the port
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.AddressPair
required: false
binding:vnic_type:
description: The vnic type to be bound on the neutron port
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -615,7 +615,7 @@ node_types:
value_specs:
description: Extra parameters to include in the request
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
default: {}
@@ -623,17 +623,17 @@ node_types:
device_owner:
description: Name of the network owning the port
type: string
- status: SUPPORTED
+ status: supported
required: false
network:
description: Network this port belongs to
type: string
- status: SUPPORTED
+ status: supported
required: false
replacement_policy:
description: Policy on how to respond to a stack-update for this resource
type: string
- status: SUPPORTED
+ status: supported
default: AUTO
required: false
constraints:
@@ -643,60 +643,60 @@ node_types:
security_groups:
description: List of security group names or IDs
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
fixed_ips:
description: Desired IPs for this port
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
required: false
mac_address:
description: MAC address to give to this port
type: string
- status: SUPPORTED
+ status: supported
required: false
admin_state_up:
description: A boolean value specifying the administrative status of the network
type: boolean
- status: SUPPORTED
+ status: supported
default: true
required: false
name:
description: A symbolic name for this port
type: string
- status: SUPPORTED
+ status: supported
required: false
attributes:
tenant_id:
description: Tenant owning the port
type: string
- status: SUPPORTED
+ status: supported
network_id:
description: Unique identifier for the network owning the port
type: string
- status: SUPPORTED
+ status: supported
qos_policy_id:
description: The QoS policy ID attached to this network
type: string
- status: SUPPORTED
+ status: supported
show:
description: Detailed information about resource
type: string
- status: SUPPORTED
+ status: supported
subnets:
description: Subnets of this network
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
status:
description: The status of the network
type: string
- status: SUPPORTED
+ status: supported
capabilities:
attachment:
type: tosca.capabilities.Attachment
@@ -718,48 +718,48 @@ node_types:
dhcp_agent_ids:
description: The IDs of the DHCP agent to schedule the network
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
tenant_id:
description: The ID of the tenant which will own the network
type: string
- status: SUPPORTED
+ status: supported
required: false
port_security_enabled:
description: Flag to enable/disable port security on the network
type: boolean
- status: SUPPORTED
+ status: supported
required: false
shared:
description: Whether this network should be shared across all tenants
type: boolean
- status: SUPPORTED
+ status: supported
default: false
required: false
admin_state_up:
description: A boolean value specifying the administrative status of the network
type: boolean
- status: SUPPORTED
+ status: supported
default: true
required: false
qos_policy:
description: The name or ID of QoS policy to attach to this network
type: string
- status: SUPPORTED
+ status: supported
required: false
subnets:
description: Network related subnets
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.neutron.Subnet
required: false
value_specs:
description: Extra parameters to include in the request
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
default: {}
@@ -768,31 +768,31 @@ node_types:
qos_policy_id:
description: The QoS policy ID attached to this network
type: string
- status: SUPPORTED
+ status: supported
show:
description: Detailed information about resource
type: string
- status: SUPPORTED
+ status: supported
subnets_name:
description: Subnets name of this network
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
subnets:
description: Network related subnets
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.neutron.Subnet
mtu:
description: The maximum transmission unit size(in bytes) for the network
type: scalar-unit.size
- status: SUPPORTED
+ status: supported
status:
description: The status of the network
type: string
- status: SUPPORTED
+ status: supported
capabilities:
attachment:
type: tosca.capabilities.Attachment
@@ -806,43 +806,43 @@ node_types:
static_routes:
description: An ordered list of static routes to be added to this interface
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
required: false
virtual_network:
description: Virtual Network for this interface
type: string
- status: SUPPORTED
+ status: supported
required: true
static_route:
description: Static route enabled
type: boolean
- status: SUPPORTED
+ status: supported
default: false
required: false
allowed_address_pairs:
description: List of allowed address pair for this interface
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.contrail.AddressPair
required: false
shared_ip:
description: Shared ip enabled
type: boolean
- status: SUPPORTED
+ status: supported
default: false
required: false
ip_address:
description: IP for this interface
type: string
- status: SUPPORTED
+ status: supported
required: false
interface_type:
description: Interface type
type: string
- status: SUPPORTED
+ status: supported
required: true
constraints:
- valid_values:
@@ -854,7 +854,7 @@ node_types:
fq_name:
description: fq_name
type: string
- status: SUPPORTED
+ status: supported
org.openecomp.resource.vfc.nodes.heat.contrail.Compute:
derived_from: org.openecomp.resource.vfc.nodes.Compute
@@ -862,22 +862,22 @@ node_types:
flavor:
description: flavor
type: string
- status: SUPPORTED
+ status: supported
required: false
image_name:
description: Image name
type: string
- status: SUPPORTED
+ status: supported
required: true
availability_zone:
description: Availability zone to create servers in
type: string
- status: SUPPORTED
+ status: supported
required: false
service_type:
description: Service type
type: string
- status: SUPPORTED
+ status: supported
required: true
constraints:
- valid_values:
@@ -888,23 +888,23 @@ node_types:
availability_zone_enable:
description: Indicates availability zone is enabled
type: boolean
- status: SUPPORTED
+ status: supported
default: false
required: false
service_template_name:
description: Service template name
type: string
- status: SUPPORTED
+ status: supported
required: false
service_instance_name:
description: Service instance name
type: string
- status: SUPPORTED
+ status: supported
required: true
service_mode:
description: Service mode
type: string
- status: SUPPORTED
+ status: supported
required: true
constraints:
- valid_values:
@@ -915,27 +915,27 @@ node_types:
tenant_id:
description: Tenant id of the VM
type: string
- status: SUPPORTED
+ status: supported
fq_name:
description: fq_name
type: string
- status: SUPPORTED
+ status: supported
show:
description: All attributes
type: string
- status: SUPPORTED
+ status: supported
active_vms:
description: Number of active VMs
type: string
- status: SUPPORTED
+ status: supported
virtual_machines:
description: VMs of this compute
type: string
- status: SUPPORTED
+ status: supported
status:
description: status of the compute
type: string
- status: SUPPORTED
+ status: supported
org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface:
derived_from: org.openecomp.resource.cp.nodes.network.v2.SubInterface
@@ -943,48 +943,48 @@ node_types:
virtual_machine_interface_refs:
description: List of virtual machine interface.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
name:
description: Virtual Machine Sub Interface VLAN name
type: string
- status: SUPPORTED
+ status: supported
required: false
virtual_network_refs:
description: List of virtual networks.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_machine_interface_properties:
description: virtual machine interface properties.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties
- status: SUPPORTED
+ status: supported
required: false
virtual_machine_interface_allowed_address_pairs:
description: Virtual Machine Sub Interface allowed address pairs.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- status: SUPPORTED
+ status: supported
required: false
virtual_machine_interface_mac_addresses:
description: List of mac addresses.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress
- status: SUPPORTED
+ status: supported
required: false
security_group_refs:
description: List of security groups.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
port_tuple_refs:
description: List of port tuples.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
@@ -992,11 +992,11 @@ node_types:
fq_name:
description: The FQ name of the Virtual Network.
type: string
- status: SUPPORTED
+ status: supported
show:
description: All attributes.
type: string
- status: SUPPORTED
+ status: supported
org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface:
derived_from: org.openecomp.resource.cp.nodes.network.SubInterface
@@ -1004,48 +1004,48 @@ node_types:
virtual_machine_interface_refs:
description: List of virtual machine interface.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
name:
description: Virtual Machine Sub Interface VLAN name
type: string
- status: SUPPORTED
+ status: supported
required: false
virtual_network_refs:
description: List of virtual networks.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_machine_interface_properties:
description: virtual machine interface properties.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties
- status: SUPPORTED
+ status: supported
required: false
virtual_machine_interface_allowed_address_pairs:
description: Virtual Machine Sub Interface allowed address pairs.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- status: SUPPORTED
+ status: supported
required: false
virtual_machine_interface_mac_addresses:
description: List of mac addresses.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress
- status: SUPPORTED
+ status: supported
required: false
security_group_refs:
description: List of security groups.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
port_tuple_refs:
description: List of port tuples.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
@@ -1053,11 +1053,11 @@ node_types:
fq_name:
description: The FQ name of the Virtual Network.
type: string
- status: SUPPORTED
+ status: supported
show:
description: All attributes.
type: string
- status: SUPPORTED
+ status: supported
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -1073,35 +1073,35 @@ node_types:
network_ipam_refs_data:
description: IPAM references Data
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData
required: false
network_policy_refs_data:
description: Policy references data
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData
required: false
network_ipam_refs:
description: IPAM references
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
network_policy_refs:
description: Policy references
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
subnets:
description: Network related subnets
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.neutron.Subnet
required: false
@@ -1109,23 +1109,23 @@ node_types:
fq_name:
description: fq_name
type: string
- status: SUPPORTED
+ status: supported
subnets_name:
description: Subnets name of this network
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
subnets_show:
description: Detailed information about each subnet
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
subnets:
description: Network related subnets
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.neutron.Subnet
capabilities:
@@ -1141,34 +1141,34 @@ node_types:
availability_zone:
description: The availability zone in which the volume will be created
type: string
- status: SUPPORTED
+ status: supported
required: false
image:
description: If specified, the name or ID of the image to create the volume from
type: string
- status: SUPPORTED
+ status: supported
required: false
metadata:
description: Key/value pairs to associate with the volume
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
volume_type:
description: If specified, the type of volume to use, mapping to a specific backend
type: string
- status: SUPPORTED
+ status: supported
required: false
description:
description: A description of the volume
type: string
- status: SUPPORTED
+ status: supported
required: false
device_type:
description: Device type
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -1178,7 +1178,7 @@ node_types:
description: 'Bus of the device: hypervisor driver chooses a suitable default
if omitted'
type: string
- status: SUPPORTED
+ status: supported
required: false
constraints:
- valid_values:
@@ -1190,95 +1190,95 @@ node_types:
backup_id:
description: If specified, the backup to create the volume from
type: string
- status: SUPPORTED
+ status: supported
required: false
source_volid:
description: If specified, the volume to use as source
type: string
- status: SUPPORTED
+ status: supported
required: false
boot_index:
description: Integer used for ordering the boot disks
type: integer
- status: SUPPORTED
+ status: supported
required: false
size:
description: The requested storage size (default unit is MB)
type: scalar-unit.size
- status: SUPPORTED
+ status: supported
required: false
constraints:
- greater_or_equal: 1 GB
read_only:
description: Enables or disables read-only access mode of volume
type: boolean
- status: SUPPORTED
+ status: supported
required: false
name:
description: A name used to distinguish the volume
type: string
- status: SUPPORTED
+ status: supported
required: false
scheduler_hints:
description: Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
swap_size:
description: The size of the swap, in MB
type: scalar-unit.size
- status: SUPPORTED
+ status: supported
required: false
delete_on_termination:
description: Indicate whether the volume should be deleted when the server is terminated
type: boolean
- status: SUPPORTED
+ status: supported
required: false
multiattach:
description: Whether allow the volume to be attached more than once
type: boolean
- status: SUPPORTED
+ status: supported
required: false
attributes:
display_description:
description: Description of the volume
type: string
- status: SUPPORTED
+ status: supported
attachments:
description: The list of attachments of the volume
type: string
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
encrypted:
description: Boolean indicating if the volume is encrypted or not
type: boolean
- status: SUPPORTED
+ status: supported
show:
description: Detailed information about resource
type: string
- status: SUPPORTED
+ status: supported
created_at:
description: The timestamp indicating volume creation
type: timestamp
- status: SUPPORTED
+ status: supported
display_name:
description: Name of the volume
type: string
- status: SUPPORTED
+ status: supported
metadata_values:
description: Key/value pairs associated with the volume in raw dict form
type: map
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
bootable:
description: Boolean indicating if the volume can be booted or not
type: boolean
- status: SUPPORTED
+ status: supported
status:
description: The current status of the volume
type: string
- status: SUPPORTED
+ status: supported
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
index 979cd95b96..8505f41a4a 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
@@ -32,7 +32,7 @@ capability_types:
type: map
description: Deployment flavors instance
required: true
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.DeploymentFlavor
@@ -43,7 +43,7 @@ capability_types:
oid:
description: Object Id of the metric
type: string
- status: SUPPORTED
+ status: supported
required: true
org.openecomp.capabilities.AllottedResource:
@@ -56,7 +56,7 @@ capability_types:
oid:
description: Object Id of the metric
type: string
- status: SUPPORTED
+ status: supported
required: true
org.openecomp.capabilities.metric.Ceilometer:
@@ -66,7 +66,7 @@ capability_types:
name:
description: Ceilometer metric type name to monitor. (The name ceilometer is using)
type: string
- status: SUPPORTED
+ status: supported
required: true
org.openecomp.capabilities.Metric:
@@ -76,28 +76,28 @@ capability_types:
unit:
description: Unit of the metric value
type: string
- status: SUPPORTED
+ status: supported
required: true
description:
description: Description of the metric
type: string
- status: SUPPORTED
+ status: supported
required: false
type:
description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
type: string
- status: SUPPORTED
+ status: supported
required: true
category:
description: Category of the metric, for an example, compute, disk, network, storage and etc.
type: string
- status: SUPPORTED
+ status: supported
required: false
attributes:
value:
description: Runtime monitored value
type: string
- status: SUPPORTED
+ status: supported
org.openecomp.capabilities.Forwarder:
derived_from: tosca.capabilities.Root
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
index b87cbb7b51..27577d4883 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
@@ -68,17 +68,17 @@ data_types:
name:
description: Deployment Flavor Name
type: string
- status: SUPPORTED
+ status: supported
required: true
license_feature_group:
description: license feature group associated with Deployment Flavor
type: org.openecomp.datatypes.FeatureGroup
- status: SUPPORTED
+ status: supported
required: true
compute_size:
description: Size of VM
type: org.openecomp.datatypes.ComputeFlavor
- status: SUPPORTED
+ status: supported
required: true
org.openecomp.datatypes.FeatureGroup:
@@ -88,12 +88,12 @@ data_types:
license_feature_group_ref:
description: Deployment Flavor Name
type: string
- status: SUPPORTED
+ status: supported
required: true
part_number:
description: refrence part number related to feature group
type: string
- status: SUPPORTED
+ status: supported
required: true
org.openecomp.datatypes.EcompHoming:
@@ -242,22 +242,22 @@ data_types:
name:
description: Compute Flavor Name
type: string
- status: SUPPORTED
+ status: supported
required: true
num_cpus:
description: Number of cpu
type: integer
- status: SUPPORTED
+ status: supported
required: true
disk_size:
description: Disk size
type: scalar-unit.size
- status: SUPPORTED
+ status: supported
required: true
mem_size:
description: Memory size
type: scalar-unit.size
- status: SUPPORTED
+ status: supported
required: true
org.openecomp.datatypes.network.MacAssignments:
@@ -374,12 +374,12 @@ data_types:
substitute_service_template:
description: Substitute Service Template
type: string
- status: SUPPORTED
+ status: supported
required: true
index_value:
description: Index value of the substitution service template runtime instance
type: integer
- status: SUPPORTED
+ status: supported
default: 0
required: false
constraints:
@@ -387,19 +387,19 @@ data_types:
count:
description: Count
type: integer
- status: SUPPORTED
+ status: supported
default: 1
required: false
scaling_enabled:
description: Indicates whether service scaling is enabled
type: boolean
- status: SUPPORTED
+ status: supported
default: true
required: false
mandatory:
description: Mandatory
type: boolean
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.datatypes.network.NetworkFlows:
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
index 904f9cdd33..f9ecfb2ca8 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/groups.yml
@@ -52,7 +52,7 @@ group_types:
isBase:
description: Whether this module should be deployed before other modules
type: boolean
- status: SUPPORTED
+ status: supported
default: false
required: true
vf_module_label:
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
index b788c1f5e6..ad7475a04f 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
@@ -43,7 +43,7 @@ node_types:
service_template_filter:
description: Substitution Filter
type: org.openecomp.datatypes.substitution.SubstitutionFiltering
- status: SUPPORTED
+ status: supported
required: true
org.openecomp.resource.vl.extVL:
@@ -308,7 +308,7 @@ node_types:
license_feature_group_ref:
description: refrence to license feature group
type: string
- status: SUPPORTED
+ status: supported
required: true
requirements:
- deployment_flavor:
@@ -328,47 +328,47 @@ node_types:
high_availablity:
description: high_availablity
type: string
- status: SUPPORTED
+ status: supported
required: false
vm_image_name:
description: Master image_name volume id
type: string
- status: SUPPORTED
+ status: supported
required: true
vm_flavor_name:
description: Master image_name volume id
type: string
- status: SUPPORTED
+ status: supported
required: true
nfc_naming_code:
description: nfc code for instance naming
type: string
- status: SUPPORTED
+ status: supported
required: false
nfc_code:
type: string
description: nfc code
- status: SUPPORTED
+ status: supported
required: false
nfc_function:
type: string
description: nfc function
- status: SUPPORTED
+ status: supported
required: false
vm_type_tag:
description: vm type based on naming Convention
type: string
- status: SUPPORTED
+ status: supported
required: false
vfc_naming:
description: vfc naming
type: org.openecomp.datatypes.Naming
- status: SUPPORTED
+ status: supported
required: false
min_instances:
description: Minimum number of VFC Instances
type: integer
- status: SUPPORTED
+ status: supported
default: 0
required: false
constraints:
@@ -376,7 +376,7 @@ node_types:
max_instances:
description: Maximum number of VFC Instances
type: integer
- status: SUPPORTED
+ status: supported
required: false
constraints:
- greater_or_equal: 1
@@ -669,29 +669,29 @@ node_types:
type: boolean
description: Flag to enable/disable port security on the network
required: false
- status: SUPPORTED
+ status: supported
device_id:
type: string
description: Device ID of this port
required: false
- status: SUPPORTED
+ status: supported
qos_policy:
type: string
description: The name or ID of QoS policy to attach to this network
required: false
- status: SUPPORTED
+ status: supported
allowed_address_pairs:
type: list
description: Additional MAC/IP address pairs allowed to pass through the port
required: false
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.AddressPair
binding:vnic_type:
type: string
description: The vnic type to be bound on the neutron port
required: false
- status: SUPPORTED
+ status: supported
constraints:
- valid_values:
- macvtap
@@ -703,25 +703,25 @@ node_types:
required: false
default: {
}
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
device_owner:
type: string
description: Name of the network owning the port
required: false
- status: SUPPORTED
+ status: supported
network:
type: string
description: Network this port belongs to
required: false
- status: SUPPORTED
+ status: supported
replacement_policy:
type: string
description: Policy on how to respond to a stack-update for this resource
required: false
default: AUTO
- status: SUPPORTED
+ status: supported
constraints:
- valid_values:
- REPLACE_ALWAYS
@@ -730,59 +730,59 @@ node_types:
type: list
description: List of security group names or IDs
required: false
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
fixed_ips:
type: list
description: Desired IPs for this port
required: false
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
mac_address:
type: string
description: MAC address to give to this port
required: false
- status: SUPPORTED
+ status: supported
admin_state_up:
type: boolean
description: A boolean value specifying the administrative status of the network
required: false
default: true
- status: SUPPORTED
+ status: supported
name:
type: string
description: A symbolic name for this port
required: false
- status: SUPPORTED
+ status: supported
attributes:
tenant_id:
type: string
description: Tenant owning the port
- status: SUPPORTED
+ status: supported
network_id:
type: string
description: Unique identifier for the network owning the port
- status: SUPPORTED
+ status: supported
qos_policy_id:
type: string
description: The QoS policy ID attached to this network
- status: SUPPORTED
+ status: supported
show:
type: string
description: Detailed information about resource
- status: SUPPORTED
+ status: supported
subnets:
type: list
description: Subnets of this network
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
status:
type: string
description: The status of the network
- status: SUPPORTED
+ status: supported
capabilities:
attachment:
type: tosca.capabilities.Attachment
@@ -797,25 +797,25 @@ node_types:
type: list
description: An ordered list of static routes to be added to this interface
required: false
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
virtual_network:
type: string
description: Virtual Network for this interface
required: true
- status: SUPPORTED
+ status: supported
static_route:
type: boolean
description: Static route enabled
required: false
default: false
- status: SUPPORTED
+ status: supported
allowed_address_pairs:
type: list
description: List of allowed address pair for this interface
required: false
- status: SUPPORTED
+ status: supported
entry_schema:
type: org.openecomp.datatypes.heat.network.contrail.AddressPair
shared_ip:
@@ -823,17 +823,17 @@ node_types:
description: Shared ip enabled
required: false
default: false
- status: SUPPORTED
+ status: supported
ip_address:
type: string
description: IP for this interface
required: false
- status: SUPPORTED
+ status: supported
interface_type:
type: string
description: Interface type
required: true
- status: SUPPORTED
+ status: supported
constraints:
- valid_values:
- management
@@ -844,7 +844,7 @@ node_types:
fq_name:
type: string
description: fq_name
- status: SUPPORTED
+ status: supported
org.openecomp.resource.cp.v2.extVirtualMachineInterfaceCP:
derived_from: org.openecomp.resource.cp.v2.extCP
@@ -852,55 +852,55 @@ node_types:
name:
description: Virtual Machine Interface name
type: string
- status: SUPPORTED
+ status: supported
required: false
security_group_refs:
description: List of security groups.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_network_refs:
description: List of virtual networks.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_machine_interface_properties:
description: virtual machine interface properties.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
- status: SUPPORTED
+ status: supported
required: false
port_tuple_refs:
description: List of port tuples.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_machine_interface_mac_addresses:
description: List of mac addresses.
type: list
- status: SUPPORTED
+ status: supported
entry_schema:
type: string
required: false
virtual_machine_interface_allowed_address_pairs:
description: Virtual Machine Interface allowed address pairs.
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- status: SUPPORTED
+ status: supported
required: false
attributes:
fq_name:
description: The FQ name of the Virtual Network.
type: string
- status: SUPPORTED
+ status: supported
show:
description: All attributes.
type: string
- status: SUPPORTED
+ status: supported
org.openecomp.nodes.ForwardingPath:
derived_from: tosca.nodes.Root
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
index d15c56e079..14e123f713 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
@@ -31,18 +31,18 @@ relationship_types:
volume_id:
description: The ID of the volume to be attached
type: string
- status: SUPPORTED
+ status: supported
required: true
instance_uuid:
description: The ID of the server to which the volume attaches
type: string
- status: SUPPORTED
+ status: supported
required: true
attributes:
show:
description: Detailed information about resource
type: string
- status: SUPPORTED
+ status: supported
org.openecomp.relationships.AttachesTo:
derived_from: tosca.relationships.AttachesTo
@@ -51,7 +51,7 @@ relationship_types:
location:
description: The relative location (e.g., path on the file system), which provides the root location to address an attached node.
type: string
- status: SUPPORTED
+ status: supported
required: false
org.openecomp.relationships.ForwardsTo:
diff --git a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java
index 237832971f..deab74f567 100644
--- a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java
+++ b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinitionTest.java
@@ -40,7 +40,7 @@ public class AttributeDefinitionTest {
attributeDefinition.setType("type");
attributeDefinition.setDescription("description");
attributeDefinition.set_default("default");
- attributeDefinition.setStatus(Status.SUPPORTED);
+ attributeDefinition.setStatus(Status.SUPPORTED.getName());
attributeDefinition.setEntry_schema(new EntrySchema());
AttributeDefinition cloned = attributeDefinition.clone();
diff --git a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java
index d9f1cc9a85..d81645129e 100644
--- a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java
+++ b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinitionTest.java
@@ -25,7 +25,7 @@ public class PropertyDefinitionTest {
public void cloneTest() {
PropertyDefinition propertyDefinition = new PropertyDefinition();
propertyDefinition.setRequired(false);
- propertyDefinition.setStatus(Status.DEPRECATED);
+ propertyDefinition.setStatus(Status.DEPRECATED.getName());
Constraint constraint = new Constraint();
constraint.setEqual("123");
ArrayList<Constraint> constraints = new ArrayList<>();
@@ -34,8 +34,8 @@ public class PropertyDefinitionTest {
PropertyDefinition propertyDefinitionClone = propertyDefinition.clone();
Assert.assertEquals(propertyDefinition.getRequired(), propertyDefinitionClone.getRequired());
- Assert.assertEquals(propertyDefinition.getStatus().getDisplayName(),
- propertyDefinitionClone.getStatus().getDisplayName());
+ Assert.assertEquals(propertyDefinition.getStatus(),
+ propertyDefinitionClone.getStatus());
Assert.assertEquals(propertyDefinition.getConstraints().get(0).getEqual(),
propertyDefinitionClone.getConstraints().get(0).getEqual());
}
diff --git a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java
index ee6d858c82..d24d32c8d5 100644
--- a/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java
+++ b/common/onap-tosca-datatype/src/test/java/org/onap/sdc/tosca/services/DataModelCloneUtilTest.java
@@ -161,8 +161,8 @@ public class DataModelCloneUtilTest {
Assert.assertEquals(originalMap.get(KEY1).getDescription(), cloneMap.get(KEY1).getDescription());
Assert.assertEquals(originalMap.get(KEY2).getDescription(), cloneMap.get(KEY2).getDescription());
Assert.assertEquals(originalMap.get(KEY1).getImplementation(), cloneMap.get(KEY1).getImplementation());
- Assert.assertEquals(originalMap.get(KEY2).getInputs().get(INPUT_KEY1).getStatus().getDisplayName(),
- cloneMap.get(DataModelCloneUtilTest.KEY2).getInputs().get(INPUT_KEY1).getStatus().getDisplayName());
+ Assert.assertEquals(originalMap.get(KEY2).getInputs().get(INPUT_KEY1).getStatus(),
+ cloneMap.get(DataModelCloneUtilTest.KEY2).getInputs().get(INPUT_KEY1).getStatus());
Assert.assertEquals(originalMap.get(KEY2).getInputs().get(INPUT_KEY1).getConstraints().get(0).getEqual(),
cloneMap.get(KEY2).getInputs().get(INPUT_KEY1).getConstraints().get(0).getEqual());
}
@@ -170,7 +170,7 @@ public class DataModelCloneUtilTest {
private PropertyDefinition createPropertyDefinition() {
PropertyDefinition propertyDefinition = new PropertyDefinition();
propertyDefinition.setRequired(false);
- propertyDefinition.setStatus(Status.UNSUPPORTED);
+ propertyDefinition.setStatus(Status.UNSUPPORTED.getName());
Constraint constraint = new Constraint();
constraint.setEqual("1234");
ArrayList<Constraint> constraints = new ArrayList<>();