diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut')
4 files changed, 59 insertions, 59 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml index 7c516d8e51..19b50897b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml @@ -97,7 +97,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -112,7 +112,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -127,7 +127,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -142,7 +142,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -169,7 +169,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -177,11 +177,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -239,10 +239,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml index 5071ce06a4..1091de0a27 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml @@ -98,7 +98,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -113,7 +113,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -128,7 +128,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -143,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -171,7 +171,7 @@ topology_template: network_name: get_attribute: - abstract_FSB - - FSB_FSB1_Internal_network_id + - FSB_FSB_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - abstract_FSB @@ -179,11 +179,11 @@ topology_template: tenant_id: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id qos_policy: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB properties: @@ -237,26 +237,23 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net-fsb2-Internal1 + - Internal2-net-fsb2-Internal2 compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null + port_FSB_Internal_port_0_mac_address: + get_input: fsb2-Internal1-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_network: - - Internal1-net-fsb1-Internal1 - - Internal1-net-fsb1-Internal2 - port_FSB2_Internal_mac_address: - get_input: fsb2-Internal1-mac - port_FSB2_Internal_network: - - Internal2-net-fsb2-Internal1 - - Internal2-net-fsb2-Internal2 compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -270,6 +267,9 @@ topology_template: compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name + port_FSB_Internal_port_1_network: + - Internal1-net-fsb1-Internal1 + - Internal1-net-fsb1-Internal2 service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 2 @@ -283,13 +283,13 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_FSB_FSB1_Internal: + - link_FSB_FSB_Internal_port_0: capability: tosca.capabilities.network.Linkable - node: jsa_net1 + node: jsa_net relationship: tosca.relationships.network.LinksTo - - link_FSB_FSB2_Internal: + - link_FSB_FSB_Internal_port_1: capability: tosca.capabilities.network.Linkable - node: jsa_net + node: jsa_net1 relationship: tosca.relationships.network.LinksTo groups: ep-jsa_net_group: @@ -299,10 +299,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml index 122b625268..74ae283a99 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml @@ -72,7 +72,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -83,7 +83,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -120,7 +120,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -128,11 +128,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -175,8 +175,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template - packet_mirror_network_name
\ 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/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml index a881a1e458..3b5922aeb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml @@ -73,7 +73,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -84,7 +84,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -122,7 +122,7 @@ topology_template: network_name: get_attribute: - abstract_FSB - - FSB_FSB1_Internal_network_id + - FSB_FSB_Internal_port_1_network_id dhcp_agent_ids: get_attribute: - abstract_FSB @@ -130,11 +130,11 @@ topology_template: tenant_id: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id qos_policy: get_attribute: - abstract_FSB - - FSB_FSB2_Internal_network_id + - FSB_FSB_Internal_port_0_network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB properties: @@ -173,22 +173,20 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net + port_FSB_Internal_port_0_mac_address: + get_input: fsb1-Internal2-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - port_FSB1_Internal_network: - - Internal1-net - port_FSB2_Internal_mac_address: - get_input: fsb1-Internal2-mac port_FSB1_OAM_network: - jsa_net1 - port_FSB2_Internal_network: - - Internal2-net compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -200,6 +198,8 @@ topology_template: get_input: fsb1-oam-ip compute_FSB_name: - get_input: fsb1-name + port_FSB_Internal_port_1_network: + - Internal1-net service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 1 @@ -213,7 +213,7 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_FSB_FSB1_Internal: + - link_FSB_FSB_Internal_port_1: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo @@ -229,8 +229,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 - FSB1_OAM - FSB1_template - packet_mirror_network_name |