From d5b4901c6a1ae136138c1300d377447e26bac4ef Mon Sep 17 00:00:00 2001 From: eleonorali Date: Sun, 11 Feb 2018 12:15:48 +0200 Subject: SRIOV - add annotations SRIOV - add annotations to input TOSCA parameter converted from HEAT file (2) Change-Id: Id0b0156730ae64093df42d09e2873de047c13ac9 Issue-ID: SDC-996 Signed-off-by: eleonorali --- .../out/MainServiceTemplate.yaml | 138 ++++++++++++++- .../out/MainServiceTemplate.yaml | 32 ++++ .../out/MainServiceTemplate.yaml | 64 +++++++ .../out/MainServiceTemplate.yaml | 64 +++++++ .../out/MainServiceTemplate.yaml | 186 ++++++++++++++++++++- .../out/MainServiceTemplate.yaml | 8 + .../out/MainServiceTemplate.yaml | 10 +- .../out/MainServiceTemplate.yaml | 8 + .../nestedNoCompute/out/MainServiceTemplate.yaml | 8 + .../out/MainServiceTemplate.yaml | 8 + .../out/MainServiceTemplate.yaml | 16 ++ .../out/MainServiceTemplate.yaml | 40 +++++ .../out/MainServiceTemplate.yaml | 16 ++ 13 files changed, 595 insertions(+), 3 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml index 43aeb451a9..209135c25a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml @@ -11,16 +11,40 @@ topology_template: ps_server_main_1b_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_image type: string description: Ps Image server security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: security_group_name type: string description: security_group_name cmaui_1c1_main_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_names type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -28,30 +52,78 @@ topology_template: contrail_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: contrail_net_name type: string description: network name of contrail v2 network ps_server_main_1b_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_flavor type: string description: Flavor for PS server ps_server_main_1b_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_ips type: string jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network pd_server_main_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_names type: list description: PD server names entry_schema: @@ -59,21 +131,53 @@ topology_template: cmaui_1c1_main_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_flavor type: string description: Flavor for CMAUI server pd_server_main_1b_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_flavor type: string description: Flavor for PD server cmaui_1c1_main_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_image type: string description: Image for CMAUI server ps_server_main_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_names type: list description: Ps server names entry_schema: @@ -82,20 +186,52 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_0 type: string description: availabilityzone name cmaui_oam_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_oam_ips type: string pd_server_main_1b_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_image type: string description: PD Image server pd_server_main_1b_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_ips type: string node_templates: abstract_pd_server_main_1b_1: @@ -294,4 +430,4 @@ topology_template: - test_nested_pattern_4_main_0 - abstract_pd_server_main_1b_1 - abstract_ps_server_main_1b_1 - - abstract_cmaui_1c1_main_1 \ No newline at end of file + - abstract_cmaui_1c1_main_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml index 6926f33ace..9ff8c4ea56 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml @@ -11,21 +11,53 @@ topology_template: security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: security_group_name type: string description: security_group_name contrail_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: contrail_net_name type: string description: network name of contrail v2 network jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml index e53177de56..8fdf0c1e04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml @@ -12,34 +12,82 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: p1 type: string description: UID of OAM network availabilityzone_name: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: security_group_name type: string description: network name of jsa log network pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_image_name type: string description: PD image name pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance entry_schema: @@ -47,11 +95,27 @@ topology_template: oam_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name type: string description: net name jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml index 2c7daf72af..9914f9b938 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml @@ -12,34 +12,82 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: p1 type: string description: UID of OAM network availabilityzone_name: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: security_group_name type: string description: network name of jsa log network pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_image_name type: string description: PD image name pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance entry_schema: @@ -47,11 +95,27 @@ topology_template: oam_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name type: string description: net name jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index 16ea9d76c1..16e7d2c267 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -11,21 +11,53 @@ topology_template: p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: p1 type: string description: UID of osm network p2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: p2 type: string description: UID of osm network rd_server_1b_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_flavor type: string description: Flavor for PD server BE_1c1_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_names type: list description: BE1, BE2 server names entry_schema: @@ -33,14 +65,38 @@ topology_template: ps_server_1b_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_ips type: string packet_internal_network_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: packet_internal_network_name type: string security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: security_group_name type: list description: BE1, BE2 server names entry_schema: @@ -48,6 +104,14 @@ topology_template: osm_server_1c2_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_names type: list description: BE1, BE2 server names entry_schema: @@ -55,15 +119,39 @@ topology_template: osm_server_1c2_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_flavor type: string description: Flavor for BE server rd_server_1b_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_ips type: string ps_server_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_names type: list description: Ps server names entry_schema: @@ -71,6 +159,14 @@ topology_template: rd_server_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_names type: list description: PD server names entry_schema: @@ -78,54 +174,142 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network osm_server_1c2_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_image type: string description: Image for BE server BE_osm_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_osm_ips type: string packet_external_network_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: packet_external_network_name type: string BE_1c1_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_image type: string description: Image for BE server availability_zone_0: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: availability_zone_0 type: string description: availabilityzone name rd_server_1b_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_image type: string description: PD Image server ps_server_1b_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_flavor type: string description: Flavor for PS server ps_server_1b_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_image type: string description: Ps Image server net: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: net type: string BE_1c1_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_flavor type: string description: Flavor for BE server node_templates: @@ -512,4 +696,4 @@ topology_template: value: get_attribute: - abstract_osm_server_1c2_1 - - osm_server_1c2_accessIPv4 \ No newline at end of file + - osm_server_1c2_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml index 8db4155247..e7e53e33ad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml index 1926fafee1..edb739aa61 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: @@ -98,4 +106,4 @@ topology_template: - dependsOn_network - test_nested_pattern_4 - test_nested_no_compute - - test_nested_all_patterns \ No newline at end of file + - test_nested_all_patterns diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml index f2c32347e0..c5e45d63ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml index ddf4044b17..71b749c66b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml index aabe7d7229..1cd4986a35 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml index 6ab38e9cdd..991c837d3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: security_group_name type: string description: network name of jsa log network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml index 2548fb9b30..fbbfe767d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml @@ -11,26 +11,66 @@ topology_template: same_file_param_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: same_file_param_1 type: string description: network name of jsa log network same_file_param_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: same_file_param_2 type: string description: network name of jsa log network same_file_param_3: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: same_file_param_3 type: string description: network name of jsa log network diff_file_param_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: diff_file_param_1 type: string description: network name of jsa log network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml index f5b820a913..0c7dc7ba78 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: security_group_name type: string description: security_group_name jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: -- cgit 1.2.3-korg