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 --- .../expectedoutputfiles/MainServiceTemplate.yaml | 450 ++++++++++++++++++++- 1 file changed, 449 insertions(+), 1 deletion(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml index 04184064bd..5e329f9448 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml @@ -21,6 +21,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -28,6 +36,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -35,6 +51,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -46,6 +70,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -53,6 +85,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -60,6 +100,14 @@ topology_template: label: mog Config script name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: mog_script_name type: string description: Config script name default: http://10.147.38.210:8080/v1/AUTH_8e501b8121f34a6eaaf526d3305985cc/mogtestcontainer/mog-cloudinit.sh @@ -67,6 +115,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -78,6 +134,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -88,12 +152,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_1 type: string description: CSB internal network subnet mask default: 255.255.255.0 dummy_net_netmask_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -101,6 +181,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -108,6 +196,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -119,6 +215,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -126,6 +230,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -133,6 +245,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -140,6 +260,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -147,6 +275,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -161,6 +297,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -168,6 +312,14 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cluster-manager-vol-1 type: string description: Cluster Manager volume 1 default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee @@ -175,12 +327,28 @@ topology_template: label: mog-cm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cluster-manager-vol-2 type: string description: Cluster Manager volume 2 with ISO image default: 6f92e211-2d61-487d-8f84-d2d00cea3698 csb_net_netmask: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -188,6 +356,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -195,6 +371,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -202,6 +386,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -209,6 +401,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -216,6 +416,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -223,6 +431,14 @@ topology_template: label: mog script parameter name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: mog_parameter_name type: string description: Config script parameter csv file name default: http://10.147.38.210:8080/v1/AUTH_8e501b8121f34a6eaaf526d3305985cc/mogtestcontainer @@ -230,6 +446,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -242,6 +466,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -262,6 +494,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -269,6 +509,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -280,6 +528,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -287,6 +543,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -294,6 +558,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -301,6 +573,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -308,6 +588,14 @@ topology_template: label: mog Config URL hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: mog_swift_container type: string description: Config URL default: http://10.147.38.210:8080/v1/AUTH_8e501b8121f34a6eaaf526d3305985cc/mogtestcontainer @@ -315,6 +603,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -322,6 +618,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -329,6 +633,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -336,6 +648,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -343,6 +663,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -350,6 +678,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -357,6 +693,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -364,6 +708,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -371,6 +723,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -378,6 +738,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -385,6 +753,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -396,6 +772,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -403,6 +787,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -413,6 +805,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -424,6 +824,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -431,6 +839,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -438,6 +854,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -445,6 +869,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -452,6 +884,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net @@ -459,6 +899,14 @@ topology_template: label: mog Config script directory hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: mog_script_dir type: string description: Config script directory default: /root @@ -1715,4 +2163,4 @@ topology_template: properties: container_type: host targets: - - servergroup_mog02_group \ No newline at end of file + - servergroup_mog02_group -- cgit 1.2.3-korg