diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance')
21 files changed, 1023 insertions, 909 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 4b348b7117..ec0f41eb8f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -153,6 +153,13 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_hsl_direct_net_3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - dependency_service_instance4: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -181,21 +188,14 @@ node_types: occurrences: - 1 - 1 - - dependency_hsl_direct_net: + - dependency_service_policy_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_service_policy: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - network_service_policy: + - network_service_policy_3: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo @@ -203,13 +203,13 @@ node_types: - 0 - UNBOUNDED capabilities: - link_hsl_direct_net: - type: tosca.capabilities.network.Linkable + end_point_hsl_direct_net_3: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - feature_service_policy: - type: tosca.capabilities.Node + link_hsl_direct_net_3: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED @@ -218,18 +218,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net: - type: tosca.capabilities.Attachment + feature_hsl_direct_net_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net: + feature_service_policy_3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net: - type: tosca.capabilities.Endpoint + attachment_hsl_direct_net_3: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -381,35 +381,21 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_service_instance1: + - dependency_hsl_direct_net_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_port_0_service_instance1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_port_1_service_instance1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_port_2_service_instance1: - capability: tosca.capabilities.network.Linkable + - dependency_test_nested3: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - dependency_test_nested3: + - 0 + - UNBOUNDED + - dependency_hsl_direct_net_3_test_nested3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -444,34 +430,20 @@ node_types: occurrences: - 1 - 1 - - dependency_hsl_direct_net_test_nested3: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - dependency_service_policy_test_nested3: + - dependency_service_policy_3_test_nested3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - network_service_policy_test_nested3: + - network_service_policy_3_test_nested3: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_hsl_direct_net: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_service_instance3: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -500,27 +472,50 @@ node_types: occurrences: - 1 - 1 - - dependency_service_policy: + - dependency_service_policy_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - network_service_policy: + - network_service_policy_2: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - capabilities: - feature_service_policy_test_nested3: - type: tosca.capabilities.Node + - dependency_service_instance21: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - feature_service_instance1: + - link_port_0_service_instance21: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_1_service_instance21: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_2_service_instance21: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + feature_service_instance21: type: tosca.capabilities.Node occurrences: - 1 @@ -530,43 +525,43 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net: - type: tosca.capabilities.Attachment + feature_hsl_direct_net_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net: - type: tosca.capabilities.Endpoint + feature_service_policy_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_service_instance4_test_nested3: + feature_service_policy_3_test_nested3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - link_hsl_direct_net: - type: tosca.capabilities.network.Linkable + end_point_hsl_direct_net_3_test_nested3: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - feature_service_policy: + feature_service_instance4_test_nested3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net_test_nested3: + feature_hsl_direct_net_3_test_nested3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - link_hsl_direct_net_test_nested3: + link_hsl_direct_net_2: type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net_test_nested3: - type: tosca.capabilities.Attachment + link_hsl_direct_net_3_test_nested3: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED @@ -575,13 +570,18 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net: - type: tosca.capabilities.Node + end_point_hsl_direct_net_2: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net_test_nested3: - type: tosca.capabilities.Endpoint + attachment_hsl_direct_net_3_test_nested3: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_hsl_direct_net_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -796,35 +796,21 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_service_instance1_test_nested2: + - dependency_hsl_direct_net_2_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_port_0_service_instance1_test_nested2: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_port_1_service_instance1_test_nested2: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_port_2_service_instance1_test_nested2: - capability: tosca.capabilities.network.Linkable + - dependency_test_nested3_test_nested2: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - dependency_test_nested3_test_nested2: + - 0 + - UNBOUNDED + - dependency_hsl_direct_net_3_test_nested3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -859,34 +845,20 @@ node_types: occurrences: - 1 - 1 - - dependency_hsl_direct_net_test_nested3_test_nested2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - dependency_service_policy_test_nested3_test_nested2: + - dependency_service_policy_3_test_nested3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - network_service_policy_test_nested3_test_nested2: + - network_service_policy_3_test_nested3_test_nested2: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_hsl_direct_net_test_nested2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_service_instance3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -915,20 +887,48 @@ node_types: occurrences: - 1 - 1 - - dependency_service_policy_test_nested2: + - dependency_service_policy_2_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - network_service_policy_test_nested2: + - network_service_policy_2_test_nested2: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED + - dependency_service_instance21_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_port_0_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_1_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_2_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_hsl_direct_net: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -951,18 +951,13 @@ node_types: - 0 - UNBOUNDED capabilities: - feature_hsl_direct_net_test_nested3_test_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED feature_service_instance1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_service_policy_test_nested2: - type: tosca.capabilities.Node + attachment_hsl_direct_net_3_test_nested3_test_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -976,6 +971,11 @@ node_types: occurrences: - 1 - UNBOUNDED + end_point_hsl_direct_net_3_test_nested3_test_nested2: + type: tosca.capabilities.Endpoint + occurrences: + - 1 + - UNBOUNDED attachment_hsl_direct_net: type: tosca.capabilities.Attachment occurrences: @@ -986,23 +986,28 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_service_instance3_test_nested2: - type: tosca.capabilities.Node + end_point_hsl_direct_net_2_test_nested2: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net_test_nested2: + feature_service_instance3_test_nested2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net_test_nested3_test_nested2: + end_point_hsl_direct_net: type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net: - type: tosca.capabilities.Endpoint + feature_service_policy_2_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + link_hsl_direct_net_3_test_nested3_test_nested2: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED @@ -1016,51 +1021,94 @@ node_types: occurrences: - 1 - UNBOUNDED - link_hsl_direct_net_test_nested2: - type: tosca.capabilities.network.Linkable + feature_hsl_direct_net_2_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net_test_nested3_test_nested2: - type: tosca.capabilities.Attachment + link_hsl_direct_net_2_test_nested2: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net_test_nested2: - type: tosca.capabilities.Attachment + feature_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_service_instance1_test_nested2: + feature_hsl_direct_net: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - link_hsl_direct_net_test_nested3_test_nested2: - type: tosca.capabilities.network.Linkable + feature_service_policy_3_test_nested3_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_test_nested2: + feature_hsl_direct_net_3_test_nested3_test_nested2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net: + feature_service_instance21_test_nested2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_service_policy_test_nested3_test_nested2: - type: tosca.capabilities.Node + attachment_hsl_direct_net_2_test_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net_test_nested2: - type: tosca.capabilities.Endpoint + org.openecomp.resource.abstract.nodes.heat.service_template_3: + derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute + requirements: + - link_port_0: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED + - 1 + - link_port_1: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + org.openecomp.resource.abstract.nodes.heat.service_template_2: + derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute + requirements: + - link_port_0: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_1: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 org.openecomp.resource.abstract.nodes.heat.service_template: derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute requirements: @@ -1086,4 +1134,4 @@ node_types: - 1 - 1 org.openecomp.resource.vfc.nodes.heat.st: - derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute
\ No newline at end of file + derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml index 099462a6d4..8e8e4f9abe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml @@ -85,18 +85,6 @@ topology_template: 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 @@ -121,6 +109,18 @@ topology_template: capability: tosca.capabilities.network.Linkable node: Internal2-net relationship: tosca.relationships.network.LinksTo + - link_port_0_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + - link_port_1_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_2_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo groups: main_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-fw2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml index 4394a3914b..d456191462 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml @@ -153,8 +153,30 @@ topology_template: type: string description: HSL (Logging) network address (CIDR notation) node_templates: - service_instance1: - type: org.openecomp.resource.abstract.nodes.heat.service_template + hsl_direct_net_2: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + network_name: + get_input: HSL_direct_net_id + subnets: + hsl_ip_subnet_2: + cidr: + get_input: HSL_direct_net_cidr + gateway_ip: + get_input: HSL_direct_net_gateway + test_nested3: + type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3 + directives: + - substitutable + properties: + network_param2: + get_input: network_param1 + service_template_filter: + substitute_service_template: OCS-fw3ServiceTemplate.yaml + network_param1: + get_input: network_param1 + service_instance3: + type: org.openecomp.resource.abstract.nodes.heat.service_template_2 directives: - substitutable properties: @@ -165,7 +187,7 @@ topology_template: image_name: get_input: st_image_name service_template_filter: - substitute_service_template: OCS-fw2_service_instance1ServiceTemplate.yaml + substitute_service_template: OCS-fw2_service_instance3ServiceTemplate.yaml count: get_input: max_num_fw_instances scaling_enabled: @@ -205,7 +227,7 @@ topology_template: get_input: service_instance_name interface_list: - virtual_network: - get_input: network_param2 + get_input: network_param1 - virtual_network: get_input: network_param1 - virtual_network: @@ -228,32 +250,44 @@ topology_template: requirements: - dependency: capability: tosca.capabilities.Node - node: hsl_direct_net + node: hsl_direct_net_2 relationship: tosca.relationships.DependsOn - test_nested3: - type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3 - directives: - - substitutable - properties: - network_param2: - get_input: network_param1 - service_template_filter: - substitute_service_template: OCS-fw3ServiceTemplate.yaml - network_param1: - get_input: network_param1 - hsl_direct_net: - type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + service_policy_2: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: - network_name: - get_input: HSL_direct_net_id - subnets: - hsl_ip_subnet: - cidr: - get_input: HSL_direct_net_cidr - gateway_ip: - get_input: HSL_direct_net_gateway - service_instance3: - type: org.openecomp.resource.abstract.nodes.heat.service_template + entries: + policy_rule: + - src_ports: + - start_port: + get_input: start_src_ports + end_port: + get_input: end_src_ports + protocol: any + action_list: + apply_service: + - service_instance3 + dst_addresses: + - virtual_network: + get_input: Cricket_OCS_direct_net_id + dst_ports: + - start_port: + get_input: start_dst_ports + end_port: + get_input: end_dst_ports + src_addresses: + - virtual_network: + get_input: Cricket_OCS_protected_net_id + direction: + get_input: service_policy_direction + name: + get_input: service_policy_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: service_instance3 + relationship: tosca.relationships.DependsOn + service_instance21: + type: org.openecomp.resource.abstract.nodes.heat.service_template_2 directives: - substitutable properties: @@ -264,7 +298,7 @@ topology_template: image_name: get_input: st_image_name service_template_filter: - substitute_service_template: OCS-fw2_service_instance3ServiceTemplate.yaml + substitute_service_template: OCS-fw2_service_instance21ServiceTemplate.yaml count: get_input: max_num_fw_instances scaling_enabled: @@ -304,7 +338,7 @@ topology_template: get_input: service_instance_name interface_list: - virtual_network: - get_input: network_param1 + get_input: network_param2 - virtual_network: get_input: network_param1 - virtual_network: @@ -327,41 +361,7 @@ topology_template: requirements: - dependency: capability: tosca.capabilities.Node - node: hsl_direct_net - relationship: tosca.relationships.DependsOn - service_policy: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - entries: - policy_rule: - - src_ports: - - start_port: - get_input: start_src_ports - end_port: - get_input: end_src_ports - protocol: any - action_list: - apply_service: - - service_instance3 - dst_addresses: - - virtual_network: - get_input: Cricket_OCS_direct_net_id - dst_ports: - - start_port: - get_input: start_dst_ports - end_port: - get_input: end_dst_ports - src_addresses: - - virtual_network: - get_input: Cricket_OCS_protected_net_id - direction: - get_input: service_policy_direction - name: - get_input: service_policy_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: service_instance3 + node: hsl_direct_net_2 relationship: tosca.relationships.DependsOn groups: OCS-fw2_group: @@ -371,111 +371,111 @@ topology_template: description: | Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two. members: - - service_instance1 + - hsl_direct_net_2 - test_nested3 - - hsl_direct_net - service_instance3 - - service_policy + - service_policy_2 + - service_instance21 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw2 capabilities: - feature_service_policy_test_nested3: - - test_nested3 - - feature_service_policy - feature_service_instance1: - - service_instance1 + feature_service_instance21: + - service_instance21 - feature feature_service_instance3: - service_instance3 - feature - attachment_hsl_direct_net: - - hsl_direct_net - - attachment - end_point_hsl_direct_net: - - hsl_direct_net - - end_point + feature_hsl_direct_net_2: + - hsl_direct_net_2 + - feature + feature_service_policy_2: + - service_policy_2 + - feature + feature_service_policy_3_test_nested3: + - test_nested3 + - feature_service_policy_3 + end_point_hsl_direct_net_3_test_nested3: + - test_nested3 + - end_point_hsl_direct_net_3 feature_service_instance4_test_nested3: - test_nested3 - feature_service_instance4 - link_hsl_direct_net: - - hsl_direct_net - - link - feature_service_policy: - - service_policy - - feature - feature_hsl_direct_net_test_nested3: - - test_nested3 - - feature_hsl_direct_net - link_hsl_direct_net_test_nested3: + feature_hsl_direct_net_3_test_nested3: - test_nested3 - - link_hsl_direct_net - attachment_hsl_direct_net_test_nested3: + - feature_hsl_direct_net_3 + link_hsl_direct_net_2: + - hsl_direct_net_2 + - link + link_hsl_direct_net_3_test_nested3: - test_nested3 - - attachment_hsl_direct_net + - link_hsl_direct_net_3 feature_test_nested3: - test_nested3 - feature - feature_hsl_direct_net: - - hsl_direct_net - - feature - end_point_hsl_direct_net_test_nested3: + end_point_hsl_direct_net_2: + - hsl_direct_net_2 + - end_point + attachment_hsl_direct_net_3_test_nested3: - test_nested3 - - end_point_hsl_direct_net + - attachment_hsl_direct_net_3 + attachment_hsl_direct_net_2: + - hsl_direct_net_2 + - attachment requirements: - link_port_0_service_instance1: - - service_instance1 - - link_port_0 dependency_service_instance3: - service_instance3 - dependency - dependency_hsl_direct_net: - - hsl_direct_net - - dependency - dependency_hsl_direct_net_test_nested3: - - test_nested3 - - dependency_hsl_direct_net + network_service_policy_2: + - service_policy_2 + - network link_port_0_service_instance3: - service_instance3 - link_port_0 - network_service_policy: - - service_policy - - network - link_port_2_service_instance1: - - service_instance1 + dependency_hsl_direct_net_3_test_nested3: + - test_nested3 + - dependency_hsl_direct_net_3 + link_port_2_service_instance21: + - service_instance21 - link_port_2 link_port_0_service_instance4_test_nested3: - test_nested3 - link_port_0_service_instance4 - dependency_service_policy: - - service_policy + dependency_hsl_direct_net_2: + - hsl_direct_net_2 - dependency link_port_2_service_instance3: - service_instance3 - link_port_2 - network_service_policy_test_nested3: + link_port_1_service_instance21: + - service_instance21 + - link_port_1 + dependency_service_policy_3_test_nested3: - test_nested3 - - network_service_policy + - dependency_service_policy_3 + link_port_0_service_instance21: + - service_instance21 + - link_port_0 link_port_2_service_instance4_test_nested3: - test_nested3 - link_port_2_service_instance4 + dependency_service_instance21: + - service_instance21 + - dependency dependency_test_nested3: - test_nested3 - dependency dependency_service_instance4_test_nested3: - test_nested3 - dependency_service_instance4 - dependency_service_policy_test_nested3: - - test_nested3 - - dependency_service_policy link_port_1_service_instance3: - service_instance3 - link_port_1 - link_port_1_service_instance1: - - service_instance1 - - link_port_1 link_port_1_service_instance4_test_nested3: - test_nested3 - link_port_1_service_instance4 - dependency_service_instance1: - - service_instance1 - - dependency
\ No newline at end of file + dependency_service_policy_2: + - service_policy_2 + - dependency + network_service_policy_3_test_nested3: + - test_nested3 + - network_service_policy_3
\ 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/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_instance21ServiceTemplate.yaml index 19e88a77fb..96d57c1fe5 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_instance21ServiceTemplate.yaml @@ -1,6 +1,6 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: - template_name: OCS-fw2_service_instance1 + template_name: OCS-fw2_service_instance21 imports: - openecomp_heat_index: file: openecomp-heat/_index.yml @@ -127,25 +127,6 @@ topology_template: entry_schema: type: boolean node_templates: - service_instance1: - type: org.openecomp.resource.vfc.nodes.heat.st - properties: - flavor: - get_input: flavor - image_name: - get_input: image_name - availability_zone: - get_input: availability_zone - service_type: - get_input: service_type - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - service_instance_name: - get_input: service_instance_name - service_mode: - get_input: service_mode port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: @@ -184,7 +165,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: service_instance1 + node: service_instance21 relationship: tosca.relationships.network.BindsTo port_1: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port @@ -224,7 +205,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: service_instance1 + node: service_instance21 relationship: tosca.relationships.network.BindsTo port_2: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port @@ -264,15 +245,34 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: service_instance1 + node: service_instance21 relationship: tosca.relationships.network.BindsTo + service_instance21: + type: org.openecomp.resource.vfc.nodes.heat.st + properties: + flavor: + get_input: flavor + image_name: + get_input: image_name + availability_zone: + get_input: availability_zone + service_type: + get_input: service_type + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name + service_instance_name: + get_input: service_instance_name + service_mode: + get_input: service_mode groups: - service_instance1_group: + service_instance21_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/OCS-fw2.yml members: - - service_instance1 + - service_instance21 - port_0 - port_1 - port_2 @@ -281,52 +281,52 @@ topology_template: description: Tenant id of the Service Instance value: get_attribute: - - service_instance1 + - service_instance21 - tenant_id fq_name: description: The FQ name of the service instance value: get_attribute: - - service_instance1 + - service_instance21 - fq_name service_template_name: description: Service Template of the Service Instance value: get_attribute: - - service_instance1 + - service_instance21 - service_template_name show: description: All attributes value: get_attribute: - - service_instance1 + - service_instance21 - show active_vms: description: Number of service VMs active for this Service Instance value: get_attribute: - - service_instance1 + - service_instance21 - active_vms service_instance_name: description: The name of the service instance value: get_attribute: - - service_instance1 + - service_instance21 - service_instance_name virtual_machines: description: Service VMs for the Service Instance value: get_attribute: - - service_instance1 + - service_instance21 - virtual_machines status: description: Status of the service instance value: get_attribute: - - service_instance1 + - service_instance21 - status substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.service_template + node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2 requirements: link_port_0: - port_0 @@ -336,4 +336,4 @@ topology_template: - link link_port_2: - port_2 - - link
\ No newline at end of file + - link 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 0f74dfe252..1e540ee891 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 @@ -326,7 +326,7 @@ topology_template: - service_instance3 - status substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.service_template + node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2 requirements: link_port_0: - port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml index c703fdb5d9..b164684390 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml @@ -153,8 +153,19 @@ topology_template: type: string description: HSL (Logging) network address (CIDR notation) node_templates: + hsl_direct_net_3: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + network_name: + get_input: HSL_direct_net_id + subnets: + hsl_ip_subnet_3: + cidr: + get_input: HSL_direct_net_cidr + gateway_ip: + get_input: HSL_direct_net_gateway service_instance4: - type: org.openecomp.resource.abstract.nodes.heat.service_template + type: org.openecomp.resource.abstract.nodes.heat.service_template_3 directives: - substitutable properties: @@ -228,20 +239,9 @@ topology_template: requirements: - dependency: capability: tosca.capabilities.Node - node: hsl_direct_net + node: hsl_direct_net_3 relationship: tosca.relationships.DependsOn - hsl_direct_net: - type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork - properties: - network_name: - get_input: HSL_direct_net_id - subnets: - hsl_ip_subnet: - cidr: - get_input: HSL_direct_net_cidr - gateway_ip: - get_input: HSL_direct_net_gateway - service_policy: + service_policy_3: type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: entries: @@ -283,48 +283,48 @@ topology_template: description: | Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two. members: + - hsl_direct_net_3 - service_instance4 - - hsl_direct_net - - service_policy + - service_policy_3 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3 capabilities: - link_hsl_direct_net: - - hsl_direct_net + end_point_hsl_direct_net_3: + - hsl_direct_net_3 + - end_point + link_hsl_direct_net_3: + - hsl_direct_net_3 - link - feature_service_policy: - - service_policy - - feature feature_service_instance4: - service_instance4 - feature - attachment_hsl_direct_net: - - hsl_direct_net - - attachment - feature_hsl_direct_net: - - hsl_direct_net + feature_hsl_direct_net_3: + - hsl_direct_net_3 - feature - end_point_hsl_direct_net: - - hsl_direct_net - - end_point + feature_service_policy_3: + - service_policy_3 + - feature + attachment_hsl_direct_net_3: + - hsl_direct_net_3 + - attachment requirements: dependency_service_instance4: - service_instance4 - dependency - dependency_hsl_direct_net: - - hsl_direct_net - - dependency + network_service_policy_3: + - service_policy_3 + - network link_port_0_service_instance4: - service_instance4 - link_port_0 link_port_1_service_instance4: - service_instance4 - link_port_1 - network_service_policy: - - service_policy - - network - dependency_service_policy: - - service_policy + dependency_service_policy_3: + - service_policy_3 + - dependency + dependency_hsl_direct_net_3: + - hsl_direct_net_3 - dependency link_port_2_service_instance4: - service_instance4 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 bb8a6c0324..14b7afc565 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 @@ -326,7 +326,7 @@ topology_template: - service_instance4 - status substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.service_template + node_type: org.openecomp.resource.abstract.nodes.heat.service_template_3 requirements: link_port_0: - port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml index 2bfeeb0797..dbd3ad9947 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml @@ -379,72 +379,72 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw capabilities: - feature_hsl_direct_net_test_nested3_test_nested2: - - test_nested2 - - feature_hsl_direct_net_test_nested3 feature_service_instance1: - service_instance1 - feature - feature_service_policy_test_nested2: + attachment_hsl_direct_net_3_test_nested3_test_nested2: - test_nested2 - - feature_service_policy + - attachment_hsl_direct_net_3_test_nested3 feature_service_instance2: - service_instance2 - feature feature_test_nested3_test_nested2: - test_nested2 - feature_test_nested3 + end_point_hsl_direct_net_3_test_nested3_test_nested2: + - test_nested2 + - end_point_hsl_direct_net_3_test_nested3 attachment_hsl_direct_net: - hsl_direct_net - attachment feature_service_instance4_test_nested3_test_nested2: - test_nested2 - feature_service_instance4_test_nested3 + end_point_hsl_direct_net_2_test_nested2: + - test_nested2 + - end_point_hsl_direct_net_2 feature_service_instance3_test_nested2: - test_nested2 - feature_service_instance3 - feature_hsl_direct_net_test_nested2: - - test_nested2 - - feature_hsl_direct_net - end_point_hsl_direct_net_test_nested3_test_nested2: - - test_nested2 - - end_point_hsl_direct_net_test_nested3 end_point_hsl_direct_net: - hsl_direct_net - end_point + feature_service_policy_2_test_nested2: + - test_nested2 + - feature_service_policy_2 + link_hsl_direct_net_3_test_nested3_test_nested2: + - test_nested2 + - link_hsl_direct_net_3_test_nested3 link_hsl_direct_net: - hsl_direct_net - link feature_service_policy: - service_policy - feature - link_hsl_direct_net_test_nested2: - - test_nested2 - - link_hsl_direct_net - attachment_hsl_direct_net_test_nested3_test_nested2: - - test_nested2 - - attachment_hsl_direct_net_test_nested3 - attachment_hsl_direct_net_test_nested2: - - test_nested2 - - attachment_hsl_direct_net - feature_service_instance1_test_nested2: + feature_hsl_direct_net_2_test_nested2: - test_nested2 - - feature_service_instance1 - link_hsl_direct_net_test_nested3_test_nested2: + - feature_hsl_direct_net_2 + link_hsl_direct_net_2_test_nested2: - test_nested2 - - link_hsl_direct_net_test_nested3 + - link_hsl_direct_net_2 feature_test_nested2: - test_nested2 - feature feature_hsl_direct_net: - hsl_direct_net - feature - feature_service_policy_test_nested3_test_nested2: + feature_service_policy_3_test_nested3_test_nested2: - test_nested2 - - feature_service_policy_test_nested3 - end_point_hsl_direct_net_test_nested2: + - feature_service_policy_3_test_nested3 + feature_hsl_direct_net_3_test_nested3_test_nested2: - test_nested2 - - end_point_hsl_direct_net + - feature_hsl_direct_net_3_test_nested3 + feature_service_instance21_test_nested2: + - test_nested2 + - feature_service_instance21 + attachment_hsl_direct_net_2_test_nested2: + - test_nested2 + - attachment_hsl_direct_net_2 requirements: link_port_1_service_instance4_test_nested3_test_nested2: - test_nested2 @@ -452,15 +452,9 @@ topology_template: dependency_hsl_direct_net: - hsl_direct_net - dependency - dependency_hsl_direct_net_test_nested2: - - test_nested2 - - dependency_hsl_direct_net - dependency_hsl_direct_net_test_nested3_test_nested2: + network_service_policy_3_test_nested3_test_nested2: - test_nested2 - - dependency_hsl_direct_net_test_nested3 - network_service_policy_test_nested3_test_nested2: - - test_nested2 - - network_service_policy_test_nested3 + - network_service_policy_3_test_nested3 link_port_2_service_instance1: - service_instance1 - link_port_2 @@ -470,9 +464,6 @@ topology_template: dependency_service_policy: - service_policy - dependency - dependency_service_instance1_test_nested2: - - test_nested2 - - dependency_service_instance1 link_port_0_service_instance3_test_nested2: - test_nested2 - link_port_0_service_instance3 @@ -482,21 +473,21 @@ topology_template: dependency_service_instance4_test_nested3_test_nested2: - test_nested2 - dependency_service_instance4_test_nested3 - dependency_service_policy_test_nested2: + dependency_service_instance21_test_nested2: - test_nested2 - - dependency_service_policy + - dependency_service_instance21 dependency_test_nested2: - test_nested2 - dependency - link_port_0_service_instance1_test_nested2: - - test_nested2 - - link_port_0_service_instance1 link_port_1_service_instance2: - service_instance2 - link_port_1 link_port_1_service_instance1: - service_instance1 - link_port_1 + link_port_2_service_instance21_test_nested2: + - test_nested2 + - link_port_2_service_instance21 link_port_1_service_instance3_test_nested2: - test_nested2 - link_port_1_service_instance3 @@ -509,24 +500,33 @@ topology_template: link_port_0_service_instance4_test_nested3_test_nested2: - test_nested2 - link_port_0_service_instance4_test_nested3 - dependency_service_policy_test_nested3_test_nested2: + dependency_service_policy_2_test_nested2: - test_nested2 - - dependency_service_policy_test_nested3 - link_port_1_service_instance1_test_nested2: + - dependency_service_policy_2 + link_port_0_service_instance21_test_nested2: - test_nested2 - - link_port_1_service_instance1 + - link_port_0_service_instance21 network_service_policy: - service_policy - network - network_service_policy_test_nested2: + dependency_hsl_direct_net_2_test_nested2: + - test_nested2 + - dependency_hsl_direct_net_2 + dependency_hsl_direct_net_3_test_nested3_test_nested2: - test_nested2 - - network_service_policy + - dependency_hsl_direct_net_3_test_nested3 + dependency_service_policy_3_test_nested3_test_nested2: + - test_nested2 + - dependency_service_policy_3_test_nested3 dependency_service_instance3_test_nested2: - test_nested2 - dependency_service_instance3 - link_port_2_service_instance1_test_nested2: + link_port_1_service_instance21_test_nested2: + - test_nested2 + - link_port_1_service_instance21 + network_service_policy_2_test_nested2: - test_nested2 - - link_port_2_service_instance1 + - network_service_policy_2 dependency_test_nested3_test_nested2: - test_nested2 - dependency_test_nested3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw2.yml index 7abef08c97..b5c3dcb393 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw2.yml @@ -92,19 +92,19 @@ parameters: resources: - hsl_direct_net: + hsl_direct_net_2: type: OS::Contrail::VirtualNetwork properties: name: { get_param: HSL_direct_net_id } - hsl_ip_subnet: + hsl_ip_subnet_2: type: OS::Neutron::Subnet properties: - network_id: { get_resource: hsl_direct_net } + network_id: { get_resource: hsl_direct_net_2 } cidr: { get_param: HSL_direct_net_cidr } gateway_ip: { get_param: HSL_direct_net_gateway } - service_template: + service_template_2: type: OS::Contrail::ServiceTemplate properties: name: { get_param: st_name } @@ -119,11 +119,11 @@ resources: service_instance3: type: OS::Contrail::ServiceInstance - depends_on: [ hsl_ip_subnet] + depends_on: [ hsl_ip_subnet_2] properties: name: { get_param: service_instance_name } availability_zone: { get_param: availability_zone_1 } - service_template: { get_resource: service_template } + service_template: { get_resource: service_template_2 } scale_out: max_instances: {get_param: max_num_fw_instances} interface_list: [ @@ -138,13 +138,13 @@ resources: } ] - service_instance1: + service_instance21: type: OS::Contrail::ServiceInstance - depends_on: [ hsl_ip_subnet] + depends_on: [ hsl_ip_subnet_2] properties: name: { get_param: service_instance_name } availability_zone: { get_param: availability_zone_1 } - service_template: { get_resource: service_template } + service_template: { get_resource: service_template_2 } scale_out: max_instances: {get_param: max_num_fw_instances} interface_list: [ @@ -159,7 +159,7 @@ resources: } ] - service_policy: + service_policy_2: type: OS::Contrail::NetworkPolicy depends_on: [ service_instance3 ] properties: @@ -177,19 +177,19 @@ resources: }, ] - service_policy_attach_direct_net: + service_policy_attach_direct_net_2: type: OS::Contrail::AttachPolicy - depends_on: [ service_policy ] + depends_on: [ service_policy_2 ] properties: network: { get_param: Cricket_OCS_direct_net_id } - policy: { get_attr: [service_policy, fq_name] } + policy: { get_attr: [service_policy_2, fq_name] } - service_policy_attach_protected_net: + service_policy_attach_protected_net_2: type: OS::Contrail::AttachPolicy - depends_on: [ service_policy ] + depends_on: [ service_policy_2 ] properties: network: { get_param: Cricket_OCS_protected_net_id } - policy: { get_attr: [service_policy, fq_name] } + policy: { get_attr: [service_policy_2, fq_name] } test_nested3: type: OCS-fw3.yml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml index 45563922d6..27bb720fa0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml @@ -92,19 +92,19 @@ parameters: resources: - hsl_direct_net: + hsl_direct_net_3: type: OS::Contrail::VirtualNetwork properties: name: { get_param: HSL_direct_net_id } - hsl_ip_subnet: + hsl_ip_subnet_3: type: OS::Neutron::Subnet properties: - network_id: { get_resource: hsl_direct_net } + network_id: { get_resource: hsl_direct_net_3 } cidr: { get_param: HSL_direct_net_cidr } gateway_ip: { get_param: HSL_direct_net_gateway } - service_template: + service_template_3: type: OS::Contrail::ServiceTemplate properties: name: { get_param: st_name } @@ -119,11 +119,11 @@ resources: service_instance4: type: OS::Contrail::ServiceInstance - depends_on: [ hsl_ip_subnet] + depends_on: [ hsl_ip_subnet_3] properties: name: { get_param: service_instance_name } availability_zone: { get_param: availability_zone_1 } - service_template: { get_resource: service_template } + service_template: { get_resource: service_template_3 } scale_out: max_instances: {get_param: max_num_fw_instances} interface_list: [ @@ -139,7 +139,7 @@ resources: ] - service_policy: + service_policy_3: type: OS::Contrail::NetworkPolicy depends_on: [ service_instance4 ] properties: @@ -157,17 +157,17 @@ resources: }, ] - service_policy_attach_direct_net: + service_policy_attach_direct_net_3: type: OS::Contrail::AttachPolicy - depends_on: [ service_policy ] + depends_on: [ service_policy_3 ] properties: network: { get_param: Cricket_OCS_direct_net_id } - policy: { get_attr: [service_policy, fq_name] } + policy: { get_attr: [service_policy_3, fq_name] } - service_policy_attach_protected_net: + service_policy_attach_protected_net_3: type: OS::Contrail::AttachPolicy - depends_on: [ service_policy ] + depends_on: [ service_policy_3 ] properties: network: { get_param: Cricket_OCS_protected_net_id } - policy: { get_attr: [service_policy, fq_name] } + policy: { get_attr: [service_policy_3, fq_name] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 4b348b7117..ec0f41eb8f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -153,6 +153,13 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_hsl_direct_net_3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - dependency_service_instance4: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -181,21 +188,14 @@ node_types: occurrences: - 1 - 1 - - dependency_hsl_direct_net: + - dependency_service_policy_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_service_policy: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - network_service_policy: + - network_service_policy_3: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo @@ -203,13 +203,13 @@ node_types: - 0 - UNBOUNDED capabilities: - link_hsl_direct_net: - type: tosca.capabilities.network.Linkable + end_point_hsl_direct_net_3: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - feature_service_policy: - type: tosca.capabilities.Node + link_hsl_direct_net_3: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED @@ -218,18 +218,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net: - type: tosca.capabilities.Attachment + feature_hsl_direct_net_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net: + feature_service_policy_3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net: - type: tosca.capabilities.Endpoint + attachment_hsl_direct_net_3: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -381,35 +381,21 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_service_instance1: + - dependency_hsl_direct_net_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_port_0_service_instance1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_port_1_service_instance1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_port_2_service_instance1: - capability: tosca.capabilities.network.Linkable + - dependency_test_nested3: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - dependency_test_nested3: + - 0 + - UNBOUNDED + - dependency_hsl_direct_net_3_test_nested3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -444,34 +430,20 @@ node_types: occurrences: - 1 - 1 - - dependency_hsl_direct_net_test_nested3: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - dependency_service_policy_test_nested3: + - dependency_service_policy_3_test_nested3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - network_service_policy_test_nested3: + - network_service_policy_3_test_nested3: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_hsl_direct_net: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_service_instance3: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -500,27 +472,50 @@ node_types: occurrences: - 1 - 1 - - dependency_service_policy: + - dependency_service_policy_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - network_service_policy: + - network_service_policy_2: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - capabilities: - feature_service_policy_test_nested3: - type: tosca.capabilities.Node + - dependency_service_instance21: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - feature_service_instance1: + - link_port_0_service_instance21: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_1_service_instance21: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_2_service_instance21: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + feature_service_instance21: type: tosca.capabilities.Node occurrences: - 1 @@ -530,43 +525,43 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net: - type: tosca.capabilities.Attachment + feature_hsl_direct_net_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net: - type: tosca.capabilities.Endpoint + feature_service_policy_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_service_instance4_test_nested3: + feature_service_policy_3_test_nested3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - link_hsl_direct_net: - type: tosca.capabilities.network.Linkable + end_point_hsl_direct_net_3_test_nested3: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - feature_service_policy: + feature_service_instance4_test_nested3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net_test_nested3: + feature_hsl_direct_net_3_test_nested3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - link_hsl_direct_net_test_nested3: + link_hsl_direct_net_2: type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net_test_nested3: - type: tosca.capabilities.Attachment + link_hsl_direct_net_3_test_nested3: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED @@ -575,13 +570,18 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net: - type: tosca.capabilities.Node + end_point_hsl_direct_net_2: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net_test_nested3: - type: tosca.capabilities.Endpoint + attachment_hsl_direct_net_3_test_nested3: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_hsl_direct_net_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -796,35 +796,21 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_service_instance1_test_nested2: + - dependency_hsl_direct_net_2_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_port_0_service_instance1_test_nested2: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_port_1_service_instance1_test_nested2: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_port_2_service_instance1_test_nested2: - capability: tosca.capabilities.network.Linkable + - dependency_test_nested3_test_nested2: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - dependency_test_nested3_test_nested2: + - 0 + - UNBOUNDED + - dependency_hsl_direct_net_3_test_nested3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -859,34 +845,20 @@ node_types: occurrences: - 1 - 1 - - dependency_hsl_direct_net_test_nested3_test_nested2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - dependency_service_policy_test_nested3_test_nested2: + - dependency_service_policy_3_test_nested3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - network_service_policy_test_nested3_test_nested2: + - network_service_policy_3_test_nested3_test_nested2: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_hsl_direct_net_test_nested2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_service_instance3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -915,20 +887,48 @@ node_types: occurrences: - 1 - 1 - - dependency_service_policy_test_nested2: + - dependency_service_policy_2_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - network_service_policy_test_nested2: + - network_service_policy_2_test_nested2: capability: tosca.capabilities.Attachment node: tosca.nodes.network.Network relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED + - dependency_service_instance21_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_port_0_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_1_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_2_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_hsl_direct_net: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -951,18 +951,13 @@ node_types: - 0 - UNBOUNDED capabilities: - feature_hsl_direct_net_test_nested3_test_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED feature_service_instance1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_service_policy_test_nested2: - type: tosca.capabilities.Node + attachment_hsl_direct_net_3_test_nested3_test_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -976,6 +971,11 @@ node_types: occurrences: - 1 - UNBOUNDED + end_point_hsl_direct_net_3_test_nested3_test_nested2: + type: tosca.capabilities.Endpoint + occurrences: + - 1 + - UNBOUNDED attachment_hsl_direct_net: type: tosca.capabilities.Attachment occurrences: @@ -986,23 +986,28 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_service_instance3_test_nested2: - type: tosca.capabilities.Node + end_point_hsl_direct_net_2_test_nested2: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net_test_nested2: + feature_service_instance3_test_nested2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net_test_nested3_test_nested2: + end_point_hsl_direct_net: type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net: - type: tosca.capabilities.Endpoint + feature_service_policy_2_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + link_hsl_direct_net_3_test_nested3_test_nested2: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED @@ -1016,51 +1021,94 @@ node_types: occurrences: - 1 - UNBOUNDED - link_hsl_direct_net_test_nested2: - type: tosca.capabilities.network.Linkable + feature_hsl_direct_net_2_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net_test_nested3_test_nested2: - type: tosca.capabilities.Attachment + link_hsl_direct_net_2_test_nested2: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - attachment_hsl_direct_net_test_nested2: - type: tosca.capabilities.Attachment + feature_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_service_instance1_test_nested2: + feature_hsl_direct_net: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - link_hsl_direct_net_test_nested3_test_nested2: - type: tosca.capabilities.network.Linkable + feature_service_policy_3_test_nested3_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_test_nested2: + feature_hsl_direct_net_3_test_nested3_test_nested2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_hsl_direct_net: + feature_service_instance21_test_nested2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_service_policy_test_nested3_test_nested2: - type: tosca.capabilities.Node + attachment_hsl_direct_net_2_test_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - end_point_hsl_direct_net_test_nested2: - type: tosca.capabilities.Endpoint + org.openecomp.resource.abstract.nodes.heat.service_template_3: + derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute + requirements: + - link_port_0: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED + - 1 + - link_port_1: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + org.openecomp.resource.abstract.nodes.heat.service_template_2: + derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute + requirements: + - link_port_0: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_1: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - link_port_2: + capability: tosca.capabilities.network.Linkable + node: tosca.nodes.Root + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 org.openecomp.resource.abstract.nodes.heat.service_template: derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute requirements: @@ -1086,4 +1134,4 @@ node_types: - 1 - 1 org.openecomp.resource.vfc.nodes.heat.st: - derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute
\ No newline at end of file + derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute 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 f4dda7cefd..f74dda879b 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 @@ -85,18 +85,6 @@ topology_template: 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 @@ -121,76 +109,106 @@ topology_template: capability: tosca.capabilities.network.Linkable node: Internal2-net relationship: tosca.relationships.network.LinksTo + - link_port_0_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + - link_port_1_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net + relationship: tosca.relationships.network.LinksTo + - link_port_2_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net + relationship: tosca.relationships.network.LinksTo + Internal1-net-1: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + shared: + get_input: Internal1_shared + forwarding_mode: + get_input: Internal1_forwarding_mode + network_name: + get_input: Internal1_net_name test_nested1: type: org.openecomp.resource.abstract.nodes.heat.OCS-fw directives: - substitutable properties: - network_param2: Internal2-net + network_param2: Internal2-net-1 service_template_filter: substitute_service_template: OCS-fwServiceTemplate.yaml - network_param1: Internal1-net + network_param1: Internal1-net-1 requirements: - link_port_0_service_instance2: capability: tosca.capabilities.network.Linkable - node: Internal2-net + node: Internal2-net-1 relationship: tosca.relationships.network.LinksTo - link_port_1_service_instance2: capability: tosca.capabilities.network.Linkable - node: Internal1-net + node: Internal1-net-1 relationship: tosca.relationships.network.LinksTo - link_port_2_service_instance2: capability: tosca.capabilities.network.Linkable - node: Internal2-net + node: Internal2-net-1 relationship: tosca.relationships.network.LinksTo - link_port_0_service_instance1: capability: tosca.capabilities.network.Linkable - node: Internal1-net + node: Internal1-net-1 relationship: tosca.relationships.network.LinksTo - link_port_1_service_instance1: capability: tosca.capabilities.network.Linkable - node: Internal1-net + node: Internal1-net-1 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 + node: Internal2-net-1 relationship: tosca.relationships.network.LinksTo - link_port_0_service_instance4_test_nested3_test_nested2: capability: tosca.capabilities.network.Linkable - node: Internal1-net + node: Internal1-net-1 relationship: tosca.relationships.network.LinksTo - link_port_1_service_instance4_test_nested3_test_nested2: capability: tosca.capabilities.network.Linkable - node: Internal1-net + node: Internal1-net-1 relationship: tosca.relationships.network.LinksTo - link_port_2_service_instance4_test_nested3_test_nested2: capability: tosca.capabilities.network.Linkable - node: Internal1-net + node: Internal1-net-1 relationship: tosca.relationships.network.LinksTo - link_port_0_service_instance3_test_nested2: capability: tosca.capabilities.network.Linkable - node: Internal1-net + node: Internal1-net-1 relationship: tosca.relationships.network.LinksTo - link_port_1_service_instance3_test_nested2: capability: tosca.capabilities.network.Linkable - node: Internal1-net + node: Internal1-net-1 relationship: tosca.relationships.network.LinksTo - link_port_2_service_instance3_test_nested2: capability: tosca.capabilities.network.Linkable - node: Internal2-net + node: Internal2-net-1 relationship: tosca.relationships.network.LinksTo + - link_port_0_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net-1 + relationship: tosca.relationships.network.LinksTo + - link_port_1_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal1-net-1 + relationship: tosca.relationships.network.LinksTo + - link_port_2_service_instance21_test_nested2: + capability: tosca.capabilities.network.Linkable + node: Internal2-net-1 + relationship: tosca.relationships.network.LinksTo + Internal2-net-1: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + shared: + get_input: Internal1_shared + forwarding_mode: + get_input: Internal1_forwarding_mode + network_name: + get_input: Internal1_net_name groups: base_group: type: org.openecomp.groups.heat.HeatStack @@ -207,6 +225,6 @@ topology_template: heat_file: ../Artifacts/addOn.yml description: ASC External Networks Template members: - - Internal2-net - - Internal1-net - - test_nested1
\ No newline at end of file + - Internal1-net-1 + - test_nested1 + - Internal2-net-1
\ 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-fw2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml index 4394a3914b..d456191462 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml @@ -153,8 +153,30 @@ topology_template: type: string description: HSL (Logging) network address (CIDR notation) node_templates: - service_instance1: - type: org.openecomp.resource.abstract.nodes.heat.service_template + hsl_direct_net_2: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + network_name: + get_input: HSL_direct_net_id + subnets: + hsl_ip_subnet_2: + cidr: + get_input: HSL_direct_net_cidr + gateway_ip: + get_input: HSL_direct_net_gateway + test_nested3: + type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3 + directives: + - substitutable + properties: + network_param2: + get_input: network_param1 + service_template_filter: + substitute_service_template: OCS-fw3ServiceTemplate.yaml + network_param1: + get_input: network_param1 + service_instance3: + type: org.openecomp.resource.abstract.nodes.heat.service_template_2 directives: - substitutable properties: @@ -165,7 +187,7 @@ topology_template: image_name: get_input: st_image_name service_template_filter: - substitute_service_template: OCS-fw2_service_instance1ServiceTemplate.yaml + substitute_service_template: OCS-fw2_service_instance3ServiceTemplate.yaml count: get_input: max_num_fw_instances scaling_enabled: @@ -205,7 +227,7 @@ topology_template: get_input: service_instance_name interface_list: - virtual_network: - get_input: network_param2 + get_input: network_param1 - virtual_network: get_input: network_param1 - virtual_network: @@ -228,32 +250,44 @@ topology_template: requirements: - dependency: capability: tosca.capabilities.Node - node: hsl_direct_net + node: hsl_direct_net_2 relationship: tosca.relationships.DependsOn - test_nested3: - type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3 - directives: - - substitutable - properties: - network_param2: - get_input: network_param1 - service_template_filter: - substitute_service_template: OCS-fw3ServiceTemplate.yaml - network_param1: - get_input: network_param1 - hsl_direct_net: - type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + service_policy_2: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: - network_name: - get_input: HSL_direct_net_id - subnets: - hsl_ip_subnet: - cidr: - get_input: HSL_direct_net_cidr - gateway_ip: - get_input: HSL_direct_net_gateway - service_instance3: - type: org.openecomp.resource.abstract.nodes.heat.service_template + entries: + policy_rule: + - src_ports: + - start_port: + get_input: start_src_ports + end_port: + get_input: end_src_ports + protocol: any + action_list: + apply_service: + - service_instance3 + dst_addresses: + - virtual_network: + get_input: Cricket_OCS_direct_net_id + dst_ports: + - start_port: + get_input: start_dst_ports + end_port: + get_input: end_dst_ports + src_addresses: + - virtual_network: + get_input: Cricket_OCS_protected_net_id + direction: + get_input: service_policy_direction + name: + get_input: service_policy_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: service_instance3 + relationship: tosca.relationships.DependsOn + service_instance21: + type: org.openecomp.resource.abstract.nodes.heat.service_template_2 directives: - substitutable properties: @@ -264,7 +298,7 @@ topology_template: image_name: get_input: st_image_name service_template_filter: - substitute_service_template: OCS-fw2_service_instance3ServiceTemplate.yaml + substitute_service_template: OCS-fw2_service_instance21ServiceTemplate.yaml count: get_input: max_num_fw_instances scaling_enabled: @@ -304,7 +338,7 @@ topology_template: get_input: service_instance_name interface_list: - virtual_network: - get_input: network_param1 + get_input: network_param2 - virtual_network: get_input: network_param1 - virtual_network: @@ -327,41 +361,7 @@ topology_template: requirements: - dependency: capability: tosca.capabilities.Node - node: hsl_direct_net - relationship: tosca.relationships.DependsOn - service_policy: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - entries: - policy_rule: - - src_ports: - - start_port: - get_input: start_src_ports - end_port: - get_input: end_src_ports - protocol: any - action_list: - apply_service: - - service_instance3 - dst_addresses: - - virtual_network: - get_input: Cricket_OCS_direct_net_id - dst_ports: - - start_port: - get_input: start_dst_ports - end_port: - get_input: end_dst_ports - src_addresses: - - virtual_network: - get_input: Cricket_OCS_protected_net_id - direction: - get_input: service_policy_direction - name: - get_input: service_policy_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: service_instance3 + node: hsl_direct_net_2 relationship: tosca.relationships.DependsOn groups: OCS-fw2_group: @@ -371,111 +371,111 @@ topology_template: description: | Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two. members: - - service_instance1 + - hsl_direct_net_2 - test_nested3 - - hsl_direct_net - service_instance3 - - service_policy + - service_policy_2 + - service_instance21 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw2 capabilities: - feature_service_policy_test_nested3: - - test_nested3 - - feature_service_policy - feature_service_instance1: - - service_instance1 + feature_service_instance21: + - service_instance21 - feature feature_service_instance3: - service_instance3 - feature - attachment_hsl_direct_net: - - hsl_direct_net - - attachment - end_point_hsl_direct_net: - - hsl_direct_net - - end_point + feature_hsl_direct_net_2: + - hsl_direct_net_2 + - feature + feature_service_policy_2: + - service_policy_2 + - feature + feature_service_policy_3_test_nested3: + - test_nested3 + - feature_service_policy_3 + end_point_hsl_direct_net_3_test_nested3: + - test_nested3 + - end_point_hsl_direct_net_3 feature_service_instance4_test_nested3: - test_nested3 - feature_service_instance4 - link_hsl_direct_net: - - hsl_direct_net - - link - feature_service_policy: - - service_policy - - feature - feature_hsl_direct_net_test_nested3: - - test_nested3 - - feature_hsl_direct_net - link_hsl_direct_net_test_nested3: + feature_hsl_direct_net_3_test_nested3: - test_nested3 - - link_hsl_direct_net - attachment_hsl_direct_net_test_nested3: + - feature_hsl_direct_net_3 + link_hsl_direct_net_2: + - hsl_direct_net_2 + - link + link_hsl_direct_net_3_test_nested3: - test_nested3 - - attachment_hsl_direct_net + - link_hsl_direct_net_3 feature_test_nested3: - test_nested3 - feature - feature_hsl_direct_net: - - hsl_direct_net - - feature - end_point_hsl_direct_net_test_nested3: + end_point_hsl_direct_net_2: + - hsl_direct_net_2 + - end_point + attachment_hsl_direct_net_3_test_nested3: - test_nested3 - - end_point_hsl_direct_net + - attachment_hsl_direct_net_3 + attachment_hsl_direct_net_2: + - hsl_direct_net_2 + - attachment requirements: - link_port_0_service_instance1: - - service_instance1 - - link_port_0 dependency_service_instance3: - service_instance3 - dependency - dependency_hsl_direct_net: - - hsl_direct_net - - dependency - dependency_hsl_direct_net_test_nested3: - - test_nested3 - - dependency_hsl_direct_net + network_service_policy_2: + - service_policy_2 + - network link_port_0_service_instance3: - service_instance3 - link_port_0 - network_service_policy: - - service_policy - - network - link_port_2_service_instance1: - - service_instance1 + dependency_hsl_direct_net_3_test_nested3: + - test_nested3 + - dependency_hsl_direct_net_3 + link_port_2_service_instance21: + - service_instance21 - link_port_2 link_port_0_service_instance4_test_nested3: - test_nested3 - link_port_0_service_instance4 - dependency_service_policy: - - service_policy + dependency_hsl_direct_net_2: + - hsl_direct_net_2 - dependency link_port_2_service_instance3: - service_instance3 - link_port_2 - network_service_policy_test_nested3: + link_port_1_service_instance21: + - service_instance21 + - link_port_1 + dependency_service_policy_3_test_nested3: - test_nested3 - - network_service_policy + - dependency_service_policy_3 + link_port_0_service_instance21: + - service_instance21 + - link_port_0 link_port_2_service_instance4_test_nested3: - test_nested3 - link_port_2_service_instance4 + dependency_service_instance21: + - service_instance21 + - dependency dependency_test_nested3: - test_nested3 - dependency dependency_service_instance4_test_nested3: - test_nested3 - dependency_service_instance4 - dependency_service_policy_test_nested3: - - test_nested3 - - dependency_service_policy link_port_1_service_instance3: - service_instance3 - link_port_1 - link_port_1_service_instance1: - - service_instance1 - - link_port_1 link_port_1_service_instance4_test_nested3: - test_nested3 - link_port_1_service_instance4 - dependency_service_instance1: - - service_instance1 - - dependency
\ No newline at end of file + dependency_service_policy_2: + - service_policy_2 + - dependency + network_service_policy_3_test_nested3: + - test_nested3 + - network_service_policy_3
\ 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_instance21ServiceTemplate.yaml index 19e88a77fb..96d57c1fe5 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_instance21ServiceTemplate.yaml @@ -1,6 +1,6 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: - template_name: OCS-fw2_service_instance1 + template_name: OCS-fw2_service_instance21 imports: - openecomp_heat_index: file: openecomp-heat/_index.yml @@ -127,25 +127,6 @@ topology_template: entry_schema: type: boolean node_templates: - service_instance1: - type: org.openecomp.resource.vfc.nodes.heat.st - properties: - flavor: - get_input: flavor - image_name: - get_input: image_name - availability_zone: - get_input: availability_zone - service_type: - get_input: service_type - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - service_instance_name: - get_input: service_instance_name - service_mode: - get_input: service_mode port_0: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port properties: @@ -184,7 +165,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: service_instance1 + node: service_instance21 relationship: tosca.relationships.network.BindsTo port_1: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port @@ -224,7 +205,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: service_instance1 + node: service_instance21 relationship: tosca.relationships.network.BindsTo port_2: type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port @@ -264,15 +245,34 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: service_instance1 + node: service_instance21 relationship: tosca.relationships.network.BindsTo + service_instance21: + type: org.openecomp.resource.vfc.nodes.heat.st + properties: + flavor: + get_input: flavor + image_name: + get_input: image_name + availability_zone: + get_input: availability_zone + service_type: + get_input: service_type + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name + service_instance_name: + get_input: service_instance_name + service_mode: + get_input: service_mode groups: - service_instance1_group: + service_instance21_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/OCS-fw2.yml members: - - service_instance1 + - service_instance21 - port_0 - port_1 - port_2 @@ -281,52 +281,52 @@ topology_template: description: Tenant id of the Service Instance value: get_attribute: - - service_instance1 + - service_instance21 - tenant_id fq_name: description: The FQ name of the service instance value: get_attribute: - - service_instance1 + - service_instance21 - fq_name service_template_name: description: Service Template of the Service Instance value: get_attribute: - - service_instance1 + - service_instance21 - service_template_name show: description: All attributes value: get_attribute: - - service_instance1 + - service_instance21 - show active_vms: description: Number of service VMs active for this Service Instance value: get_attribute: - - service_instance1 + - service_instance21 - active_vms service_instance_name: description: The name of the service instance value: get_attribute: - - service_instance1 + - service_instance21 - service_instance_name virtual_machines: description: Service VMs for the Service Instance value: get_attribute: - - service_instance1 + - service_instance21 - virtual_machines status: description: Status of the service instance value: get_attribute: - - service_instance1 + - service_instance21 - status substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.service_template + node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2 requirements: link_port_0: - port_0 @@ -336,4 +336,4 @@ topology_template: - link link_port_2: - port_2 - - link
\ No newline at end of file + - link 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 0f74dfe252..1e540ee891 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 @@ -326,7 +326,7 @@ topology_template: - service_instance3 - status substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.service_template + node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2 requirements: link_port_0: - port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml index c703fdb5d9..b164684390 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml @@ -153,8 +153,19 @@ topology_template: type: string description: HSL (Logging) network address (CIDR notation) node_templates: + hsl_direct_net_3: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + network_name: + get_input: HSL_direct_net_id + subnets: + hsl_ip_subnet_3: + cidr: + get_input: HSL_direct_net_cidr + gateway_ip: + get_input: HSL_direct_net_gateway service_instance4: - type: org.openecomp.resource.abstract.nodes.heat.service_template + type: org.openecomp.resource.abstract.nodes.heat.service_template_3 directives: - substitutable properties: @@ -228,20 +239,9 @@ topology_template: requirements: - dependency: capability: tosca.capabilities.Node - node: hsl_direct_net + node: hsl_direct_net_3 relationship: tosca.relationships.DependsOn - hsl_direct_net: - type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork - properties: - network_name: - get_input: HSL_direct_net_id - subnets: - hsl_ip_subnet: - cidr: - get_input: HSL_direct_net_cidr - gateway_ip: - get_input: HSL_direct_net_gateway - service_policy: + service_policy_3: type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: entries: @@ -283,48 +283,48 @@ topology_template: description: | Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two. members: + - hsl_direct_net_3 - service_instance4 - - hsl_direct_net - - service_policy + - service_policy_3 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3 capabilities: - link_hsl_direct_net: - - hsl_direct_net + end_point_hsl_direct_net_3: + - hsl_direct_net_3 + - end_point + link_hsl_direct_net_3: + - hsl_direct_net_3 - link - feature_service_policy: - - service_policy - - feature feature_service_instance4: - service_instance4 - feature - attachment_hsl_direct_net: - - hsl_direct_net - - attachment - feature_hsl_direct_net: - - hsl_direct_net + feature_hsl_direct_net_3: + - hsl_direct_net_3 - feature - end_point_hsl_direct_net: - - hsl_direct_net - - end_point + feature_service_policy_3: + - service_policy_3 + - feature + attachment_hsl_direct_net_3: + - hsl_direct_net_3 + - attachment requirements: dependency_service_instance4: - service_instance4 - dependency - dependency_hsl_direct_net: - - hsl_direct_net - - dependency + network_service_policy_3: + - service_policy_3 + - network link_port_0_service_instance4: - service_instance4 - link_port_0 link_port_1_service_instance4: - service_instance4 - link_port_1 - network_service_policy: - - service_policy - - network - dependency_service_policy: - - service_policy + dependency_service_policy_3: + - service_policy_3 + - dependency + dependency_hsl_direct_net_3: + - hsl_direct_net_3 - dependency link_port_2_service_instance4: - service_instance4 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 bb8a6c0324..14b7afc565 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 @@ -326,7 +326,7 @@ topology_template: - service_instance4 - status substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.service_template + node_type: org.openecomp.resource.abstract.nodes.heat.service_template_3 requirements: link_port_0: - port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml index 2bfeeb0797..dbd3ad9947 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml @@ -379,72 +379,72 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw capabilities: - feature_hsl_direct_net_test_nested3_test_nested2: - - test_nested2 - - feature_hsl_direct_net_test_nested3 feature_service_instance1: - service_instance1 - feature - feature_service_policy_test_nested2: + attachment_hsl_direct_net_3_test_nested3_test_nested2: - test_nested2 - - feature_service_policy + - attachment_hsl_direct_net_3_test_nested3 feature_service_instance2: - service_instance2 - feature feature_test_nested3_test_nested2: - test_nested2 - feature_test_nested3 + end_point_hsl_direct_net_3_test_nested3_test_nested2: + - test_nested2 + - end_point_hsl_direct_net_3_test_nested3 attachment_hsl_direct_net: - hsl_direct_net - attachment feature_service_instance4_test_nested3_test_nested2: - test_nested2 - feature_service_instance4_test_nested3 + end_point_hsl_direct_net_2_test_nested2: + - test_nested2 + - end_point_hsl_direct_net_2 feature_service_instance3_test_nested2: - test_nested2 - feature_service_instance3 - feature_hsl_direct_net_test_nested2: - - test_nested2 - - feature_hsl_direct_net - end_point_hsl_direct_net_test_nested3_test_nested2: - - test_nested2 - - end_point_hsl_direct_net_test_nested3 end_point_hsl_direct_net: - hsl_direct_net - end_point + feature_service_policy_2_test_nested2: + - test_nested2 + - feature_service_policy_2 + link_hsl_direct_net_3_test_nested3_test_nested2: + - test_nested2 + - link_hsl_direct_net_3_test_nested3 link_hsl_direct_net: - hsl_direct_net - link feature_service_policy: - service_policy - feature - link_hsl_direct_net_test_nested2: - - test_nested2 - - link_hsl_direct_net - attachment_hsl_direct_net_test_nested3_test_nested2: - - test_nested2 - - attachment_hsl_direct_net_test_nested3 - attachment_hsl_direct_net_test_nested2: - - test_nested2 - - attachment_hsl_direct_net - feature_service_instance1_test_nested2: + feature_hsl_direct_net_2_test_nested2: - test_nested2 - - feature_service_instance1 - link_hsl_direct_net_test_nested3_test_nested2: + - feature_hsl_direct_net_2 + link_hsl_direct_net_2_test_nested2: - test_nested2 - - link_hsl_direct_net_test_nested3 + - link_hsl_direct_net_2 feature_test_nested2: - test_nested2 - feature feature_hsl_direct_net: - hsl_direct_net - feature - feature_service_policy_test_nested3_test_nested2: + feature_service_policy_3_test_nested3_test_nested2: - test_nested2 - - feature_service_policy_test_nested3 - end_point_hsl_direct_net_test_nested2: + - feature_service_policy_3_test_nested3 + feature_hsl_direct_net_3_test_nested3_test_nested2: - test_nested2 - - end_point_hsl_direct_net + - feature_hsl_direct_net_3_test_nested3 + feature_service_instance21_test_nested2: + - test_nested2 + - feature_service_instance21 + attachment_hsl_direct_net_2_test_nested2: + - test_nested2 + - attachment_hsl_direct_net_2 requirements: link_port_1_service_instance4_test_nested3_test_nested2: - test_nested2 @@ -452,15 +452,9 @@ topology_template: dependency_hsl_direct_net: - hsl_direct_net - dependency - dependency_hsl_direct_net_test_nested2: - - test_nested2 - - dependency_hsl_direct_net - dependency_hsl_direct_net_test_nested3_test_nested2: + network_service_policy_3_test_nested3_test_nested2: - test_nested2 - - dependency_hsl_direct_net_test_nested3 - network_service_policy_test_nested3_test_nested2: - - test_nested2 - - network_service_policy_test_nested3 + - network_service_policy_3_test_nested3 link_port_2_service_instance1: - service_instance1 - link_port_2 @@ -470,9 +464,6 @@ topology_template: dependency_service_policy: - service_policy - dependency - dependency_service_instance1_test_nested2: - - test_nested2 - - dependency_service_instance1 link_port_0_service_instance3_test_nested2: - test_nested2 - link_port_0_service_instance3 @@ -482,21 +473,21 @@ topology_template: dependency_service_instance4_test_nested3_test_nested2: - test_nested2 - dependency_service_instance4_test_nested3 - dependency_service_policy_test_nested2: + dependency_service_instance21_test_nested2: - test_nested2 - - dependency_service_policy + - dependency_service_instance21 dependency_test_nested2: - test_nested2 - dependency - link_port_0_service_instance1_test_nested2: - - test_nested2 - - link_port_0_service_instance1 link_port_1_service_instance2: - service_instance2 - link_port_1 link_port_1_service_instance1: - service_instance1 - link_port_1 + link_port_2_service_instance21_test_nested2: + - test_nested2 + - link_port_2_service_instance21 link_port_1_service_instance3_test_nested2: - test_nested2 - link_port_1_service_instance3 @@ -509,24 +500,33 @@ topology_template: link_port_0_service_instance4_test_nested3_test_nested2: - test_nested2 - link_port_0_service_instance4_test_nested3 - dependency_service_policy_test_nested3_test_nested2: + dependency_service_policy_2_test_nested2: - test_nested2 - - dependency_service_policy_test_nested3 - link_port_1_service_instance1_test_nested2: + - dependency_service_policy_2 + link_port_0_service_instance21_test_nested2: - test_nested2 - - link_port_1_service_instance1 + - link_port_0_service_instance21 network_service_policy: - service_policy - network - network_service_policy_test_nested2: + dependency_hsl_direct_net_2_test_nested2: + - test_nested2 + - dependency_hsl_direct_net_2 + dependency_hsl_direct_net_3_test_nested3_test_nested2: - test_nested2 - - network_service_policy + - dependency_hsl_direct_net_3_test_nested3 + dependency_service_policy_3_test_nested3_test_nested2: + - test_nested2 + - dependency_service_policy_3_test_nested3 dependency_service_instance3_test_nested2: - test_nested2 - dependency_service_instance3 - link_port_2_service_instance1_test_nested2: + link_port_1_service_instance21_test_nested2: + - test_nested2 + - link_port_1_service_instance21 + network_service_policy_2_test_nested2: - test_nested2 - - link_port_2_service_instance1 + - network_service_policy_2 dependency_test_nested3_test_nested2: - test_nested2 - dependency_test_nested3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw2.yml index 7abef08c97..b5c3dcb393 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw2.yml @@ -92,19 +92,19 @@ parameters: resources: - hsl_direct_net: + hsl_direct_net_2: type: OS::Contrail::VirtualNetwork properties: name: { get_param: HSL_direct_net_id } - hsl_ip_subnet: + hsl_ip_subnet_2: type: OS::Neutron::Subnet properties: - network_id: { get_resource: hsl_direct_net } + network_id: { get_resource: hsl_direct_net_2 } cidr: { get_param: HSL_direct_net_cidr } gateway_ip: { get_param: HSL_direct_net_gateway } - service_template: + service_template_2: type: OS::Contrail::ServiceTemplate properties: name: { get_param: st_name } @@ -119,11 +119,11 @@ resources: service_instance3: type: OS::Contrail::ServiceInstance - depends_on: [ hsl_ip_subnet] + depends_on: [ hsl_ip_subnet_2] properties: name: { get_param: service_instance_name } availability_zone: { get_param: availability_zone_1 } - service_template: { get_resource: service_template } + service_template: { get_resource: service_template_2 } scale_out: max_instances: {get_param: max_num_fw_instances} interface_list: [ @@ -138,13 +138,13 @@ resources: } ] - service_instance1: + service_instance21: type: OS::Contrail::ServiceInstance - depends_on: [ hsl_ip_subnet] + depends_on: [ hsl_ip_subnet_2] properties: name: { get_param: service_instance_name } availability_zone: { get_param: availability_zone_1 } - service_template: { get_resource: service_template } + service_template: { get_resource: service_template_2 } scale_out: max_instances: {get_param: max_num_fw_instances} interface_list: [ @@ -159,7 +159,7 @@ resources: } ] - service_policy: + service_policy_2: type: OS::Contrail::NetworkPolicy depends_on: [ service_instance3 ] properties: @@ -177,19 +177,19 @@ resources: }, ] - service_policy_attach_direct_net: + service_policy_attach_direct_net_2: type: OS::Contrail::AttachPolicy - depends_on: [ service_policy ] + depends_on: [ service_policy_2 ] properties: network: { get_param: Cricket_OCS_direct_net_id } - policy: { get_attr: [service_policy, fq_name] } + policy: { get_attr: [service_policy_2, fq_name] } - service_policy_attach_protected_net: + service_policy_attach_protected_net_2: type: OS::Contrail::AttachPolicy - depends_on: [ service_policy ] + depends_on: [ service_policy_2 ] properties: network: { get_param: Cricket_OCS_protected_net_id } - policy: { get_attr: [service_policy, fq_name] } + policy: { get_attr: [service_policy_2, fq_name] } test_nested3: type: OCS-fw3.yml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw3.yml index 45563922d6..27bb720fa0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw3.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw3.yml @@ -92,19 +92,19 @@ parameters: resources: - hsl_direct_net: + hsl_direct_net_3: type: OS::Contrail::VirtualNetwork properties: name: { get_param: HSL_direct_net_id } - hsl_ip_subnet: + hsl_ip_subnet_3: type: OS::Neutron::Subnet properties: - network_id: { get_resource: hsl_direct_net } + network_id: { get_resource: hsl_direct_net_3 } cidr: { get_param: HSL_direct_net_cidr } gateway_ip: { get_param: HSL_direct_net_gateway } - service_template: + service_template_3: type: OS::Contrail::ServiceTemplate properties: name: { get_param: st_name } @@ -119,11 +119,11 @@ resources: service_instance4: type: OS::Contrail::ServiceInstance - depends_on: [ hsl_ip_subnet] + depends_on: [ hsl_ip_subnet_3] properties: name: { get_param: service_instance_name } availability_zone: { get_param: availability_zone_1 } - service_template: { get_resource: service_template } + service_template: { get_resource: service_template_3 } scale_out: max_instances: {get_param: max_num_fw_instances} interface_list: [ @@ -139,7 +139,7 @@ resources: ] - service_policy: + service_policy_3: type: OS::Contrail::NetworkPolicy depends_on: [ service_instance4 ] properties: @@ -157,17 +157,17 @@ resources: }, ] - service_policy_attach_direct_net: + service_policy_attach_direct_net_3: type: OS::Contrail::AttachPolicy - depends_on: [ service_policy ] + depends_on: [ service_policy_3 ] properties: network: { get_param: Cricket_OCS_direct_net_id } - policy: { get_attr: [service_policy, fq_name] } + policy: { get_attr: [service_policy_3, fq_name] } - service_policy_attach_protected_net: + service_policy_attach_protected_net_3: type: OS::Contrail::AttachPolicy - depends_on: [ service_policy ] + depends_on: [ service_policy_3 ] properties: network: { get_param: Cricket_OCS_protected_net_id } - policy: { get_attr: [service_policy, fq_name] } + policy: { get_attr: [service_policy_3, fq_name] } 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 7747ff6719..ceadde74b8 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 @@ -17,13 +17,13 @@ parameters: type: string resources: - Internal1-net: + Internal1-net-1: type: OS::Contrail::VirtualNetwork properties: name: { get_param: Internal1_net_name } forwarding_mode: { get_param: Internal1_forwarding_mode } shared: { get_param: Internal1_shared } - Internal2-net: + Internal2-net-1: type: OS::Contrail::VirtualNetwork properties: name: { get_param: Internal1_net_name } @@ -33,5 +33,5 @@ resources: test_nested1: type: OCS-fw.yml properties: - network_param1: { get_resource: Internal1-net} - network_param2: { get_resource: Internal2-net}
\ No newline at end of file + network_param1: { get_resource: Internal1-net-1} + network_param2: { get_resource: Internal2-net-1}
\ No newline at end of file |