From 1b700c8606f319cbda416a8abb70ea16dceb7a29 Mon Sep 17 00:00:00 2001 From: "Assaf, Shay (sa726r)" Date: Sun, 26 Aug 2018 11:53:35 +0300 Subject: related-networks property support as input Change-Id: I2d6fb011f7440127559a8f02b1c8a72095694403 Issue-ID: SDC-1658 Signed-off-by: Assaf, Shay (sa726r) --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 14 ++++- .../out/Nested_pd_serverServiceTemplate.yaml | 70 +++++++++++++--------- 2 files changed, 55 insertions(+), 29 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml index cf4a0e04ec..ddd2d22fa3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -54,6 +54,12 @@ node_types: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true status: SUPPORTED + port_template_VMInt_OAM_lb_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd01_port_device_id: type: list required: true @@ -118,6 +124,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_template_VMInt_OAM_lb_ip_requirements: type: list required: true @@ -842,4 +854,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - 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/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml index e676206762..d3a355c174 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -48,6 +48,11 @@ topology_template: port_template_VMInt_OAM_lb_virtual_machine_interface_properties: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true + port_template_VMInt_OAM_lb_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd01_port_device_id: type: list required: true @@ -100,6 +105,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_template_VMInt_OAM_lb_ip_requirements: type: list required: true @@ -360,6 +370,8 @@ topology_template: - port_template_VMInt_OAM_lb_virtual_machine_interface_properties - index_value subinterface_indicator: false + related_networks: + get_input: port_template_VMInt_OAM_lb_related_networks security_group_refs: get_input: - port_template_VMInt_OAM_lb_security_group_refs @@ -396,30 +408,46 @@ topology_template: pd_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + allowed_address_pairs: + get_input: port_pd01_port_allowed_address_pairs + binding:vnic_type: + get_input: + - port_pd01_port_binding:vnic_type + - index_value + value_specs: + get_input: + - port_pd01_port_value_specs + - index_value + network_role_tag: + get_input: port_pd01_port_network_role_tag + fixed_ips: + get_input: + - port_pd01_port_fixed_ips + - index_value + subnetpoolid: + get_input: port_pd01_port_subnetpoolid + name: + get_input: + - port_pd01_port_name + - index_value + network: + get_input: + - port_pd01_port_network + - index_value replacement_policy: get_input: - port_pd01_port_replacement_policy - index_value mac_requirements: get_input: port_pd01_port_mac_requirements - allowed_address_pairs: - get_input: port_pd01_port_allowed_address_pairs order: get_input: port_pd01_port_order - binding:vnic_type: - get_input: - - port_pd01_port_binding:vnic_type - - index_value device_owner: get_input: - port_pd01_port_device_owner - index_value mac_address: get_input: port_pd01_port_mac_address - value_specs: - get_input: - - port_pd01_port_value_specs - - index_value security_groups: get_input: - port_pd01_port_security_groups @@ -428,15 +456,15 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements - subinterface_indicator: false qos_policy: get_input: - port_pd01_port_qos_policy - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd01_port_ip_requirements - network_role_tag: - get_input: port_pd01_port_network_role_tag + related_networks: + get_input: port_pd01_port_related_networks port_security_enabled: get_input: - port_pd01_port_port_security_enabled @@ -447,24 +475,10 @@ topology_template: - index_value network_role: get_input: port_pd01_port_network_role - subnetpoolid: - get_input: port_pd01_port_subnetpoolid - fixed_ips: - get_input: - - port_pd01_port_fixed_ips - - index_value - name: - get_input: - - port_pd01_port_name - - index_value device_id: get_input: - port_pd01_port_device_id - index_value - network: - get_input: - - port_pd01_port_network - - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -874,4 +888,4 @@ topology_template: - dependency link_pd_server_template_VMInt_OAM_lb: - pd_server_template_VMInt_OAM_lb - - link + - link \ No newline at end of file -- cgit 1.2.3-korg