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 | 18 +- .../out/MainServiceTemplate.yaml | 714 ++++++++++++++++++++- .../expectedoutputfiles/MainServiceTemplate.yaml | 98 ++- .../expectedoutputfiles/MainServiceTemplate.yaml | 18 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 36 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 51 +- 6 files changed, 929 insertions(+), 6 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index 6616fbb42b..ef939ddd73 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml @@ -14,11 +14,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: @@ -269,4 +285,4 @@ topology_template: - test_resourceGroup - jsa_security_group1 - jsa_security_group2 - - test_nova \ No newline at end of file + - test_nova diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml index de4eb2c145..02223317d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml @@ -11,88 +11,208 @@ topology_template: vprobe_volume_type_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_type_0 type: string description: The type of the volume mapping to a backend default: volumes_ceph vprobe_volume_type_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_type_1 type: string description: The type of the volume mapping to a backend default: volumes_ceph vprobe_volume_type_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_type_2 type: string description: The type of the volume mapping to a backend default: volumes_ceph oam_private_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: oam_private_net_name type: string description: A string specifying a symbolic name for the network vProbe_cluster_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vProbe_cluster_name type: string description: The component cluster name default: vProbe_cluster qrouter_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_flavor_name type: string description: The ID or name of the flavor to boot onto default: m1.large version_number: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: version_number type: string description: The version number of the component default: 11.1.5 vLB_version_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_version_name type: string description: The version name of the component. default: vProbe.r.11.1.e._08_16-12_53 vprobe_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_flavor_name type: string description: The name of the flavor to boot onto default: m1.large domain_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: domain_name type: string description: The servers domain ntp_timezone: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: ntp_timezone type: string description: Name of NTP Time zone to be used default: UTC packet_mirror_network_subnet_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_mirror_network_subnet_cidr type: string description: The Classless Inter-Domain Routing default: 20.20.5.0/24 vLBAgent_cluster_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_cluster_name type: string description: The component cluster name default: vLBAgent_cluster vLB_type: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_type type: string description: The type of VLB. MME or SGW. default: mme qrouter_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_names type: list description: VM Names for QRouter VMs entry_schema: @@ -100,16 +220,40 @@ topology_template: win_domain_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: win_domain_name type: string description: Windows servers' domain tenant_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: tenant_name type: string description: Name of tenant to be used vLB_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_names type: list description: VM Names for vLB VMs entry_schema: @@ -117,337 +261,801 @@ topology_template: vprobe_volume_size_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_size_2 type: float description: The size of the volume in GB default: 1 vLBAgent_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_flavor_name type: string description: The ID or name of the flavor to boot onto default: m1.large vprobe_volume_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_name_0 type: string description: The name of the volume default: data vprobe_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_size_0 type: float description: The size of the volume in GB default: 100 vprobe_volume_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_name_1 type: string description: The name of the volume default: log vprobe_volume_size_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_size_1 type: float description: The size of the volume in GB default: 5 vprobe_volume_name_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_volume_name_2 type: string description: The name of the volume default: config packet_mirror_network_subnet_alloc_start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_mirror_network_subnet_alloc_start type: string description: Start address for the allocation pool default: 20.20.5.2 vLBAgent_version_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_version_name type: string description: The version name of the component default: vProbe.r.11.1.e._08_16-12_53 vLB_volume_name_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_name_2 type: string description: The name of the volume default: config cdr_network: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: cdr_network type: string description: A string specifying a symbolic name for the network vLBAgent_type: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_type type: string description: vLBAgent Type. mme or sgw default: mme vProbe_node_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vProbe_node_count type: float description: The number of nodes to create default: 1 packet_internal_network_subnet_alloc_end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_internal_network_subnet_alloc_end type: string description: End address for the allocation pool default: 192.0.6.250 vLBAgent_volume_type_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_type_0 type: string description: The type of the volume mapping to a backend default: volumes_ceph vLBAgent_volume_type_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_type_1 type: string description: The type of the volume mapping to a backend default: volumes_ceph vLBAgent_volume_size_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_size_1 type: float description: The size of the volume in GB default: 1 vLBAgent_volume_type_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_type_2 type: string description: The Cinder volume type. Used to specify the backend. default: volumes_ceph vLB_volume_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_name_0 type: string description: The name of the volume default: data vLB_volume_type_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_type_1 type: string description: The type of the volume mapping to a backend default: volumes_ceph vLBAgent_volume_size_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_size_2 type: float description: The size of the volume in Gigabytes. default: 1 vLB_volume_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_name_1 type: string description: The name of the volume default: log vLB_volume_type_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_type_2 type: string description: The type of the volume mapping to a backend default: volumes_ceph vLBAgent_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_size_0 type: float description: The size of the volume in GB default: 15 vLB_volume_type_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_type_0 type: string description: The type of the volume mapping to a backend default: volumes_ceph vLBAgent_volume_name_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_name_2 type: string description: The name of the volume default: config vLBAgent_volume_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_name_1 type: string description: The name of the volume default: log vLBAgent_volume_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_volume_name_0 type: string description: The name of the volume default: data vLB_volume_size_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_size_1 type: float description: The size of the volume in GB. default: 1 vLB_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_size_0 type: float description: The size of the volume in GB. default: 10 packet_mirror_network_subnet_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_mirror_network_subnet_name type: string description: The name of the subnet default: rprb_26071_mme_int_pktmirror_net_1_subnet vLB_volume_size_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_volume_size_2 type: float description: The size of the volume in GB. default: 1 vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vf_module_id type: string description: The VF MODULE ID of the RADCOM System. qrouter_cluster_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_cluster_name type: string description: The component cluster name default: qrouter_cluster vprobe_type: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_type type: string description: The type of vProbe. MME or SGW. default: mme base_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: base_image_name type: string description: The base ID or name of the image to boot with default: rprb_centos_6_7_05_24_2016 vf_module_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vf_module_name type: string description: The VNF module name for vProbe elements. vLB_node_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_node_count type: float description: The number of nodes to create. default: 1 packet_mirror_network_subnet_alloc_end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_mirror_network_subnet_alloc_end type: string description: End address for the allocation pool default: 20.20.5.250 packet_internal_network_subnet_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_internal_network_subnet_name type: string description: The name of the subnet default: rprb_26071_mme_int_pktinternal_net_1_subnet vProbe_version_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vProbe_version_name type: string description: The version name of the component default: vProbe.r.11.1.e._08_16-12_53 vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vnf_id type: string description: The VNF ID of the RADCOM System. availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: availability_zone_0 type: string description: Name of the availability zone for server placement region_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: region_name type: string description: Name of region to be used availability_zone_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: availability_zone_1 type: string description: Name of the availability zone for server placement qtrace_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qtrace_name_0 type: string description: VM Name for QRouter VMs availability_zone_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: availability_zone_2 type: string description: Name of the availability zone for server placement. vprobe_AppDependenciesMachineType: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_AppDependenciesMachineType type: string description: The application dependencies default: DatabaseUpgrade manager_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: manager_name_0 type: string description: VM Name for Manager VM 0 availability_zone_3: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: availability_zone_3 type: string description: Name of the availability zone for server placement vLB_cluster_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_cluster_name type: string description: The component cluster name. default: vLB_cluster packet_internal_network_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_internal_network_name type: string description: A string specifying a symbolic name for the network default: rprb_26071_mme_int_pktinternal_net_1 packet_mirror_network_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_mirror_network_name type: string description: A string specifying a symbolic name for the network default: rprb_26071_mme_int_pktmirror_net_1 packet_internal_network_subnet_alloc_start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_internal_network_subnet_alloc_start type: string description: Start address for the allocation pool default: 192.0.6.2 qrouter_volume_type_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_type_1 type: string description: The type of the volume mapping to a backend default: volumes_ceph vLBAgent_node_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_node_count type: float description: The number of nodes to create default: 1 qrouter_volume_type_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_type_2 type: string description: The type of the volume mapping to a backend default: volumes_ceph vprobe_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vprobe_names type: list description: VM Names for vProbe VMs entry_schema: @@ -455,18 +1063,42 @@ topology_template: qrouter_node_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_node_count type: float description: The number of nodes to create default: 1 qrouter_volume_name_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_name_2 type: string description: The name of the volume default: config vLBAgent_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLBAgent_names type: list description: VM Names for vLBAgent VMs entry_schema: @@ -474,59 +1106,139 @@ topology_template: vLB_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: vLB_flavor_name type: string description: The name of the flavor to boot onto. default: m1.large qrouter_volume_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_name_1 type: string description: The name of the volume default: log qrouter_volume_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_name_0 type: string description: The name of the volume default: data qrouter_volume_type_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_type_0 type: string description: The type of the volume mapping to a backend default: volumes_ceph qrouter_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_size_0 type: float description: The size of the volume in GB default: 1 qrouter_volume_size_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_size_1 type: float description: The size of the volume in GB default: 1 packet_internal_network_subnet_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: packet_internal_network_subnet_cidr type: string description: The Classless Inter-Domain Routing default: 192.0.6.0/24 manager_oam_direct_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: manager_oam_direct_ip_0 type: string description: The public ip address of the manager qrouter_volume_size_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: qrouter_volume_size_2 type: float description: The size of the volume in GB default: 1 rpmrepository_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - FEBase_Module + source_type: HEAT + param_name: rpmrepository_ip_0 type: string description: The public ip address of the repository node_templates: @@ -1066,4 +1778,4 @@ topology_template: - packet_internal_network - security_group - QRouter0 - - vLB \ No newline at end of file + - vLB diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml index aed01b886e..b1b1213804 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml @@ -12,11 +12,27 @@ topology_template: security_group_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: security_group_id1 type: string description: UID of OAM network cmaui_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_names type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -24,53 +40,133 @@ topology_template: cmaui_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_image type: string description: Image for CMAUI server cmaui_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_flavor type: string description: Flavor for CMAUI server security_group_name: label: 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: the name of security group security_group_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: security_group_id type: string description: UID of OAM network availability_zone_0: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + 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: + - addOn + source_type: HEAT + param_name: cmaui_oam_ips type: string description: cmaui_oam_ips shared_network_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id type: string description: Flavor for CMAUI server 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 log network security_group_id3: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: security_group_id3 type: string description: UID of OAM network security_group_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: security_group_id2 type: string description: UID of OAM network node_templates: @@ -368,4 +464,4 @@ topology_template: - cmaui_port_2 - server_cmaui - cmaui_port_1 - - cmaui_port_0 \ No newline at end of file + - cmaui_port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml index b656ef8c37..d5095b90f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml @@ -12,11 +12,27 @@ topology_template: label: 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: the name of security group 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 log network node_templates: @@ -195,4 +211,4 @@ topology_template: members: - jsa_security_group1 - jsa_security_group2 - - test_nested \ No newline at end of file + - test_nested diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml index 58b238e8e7..cb8aeec2d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml @@ -12,21 +12,55 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - main + source_type: HEAT + param_name: security_group_name type: string description: the name of security group shared_security_group_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_security_group_id2 type: string description: network name of jsa log network jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network shared_security_group_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_security_group_id1 type: string description: network name of jsa log network node_templates: @@ -226,4 +260,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - test_nestedArrayParam - - test_nested \ No newline at end of file + - test_nested diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index d3f98b3c71..86afc22c02 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml @@ -14,28 +14,77 @@ topology_template: shared_test_nova: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_test_nova type: string p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: p1 type: string security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base + source_type: HEAT + param_name: security_group_name type: string description: network name of jsa log network shared_test_group2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_test_group2 type: string jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: jsa_net_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: + - base + source_type: HEAT + param_name: jsa_name type: string node_templates: test_nested1Level: @@ -296,4 +345,4 @@ topology_template: members: - test_nested1Level - test_nestedInvalidConnectionToNova - - test_resourceGroup \ No newline at end of file + - test_resourceGroup -- cgit