diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib')
6 files changed, 569 insertions, 21 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 67df29f6bf..dfd72046b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -237,6 +237,26 @@ node_types: occurrences: - 1 - 1 + - dependency_perimeta_ssc_a_untrusted_0_vlan_ports: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_perimeta_ssc_a_trusted_0_port: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -436,6 +456,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED feature_perimeta_ssc_a_mgmt_1_port: type: tosca.capabilities.Node occurrences: @@ -650,6 +675,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_perimeta_ssc_a_untrusted_0_vlan_ports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.latency_perimeta_ssc_a_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1167,6 +1197,26 @@ node_types: occurrences: - 1 - 1 + - dependency_perimeta_ssc_b_untrusted_0_vlan_ports: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_perimeta_ssc_b_mgmt_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1574,6 +1624,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_perimeta_ssc_b_untrusted_0_vlan_ports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_perimeta_ssc_b_mgmt_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1813,6 +1868,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_perimeta_ssc_b_untrusted_parent_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2111,6 +2171,26 @@ node_types: entry_schema: type: string requirements: + - dependency_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_perimeta_rtp_msc_a_trusted_0_port: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2189,6 +2269,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED attachment_perimeta_rtp_msc_a_mgmt_0_port: type: tosca.capabilities.Attachment occurrences: @@ -2390,6 +2475,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.usage_perimeta_rtp_msc_a_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2761,6 +2851,33 @@ node_types: description: IPv6 address associated with subinterfaces required: true status: SUPPORTED + requirements: + - dependency_contrail_vmi_subinterface: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_contrail_vmi_subinterface: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_contrail_vmi_subinterface: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_contrail_vmi_subinterface: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.module_2_perimeta_sw_b_child: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -2997,6 +3114,26 @@ node_types: occurrences: - 1 - 1 + - dependency_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_perimeta_rtp_msc_b_server_0: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3154,6 +3291,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED attachment_perimeta_rtp_msc_b_ha_0_port: type: tosca.capabilities.Attachment occurrences: @@ -3399,6 +3541,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED network.incoming.packets.rate_perimeta_rtp_msc_b_mgmt_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3559,4 +3706,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml index ed4dfdd49b..96d690fb8e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml @@ -306,6 +306,51 @@ topology_template: capability: tosca.capabilities.network.Bindable node: perimeta_ssc_a_server_0 relationship: tosca.relationships.network.BindsTo + perimeta_ssc_a_untrusted_0_vlan_ports: + type: org.openecomp.resource.abstract.nodes.heat.vlan_subinterface_dual + directives: + - substitutable + properties: + perimeta_parent_interface: perimeta_ssc_a_untrusted_parent_0_port + perimeta_v6_vip_0: + get_input: ssc_untrusted_v6_vip_0 + service_template_filter: + substitute_service_template: vlan_subinterface_dualServiceTemplate.yaml + count: + get_input: perimeta_untrusted_num_vlans + mandatory: false + perimeta_subinterface_name_prefix: + str_replace: + template: $VNF_NAME_$VM_untrusted_port_vlan + params: + $VM: + get_input: ssc_a_name_0 + $VNF_NAME: + get_input: vnf_name + perimeta_vlan_networks: + get_input: perimeta_untrusted_vlan_networks + perimeta_subinterface_instance_index: + get_property: + - SELF + - service_template_filter + - index_value + perimeta_ip_0: + get_input: ssc_a_untrusted_ip_0 + perimeta_vip_0: + get_input: ssc_untrusted_vip_0 + perimeta_vlan_ids: + get_input: perimeta_untrusted_vlan_ids + perimeta_mac_address: + get_attribute: + - perimeta_ssc_a_untrusted_parent_0_port + - mac_address + perimeta_v6_ip_0: + get_input: ssc_a_untrusted_v6_ip_0 + requirements: + - binding_contrail_vmi_subinterface: + capability: tosca.capabilities.network.Bindable + node: perimeta_ssc_a_untrusted_parent_0_port + relationship: tosca.relationships.network.BindsTo perimeta_ssc_a_trusted_0_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -458,6 +503,7 @@ topology_template: - perimeta_ssc_a_ha_0_port - perimeta_ssc_a_untrusted_parent_0_port - perimeta_ssc_a_mgmt_1_port + - perimeta_ssc_a_untrusted_0_vlan_ports - perimeta_ssc_a_trusted_0_port - perimeta_ssc_a_unused_0_port - perimeta_ssc_a_mgmt_0_port @@ -540,6 +586,9 @@ topology_template: network.outgoing.packets.rate_perimeta_ssc_a_unused_0_port: - perimeta_ssc_a_unused_0_port - network.outgoing.packets.rate + feature_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports: + - perimeta_ssc_a_untrusted_0_vlan_ports + - feature_contrail_vmi_subinterface feature_perimeta_ssc_a_mgmt_1_port: - perimeta_ssc_a_mgmt_1_port - feature @@ -651,6 +700,9 @@ topology_template: network.incoming.packets_perimeta_ssc_a_mgmt_0_port: - perimeta_ssc_a_mgmt_0_port - network.incoming.packets + feature_perimeta_ssc_a_untrusted_0_vlan_ports: + - perimeta_ssc_a_untrusted_0_vlan_ports + - feature disk.device.latency_perimeta_ssc_a_server_0: - perimeta_ssc_a_server_0 - disk.device.latency @@ -811,6 +863,9 @@ topology_template: dependency_perimeta_ssc_a_mgmt_1_port: - perimeta_ssc_a_mgmt_1_port - dependency + dependency_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports: + - perimeta_ssc_a_untrusted_0_vlan_ports + - dependency_contrail_vmi_subinterface dependency_perimeta_ssc_a_untrusted_parent_0_port: - perimeta_ssc_a_untrusted_parent_0_port - dependency @@ -829,6 +884,9 @@ topology_template: dependency_perimeta_ssc_a_ha_0_port: - perimeta_ssc_a_ha_0_port - dependency + link_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports: + - perimeta_ssc_a_untrusted_0_vlan_ports + - link_contrail_vmi_subinterface link_perimeta_ssc_a_mgmt_0_port: - perimeta_ssc_a_mgmt_0_port - link @@ -844,6 +902,9 @@ topology_template: dependency_perimeta_ssc_a_mgmt_0_port: - perimeta_ssc_a_mgmt_0_port - dependency + dependency_perimeta_ssc_a_untrusted_0_vlan_ports: + - perimeta_ssc_a_untrusted_0_vlan_ports + - dependency dependency_perimeta_ssc_a_server_0: - perimeta_ssc_a_server_0 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml index fffad896af..74a843c3b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml @@ -268,6 +268,51 @@ topology_template: capability: tosca.capabilities.network.Bindable node: perimeta_ssc_b_server_0 relationship: tosca.relationships.network.BindsTo + perimeta_ssc_b_untrusted_0_vlan_ports: + type: org.openecomp.resource.abstract.nodes.heat.vlan_subinterface_dual + directives: + - substitutable + properties: + perimeta_parent_interface: perimeta_ssc_b_untrusted_parent_0_port + perimeta_v6_vip_0: + get_input: ssc_untrusted_v6_vip_0 + service_template_filter: + substitute_service_template: vlan_subinterface_dualServiceTemplate.yaml + count: + get_input: perimeta_untrusted_num_vlans + mandatory: false + perimeta_subinterface_name_prefix: + str_replace: + template: $VNF_NAME_$VM_untrusted_port_vlan + params: + $VM: + get_input: ssc_b_name_0 + $VNF_NAME: + get_input: vnf_name + perimeta_vlan_networks: + get_input: perimeta_untrusted_vlan_networks + perimeta_subinterface_instance_index: + get_property: + - SELF + - service_template_filter + - index_value + perimeta_ip_0: + get_input: ssc_b_untrusted_ip_0 + perimeta_vip_0: + get_input: ssc_untrusted_vip_0 + perimeta_vlan_ids: + get_input: perimeta_untrusted_vlan_ids + perimeta_mac_address: + get_attribute: + - perimeta_ssc_b_untrusted_parent_0_port + - mac_address + perimeta_v6_ip_0: + get_input: ssc_b_untrusted_v6_ip_0 + requirements: + - binding_contrail_vmi_subinterface: + capability: tosca.capabilities.network.Bindable + node: perimeta_ssc_b_untrusted_parent_0_port + relationship: tosca.relationships.network.BindsTo perimeta_ssc_b_mgmt_1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -443,6 +488,7 @@ topology_template: members: - perimeta_ssc_b_trusted_0_port - perimeta_ssc_b_untrusted_parent_0_port + - perimeta_ssc_b_untrusted_0_vlan_ports - perimeta_ssc_b_mgmt_1_port - perimeta_ssc_b_unused_0_port - perimeta_ssc_b_server_0 @@ -625,6 +671,9 @@ topology_template: forwarder_perimeta_ssc_b_ha_0_port: - perimeta_ssc_b_ha_0_port - forwarder + feature_perimeta_ssc_b_untrusted_0_vlan_ports: + - perimeta_ssc_b_untrusted_0_vlan_ports + - feature network.outgoing.bytes.rate_perimeta_ssc_b_mgmt_1_port: - perimeta_ssc_b_mgmt_1_port - network.outgoing.bytes.rate @@ -748,6 +797,9 @@ topology_template: network.outgoing.bytes_perimeta_ssc_b_unused_0_port: - perimeta_ssc_b_unused_0_port - network.outgoing.bytes + feature_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports: + - perimeta_ssc_b_untrusted_0_vlan_ports + - feature_contrail_vmi_subinterface network.outgoing.bytes.rate_perimeta_ssc_b_untrusted_parent_0_port: - perimeta_ssc_b_untrusted_parent_0_port - network.outgoing.bytes.rate @@ -800,12 +852,18 @@ topology_template: dependency_perimeta_ssc_b_unused_0_port: - perimeta_ssc_b_unused_0_port - dependency + dependency_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports: + - perimeta_ssc_b_untrusted_0_vlan_ports + - dependency_contrail_vmi_subinterface dependency_perimeta_ssc_b_ha_0_port: - perimeta_ssc_b_ha_0_port - dependency local_storage_perimeta_ssc_b_server_0: - perimeta_ssc_b_server_0 - local_storage + link_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports: + - perimeta_ssc_b_untrusted_0_vlan_ports + - link_contrail_vmi_subinterface link_perimeta_ssc_b_mgmt_0_port: - perimeta_ssc_b_mgmt_0_port - link @@ -821,6 +879,9 @@ topology_template: link_perimeta_ssc_b_untrusted_parent_0_port: - perimeta_ssc_b_untrusted_parent_0_port - link + dependency_perimeta_ssc_b_untrusted_0_vlan_ports: + - perimeta_ssc_b_untrusted_0_vlan_ports + - dependency dependency_perimeta_ssc_b_server_0: - perimeta_ssc_b_server_0 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml index 370cc8cf86..d5d91bbaf9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml @@ -223,6 +223,61 @@ topology_template: entry_schema: type: string node_templates: + perimeta_rtp_msc_a_untrusted_0_vlan_ports: + type: org.openecomp.resource.abstract.nodes.heat.vlan_subinterface_dual + directives: + - substitutable + properties: + perimeta_parent_interface: perimeta_rtp_msc_a_untrusted_parent_0_port + perimeta_v6_vip_0: + get_input: + - rtp_msc_untrusted_v6_vips + - get_input: perimeta_instance_index + service_template_filter: + substitute_service_template: vlan_subinterface_dualServiceTemplate.yaml + count: + get_input: perimeta_untrusted_num_vlans + mandatory: false + perimeta_subinterface_name_prefix: + str_replace: + template: $VNF_NAME_$VM_untrusted_port_vlan + params: + $VM: + get_input: + - rtp_msc_a_names + - get_input: perimeta_instance_index + $VNF_NAME: + get_input: vnf_name + perimeta_vlan_networks: + get_input: perimeta_untrusted_vlan_networks + perimeta_subinterface_instance_index: + get_property: + - SELF + - service_template_filter + - index_value + perimeta_ip_0: + get_input: + - rtp_msc_a_untrusted_ips + - get_input: perimeta_instance_index + perimeta_vip_0: + get_input: + - rtp_msc_untrusted_vips + - get_input: perimeta_instance_index + perimeta_vlan_ids: + get_input: perimeta_untrusted_vlan_ids + perimeta_mac_address: + get_attribute: + - perimeta_rtp_msc_a_untrusted_parent_0_port + - mac_address + perimeta_v6_ip_0: + get_input: + - rtp_msc_a_untrusted_v6_ips + - get_input: perimeta_instance_index + requirements: + - binding_contrail_vmi_subinterface: + capability: tosca.capabilities.network.Bindable + node: perimeta_rtp_msc_a_untrusted_parent_0_port + relationship: tosca.relationships.network.BindsTo perimeta_rtp_msc_a_trusted_0_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -439,6 +494,7 @@ topology_template: description: | HOT template to instantiate an A side Perimeta RTP MSC instance with 4 vNICs as part of a nested template members: + - perimeta_rtp_msc_a_untrusted_0_vlan_ports - perimeta_rtp_msc_a_trusted_0_port - perimeta_rtp_msc_a_ha_0_port - perimeta_rtp_msc_a_untrusted_parent_0_port @@ -453,6 +509,9 @@ topology_template: disk.device.read.requests_perimeta_rtp_msc_a_server_0: - perimeta_rtp_msc_a_server_0 - disk.device.read.requests + feature_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + - perimeta_rtp_msc_a_untrusted_0_vlan_ports + - feature attachment_perimeta_rtp_msc_a_mgmt_0_port: - perimeta_rtp_msc_a_mgmt_0_port - attachment @@ -558,6 +617,9 @@ topology_template: feature_perimeta_rtp_msc_a_untrusted_parent_0_port: - perimeta_rtp_msc_a_untrusted_parent_0_port - feature + feature_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + - perimeta_rtp_msc_a_untrusted_0_vlan_ports + - feature_contrail_vmi_subinterface disk.usage_perimeta_rtp_msc_a_server_0: - perimeta_rtp_msc_a_server_0 - disk.usage @@ -721,27 +783,36 @@ topology_template: local_storage_perimeta_rtp_msc_a_server_0: - perimeta_rtp_msc_a_server_0 - local_storage - dependency_perimeta_rtp_msc_a_server_0: - - perimeta_rtp_msc_a_server_0 + dependency_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + - perimeta_rtp_msc_a_untrusted_0_vlan_ports + - dependency_contrail_vmi_subinterface + dependency_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + - perimeta_rtp_msc_a_untrusted_0_vlan_ports - dependency dependency_perimeta_rtp_msc_a_untrusted_parent_0_port: - perimeta_rtp_msc_a_untrusted_parent_0_port - dependency - dependency_perimeta_rtp_msc_a_trusted_0_port: - - perimeta_rtp_msc_a_trusted_0_port - - dependency dependency_perimeta_rtp_msc_a_ha_0_port: - perimeta_rtp_msc_a_ha_0_port - dependency - link_perimeta_rtp_msc_a_mgmt_0_port: - - perimeta_rtp_msc_a_mgmt_0_port - - link - link_perimeta_rtp_msc_a_ha_0_port: - - perimeta_rtp_msc_a_ha_0_port - - link + link_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports: + - perimeta_rtp_msc_a_untrusted_0_vlan_ports + - link_contrail_vmi_subinterface link_perimeta_rtp_msc_a_untrusted_parent_0_port: - perimeta_rtp_msc_a_untrusted_parent_0_port - link dependency_perimeta_rtp_msc_a_mgmt_0_port: - perimeta_rtp_msc_a_mgmt_0_port - dependency + dependency_perimeta_rtp_msc_a_server_0: + - perimeta_rtp_msc_a_server_0 + - dependency + dependency_perimeta_rtp_msc_a_trusted_0_port: + - perimeta_rtp_msc_a_trusted_0_port + - dependency + link_perimeta_rtp_msc_a_mgmt_0_port: + - perimeta_rtp_msc_a_mgmt_0_port + - link + link_perimeta_rtp_msc_a_ha_0_port: + - perimeta_rtp_msc_a_ha_0_port + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml index 6b306a47f4..6aca4842f1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml @@ -302,6 +302,61 @@ topology_template: capability: tosca.capabilities.network.Bindable node: perimeta_rtp_msc_b_server_0 relationship: tosca.relationships.network.BindsTo + perimeta_rtp_msc_b_untrusted_0_vlan_ports: + type: org.openecomp.resource.abstract.nodes.heat.vlan_subinterface_dual + directives: + - substitutable + properties: + perimeta_parent_interface: perimeta_rtp_msc_b_untrusted_parent_0_port + perimeta_v6_vip_0: + get_input: + - rtp_msc_untrusted_v6_vips + - get_input: perimeta_instance_index + service_template_filter: + substitute_service_template: vlan_subinterface_dualServiceTemplate.yaml + count: + get_input: perimeta_untrusted_num_vlans + mandatory: false + perimeta_subinterface_name_prefix: + str_replace: + template: $VNF_NAME_$VM_untrusted_port_vlan + params: + $VM: + get_input: + - rtp_msc_b_names + - get_input: perimeta_instance_index + $VNF_NAME: + get_input: vnf_name + perimeta_vlan_networks: + get_input: perimeta_untrusted_vlan_networks + perimeta_subinterface_instance_index: + get_property: + - SELF + - service_template_filter + - index_value + perimeta_ip_0: + get_input: + - rtp_msc_b_untrusted_ips + - get_input: perimeta_instance_index + perimeta_vip_0: + get_input: + - rtp_msc_untrusted_vips + - get_input: perimeta_instance_index + perimeta_vlan_ids: + get_input: perimeta_untrusted_vlan_ids + perimeta_mac_address: + get_attribute: + - perimeta_rtp_msc_b_untrusted_parent_0_port + - mac_address + perimeta_v6_ip_0: + get_input: + - rtp_msc_b_untrusted_v6_ips + - get_input: perimeta_instance_index + requirements: + - binding_contrail_vmi_subinterface: + capability: tosca.capabilities.network.Bindable + node: perimeta_rtp_msc_b_untrusted_parent_0_port + relationship: tosca.relationships.network.BindsTo perimeta_rtp_msc_b_server_0: type: org.openecomp.resource.vfc.nodes.heat.rtp_msc_b properties: @@ -427,6 +482,7 @@ topology_template: members: - perimeta_rtp_msc_b_trusted_0_port - perimeta_rtp_msc_b_mgmt_0_port + - perimeta_rtp_msc_b_untrusted_0_vlan_ports - perimeta_rtp_msc_b_server_0 - perimeta_rtp_msc_b_ha_0_port - perimeta_rtp_msc_b_untrusted_parent_0_port @@ -493,6 +549,9 @@ topology_template: network.outgoing.bytes.rate_perimeta_rtp_msc_b_trusted_0_port: - perimeta_rtp_msc_b_trusted_0_port - network.outgoing.bytes.rate + feature_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + - perimeta_rtp_msc_b_untrusted_0_vlan_ports + - feature_contrail_vmi_subinterface attachment_perimeta_rtp_msc_b_ha_0_port: - perimeta_rtp_msc_b_ha_0_port - attachment @@ -619,6 +678,9 @@ topology_template: disk.write.requests_perimeta_rtp_msc_b_server_0: - perimeta_rtp_msc_b_server_0 - disk.write.requests + feature_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + - perimeta_rtp_msc_b_untrusted_0_vlan_ports + - feature network.incoming.packets.rate_perimeta_rtp_msc_b_mgmt_0_port: - perimeta_rtp_msc_b_mgmt_0_port - network.incoming.packets.rate @@ -701,18 +763,15 @@ topology_template: - perimeta_rtp_msc_b_server_0 - disk.read.bytes.rate requirements: - link_perimeta_rtp_msc_b_trusted_0_port: - - perimeta_rtp_msc_b_trusted_0_port - - link - dependency_perimeta_rtp_msc_b_untrusted_parent_0_port: - - perimeta_rtp_msc_b_untrusted_parent_0_port - - dependency - link_perimeta_rtp_msc_b_ha_0_port: - - perimeta_rtp_msc_b_ha_0_port - - link + dependency_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + - perimeta_rtp_msc_b_untrusted_0_vlan_ports + - dependency_contrail_vmi_subinterface dependency_perimeta_rtp_msc_b_trusted_0_port: - perimeta_rtp_msc_b_trusted_0_port - dependency + dependency_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + - perimeta_rtp_msc_b_untrusted_0_vlan_ports + - dependency dependency_perimeta_rtp_msc_b_ha_0_port: - perimeta_rtp_msc_b_ha_0_port - dependency @@ -722,6 +781,18 @@ topology_template: dependency_perimeta_rtp_msc_b_mgmt_0_port: - perimeta_rtp_msc_b_mgmt_0_port - dependency + link_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports: + - perimeta_rtp_msc_b_untrusted_0_vlan_ports + - link_contrail_vmi_subinterface + link_perimeta_rtp_msc_b_trusted_0_port: + - perimeta_rtp_msc_b_trusted_0_port + - link + dependency_perimeta_rtp_msc_b_untrusted_parent_0_port: + - perimeta_rtp_msc_b_untrusted_parent_0_port + - dependency + link_perimeta_rtp_msc_b_ha_0_port: + - perimeta_rtp_msc_b_ha_0_port + - link local_storage_perimeta_rtp_msc_b_server_0: - perimeta_rtp_msc_b_server_0 - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/vlan_subinterface_dualServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/vlan_subinterface_dualServiceTemplate.yaml new file mode 100644 index 0000000000..d9cb24a8ae --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/vlan_subinterface_dualServiceTemplate.yaml @@ -0,0 +1,137 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan_subinterface_dual +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + perimeta_parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + perimeta_v6_vip_0: + hidden: false + immutable: false + type: string + description: virtual IPv6 address associated with subinterfaces + perimeta_subinterface_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + perimeta_vlan_networks: + hidden: false + immutable: false + type: list + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + entry_schema: + type: string + perimeta_subinterface_instance_index: + 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. + constraints: + - in_range: + - 1 + - 1001 + perimeta_ip_0: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + perimeta_vip_0: + hidden: false + immutable: false + type: string + description: virtual IPv4 address associated with subinterfaces + perimeta_vlan_ids: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + perimeta_mac_address: + hidden: false + immutable: false + type: string + description: MAC address to use for subinterface + perimeta_v6_ip_0: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + node_templates: + contrail_vmi_subinterface: + type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: perimeta_parent_interface + name: + str_replace: + template: $NAME_$VLAN + params: + $NAME: + get_input: perimeta_subinterface_name_prefix + $VLAN: + get_input: + - perimeta_vlan_ids + - get_input: perimeta_subinterface_instance_index + virtual_network_refs: + - get_input: + - perimeta_vlan_networks + - get_input: perimeta_subinterface_instance_index + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - perimeta_vlan_ids + - get_input: perimeta_subinterface_instance_index + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: active-standby + ip: + ip_prefix: + get_input: perimeta_vip_0 + ip_prefix_len: 32 + mac: + get_input: perimeta_mac_address + - address_mode: active-standby + ip: + ip_prefix: + get_input: perimeta_v6_vip_0 + ip_prefix_len: 128 + mac: + get_input: perimeta_mac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: perimeta_mac_address + groups: + vlan_subinterface_dual_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan_subinterface_dual.yaml + description: | + HOT template to instantiate a single Contrail VLAN sub-interface with associated instance IP addresses and allowed address pairs + members: + - contrail_vmi_subinterface + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.vlan_subinterface_dual + capabilities: + feature_contrail_vmi_subinterface: + - contrail_vmi_subinterface + - feature + requirements: + binding_contrail_vmi_subinterface: + - contrail_vmi_subinterface + - binding + link_contrail_vmi_subinterface: + - contrail_vmi_subinterface + - link + dependency_contrail_vmi_subinterface: + - contrail_vmi_subinterface + - dependency |