From f4f74690140299c1a1df3d10509e873b67cdd2c9 Mon Sep 17 00:00:00 2001 From: talio Date: Wed, 13 Sep 2017 12:23:28 +0300 Subject: Fixing requirements in substituable node templates Adding dependencies with correct dependency id for substituable node templates Change-Id: I696441bc62807cf2abd73963583d6198dfaea259 Issue-ID: SDC-313 Signed-off-by: talio --- .../out/MainServiceTemplate.yaml | 260 ++++----------------- 1 file changed, 41 insertions(+), 219 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml index b1f6c7e875..e44327fa33 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml @@ -105,11 +105,6 @@ topology_template: type: string description: PCRF CM image name default: rhel2 - shared_security_group_id2: - hidden: false - immutable: false - type: string - description: network name of jsa log network oam_server_names: label: PCRF CM server names hidden: false @@ -141,11 +136,6 @@ topology_template: type: string description: CPS network mask default: 255.255.255.0 - shared_security_group_id1: - hidden: false - immutable: false - type: string - description: network name of jsa log network oam_net_name: label: OAM network name hidden: false @@ -161,10 +151,8 @@ topology_template: properties: pcm_flavor_name: get_input: pcm_flavor_name - p1: jsa_security_group1 service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml - p2: jsa_security_group2 port_pcm_port_1_network_role_tag: oam port_pcm_port_0_ip_requirements: - ip_version: 4 @@ -191,68 +179,53 @@ topology_template: get_input: - pcm_server_names - 0 - requirements: - - dependency_pcm_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - link_pcm_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - - dependency_server_pcm: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - - dependency_pcm_port_0: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo server_oam_001: type: org.openecomp.resource.abstract.nodes.heat.oam_server directives: - substitutable properties: + port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false oam_net_gw: get_input: oam_net_gw - port_oam_port_0_mac_requirements: - mac_count_required: - is_required: false oam_flavor_name: get_input: oam_flavor_name + security_group_name: + get_input: security_group_name cps_net_ip: get_input: - cps_net_ips - 0 - port_oam_port_1_network_role_tag: oam oam_server_name: get_input: - oam_server_names - 0 + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml - port_oam_port_1_ip_requirements: + pcm_vol: + get_input: + - pcm_volumes + - 0 + port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_port_1_mac_requirements: + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: mac_count_required: is_required: false - pcm_vol: - get_input: - - pcm_volumes - - 0 - port_oam_port_0_network_role_tag: cps oam_image_name: get_input: oam_image_name cps_net_name: @@ -265,42 +238,17 @@ topology_template: - 0 oam_net_mask: get_input: oam_net_mask - port_oam_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false oam_net_name: get_input: oam_net_name - requirements: - - dependency_oam_port_0: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - link_oam_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - - dependency_server_oam: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - local_storage_server_oam: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - - dependency_oam_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - link_oam_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server directives: - substitutable properties: + metadata: + get_attribute: + - compute_port_0 + - device_id port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name @@ -325,8 +273,16 @@ topology_template: is_required: false pcm_flavor_name: get_input: pcm_flavor_name + key_name: + get_attribute: + - server_oam_001 + - accessIPv4 service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + user_data_format: + get_attribute: + - server_pcm_002 + - oam_net_gw pcm_vol: get_input: - pcm_volumes @@ -357,43 +313,17 @@ topology_template: get_input: oam_net_mask oam_net_name: get_input: oam_net_name - requirements: - - dependency_pcm_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - link_pcm_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - - dependency_server_pcm: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - - dependency_pcm_port_0: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo packet_mirror_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: + tenant_id: + get_attribute: + - abstract_compute + - compute_instance_name network_name: - get_input: net_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: server_pcm_001 - relationship: tosca.relationships.DependsOn - - dependency: - capability: feature_compute - node: abstract_compute - relationship: tosca.relationships.DependsOn + get_attribute: + - server_pcm_001 + - instance_name compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -408,104 +338,6 @@ topology_template: is_required: false network: get_input: net_name - jsa_security_group1: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules - properties: - name: jsa_security_group1_name - description: ems security group - rules: - - protocol: icmp - ethertype: IPv6 - remote_ip_prefix: ::/0 - direction: ingress - requirements: - - port: - capability: attachment_pcm_port_0 - node: server_pcm_002 - relationship: org.openecomp.relationships.AttachesTo - - port: - capability: attachment_pcm_port_1 - node: server_pcm_002 - relationship: org.openecomp.relationships.AttachesTo - - port: - capability: attachment_oam_port_1 - node: test_shared_node_connected_in_nested - relationship: org.openecomp.relationships.AttachesTo - - port: - capability: attachment_oam_port_0 - node: test_shared_node_connected_in_nested - relationship: org.openecomp.relationships.AttachesTo - jsa_security_group2: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules - properties: - name: jsa_security_group2_name - description: ems security group - rules: - - protocol: tcp - ethertype: IPv4 - port_range_max: 65535 - remote_ip_prefix: 0.0.0.0/0 - direction: egress - port_range_min: 1 - requirements: - - port: - capability: attachment_pcm_port_0 - node: server_pcm_002 - relationship: org.openecomp.relationships.AttachesTo - test_shared_node_connected_in_nested: - type: org.openecomp.resource.abstract.nodes.heat.oam_server - directives: - - substitutable - properties: - service_template_filter: - substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml - p2: - get_input: shared_security_group_id2 - port_oam_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_1_mac_requirements: - mac_count_required: - is_required: false - port_oam_port_0_mac_requirements: - mac_count_required: - is_required: false - port_oam_port_0_network_role_tag: cps - port_oam_port_1_network_role_tag: oam - port_oam_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - shared_security_group_id1: - get_input: shared_security_group_id1 - requirements: - - dependency_oam_port_0: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - link_oam_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - - dependency_server_oam: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - local_storage_server_oam: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - - dependency_oam_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - - link_oam_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo abstract_compute: type: org.openecomp.resource.abstract.nodes.compute directives: @@ -519,8 +351,8 @@ topology_template: get_input: compute_image_name compute_compute_metadata: - get_attribute: - - server_pcm_001 - - server_pcm_id + - compute_port_0 + - device_id compute_compute_name: - compute_name: null vm_flavor_name: @@ -563,14 +395,4 @@ topology_template: - server_pcm_001 - packet_mirror_network - compute_port_0 - - jsa_security_group1 - - jsa_security_group2 - - abstract_compute - addOn_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/addOn.yml - description: | - Version 2.0 02-09-2016 (Authors: John Doe, user PROD) - members: - - test_shared_node_connected_in_nested \ No newline at end of file + - abstract_compute \ No newline at end of file -- cgit 1.2.3-korg