diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml')
1 files changed, 124 insertions, 124 deletions
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 |