From d6982006c27288936d8b0d9eee18068854036f45 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Tue, 3 Apr 2018 20:24:59 +0530 Subject: Added new nodes type Added new nodes type and new property in Port. All test data need to be updated, so file count is much more. Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c Issue-ID: SDC-1183 Signed-off-by: siddharth0905 --- .../resources/globalTypes/openecomp-heat/nodes.yml | 73 +++++++++++++++++++++- .../main/resources/globalTypes/openecomp/nodes.yml | 50 +++++++++++++++ 2 files changed, 122 insertions(+), 1 deletion(-) (limited to 'common/openecomp-tosca-datatype') diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml index 5906243270..9abb964661 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml @@ -218,6 +218,8 @@ node_types: - UNBOUNDED valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules: derived_from: tosca.nodes.Root @@ -708,6 +710,7 @@ node_types: - UNBOUNDED valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface org.openecomp.resource.vl.nodes.heat.network.neutron.Net: derived_from: org.openecomp.resource.vl.nodes.network.Network @@ -934,7 +937,75 @@ node_types: type: string status: SUPPORTED - + org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface: + derived_from: org.openecomp.resource.cp.nodes.network.v2.SubInterface + properties: + virtual_machine_interface_refs: + description: List of virtual machine interface. + type: list + status: SUPPORTED + entry_schema: + type: string + required: false + name: + description: Virtual Machine Sub Interface VLAN name + type: string + status: SUPPORTED + required: false + virtual_network_refs: + description: List of virtual networks. + type: list + 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 + 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 + required: false + virtual_machine_interface_mac_addresses: + description: List of mac addresses. + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress + status: SUPPORTED + required: false + security_group_refs: + description: List of security groups. + type: list + status: SUPPORTED + entry_schema: + type: string + required: false + port_tuple_refs: + description: List of port tuples. + type: list + status: SUPPORTED + entry_schema: + type: string + required: false + attributes: + fq_name: + description: The FQ name of the Virtual Network. + type: string + status: SUPPORTED + show: + description: All attributes. + type: string + status: SUPPORTED + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface: derived_from: org.openecomp.resource.cp.nodes.network.SubInterface properties: diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml index ae52b4c42a..457770845f 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml @@ -391,6 +391,49 @@ node_types: - 0 - 2 + org.openecomp.resource.cp.nodes.network.v2.SubInterface: + derived_from: tosca.nodes.Root + properties: + ip_address: + 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. + type: string + required: false + order: + description: 'The order of the NIC on the compute instance (e.g. eth2). Note: + when binding more than one port to a single compute (aka multi vNICs) and + ordering is desired, it is *mandatory* that all ports will be set with an + order value and. The order values must represent a positive, arithmetic + progression that starts with 0 (e.g. 0, 1, 2, ..., n).' + type: integer + default: 0 + required: false + constraints: + - greater_or_equal: 0 + is_default: + 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. + type: boolean + default: false + required: false + ip_range_start: + 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. + type: string + required: false + ip_range_end: + 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. + type: string + required: false + attributes: + ip_address: + description: The IP address would be assigned to the associated compute instance. + type: string + requirements: + - subinterface_link: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + - binding: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo + org.openecomp.resource.cp.nodes.network.SubInterface: derived_from: tosca.nodes.network.Port @@ -401,6 +444,11 @@ node_types: org.openecomp.resource.cp.nodes.network.Port: derived_from: tosca.nodes.network.Port properties: + subinterface_indicator: + description: identifies if Port is having Sub Interface + type: boolean + required: false + default: false network_role_tag: description: Must correlate to the set of defined “network-role�? tag identifiers from the associated HEAT template type: string @@ -728,6 +776,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -851,6 +900,7 @@ node_types: - UNBOUNDED valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface org.openecomp.nodes.ForwardingPath: derived_from: tosca.nodes.Root -- cgit 1.2.3-korg