diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection')
19 files changed, 3160 insertions, 842 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml new file mode 100644 index 0000000000..4176447d09 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -0,0 +1,119 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: GlobalSubstitutionTypes
+imports:
+- openecomp_heat_index:
+ file: openecomp-heat/_index.yml
+node_types:
+ org.openecomp.resource.abstract.nodes.heat.subinterface.nested:
+ derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
+ properties:
+ aap_untrusted_ip_prefix:
+ type: string
+ description: ip prefix for primary vDBE VM on the VAN untrusted network
+ required: true
+ status: SUPPORTED
+ aap_sec_untrusted_ip_prefix:
+ type: string
+ description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
+ required: true
+ status: SUPPORTED
+ vdbe_subport_network:
+ type: string
+ description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
+ required: true
+ status: SUPPORTED
+ ip_v6_address:
+ type: string
+ description: IPv6 address associated with subinterfaces
+ required: true
+ status: SUPPORTED
+ counter:
+ type: float
+ description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
+ required: true
+ status: SUPPORTED
+ subinterfaces_name_prefix:
+ type: string
+ description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
+ required: true
+ status: SUPPORTED
+ ip_address:
+ type: string
+ description: IPv4 address associated with subinterfaces
+ required: true
+ status: SUPPORTED
+ aap_address_mode:
+ type: string
+ description: Address mode for the vDBE cluster IP
+ required: true
+ status: SUPPORTED
+ aap_untrusted_v6_ip_prefix:
+ type: string
+ description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
+ required: true
+ status: SUPPORTED
+ parent_interface:
+ type: string
+ description: Parent Contrail interface
+ required: true
+ status: SUPPORTED
+ mac_address:
+ type: string
+ description: HW MAC address to use for subinterface
+ required: true
+ status: SUPPORTED
+ vlan_tag_list:
+ type: list
+ description: List of VLAN IDs to use for subinterfaces
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ aap_sec_untrusted_ip_prefix_len:
+ type: string
+ description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
+ required: true
+ status: SUPPORTED
+ vmac_address:
+ type: string
+ description: virtual MAC address to use for subinterface
+ required: true
+ status: SUPPORTED
+ aap_untrusted_v6_ip_prefix_len:
+ type: string
+ description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
+ required: true
+ status: SUPPORTED
+ aap_untrusted_ip_prefix_len:
+ type: string
+ description: ip prefix length for the primary vDBE VM on the VAN untrusted network
+ required: true
+ status: SUPPORTED
+ requirements:
+ - dependency_vdbe_untr_vmi_subport:
+ capability: tosca.capabilities.Node
+ node: tosca.nodes.Root
+ relationship: tosca.relationships.DependsOn
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - link_vdbe_untr_vmi_subport:
+ capability: tosca.capabilities.network.Linkable
+ relationship: tosca.relationships.network.LinksTo
+ occurrences:
+ - 1
+ - 1
+ - binding_vdbe_untr_vmi_subport:
+ capability: tosca.capabilities.network.Bindable
+ node: org.openecomp.resource.cp.nodes.network.Port
+ relationship: tosca.relationships.network.BindsTo
+ occurrences:
+ - 1
+ - 1
+ capabilities:
+ feature_vdbe_untr_vmi_subport:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..d6f832f595 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,553 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: Main
+imports:
+- openecomp_heat_index:
+ file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+ file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.vdbe:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+ inputs:
+ vf_module_id:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vf_module_id
+ type: string
+ description: Unique ID for this VF module inst
+ control_int_net_rpf:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: control_int_net_rpf
+ type: string
+ description: Reverse Path Filtering enable or disable for the control virtual network
+ control_int_net_forwarding_mode:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: control_int_net_forwarding_mode
+ type: string
+ description: forwarding mode of the control virtual network
+ vnf_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vnf_name
+ type: string
+ description: Unique name for this VF instance
+ vdbe_untrusted_ip_1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_untrusted_ip_1
+ type: string
+ description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
+ vdbe_aap_untrusted_ip_prefix_len:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_aap_untrusted_ip_prefix_len
+ type: string
+ description: ip prefix length for the primary vDBE VM on the VAN untrusted network
+ untrusted_num_vn:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: untrusted_num_vn
+ type: float
+ description: Number of vDBE subinterface virtual Networks
+ constraints:
+ - in_range:
+ - 1
+ - 77
+ aap_address_mode:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: aap_address_mode
+ type: string
+ description: Address mode for the vDBE cluster IP
+ control_int_net_shared:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: control_int_net_shared
+ type: boolean
+ description: control virtual network shared
+ vdbe_untrusted_v6_ip_1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_untrusted_v6_ip_1
+ type: string
+ description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
+ vdbe_untrusted_vmac_address:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_untrusted_vmac_address
+ type: string
+ description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
+ control_int_net_flood_unknown_unicast:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: control_int_net_flood_unknown_unicast
+ type: boolean
+ description: forwarding mode of the control virtual network
+ vdbe_aap_sec_untrusted_ip_prefix:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_aap_sec_untrusted_ip_prefix
+ type: string
+ description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
+ vnf_id:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vnf_id
+ type: string
+ description: Unique ID for this VF inst
+ vdbe_name_1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_name_1
+ type: string
+ description: VM Name for this vdbe node 1
+ availability_zone_1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: availability_zone_1
+ type: string
+ description: The availability zone of secondary node1 vDBE vm in the local HA pair.
+ untrusted_vn_networks:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: untrusted_vn_networks
+ type: list
+ description: List of subinterface virtual networks
+ entry_schema:
+ type: string
+ vdbe_image_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_image_name
+ type: string
+ description: Image to use for vDBE
+ oam_net_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_net_name
+ type: string
+ description: Name of NSDNet network from which the management IP addresses will be allocated
+ vdbe_aap_sec_untrusted_ip_prefix_len:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_aap_sec_untrusted_ip_prefix_len
+ type: string
+ description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
+ vdbe_aap_untrusted_v6_ip_prefix:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_aap_untrusted_v6_ip_prefix
+ type: string
+ description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
+ vdbe_aap_untrusted_v6_ip_prefix_len:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_aap_untrusted_v6_ip_prefix_len
+ type: string
+ description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
+ untrusted_vlan_tags:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: untrusted_vlan_tags
+ type: list
+ description: List of subinterface vlan tags
+ entry_schema:
+ type: string
+ vdbe_flavor_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_flavor_name
+ type: string
+ description: Flavor to use for vDBE
+ vdbe_hw_untr_mac_1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_hw_untr_mac_1
+ type: string
+ description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
+ untrusted_net_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: untrusted_net_name
+ type: string
+ description: Name of public untrusted network into which this vDBE HA cluster is deployed
+ vdbe_device_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_device_name
+ type: string
+ description: VDBE device Name for this vdbe VNF
+ vdbe_aap_untrusted_ip_prefix:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vdbe_aap_untrusted_ip_prefix
+ type: string
+ description: ip prefix for primary vDBE VM on the VAN untrusted network
+ node_templates:
+ vdbe_node_1:
+ type: org.openecomp.resource.vfc.nodes.heat.vdbe
+ properties:
+ flavor:
+ get_input: vdbe_flavor_name
+ availability_zone:
+ get_input: availability_zone_1
+ image:
+ get_input: vdbe_image_name
+ metadata:
+ vf_module_id:
+ get_input: vf_module_id
+ vnf_id:
+ get_input: vnf_id
+ vnf_name:
+ get_input: vnf_name
+ name:
+ get_input: vdbe_name_1
+ vdbe_untr_1_port:
+ type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+ properties:
+ name:
+ str_replace:
+ template: VM_NAMEDBE001p1n004
+ params:
+ DBE:
+ get_input: vdbe_device_name
+ VM_NAME:
+ get_input: vdbe_name_1
+ virtual_network_refs:
+ - get_input: untrusted_net_name
+ virtual_machine_interface_allowed_address_pairs:
+ allowed_address_pair:
+ - address_mode:
+ get_input: aap_address_mode
+ ip:
+ ip_prefix:
+ get_input: vdbe_aap_untrusted_ip_prefix
+ ip_prefix_len:
+ get_input: vdbe_aap_untrusted_ip_prefix_len
+ mac:
+ get_input: vdbe_untrusted_vmac_address
+ - address_mode:
+ get_input: aap_address_mode
+ ip:
+ ip_prefix:
+ get_input: vdbe_aap_sec_untrusted_ip_prefix
+ ip_prefix_len:
+ get_input: vdbe_aap_sec_untrusted_ip_prefix_len
+ mac:
+ get_input: vdbe_hw_untr_mac_1
+ - address_mode:
+ get_input: aap_address_mode
+ ip:
+ ip_prefix:
+ get_input: vdbe_aap_untrusted_v6_ip_prefix
+ ip_prefix_len:
+ get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+ mac:
+ get_input: vdbe_untrusted_vmac_address
+ virtual_machine_interface_mac_addresses:
+ - get_input: vdbe_hw_untr_mac_1
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: vdbe_node_1
+ relationship: tosca.relationships.network.BindsTo
+ vdbe_untr_1_subports:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
+ directives:
+ - substitutable
+ properties:
+ aap_untrusted_ip_prefix:
+ get_input: vdbe_aap_untrusted_ip_prefix
+ attr_test:
+ get_attribute:
+ - vdbe_untr_1_port
+ - name
+ aap_sec_untrusted_ip_prefix:
+ get_input: vdbe_aap_sec_untrusted_ip_prefix
+ vdbe_subport_network: control_int_net
+ ip_v6_address:
+ get_input: vdbe_untrusted_v6_ip_1
+ counter:
+ get_input: vnf_id
+ ip_address:
+ get_input: vdbe_untrusted_ip_1
+ subinterfaces_name_prefix:
+ str_replace:
+ template: VM_NAMEDBE001p1n004
+ params:
+ DBE:
+ get_input: vdbe_device_name
+ VM_NAME:
+ get_input: vdbe_name_1
+ aap_address_mode:
+ get_input: aap_address_mode
+ service_template_filter:
+ substitute_service_template: nestedServiceTemplate.yaml
+ count:
+ get_input: untrusted_num_vn
+ mandatory: false
+ aap_untrusted_v6_ip_prefix:
+ get_input: vdbe_aap_untrusted_v6_ip_prefix
+ parent_interface: vdbe_untr_1_port
+ mac_address:
+ get_input: vdbe_hw_untr_mac_1
+ vlan_tag_list:
+ get_input: untrusted_vlan_tags
+ aap_sec_untrusted_ip_prefix_len:
+ get_input: vdbe_aap_sec_untrusted_ip_prefix_len
+ vmac_address:
+ get_input: vdbe_untrusted_vmac_address
+ aap_untrusted_v6_ip_prefix_len:
+ get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+ aap_untrusted_ip_prefix_len:
+ get_input: vdbe_aap_untrusted_ip_prefix_len
+ requirements:
+ - link_vdbe_untr_vmi_subport:
+ capability: tosca.capabilities.network.Linkable
+ node: control_int_net
+ relationship: tosca.relationships.network.LinksTo
+ - binding_vdbe_untr_vmi_subport:
+ capability: tosca.capabilities.network.Bindable
+ node: vdbe_untr_1_port
+ relationship: tosca.relationships.network.BindsTo
+ - dependency:
+ capability: tosca.capabilities.Node
+ node: control_int_net
+ relationship: tosca.relationships.DependsOn
+ control_int_net:
+ type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
+ properties:
+ network_name:
+ str_replace:
+ template: VNF_NAME_control_net
+ params:
+ VNF_NAME:
+ get_input: vnf_name
+ network_ipam_refs:
+ get_attribute:
+ - vdbe_untr_1_subports
+ - count
+ requirements:
+ - dependency:
+ capability: tosca.capabilities.Node
+ node: vdbe_untr_1_subports
+ relationship: tosca.relationships.DependsOn
+ groups:
+ main_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/main.yml
+ description: |
+ Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
+ members:
+ - vdbe_node_1
+ - vdbe_untr_1_port
+ - vdbe_untr_1_subports
+ - control_int_net
+ outputs:
+ out1:
+ description: output_test
+ value:
+ get_attribute:
+ - vdbe_untr_1_subports
+ - name
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml new file mode 100644 index 0000000000..2eb726c199 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml @@ -0,0 +1,171 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: nested
+imports:
+- openecomp_heat_index:
+ file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+ file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+ inputs:
+ aap_untrusted_ip_prefix:
+ hidden: false
+ immutable: false
+ type: string
+ description: ip prefix for primary vDBE VM on the VAN untrusted network
+ aap_sec_untrusted_ip_prefix:
+ hidden: false
+ immutable: false
+ type: string
+ description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
+ vdbe_subport_network:
+ hidden: false
+ immutable: false
+ type: string
+ description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
+ ip_v6_address:
+ hidden: false
+ immutable: false
+ type: string
+ description: IPv6 address associated with subinterfaces
+ counter:
+ hidden: false
+ immutable: false
+ type: float
+ description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
+ subinterfaces_name_prefix:
+ hidden: false
+ immutable: false
+ type: string
+ description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
+ ip_address:
+ hidden: false
+ immutable: false
+ type: string
+ description: IPv4 address associated with subinterfaces
+ aap_address_mode:
+ hidden: false
+ immutable: false
+ type: string
+ description: Address mode for the vDBE cluster IP
+ aap_untrusted_v6_ip_prefix:
+ hidden: false
+ immutable: false
+ type: string
+ description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
+ parent_interface:
+ hidden: false
+ immutable: false
+ type: string
+ description: Parent Contrail interface
+ mac_address:
+ hidden: false
+ immutable: false
+ type: string
+ description: HW MAC address to use for subinterface
+ vlan_tag_list:
+ hidden: false
+ immutable: false
+ type: list
+ description: List of VLAN IDs to use for subinterfaces
+ entry_schema:
+ type: string
+ aap_sec_untrusted_ip_prefix_len:
+ hidden: false
+ immutable: false
+ type: string
+ description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
+ vmac_address:
+ hidden: false
+ immutable: false
+ type: string
+ description: virtual MAC address to use for subinterface
+ aap_untrusted_v6_ip_prefix_len:
+ hidden: false
+ immutable: false
+ type: string
+ description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
+ aap_untrusted_ip_prefix_len:
+ hidden: false
+ immutable: false
+ type: string
+ description: ip prefix length for the primary vDBE VM on the VAN untrusted network
+ node_templates:
+ vdbe_untr_vmi_subport:
+ type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ properties:
+ virtual_machine_interface_refs:
+ - get_input: parent_interface
+ name:
+ str_replace:
+ template: $NAME_$INDEX
+ params:
+ $NAME:
+ get_input: subinterfaces_name_prefix
+ $INDEX:
+ get_input:
+ - vlan_tag_list
+ - get_input: counter
+ virtual_network_refs:
+ - get_input: vdbe_subport_network
+ virtual_machine_interface_properties:
+ sub_interface_vlan_tag:
+ get_input:
+ - vlan_tag_list
+ - get_input: counter
+ virtual_machine_interface_allowed_address_pairs:
+ allowed_address_pair:
+ - address_mode:
+ get_input: aap_address_mode
+ ip:
+ ip_prefix:
+ get_input: aap_untrusted_ip_prefix
+ ip_prefix_len:
+ get_input: aap_untrusted_ip_prefix_len
+ mac:
+ get_input: vmac_address
+ - address_mode:
+ get_input: aap_address_mode
+ ip:
+ ip_prefix:
+ get_input: aap_sec_untrusted_ip_prefix
+ ip_prefix_len:
+ get_input: aap_sec_untrusted_ip_prefix_len
+ mac:
+ get_input: mac_address
+ - address_mode:
+ get_input: aap_address_mode
+ ip:
+ ip_prefix:
+ get_input: aap_untrusted_v6_ip_prefix
+ ip_prefix_len:
+ get_input: aap_untrusted_v6_ip_prefix_len
+ mac:
+ get_input: vmac_address
+ virtual_machine_interface_mac_addresses:
+ mac_address:
+ - get_input: mac_address
+ groups:
+ nested_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/nested.yml
+ description: cmaui server template for vMMSC
+ members:
+ - vdbe_untr_vmi_subport
+ substitution_mappings:
+ node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
+ capabilities:
+ feature_vdbe_untr_vmi_subport:
+ - vdbe_untr_vmi_subport
+ - feature
+ requirements:
+ dependency_vdbe_untr_vmi_subport:
+ - vdbe_untr_vmi_subport
+ - dependency
+ link_vdbe_untr_vmi_subport:
+ - vdbe_untr_vmi_subport
+ - link
+ binding_vdbe_untr_vmi_subport:
+ - vdbe_untr_vmi_subport
+ - binding
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..aca75b5055 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/MANIFEST.json @@ -0,0 +1,17 @@ +{ + "name": "vMME_Small", + "description": "HOT template to create 2 cinder volume attachment", + "version": "2013-05-23", + "data": [ + { + "file": "main.yml", + "type": "HEAT", + "isBase": "true" + }, + { + "file": "nested.yml", + "type": "HEAT", + "isBase": "false" + } + ] +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/main.yml new file mode 100644 index 0000000000..45ff90d13f --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/main.yml @@ -0,0 +1,238 @@ +heat_template_version: 2013-05-23
+
+description: >
+ Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
+
+parameters:
+ aap_address_mode:
+ description: "Address mode for the vDBE cluster IP"
+ type: string
+ control_int_net_forwarding_mode:
+ description: "forwarding mode of the control virtual network"
+ type: string
+ control_int_net_rpf:
+ description: "Reverse Path Filtering enable or disable for the control virtual network"
+ type: string
+ control_int_net_shared:
+ description: "control virtual network shared"
+ type: boolean
+ control_int_net_flood_unknown_unicast:
+ description: "forwarding mode of the control virtual network"
+ type: boolean
+ oam_net_name:
+ description: "Name of NSDNet network from which the management IP addresses will be allocated"
+ type: string
+ untrusted_net_name:
+ description: "Name of public untrusted network into which this vDBE HA cluster is deployed"
+ type: string
+ untrusted_num_vn:
+ constraints:
+ -
+ range:
+ max: 77
+ min: 1
+ description: "Number of vDBE subinterface virtual Networks"
+ type: number
+ untrusted_vlan_tags:
+ description: "List of subinterface vlan tags"
+ type: comma_delimited_list
+ untrusted_vn_networks:
+ description: "List of subinterface virtual networks"
+ type: comma_delimited_list
+ vdbe_aap_sec_untrusted_ip_prefix:
+ description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network"
+ type: string
+ vdbe_aap_sec_untrusted_ip_prefix_len:
+ description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network"
+ type: string
+ vdbe_aap_untrusted_ip_prefix:
+ description: "ip prefix for primary vDBE VM on the VAN untrusted network"
+ type: string
+ vdbe_aap_untrusted_ip_prefix_len:
+ description: "ip prefix length for the primary vDBE VM on the VAN untrusted network"
+ type: string
+ vdbe_aap_untrusted_v6_ip_prefix:
+ description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network"
+ type: string
+ vdbe_aap_untrusted_v6_ip_prefix_len:
+ description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network"
+ type: string
+ vdbe_device_name:
+ description: "VDBE device Name for this vdbe VNF"
+ type: string
+ vdbe_hw_untr_mac_1:
+ description: "Secondary MAC address of the secondary vDBE VM on the VAN untrusted network"
+ type: string
+ vdbe_name_1:
+ description: "VM Name for this vdbe node 1"
+ type: string
+ vdbe_untrusted_ip_1:
+ description: "IPV4 address of the secondary vDBE VM on the VAN untrusted network"
+ type: string
+ vdbe_untrusted_v6_ip_1:
+ description: "IPV6 address of the secondary vDBE VM on the VAN untrusted network"
+ type: string
+ vdbe_untrusted_vmac_address:
+ description: "Virtual MAC of the primary vDBE VM on the VAN untrusted network"
+ type: string
+ vdbe_flavor_name:
+ description: "Flavor to use for vDBE"
+ type: string
+ vdbe_image_name:
+ description: "Image to use for vDBE"
+ type: string
+ vnf_id:
+ description: "Unique ID for this VF inst"
+ type: string
+ vnf_name:
+ description: "Unique name for this VF instance"
+ type: string
+ vf_module_id:
+ description: "Unique ID for this VF module inst"
+ type: string
+ availability_zone_1:
+ description: "The availability zone of secondary node1 vDBE vm in the local HA pair."
+ type: string
+resources:
+ vdbe_node_1:
+ type: OS::Nova::Server
+ properties:
+ availability_zone:
+ get_param: availability_zone_1
+ flavor:
+ get_param: vdbe_flavor_name
+ image:
+ get_param: vdbe_image_name
+ metadata:
+ vf_module_id:
+ get_param: vf_module_id
+ vnf_id:
+ get_param: vnf_id
+ vnf_name:
+ get_param: vnf_name
+ name:
+ get_param: vdbe_name_1
+ networks:
+ - port: {get_resource: vdbe_untr_1_port}
+ vdbe_untr_1_subports:
+ type: OS::Heat::ResourceGroup
+ depends_on: control_int_net
+ properties:
+ count:
+ get_param: untrusted_num_vn
+ resource_def:
+ type: nested.yml
+ properties:
+ attr_test: { get_attr: [ vdbe_untr_1_port, name ] }
+ aap_address_mode:
+ get_param: aap_address_mode
+ aap_sec_untrusted_ip_prefix:
+ get_param: vdbe_aap_sec_untrusted_ip_prefix
+ aap_sec_untrusted_ip_prefix_len:
+ get_param: vdbe_aap_sec_untrusted_ip_prefix_len
+ aap_untrusted_ip_prefix:
+ get_param: vdbe_aap_untrusted_ip_prefix
+ aap_untrusted_ip_prefix_len:
+ get_param: vdbe_aap_untrusted_ip_prefix_len
+ aap_untrusted_v6_ip_prefix:
+ get_param: vdbe_aap_untrusted_v6_ip_prefix
+ aap_untrusted_v6_ip_prefix_len:
+ get_param: vdbe_aap_untrusted_v6_ip_prefix_len
+ counter:
+ get_param: vnf_id
+ ip_address:
+ get_param: vdbe_untrusted_ip_1
+ ip_v6_address:
+ get_param: vdbe_untrusted_v6_ip_1
+ mac_address:
+ get_param: vdbe_hw_untr_mac_1
+ parent_interface:
+ get_resource: vdbe_untr_1_port
+ subinterfaces_name_prefix:
+ str_replace:
+ params:
+ DBE:
+ get_param: vdbe_device_name
+ VM_NAME:
+ get_param: vdbe_name_1
+ template: VM_NAMEDBE001p1n004
+ vlan_tag_list:
+ get_param: untrusted_vlan_tags
+ vmac_address:
+ get_param: vdbe_untrusted_vmac_address
+ vdbe_subport_network:
+ get_resource: control_int_net
+ vdbe_untr_1_port:
+ properties:
+ name:
+ str_replace:
+ params:
+ DBE:
+ get_param: vdbe_device_name
+ VM_NAME:
+ get_param: vdbe_name_1
+ template: VM_NAMEDBE001p1n004
+ virtual_machine_interface_allowed_address_pairs:
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
+ -
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
+ get_param: aap_address_mode
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
+ get_param: vdbe_aap_untrusted_ip_prefix
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
+ get_param: vdbe_aap_untrusted_ip_prefix_len
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
+ get_param: vdbe_untrusted_vmac_address
+ -
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
+ get_param: aap_address_mode
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
+ get_param: vdbe_aap_sec_untrusted_ip_prefix
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
+ get_param: vdbe_aap_sec_untrusted_ip_prefix_len
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
+ get_param: vdbe_hw_untr_mac_1
+ -
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
+ get_param: aap_address_mode
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
+ get_param: vdbe_aap_untrusted_v6_ip_prefix
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
+ get_param: vdbe_aap_untrusted_v6_ip_prefix_len
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
+ get_param: vdbe_untrusted_vmac_address
+ virtual_machine_interface_mac_addresses:
+ virtual_machine_interface_mac_addresses_mac_address:
+ -
+ get_param: vdbe_hw_untr_mac_1
+ virtual_network_refs:
+ -
+ get_param: untrusted_net_name
+ type: OS::ContrailV2::VirtualMachineInterface
+ control_int_net:
+ type: OS::ContrailV2::VirtualNetwork
+ depends_on: vdbe_untr_1_subports
+ properties:
+ network_ipam_refs: { get_attr: [ vdbe_untr_1_subports, count ] }
+ flood_unknown_unicast:
+ get_param: control_int_net_flood_unknown_unicast
+ is_shared:
+ get_param: control_int_net_shared
+ name:
+ str_replace:
+ params:
+ VNF_NAME:
+ get_param: vnf_name
+ template: VNF_NAME_control_net
+ virtual_network_properties:
+ virtual_network_properties_forwarding_mode:
+ get_param: control_int_net_forwarding_mode
+ virtual_network_properties_rpf:
+ get_param: control_int_net_rpf
+outputs:
+ out1:
+ description: output_test
+ value: {get_attr: [vdbe_untr_1_subports, name]}
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml new file mode 100644 index 0000000000..eeaf3b68c3 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml @@ -0,0 +1,114 @@ +heat_template_version: 2013-05-23
+
+description: cmaui server template for vMMSC
+
+parameters:
+ aap_address_mode:
+ description: "Address mode for the vDBE cluster IP"
+ type: string
+ aap_sec_untrusted_ip_prefix:
+ description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network"
+ type: string
+ aap_sec_untrusted_ip_prefix_len:
+ description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network"
+ type: string
+ aap_untrusted_ip_prefix:
+ description: "ip prefix for primary vDBE VM on the VAN untrusted network"
+ type: string
+ aap_untrusted_ip_prefix_len:
+ description: "ip prefix length for the primary vDBE VM on the VAN untrusted network"
+ type: string
+ aap_untrusted_v6_ip_prefix:
+ description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network"
+ type: string
+ aap_untrusted_v6_ip_prefix_len:
+ description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network"
+ type: string
+ counter:
+ description: "Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances."
+ type: number
+ mac_address:
+ description: "HW MAC address to use for subinterface"
+ type: string
+ parent_interface:
+ description: "Parent Contrail interface"
+ type: string
+ subinterfaces_name_prefix:
+ description: "Combined with subinterface_instance_index, this is used as the name of the subinterface resource"
+ type: string
+ vlan_tag_list:
+ description: "List of VLAN IDs to use for subinterfaces"
+ type: comma_delimited_list
+ vmac_address:
+ description: "virtual MAC address to use for subinterface"
+ type: string
+ vdbe_subport_network:
+ description: "List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list"
+ type: string
+ ip_address:
+ description: "IPv4 address associated with subinterfaces"
+ type: string
+ ip_v6_address:
+ description: "IPv6 address associated with subinterfaces"
+ type: string
+resources:
+ vdbe_untr_vmi_subport:
+ type: OS::ContrailV2::VirtualMachineInterface
+ properties:
+ name:
+ str_replace:
+ params:
+ $INDEX:
+ get_param:
+ - vlan_tag_list
+ -
+ get_param: counter
+ $NAME:
+ get_param: subinterfaces_name_prefix
+ template: $NAME_$INDEX
+ virtual_machine_interface_allowed_address_pairs:
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
+ -
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
+ get_param: aap_address_mode
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
+ get_param: aap_untrusted_ip_prefix
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
+ get_param: aap_untrusted_ip_prefix_len
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
+ get_param: vmac_address
+ -
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
+ get_param: aap_address_mode
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
+ get_param: aap_sec_untrusted_ip_prefix
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
+ get_param: aap_sec_untrusted_ip_prefix_len
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
+ get_param: mac_address
+ -
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
+ get_param: aap_address_mode
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
+ get_param: aap_untrusted_v6_ip_prefix
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
+ get_param: aap_untrusted_v6_ip_prefix_len
+ virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
+ get_param: vmac_address
+ virtual_machine_interface_mac_addresses:
+ virtual_machine_interface_mac_addresses_mac_address:
+ -
+ get_param: mac_address
+ virtual_machine_interface_properties:
+ virtual_machine_interface_properties_sub_interface_vlan_tag:
+ get_param:
+ - vlan_tag_list
+ -
+ get_param: counter
+ virtual_machine_interface_refs:
+ [{get_param: parent_interface}]
+ virtual_network_refs:
+ [{get_param: vdbe_subport_network}]
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index fe2be599b5..cd3f9701c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,7 +5,7 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.abstract.nodes.heat.nested: + org.openecomp.resource.abstract.nodes.heat.subinterface.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: vlan_ids: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml index a9d7c6b6ec..b99f0a0a76 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml @@ -1,442 +1,431 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server -topology_template: - inputs: - cmaui_names: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_names - type: list - description: CMAUI1, CMAUI2 server names - entry_schema: - type: string - template_PortTuple_LB1: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: template_PortTuple_LB1 - type: string - oam_sec_group_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: oam_sec_group_name - type: string - lb_st_interface_type_oam: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: lb_st_interface_type_oam - type: string - virtual_ip_address: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: virtual_ip_address - type: string - security_group_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: security_group_name - type: list - description: CMAUI1, CMAUI2 server names - entry_schema: - type: string - jsa_net_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: jsa_net_name - type: string - description: network name of jsa log network - vlan_ids: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: vlan_ids - type: string - cmaui_image: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_image - type: string - description: Image for CMAUI server - virtual_ipv6_address: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: virtual_ipv6_address - type: string - cmaui_flavor: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_flavor - type: string - description: Flavor for CMAUI server - lb_st_vlan_type_oam: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: lb_st_vlan_type_oam - type: string - description: dummy - mac_address: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: mac_address - type: string - availability_zone_0: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: availability_zone_0 - type: string - description: availabilityzone name - cmaui_oam_ips: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_oam_ips - type: string - node_templates: - cmaui_port_2: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: AUTO - ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - mac_requirements: - mac_count_required: - is_required: false - network: test_net1 - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui_nova - relationship: tosca.relationships.network.BindsTo - test_nested_invalidConnection: - type: org.openecomp.resource.abstract.nodes.heat.nested - directives: - - substitutable - properties: - p1: test_Vlan1 - service_template_filter: - substitute_service_template: nestedServiceTemplate.yaml - p2: server_cmaui_nova - test_net2: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_input: jsa_net_name - template_VMInt_OAM_lb_1: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - test_net1 - virtual_machine_interface_properties: - service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui_nova - relationship: tosca.relationships.network.BindsTo - test_resourceGroup: - type: org.openecomp.resource.abstract.nodes.heat.nested - directives: - - substitutable - properties: - p1: template_VMInt_OAM_lb_1 - service_template_filter: - substitute_service_template: nestedServiceTemplate.yaml - count: 9 - mandatory: true - p2: cmaui_port_2 - net2: test_net2 - net1: test_net1 - requirements: - - link_template_Vlan_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding_template_Vlan_2: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_2 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_1: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - test_net1: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_input: jsa_net_name - test_Vlan2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: vlan - virtual_network_refs: - - test_net1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - test_Vlan1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - test_Vlan2 - name: vlan - virtual_network_refs: - - test_net1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - server_cmaui_nova: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - test_nested: - type: org.openecomp.resource.abstract.nodes.heat.nested - directives: - - substitutable - properties: - p1: template_VMInt_OAM_lb_1 - service_template_filter: - substitute_service_template: nestedServiceTemplate.yaml - p2: cmaui_port_2 - net2: test_net2 - net1: test_net1 - requirements: - - link_template_Vlan_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding_template_Vlan_2: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_2 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_1: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - groups: - main_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/main.yml - description: | - Version 2.0 02-09-2016 (Authors: John Doe, user PROD) - members: - - cmaui_port_2 - - test_nested_invalidConnection - - test_net2 - - template_VMInt_OAM_lb_1 - - test_resourceGroup - - test_net1 - - test_Vlan2 - - test_Vlan1 - - server_cmaui_nova - - test_nested +tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: Main
+imports:
+- openecomp_heat_index:
+ file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+ file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.cmaui:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+ inputs:
+ cmaui_names:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
+ template_PortTuple_LB1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
+ type: string
+ oam_sec_group_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_sec_group_name
+ type: string
+ lb_st_interface_type_oam:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
+ type: string
+ virtual_ip_address:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: virtual_ip_address
+ type: string
+ security_group_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: security_group_name
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
+ jsa_net_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: jsa_net_name
+ type: string
+ description: network name of jsa log network
+ vlan_ids:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vlan_ids
+ type: string
+ cmaui_image:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
+ type: string
+ description: Image for CMAUI server
+ virtual_ipv6_address:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: virtual_ipv6_address
+ type: string
+ cmaui_flavor:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
+ type: string
+ description: Flavor for CMAUI server
+ lb_st_vlan_type_oam:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: lb_st_vlan_type_oam
+ type: string
+ description: dummy
+ mac_address:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: mac_address
+ type: string
+ availability_zone_0:
+ label: availabilityzone name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: availability_zone_0
+ type: string
+ description: availabilityzone name
+ cmaui_oam_ips:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_oam_ips
+ type: string
+ node_templates:
+ cmaui_port_2:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ replacement_policy: AUTO
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
+ security_groups:
+ - get_input: security_group_name
+ fixed_ips:
+ - ip_address:
+ get_input:
+ - cmaui_oam_ips
+ - 0
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network: test_net1
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_cmaui_nova
+ relationship: tosca.relationships.network.BindsTo
+ test_nested_invalidConnection:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
+ directives:
+ - substitutable
+ properties:
+ p1: test_Vlan1
+ service_template_filter:
+ substitute_service_template: nestedServiceTemplate.yaml
+ p2: server_cmaui_nova
+ requirements:
+ - binding_template_Vlan_1:
+ capability: tosca.capabilities.network.Bindable
+ node: test_Vlan1
+ relationship: tosca.relationships.network.BindsTo
+ test_net2:
+ type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+ properties:
+ shared: true
+ network_name:
+ get_input: jsa_net_name
+ template_VMInt_OAM_lb_1:
+ type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+ properties:
+ security_group_refs:
+ - get_input: oam_sec_group_name
+ virtual_network_refs:
+ - test_net1
+ virtual_machine_interface_properties:
+ service_interface_type:
+ get_input: lb_st_interface_type_oam
+ port_tuple_refs:
+ - get_input: template_PortTuple_LB1
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_cmaui_nova
+ relationship: tosca.relationships.network.BindsTo
+ test_resourceGroup:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
+ directives:
+ - substitutable
+ properties:
+ p1: template_VMInt_OAM_lb_1
+ service_template_filter:
+ substitute_service_template: nestedServiceTemplate.yaml
+ count: 9
+ mandatory: true
+ p2: cmaui_port_2
+ net2: test_net2
+ net1: test_net1
+ requirements:
+ - link_template_Vlan_2:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net2
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_1:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding_template_Vlan_2:
+ capability: tosca.capabilities.network.Bindable
+ node: cmaui_port_2
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_1:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ test_net1:
+ type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+ properties:
+ shared: true
+ network_name:
+ get_input: jsa_net_name
+ test_Vlan2:
+ type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+ properties:
+ name: vlan
+ virtual_network_refs:
+ - test_net1
+ virtual_machine_interface_allowed_address_pairs:
+ allowed_address_pair:
+ - address_mode: active-standby
+ ip:
+ ip_prefix:
+ get_input: virtual_ip_address
+ ip_prefix_len: 32
+ mac:
+ get_input: mac_address
+ - address_mode: active-standby
+ ip:
+ ip_prefix:
+ get_input: virtual_ipv6_address
+ ip_prefix_len: 128
+ mac:
+ get_input: mac_address
+ virtual_machine_interface_mac_addresses:
+ - get_input: mac_address
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ test_Vlan1:
+ type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+ properties:
+ name: vlan
+ virtual_network_refs:
+ - test_net1
+ virtual_machine_interface_allowed_address_pairs:
+ allowed_address_pair:
+ - address_mode: active-standby
+ ip:
+ ip_prefix:
+ get_input: virtual_ip_address
+ ip_prefix_len: 32
+ mac:
+ get_input: mac_address
+ - address_mode: active-standby
+ ip:
+ ip_prefix:
+ get_input: virtual_ipv6_address
+ ip_prefix_len: 128
+ mac:
+ get_input: mac_address
+ virtual_machine_interface_mac_addresses:
+ - get_input: mac_address
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ server_cmaui_nova:
+ type: org.openecomp.resource.vfc.nodes.heat.cmaui
+ properties:
+ flavor:
+ get_input: cmaui_flavor
+ availability_zone:
+ get_input: availability_zone_0
+ image:
+ get_input: cmaui_image
+ contrail_service_instance_ind: true
+ name:
+ get_input:
+ - cmaui_names
+ - 0
+ test_nested:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
+ directives:
+ - substitutable
+ properties:
+ p1: template_VMInt_OAM_lb_1
+ service_template_filter:
+ substitute_service_template: nestedServiceTemplate.yaml
+ p2: cmaui_port_2
+ net2: test_net2
+ net1: test_net1
+ requirements:
+ - link_template_Vlan_2:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net2
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_1:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding_template_Vlan_2:
+ capability: tosca.capabilities.network.Bindable
+ node: cmaui_port_2
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_1:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ groups:
+ main_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/main.yml
+ description: |
+ Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
+ members:
+ - cmaui_port_2
+ - test_nested_invalidConnection
+ - test_net2
+ - template_VMInt_OAM_lb_1
+ - test_resourceGroup
+ - test_net1
+ - test_Vlan2
+ - test_Vlan1
+ - server_cmaui_nova
+ - test_nested
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index d1c8a517a9..949d55d270 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml @@ -188,7 +188,7 @@ topology_template: - template_Vlan_2 - template_Vlan_1 substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.nested + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested capabilities: feature_template_Vlan_2: - template_Vlan_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/inputfiles/main.yml index 8bdc627afc..18f72d17b5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/inputfiles/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/inputfiles/main.yml @@ -88,10 +88,6 @@ resources: type: OS::ContrailV2::VirtualMachineInterface properties: name: vlan - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } - } virtual_machine_interface_mac_addresses: { virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], @@ -126,10 +122,6 @@ resources: type: OS::ContrailV2::VirtualMachineInterface properties: name: vlan - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } - } virtual_machine_interface_mac_addresses: { virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index ca22a8dcff..d0270968e9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,7 +5,7 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.abstract.nodes.heat.nested1: + org.openecomp.resource.abstract.nodes.heat.subinterface.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: vlan_ids: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index 7cef7ff372..d56b564910 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml @@ -1,388 +1,388 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server -topology_template: - inputs: - cmaui_names: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_names - type: list - description: CMAUI1, CMAUI2 server names - entry_schema: - type: string - cmaui_image: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_image - type: string - description: Image for CMAUI server - template_PortTuple_LB1: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: template_PortTuple_LB1 - type: string - cmaui_flavor: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_flavor - type: string - description: Flavor for CMAUI server - oam_sec_group_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: oam_sec_group_name - type: string - lb_st_interface_type_oam: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: lb_st_interface_type_oam - type: string - security_group_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: security_group_name - type: list - description: CMAUI1, CMAUI2 server names - entry_schema: - type: string - availability_zone_0: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: availability_zone_0 - type: string - description: availabilityzone name - cmaui_oam_ips: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_oam_ips - type: string - contrail_net_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: contrail_net_name - type: string - description: network name of jsa log network - jsa_net_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: jsa_net_name - type: string - jsa_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: jsa_name - type: string - description: network name of jsa log network - node_templates: - cmaui_port_2: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: AUTO - ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - mac_requirements: - mac_count_required: - is_required: false - network: test_net1 - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui_nova - relationship: tosca.relationships.network.BindsTo - test_nested1Level: - type: org.openecomp.resource.abstract.nodes.heat.nested1 - directives: - - substitutable - properties: - service_template_filter: - substitute_service_template: nested1ServiceTemplate.yaml - net2: - get_attribute: - - test_contrailV2_net2 - - fq_name - net1: test_net1 - port1: template_VMInt_OAM_lb_1 - port2: cmaui_port_2 - requirements: - - link_template_Vlan_2: - capability: tosca.capabilities.network.Linkable - node: test_contrailV2_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_6_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_5_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_4_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_contrailV2_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_contrailV2_net2 - relationship: tosca.relationships.network.LinksTo - - binding_template_Vlan_2: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_2 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_1: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_6_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_5_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_4_test_nested2Level: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_3_test_nested2Level: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - test_contrailV2_net2: - type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork - properties: - network_name: - get_input: contrail_net_name - template_VMInt_OAM_lb_1: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - test_net1 - virtual_machine_interface_properties: - service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui_nova - relationship: tosca.relationships.network.BindsTo - test_resourceGroup: - type: org.openecomp.resource.abstract.nodes.heat.nested3 - directives: - - substitutable - properties: - service_template_filter: - substitute_service_template: nested3ServiceTemplate.yaml - count: 9 - mandatory: true - net1: - list_join: - - ':' - - get_attribute: - - test_contrailV2_net2 - - fq_name - indx: - get_property: - - SELF - - service_template_filter - - index_value - port1: cmaui_port_2 - requirements: - - link_template_Vlan_7_test_nested4Level: - capability: tosca.capabilities.network.Linkable - node: test_contrailV2_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_6: - capability: tosca.capabilities.network.Linkable - node: test_contrailV2_net2 - relationship: tosca.relationships.network.LinksTo - - binding_template_Vlan_7_test_nested4Level: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_2 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_6: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_2 - relationship: tosca.relationships.network.BindsTo - test_net1: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_input: jsa_net_name - test_nestedInvalidConnection: - type: org.openecomp.resource.abstract.nodes.heat.nested1 - directives: - - substitutable - properties: - service_template_filter: - substitute_service_template: nested1ServiceTemplate.yaml - net1: server_cmaui_nova - port1: server_cmaui_nova - server_cmaui_nova: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - groups: - main_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/main.yml - description: | - Version 2.0 02-09-2016 (Authors: Paul Phillips, pnet2854 PROD) - members: - - cmaui_port_2 - - test_nested1Level - - test_contrailV2_net2 - - template_VMInt_OAM_lb_1 - - test_resourceGroup - - test_net1 - - test_nestedInvalidConnection - - server_cmaui_nova +tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: Main
+imports:
+- openecomp_heat_index:
+ file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+ file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.cmaui:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+ inputs:
+ cmaui_names:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
+ cmaui_image:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
+ type: string
+ description: Image for CMAUI server
+ template_PortTuple_LB1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
+ type: string
+ cmaui_flavor:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
+ type: string
+ description: Flavor for CMAUI server
+ oam_sec_group_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_sec_group_name
+ type: string
+ lb_st_interface_type_oam:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
+ type: string
+ security_group_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: security_group_name
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
+ availability_zone_0:
+ label: availabilityzone name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: availability_zone_0
+ type: string
+ description: availabilityzone name
+ cmaui_oam_ips:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_oam_ips
+ type: string
+ contrail_net_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: contrail_net_name
+ type: string
+ description: network name of jsa log network
+ jsa_net_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: jsa_net_name
+ type: string
+ jsa_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: jsa_name
+ type: string
+ description: network name of jsa log network
+ node_templates:
+ cmaui_port_2:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ replacement_policy: AUTO
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
+ security_groups:
+ - get_input: security_group_name
+ fixed_ips:
+ - ip_address:
+ get_input:
+ - cmaui_oam_ips
+ - 0
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network: test_net1
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_cmaui_nova
+ relationship: tosca.relationships.network.BindsTo
+ test_nested1Level:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1
+ directives:
+ - substitutable
+ properties:
+ service_template_filter:
+ substitute_service_template: nested1ServiceTemplate.yaml
+ net2:
+ get_attribute:
+ - test_contrailV2_net2
+ - fq_name
+ net1: test_net1
+ port1: template_VMInt_OAM_lb_1
+ port2: cmaui_port_2
+ requirements:
+ - link_template_Vlan_2:
+ capability: tosca.capabilities.network.Linkable
+ node: test_contrailV2_net2
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_1:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_6_test_nested3Level_test_nested2Level:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_5_test_nested3Level_test_nested2Level:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_4_test_nested2Level:
+ capability: tosca.capabilities.network.Linkable
+ node: test_contrailV2_net2
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_3_test_nested2Level:
+ capability: tosca.capabilities.network.Linkable
+ node: test_contrailV2_net2
+ relationship: tosca.relationships.network.LinksTo
+ - binding_template_Vlan_2:
+ capability: tosca.capabilities.network.Bindable
+ node: cmaui_port_2
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_1:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_6_test_nested3Level_test_nested2Level:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_5_test_nested3Level_test_nested2Level:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_4_test_nested2Level:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_3_test_nested2Level:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ test_contrailV2_net2:
+ type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
+ properties:
+ network_name:
+ get_input: contrail_net_name
+ template_VMInt_OAM_lb_1:
+ type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+ properties:
+ security_group_refs:
+ - get_input: oam_sec_group_name
+ virtual_network_refs:
+ - test_net1
+ virtual_machine_interface_properties:
+ service_interface_type:
+ get_input: lb_st_interface_type_oam
+ port_tuple_refs:
+ - get_input: template_PortTuple_LB1
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_cmaui_nova
+ relationship: tosca.relationships.network.BindsTo
+ test_resourceGroup:
+ type: org.openecomp.resource.abstract.nodes.heat.nested3
+ directives:
+ - substitutable
+ properties:
+ service_template_filter:
+ substitute_service_template: nested3ServiceTemplate.yaml
+ count: 9
+ mandatory: true
+ net1:
+ list_join:
+ - ':'
+ - get_attribute:
+ - test_contrailV2_net2
+ - fq_name
+ indx:
+ get_property:
+ - SELF
+ - service_template_filter
+ - index_value
+ port1: cmaui_port_2
+ requirements:
+ - link_template_Vlan_7_test_nested4Level:
+ capability: tosca.capabilities.network.Linkable
+ node: test_contrailV2_net2
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_6:
+ capability: tosca.capabilities.network.Linkable
+ node: test_contrailV2_net2
+ relationship: tosca.relationships.network.LinksTo
+ - binding_template_Vlan_7_test_nested4Level:
+ capability: tosca.capabilities.network.Bindable
+ node: cmaui_port_2
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_6:
+ capability: tosca.capabilities.network.Bindable
+ node: cmaui_port_2
+ relationship: tosca.relationships.network.BindsTo
+ test_net1:
+ type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+ properties:
+ shared: true
+ network_name:
+ get_input: jsa_net_name
+ test_nestedInvalidConnection:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1
+ directives:
+ - substitutable
+ properties:
+ service_template_filter:
+ substitute_service_template: nested1ServiceTemplate.yaml
+ net1: server_cmaui_nova
+ port1: server_cmaui_nova
+ server_cmaui_nova:
+ type: org.openecomp.resource.vfc.nodes.heat.cmaui
+ properties:
+ flavor:
+ get_input: cmaui_flavor
+ availability_zone:
+ get_input: availability_zone_0
+ image:
+ get_input: cmaui_image
+ contrail_service_instance_ind: true
+ name:
+ get_input:
+ - cmaui_names
+ - 0
+ groups:
+ main_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/main.yml
+ description: |
+ Version 2.0 02-09-2016 (Authors: Paul Phillips, pnet2854 PROD)
+ members:
+ - cmaui_port_2
+ - test_nested1Level
+ - test_contrailV2_net2
+ - template_VMInt_OAM_lb_1
+ - test_resourceGroup
+ - test_net1
+ - test_nestedInvalidConnection
+ - server_cmaui_nova
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index f681a14a9b..92647bb2f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -162,7 +162,7 @@ topology_template: - template_Vlan_1 - test_nested2Level substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.nested1 + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1 capabilities: feature_template_Vlan_2: - template_Vlan_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml new file mode 100644 index 0000000000..662ea182f7 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -0,0 +1,119 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: GlobalSubstitutionTypes +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.abstract.nodes.heat.subinterface.nested: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + aap_untrusted_ip_prefix: + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_sec_untrusted_ip_prefix: + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vdbe_subport_network: + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + required: true + status: SUPPORTED + ip_v6_address: + type: string + description: IPv6 address associated with subinterfaces + required: true + status: SUPPORTED + counter: + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + required: true + status: SUPPORTED + subinterfaces_name_prefix: + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + required: true + status: SUPPORTED + ip_address: + type: string + description: IPv4 address associated with subinterfaces + required: true + status: SUPPORTED + aap_address_mode: + type: string + description: Address mode for the vDBE cluster IP + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix: + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + parent_interface: + type: string + description: Parent Contrail interface + required: true + status: SUPPORTED + mac_address: + type: string + description: HW MAC address to use for subinterface + required: true + status: SUPPORTED + vlan_tag_list: + type: list + description: List of VLAN IDs to use for subinterfaces + required: true + status: SUPPORTED + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vmac_address: + type: string + description: virtual MAC address to use for subinterface + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix_len: + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + requirements: + - dependency_vdbe_untr_vmi_subport: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_untr_vmi_subport: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_vdbe_untr_vmi_subport: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_vdbe_untr_vmi_subport: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..0510ab9e05 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,329 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.vdbe: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + vf_module_id: + hidden: false + immutable: false + type: string + description: Unique ID for this VF module inst + control_int_net_rpf: + hidden: false + immutable: false + type: string + description: Reverse Path Filtering enable or disable for the control virtual network + control_int_net_forwarding_mode: + hidden: false + immutable: false + type: string + description: forwarding mode of the control virtual network + vnf_name: + hidden: false + immutable: false + type: string + description: Unique name for this VF instance + vdbe_untrusted_ip_1: + hidden: false + immutable: false + type: string + description: IPV4 address of the secondary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + control_int_net_shared: + hidden: false + immutable: false + type: boolean + description: control virtual network shared + vdbe_untrusted_v6_ip_1: + hidden: false + immutable: false + type: string + description: IPV6 address of the secondary vDBE VM on the VAN untrusted network + vdbe_untrusted_vmac_address: + hidden: false + immutable: false + type: string + description: Virtual MAC of the primary vDBE VM on the VAN untrusted network + control_int_net_flood_unknown_unicast: + hidden: false + immutable: false + type: boolean + description: forwarding mode of the control virtual network + vdbe_aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vnf_id: + hidden: false + immutable: false + type: string + description: Unique ID for this VF inst + vdbe_name_1: + hidden: false + immutable: false + type: string + description: VM Name for this vdbe node 1 + availability_zone_1: + hidden: false + immutable: false + type: string + description: The availability zone of secondary node1 vDBE vm in the local HA pair. + untrusted_vn_networks: + hidden: false + immutable: false + type: list + description: List of subinterface virtual networks + entry_schema: + type: string + vdbe_image_name: + hidden: false + immutable: false + type: string + description: Image to use for vDBE + oam_net_name: + hidden: false + immutable: false + type: string + description: Name of NSDNet network from which the management IP addresses will be allocated + vdbe_aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_vlan_tags: + hidden: false + immutable: false + type: list + description: List of subinterface vlan tags + entry_schema: + type: string + vdbe_flavor_name: + hidden: false + immutable: false + type: string + description: Flavor to use for vDBE + vdbe_hw_untr_mac_1: + hidden: false + immutable: false + type: string + description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network + untrusted_net_name: + hidden: false + immutable: false + type: string + description: Name of public untrusted network into which this vDBE HA cluster is deployed + vdbe_device_name: + hidden: false + immutable: false + type: string + description: VDBE device Name for this vdbe VNF + vdbe_aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_node_1: + type: org.openecomp.resource.vfc.nodes.heat.vdbe + properties: + flavor: + get_input: vdbe_flavor_name + availability_zone: + get_input: availability_zone_1 + image: + get_input: vdbe_image_name + metadata: + vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + name: + get_input: vdbe_name_1 + vdbe_untr_1_port: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + name: + str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + virtual_network_refs: + - get_input: untrusted_net_name + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: vdbe_aap_untrusted_ip_prefix + ip_prefix_len: + get_input: vdbe_aap_untrusted_ip_prefix_len + mac: + get_input: vdbe_untrusted_vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: vdbe_aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: vdbe_aap_sec_untrusted_ip_prefix_len + mac: + get_input: vdbe_hw_untr_mac_1 + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: vdbe_aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: vdbe_aap_untrusted_v6_ip_prefix_len + mac: + get_input: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + - get_input: vdbe_hw_untr_mac_1 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe_node_1 + relationship: tosca.relationships.network.BindsTo + vdbe_untr_1_subports: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: vdbe_aap_untrusted_ip_prefix + attr_test: + get_attribute: + - vdbe_untr_1_port + - name + aap_sec_untrusted_ip_prefix: + get_input: vdbe_aap_sec_untrusted_ip_prefix + vdbe_subport_network: control_int_net + ip_v6_address: + get_input: vdbe_untrusted_v6_ip_1 + counter: + get_input: vnf_id + ip_address: + get_input: vdbe_untrusted_ip_1 + subinterfaces_name_prefix: + str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + aap_address_mode: + get_input: aap_address_mode + service_template_filter: + substitute_service_template: nestedServiceTemplate.yaml + count: + get_input: untrusted_num_vn + mandatory: false + aap_untrusted_v6_ip_prefix: + get_input: vdbe_aap_untrusted_v6_ip_prefix + parent_interface: vdbe_untr_1_port + mac_address: + get_input: vdbe_hw_untr_mac_1 + vlan_tag_list: + get_input: untrusted_vlan_tags + aap_sec_untrusted_ip_prefix_len: + get_input: vdbe_aap_sec_untrusted_ip_prefix_len + vmac_address: + get_input: vdbe_untrusted_vmac_address + aap_untrusted_v6_ip_prefix_len: + get_input: vdbe_aap_untrusted_v6_ip_prefix_len + aap_untrusted_ip_prefix_len: + get_input: vdbe_aap_untrusted_ip_prefix_len + requirements: + - link_vdbe_untr_vmi_subport: + capability: tosca.capabilities.network.Linkable + node: control_int_net + relationship: tosca.relationships.network.LinksTo + - binding_vdbe_untr_vmi_subport: + capability: tosca.capabilities.network.Bindable + node: vdbe_untr_1_port + relationship: tosca.relationships.network.BindsTo + - dependency: + capability: tosca.capabilities.Node + node: control_int_net + relationship: tosca.relationships.DependsOn + control_int_net: + type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork + properties: + network_name: + str_replace: + template: VNF_NAME_control_net + params: + VNF_NAME: + get_input: vnf_name + network_ipam_refs: + get_attribute: + - vdbe_untr_1_subports + - count + requirements: + - dependency: + capability: tosca.capabilities.Node + node: vdbe_untr_1_subports + relationship: tosca.relationships.DependsOn + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - vdbe_node_1 + - vdbe_untr_1_port + - vdbe_untr_1_subports + - control_int_net + outputs: + out1: + description: output_test + value: + get_attribute: + - vdbe_untr_1_subports + - name
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/nestedServiceTemplate.yaml new file mode 100644 index 0000000000..3ec312ac47 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/expectedoutputfiles/nestedServiceTemplate.yaml @@ -0,0 +1,171 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vdbe_subport_network: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vdbe_subport_network + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_vmi_subport: + - vdbe_untr_vmi_subport + - feature + requirements: + dependency_vdbe_untr_vmi_subport: + - vdbe_untr_vmi_subport + - dependency + link_vdbe_untr_vmi_subport: + - vdbe_untr_vmi_subport + - link + binding_vdbe_untr_vmi_subport: + - vdbe_untr_vmi_subport + - binding
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..aca75b5055 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/MANIFEST.json @@ -0,0 +1,17 @@ +{ + "name": "vMME_Small", + "description": "HOT template to create 2 cinder volume attachment", + "version": "2013-05-23", + "data": [ + { + "file": "main.yml", + "type": "HEAT", + "isBase": "true" + }, + { + "file": "nested.yml", + "type": "HEAT", + "isBase": "false" + } + ] +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/main.yml new file mode 100644 index 0000000000..994b081559 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/main.yml @@ -0,0 +1,375 @@ +heat_template_version: 2013-05-23 + +description: > + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + +parameters: + aap_address_mode: + description: "Address mode for the vDBE cluster IP" + type: string + control_int_net_forwarding_mode: + description: "forwarding mode of the control virtual network" + type: string + control_int_net_rpf: + description: "Reverse Path Filtering enable or disable for the control virtual network" + type: string + control_int_net_shared: + description: "control virtual network shared" + type: boolean + control_int_net_flood_unknown_unicast: + description: "forwarding mode of the control virtual network" + type: boolean + oam_net_name: + description: "Name of NSDNet network from which the management IP addresses will be allocated" + type: string + untrusted_net_name: + description: "Name of public untrusted network into which this vDBE HA cluster is deployed" + type: string + untrusted_num_vn: + constraints: + - + range: + max: 77 + min: 1 + description: "Number of vDBE subinterface virtual Networks" + type: number + untrusted_vlan_tags: + description: "List of subinterface vlan tags" + type: comma_delimited_list + untrusted_vn_networks: + description: "List of subinterface virtual networks" + type: comma_delimited_list + vdbe_aap_sec_untrusted_ip_prefix: + description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network" + type: string + vdbe_aap_sec_untrusted_ip_prefix_len: + description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network" + type: string + vdbe_aap_untrusted_ip_prefix: + description: "ip prefix for primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_ip_prefix_len: + description: "ip prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_v6_ip_prefix: + description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_v6_ip_prefix_len: + description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_device_name: + description: "VDBE device Name for this vdbe VNF" + type: string + vdbe_hw_untr_mac_1: + description: "Secondary MAC address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_name_1: + description: "VM Name for this vdbe node 1" + type: string + vdbe_untrusted_ip_1: + description: "IPV4 address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_untrusted_v6_ip_1: + description: "IPV6 address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_untrusted_vmac_address: + description: "Virtual MAC of the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_flavor_name: + description: "Flavor to use for vDBE" + type: string + vdbe_image_name: + description: "Image to use for vDBE" + type: string + vnf_id: + description: "Unique ID for this VF inst" + type: string + vnf_name: + description: "Unique name for this VF instance" + type: string + vf_module_id: + description: "Unique ID for this VF module inst" + type: string + availability_zone_1: + description: "The availability zone of secondary node1 vDBE vm in the local HA pair." + type: string +resources: + vdbe_node_1: + type: OS::Nova::Server + properties: + availability_zone: + get_param: availability_zone_1 + flavor: + get_param: vdbe_flavor_name + image: + get_param: vdbe_image_name + metadata: + vf_module_id: + get_param: vf_module_id + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + name: + get_param: vdbe_name_1 + networks: + - port: {get_resource: vdbe_0_untr_vmi_0} + - port: {get_resource: vdbe_untr_vmi} + - port: {get_resource: vdbe_0_oam_port_1} + - port: {get_resource: vdbe_oam_port} + - port: {get_resource: vdbe_oam_port_2} + - port: {get_resource: vdbe_0_oam_neutronNotFollowingHeatGuidelines_2} + - port: {get_resource: vdbe_0_untr_vmiNotFollowingHeatGuidelines_1} + vdbe_untr_1_subports: + type: OS::Heat::ResourceGroup + depends_on: control_int_net + properties: + count: + get_param: untrusted_num_vn + resource_def: + type: nested.yml + properties: + attr_test: { get_attr: [ vdbe_0_untr_vmi_0, name ] } + aap_address_mode: + get_param: aap_address_mode + aap_sec_untrusted_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + aap_untrusted_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + aap_untrusted_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + aap_untrusted_v6_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + aap_untrusted_v6_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + counter: + get_param: vnf_id + ip_address: + get_param: vdbe_untrusted_ip_1 + ip_v6_address: + get_param: vdbe_untrusted_v6_ip_1 + mac_address: + get_param: vdbe_hw_untr_mac_1 + parent_interface: + get_resource: vdbe_0_untr_vmi_0 + subinterfaces_name_prefix: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + vlan_tag_list: + get_param: untrusted_vlan_tags + vmac_address: + get_param: vdbe_untrusted_vmac_address + vdbe_subport_network: + get_resource: control_int_net + vdbe_0_untr_vmi_0: + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_param: untrusted_net_name + type: OS::ContrailV2::VirtualMachineInterface + + vdbe_untr_vmi: + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_param: untrusted_net_name + type: OS::ContrailV2::VirtualMachineInterface + + vdbe_0_oam_port_1: + type: OS::Neutron::Port + properties: + network: Test + fixed_ips: [{"ip_address": 1.2.3.4}] + replacement_policy: AUTO + + vdbe_oam_port: + type: OS::Neutron::Port + properties: + network: Test + fixed_ips: [{"ip_address": 1.2.3.4}] + replacement_policy: AUTO + + vdbe_oam_port_2: + type: OS::Neutron::Port + properties: + network: Test + fixed_ips: [{"ip_address": 1.2.3.4}] + replacement_policy: AUTO + + vdbe_0_oam_neutronNotFollowingHeatGuidelines_2: + type: OS::Neutron::Port + properties: + network: Test + fixed_ips: [{"ip_address": 1.2.3.4}] + replacement_policy: AUTO + + vdbe_0_untr_vmiNotFollowingHeatGuidelines_1: + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_param: untrusted_net_name + type: OS::ContrailV2::VirtualMachineInterface + + control_int_net: + type: OS::ContrailV2::VirtualNetwork + depends_on: vdbe_untr_1_subports + properties: + network_ipam_refs: { get_attr: [ vdbe_untr_1_subports, count ] } + flood_unknown_unicast: + get_param: control_int_net_flood_unknown_unicast + is_shared: + get_param: control_int_net_shared + name: + str_replace: + params: + VNF_NAME: + get_param: vnf_name + template: VNF_NAME_control_net + virtual_network_properties: + virtual_network_properties_forwarding_mode: + get_param: control_int_net_forwarding_mode + virtual_network_properties_rpf: + get_param: control_int_net_rpf +outputs: + out1: + description: output_test + value: {get_attr: [vdbe_untr_1_subports, name]}
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/nested.yml new file mode 100644 index 0000000000..059394be08 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/portNetworkRole/inputfiles/nested.yml @@ -0,0 +1,114 @@ +heat_template_version: 2013-05-23 + +description: cmaui server template for vMMSC + +parameters: + aap_address_mode: + description: "Address mode for the vDBE cluster IP" + type: string + aap_sec_untrusted_ip_prefix: + description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network" + type: string + aap_sec_untrusted_ip_prefix_len: + description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network" + type: string + aap_untrusted_ip_prefix: + description: "ip prefix for primary vDBE VM on the VAN untrusted network" + type: string + aap_untrusted_ip_prefix_len: + description: "ip prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + aap_untrusted_v6_ip_prefix: + description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network" + type: string + aap_untrusted_v6_ip_prefix_len: + description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + counter: + description: "Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances." + type: number + mac_address: + description: "HW MAC address to use for subinterface" + type: string + parent_interface: + description: "Parent Contrail interface" + type: string + subinterfaces_name_prefix: + description: "Combined with subinterface_instance_index, this is used as the name of the subinterface resource" + type: string + vlan_tag_list: + description: "List of VLAN IDs to use for subinterfaces" + type: comma_delimited_list + vmac_address: + description: "virtual MAC address to use for subinterface" + type: string + vdbe_subport_network: + description: "List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list" + type: string + ip_address: + description: "IPv4 address associated with subinterfaces" + type: string + ip_v6_address: + description: "IPv6 address associated with subinterfaces" + type: string +resources: + vdbe_untr_vmi_subport: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + params: + $INDEX: + get_param: + - vlan_tag_list + - + get_param: counter + $NAME: + get_param: subinterfaces_name_prefix + template: $NAME_$INDEX + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: mac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: mac_address + virtual_machine_interface_properties: + virtual_machine_interface_properties_sub_interface_vlan_tag: + get_param: + - vlan_tag_list + - + get_param: counter + virtual_machine_interface_refs: + [{get_param: parent_interface}] + virtual_network_refs: + [{get_param: vdbe_subport_network}]
\ No newline at end of file |