From b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 11 Jun 2017 14:22:02 +0300 Subject: [SDC-29] rebase continue work to align source Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando --- .../OCS-fw2_service_instance1ServiceTemplate.yaml | 22 ++----- .../OCS-fw2_service_instance3ServiceTemplate.yaml | 22 ++----- .../OCS-fw3_service_instance4ServiceTemplate.yaml | 22 ++----- .../OCS-fw_service_instance1ServiceTemplate.yaml | 22 ++----- .../OCS-fw_service_instance2ServiceTemplate.yaml | 22 ++----- .../expectedoutputfiles/MainServiceTemplate.yaml | 76 +++++++++++++++++++++- .../OCS-fw2_service_instance1ServiceTemplate.yaml | 22 ++----- .../OCS-fw2_service_instance3ServiceTemplate.yaml | 22 ++----- .../OCS-fw3_service_instance4ServiceTemplate.yaml | 22 ++----- .../OCS-fw_service_instance1ServiceTemplate.yaml | 22 ++----- .../OCS-fw_service_instance2ServiceTemplate.yaml | 22 ++----- .../inputfiles/addOn.yml | 2 +- .../inputfiles/base.yml | 2 +- .../OCS-fw_service_instance_1ServiceTemplate.yaml | 22 ++----- .../OCS-fw_service_instance_2ServiceTemplate.yaml | 22 ++----- ....oam-fw_si_service_instanceServiceTemplate.yaml | 22 ++----- .../OCS-fw_service_instance_1ServiceTemplate.yaml | 22 ++----- .../OCS-fw_service_instance_2ServiceTemplate.yaml | 22 ++----- .../OCS-fw_service_instanceServiceTemplate.yaml | 22 ++----- 19 files changed, 171 insertions(+), 261 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml index c47881c827..19e88a77fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance1: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml index b3fd08ad7f..0f74dfe252 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml @@ -250,32 +250,22 @@ topology_template: service_instance3: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list groups: service_instance3_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml index 031d40e78f..bb8a6c0324 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml @@ -250,32 +250,22 @@ topology_template: service_instance4: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list groups: service_instance4_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml index a80565137c..72b97b69a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance1: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml index 1ba7cd1567..1798f33fde 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance2: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml index 3fc99fd2e7..f4dda7cefd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml @@ -51,7 +51,77 @@ topology_template: get_input: Internal1_forwarding_mode network_name: get_input: Internal1_net_name - test_nested: + test_nested0: + type: org.openecomp.resource.abstract.nodes.heat.OCS-fw + directives: + - substitutable + properties: + network_param2: Internal2-net + service_template_filter: + substitute_service_template: OCS-fwServiceTemplate.yaml + network_param1: Internal1-net + requirements: + - link_port_0_service_instance2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + - link_port_1_service_instance2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_2_service_instance2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + - link_port_0_service_instance1: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_1_service_instance1: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_2_service_instance1: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + - link_port_0_service_instance1_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + - link_port_1_service_instance1_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_2_service_instance1_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + - link_port_0_service_instance4_test_nested3_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_1_service_instance4_test_nested3_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_2_service_instance4_test_nested3_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_0_service_instance3_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_1_service_instance3_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_2_service_instance3_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + test_nested1: type: org.openecomp.resource.abstract.nodes.heat.OCS-fw directives: - substitutable @@ -130,7 +200,7 @@ topology_template: members: - Internal2-net - Internal1-net - - test_nested + - test_nested0 addOn_group: type: org.openecomp.groups.heat.HeatStack properties: @@ -139,4 +209,4 @@ topology_template: members: - Internal2-net - Internal1-net - - test_nested \ No newline at end of file + - test_nested1 \ 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml index c47881c827..19e88a77fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance1: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml index b3fd08ad7f..0f74dfe252 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml @@ -250,32 +250,22 @@ topology_template: service_instance3: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list groups: service_instance3_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml index 031d40e78f..bb8a6c0324 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml @@ -250,32 +250,22 @@ topology_template: service_instance4: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list groups: service_instance4_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml index a80565137c..72b97b69a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance1: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml index 1ba7cd1567..1798f33fde 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance2: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml index 2785688607..7747ff6719 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml @@ -30,7 +30,7 @@ resources: forwarding_mode: { get_param: Internal1_forwarding_mode } shared: { get_param: Internal1_shared } - test_nested: + test_nested1: type: OCS-fw.yml properties: network_param1: { get_resource: Internal1-net} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/base.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/base.yml index 2785688607..235cf5e4cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/base.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/base.yml @@ -30,7 +30,7 @@ resources: forwarding_mode: { get_param: Internal1_forwarding_mode } shared: { get_param: Internal1_shared } - test_nested: + test_nested0: type: OCS-fw.yml properties: network_param1: { get_resource: Internal1-net} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml index 69d73f9034..9c7de5309f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance_1: type: org.openecomp.resource.vfc.nodes.heat.compute_service_template_1 properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml index 1a0f590d58..6ccd3c4a0e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance_2: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml index 53cb41cc75..c7685c951b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml @@ -294,32 +294,22 @@ topology_template: service_instance: type: org.openecomp.resource.vfc.nodes.heat.st properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list groups: service_instance_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml index de34c8fba8..413aa7b724 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance_1: type: org.openecomp.resource.vfc.nodes.heat.compute_service_template properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml index 818e411705..a20cb55608 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml @@ -130,32 +130,22 @@ topology_template: service_instance_2: type: org.openecomp.resource.vfc.nodes.heat.compute_service_template properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml index 1980b18393..e99b179375 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml @@ -330,32 +330,22 @@ topology_template: service_instance: type: org.openecomp.resource.vfc.nodes.heat.compute_service_template properties: - availability_zone: - get_input: availability_zone - static_routes_list: - get_input: static_routes_list - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - ordered_interfaces: - get_input: ordered_interfaces flavor: get_input: flavor image_name: get_input: image_name + availability_zone: + get_input: availability_zone service_type: get_input: service_type - service_interface_type_list: - get_input: service_interface_type_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name service_instance_name: get_input: service_instance_name - interface_list: - get_input: interface_list service_mode: get_input: service_mode - shared_ip_list: - get_input: shared_ip_list groups: service_instance_group: type: org.openecomp.groups.heat.HeatStack -- cgit 1.2.3-korg