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 | 146 ++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml index 628bf3df22..0741732d8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VNF Module instance avpn_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_subnet_id type: list description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets entry_schema: @@ -23,6 +39,14 @@ topology_template: internal_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: internal_net_id type: string description: the UUID of the operator-created Internal network constraints: @@ -30,6 +54,14 @@ topology_template: sbg_AVPN_vlan_tag_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_vlan_tag_list type: list description: comma delimited list of internal VLAN TAG(s) used by AVPN networks entry_schema: @@ -37,6 +69,14 @@ topology_template: sbg_AVPN_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_count type: float description: The number of AVPN networks constraints: @@ -46,11 +86,27 @@ topology_template: sbg_sc_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_flavor_name type: string description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required sbg_comte_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_comte_floating_ip type: string description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default! constraints: @@ -58,6 +114,14 @@ topology_template: sbg_internal_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values. entry_schema: @@ -65,6 +129,14 @@ topology_template: sbg_avpn_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_avpn_ips type: list description: | comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count. @@ -73,6 +145,14 @@ topology_template: sbg_sc_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_names type: list description: comma delimited list of VM names assigned to System Controller VMs entry_schema: @@ -80,6 +160,14 @@ topology_template: sbg_nfs_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_nfs_floating_ip type: string description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -87,6 +175,14 @@ topology_template: sbg_boot_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_boot_floating_ip type: string description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -94,6 +190,14 @@ topology_template: sbg_sc_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_0 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume constraints: @@ -101,11 +205,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance avpn_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_net_id type: list description: comma delimited list of the UUIDs of the operator-created AVPN networks entry_schema: @@ -113,6 +233,14 @@ topology_template: sbg_sc_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_1 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume constraints: @@ -120,11 +248,27 @@ topology_template: availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: availability_zone_0 type: string description: First availability zone ID or Name. sbg_internal_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Internal network entry_schema: @@ -224,4 +368,4 @@ topology_template: SC1, SC2, PL3 and PL4. This is the main template, to be used to create an initial stack, with 1 mated pair members: - sbg_pl_trunk_subport_avpn_group_0 - - abstract_sbg_sc \ No newline at end of file + - abstract_sbg_sc -- cgit 1.2.3-korg