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 | 50 +++- .../expectedoutputfiles/MainServiceTemplate.yaml | 56 ++++- .../expectedoutputfiles/MainServiceTemplate.yaml | 242 +++++++++++++++++- .../expectedoutputfiles/MainServiceTemplate.yaml | 202 ++++++++++++++- .../expectedoutputfiles/MainServiceTemplate.yaml | 234 +++++++++++++++++- .../expectedoutputfiles/MainServiceTemplate.yaml | 274 ++++++++++++++++++++- 6 files changed, 1052 insertions(+), 6 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml index 8e8e4f9abe..a228e6d892 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,26 +11,74 @@ topology_template: Internal1_shared: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: Internal1_shared type: string Internal1_forwarding_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: Internal1_forwarding_mode type: string Internal2_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: Internal2_net_name type: string Internal2_forwarding_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: Internal2_forwarding_mode type: string Internal2_shared: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: Internal2_shared type: string Internal1_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: Internal1_net_name type: string node_templates: Internal2-net: @@ -130,4 +178,4 @@ topology_template: members: - Internal2-net - Internal1-net - - 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml index f74dda879b..0d104cb622 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,26 +11,80 @@ topology_template: Internal1_shared: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: Internal1_shared type: string Internal1_forwarding_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: Internal1_forwarding_mode type: string Internal2_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: Internal2_net_name type: string Internal2_forwarding_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: Internal2_forwarding_mode type: string Internal2_shared: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: Internal2_shared type: string Internal1_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: Internal1_net_name type: string node_templates: Internal2-net: @@ -227,4 +281,4 @@ topology_template: members: - Internal1-net-1 - test_nested1 - - Internal2-net-1 \ No newline at end of file + - Internal2-net-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml index b663dca29a..9482138b50 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,146 +11,386 @@ topology_template: service_policy_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_policy_name type: string description: Policy Name st_static_routes_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_static_routes_list type: string description: List of static routes enabled-disabled st_type: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_type type: string description: service type st_service_interface_type_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_service_interface_type_list type: string description: List of interface types st_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_mode type: string description: service mode Cricket_OCS_protected_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: Cricket_OCS_protected_net_id type: string description: Name of Cricket OCS network oam_mgmt_net_0_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: oam_mgmt_net_0_id type: string description: Name of OAM network start_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: start_dst_ports type: float description: Start of dst port st_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_flavor type: string description: Flavor availability_zone_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: availability_zone_1 type: string description: availability zone service_instance_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_instance_name type: string description: Service instance name st_scaling: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_scaling type: string description: Indicates whether service scaling is enabled max_num_fw_instances: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: max_num_fw_instances type: float description: maximum number of firewall instances for scaling start_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: start_src_ports type: float description: Start of src port service_policy_direction: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_policy_direction type: string description: Direction of Policy st_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_name type: string description: Name of service template count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: count HSL_direct_net_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_gateway type: string description: HSL (Logging) network gateway address st_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_image type: string description: Name of the image st_shared_ip_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_shared_ip_list type: string description: List of shared ip enabled-disabled prefix_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: prefix_0 type: string Cricket_OCS_direct_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: Cricket_OCS_direct_net_id type: string description: Name of Cricket OCS network oam_mgmt_net_1_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: oam_mgmt_net_1_id type: string description: Name of OAM network prefix_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: prefix_1 type: string end_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: end_src_ports type: float description: End of src port prefix_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: prefix_2 type: string end_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: end_dst_ports type: float description: End of dst port st_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_image_name type: string description: Name of the image HSL_direct_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_id type: string description: Name of HSL (Logging) network HSL_direct_net_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_cidr type: string description: HSL (Logging) network address (CIDR notation) node_templates: @@ -374,4 +614,4 @@ topology_template: - service_instance_1 - service_instance_2 - hsl_direct_net - - service_policy \ No newline at end of file + - service_policy diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml index 7b2ef898db..7ba76db7bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,142 +11,342 @@ topology_template: protected_net: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: protected_net type: string service_policy_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: service_policy_name type: string description: Policy Name default: MNS-25180-L-02Shared_policy_direct_fw_protected_oam_1 oam_direct_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: oam_direct_net_id type: string description: Name of private network to be created st_static_routes_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_static_routes_list type: string description: List of static routes enabled-disabled default: True,True,True,True st_type: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_type type: string description: service type default: firewall st_service_interface_type_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_service_interface_type_list type: string description: List of interface types default: management,left,right,other oam_protected_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: oam_protected_net_id type: string description: Name of private network to be created st_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_mode type: string description: service mode default: in-network-nat static_prefix_3_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: static_prefix_3_1 type: string description: prefix for static route default: 107.239.80.0/21 oam_hsl_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: oam_hsl_net_id type: string description: Name of private network to be created start_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: start_dst_ports type: float description: Start of dst port default: -1 st_scaling: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_scaling type: string description: Indicates whether service scaling is enabled default: 'True' service_instance_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: service_instance_name type: string description: service instance name max_num_fw_instances: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: max_num_fw_instances type: float description: maximum number of firewall instances for scaling default: 8 start_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: start_src_ports type: float description: Start of src port default: -1 availability_zone: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: availability_zone type: string description: availability zone in form of Zone:Host service_policy_direction: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: service_policy_direction type: string description: Direction of Policy default: <> st_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_flavor_name type: string description: Flavor default: lc.medium st_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_name type: string description: service template name or ID default: MNS-25180-L-02Shared_oam_fw_template_1 st_availability_zone_enable_flag: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_availability_zone_enable_flag type: string description: service template availablity_zone feature enable flag default: 'True' st_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_image type: string description: Name of the image default: NIMBUS_SRX_151X49-D303 st_shared_ip_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: st_shared_ip_list type: string description: List of shared ip enabled-disabled default: False,True,False,False oam_mgmt_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: oam_mgmt_net_id type: string description: Name of private network to be created end_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: end_src_ports type: float description: End of src port default: -1 end_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - lcp1_mss.oam-fw_si + source_type: HEAT + param_name: end_dst_ports type: float description: End of dst port default: -1 @@ -273,4 +473,4 @@ topology_template: Version 2.0 10-14-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-OAM-FW-SI template that creates two OAM networks (direct and protected) with a scaled out firewall service between the two. members: - service_instance - - service_policy \ No newline at end of file + - service_policy diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml index f0a62e7984..808c294b26 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,143 +11,375 @@ topology_template: service_policy_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_policy_name type: string description: Policy Name st_static_routes_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_static_routes_list type: string description: List of static routes enabled-disabled st_type: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_type type: string description: service type st_service_interface_type_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_service_interface_type_list type: string description: List of interface types st_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_mode type: string description: service mode Cricket_OCS_protected_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: Cricket_OCS_protected_net_id type: string description: Name of Cricket OCS network oam_mgmt_net_0_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: oam_mgmt_net_0_id type: string description: Name of OAM network start_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: start_dst_ports type: float description: Start of dst port st_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_flavor type: string description: Flavor availability_zone_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: availability_zone_1 type: string description: availability zone service_instance_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_instance_name type: string description: Service instance name st_scaling: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_scaling type: string description: Indicates whether service scaling is enabled max_num_fw_instances: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: max_num_fw_instances type: float description: maximum number of firewall instances for scaling start_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: start_src_ports type: float description: Start of src port service_policy_direction: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_policy_direction type: string description: Direction of Policy st_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_name type: string description: Name of service template HSL_direct_net_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_gateway type: string description: HSL (Logging) network gateway address st_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_image type: string description: Name of the image st_shared_ip_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_shared_ip_list type: string description: List of shared ip enabled-disabled prefix_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: prefix_0 type: string Cricket_OCS_direct_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: Cricket_OCS_direct_net_id type: string description: Name of Cricket OCS network oam_mgmt_net_1_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: oam_mgmt_net_1_id type: string description: Name of OAM network prefix_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: prefix_1 type: string end_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: end_src_ports type: float description: End of src port prefix_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: prefix_2 type: string end_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: end_dst_ports type: float description: End of dst port st_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_image_name type: string description: Name of the image HSL_direct_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_id type: string description: Name of HSL (Logging) network HSL_direct_net_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_cidr type: string description: HSL (Logging) network address (CIDR notation) node_templates: @@ -414,4 +646,4 @@ topology_template: - service_instance_2 - hsl_direct_net1 - hsl_direct_net2 - - service_policy \ No newline at end of file + - service_policy diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml index 108852543e..8d2476a20f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,161 +11,433 @@ topology_template: Internal1_shared: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_base + source_type: HEAT + param_name: Internal1_shared type: string service_policy_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_policy_name type: string description: Policy Name st_static_routes_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_static_routes_list type: string description: List of static routes enabled-disabled st_type: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_type type: string description: service type Internal2_forwarding_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_base + source_type: HEAT + param_name: Internal2_forwarding_mode type: string st_service_interface_type_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_service_interface_type_list type: string description: List of interface types st_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_mode type: string description: service mode Cricket_OCS_protected_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: Cricket_OCS_protected_net_id type: string description: Name of Cricket OCS network oam_mgmt_net_0_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: oam_mgmt_net_0_id type: string description: Name of OAM network start_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: start_dst_ports type: float description: Start of dst port st_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_flavor type: string description: Flavor availability_zone_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: availability_zone_1 type: string description: availability zone Internal2_shared: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_base + source_type: HEAT + param_name: Internal2_shared type: string service_instance_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_instance_name type: string description: Service instance name st_scaling: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_scaling type: string description: Indicates whether service scaling is enabled max_num_fw_instances: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: max_num_fw_instances type: float description: maximum number of firewall instances for scaling Internal1_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_base + source_type: HEAT + param_name: Internal1_net_name type: string start_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: start_src_ports type: float description: Start of src port service_policy_direction: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: service_policy_direction type: string description: Direction of Policy st_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_name type: string description: Name of service template Internal2_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_base + source_type: HEAT + param_name: Internal2_net_name type: string hsl_direct_net3: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: hsl_direct_net3 type: string hsl_direct_net4: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: hsl_direct_net4 type: string HSL_direct_net_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_gateway type: string description: HSL (Logging) network gateway address hsl_direct_net1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: hsl_direct_net1 type: string hsl_direct_net2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: hsl_direct_net2 type: string st_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_image type: string description: Name of the image st_shared_ip_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: st_shared_ip_list type: string description: List of shared ip enabled-disabled Cricket_OCS_direct_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: Cricket_OCS_direct_net_id type: string description: Name of Cricket OCS network Internal1_forwarding_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_base + source_type: HEAT + param_name: Internal1_forwarding_mode type: string end_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: end_src_ports type: float description: End of src port end_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: end_dst_ports type: float description: End of dst port HSL_direct_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_id type: string description: Name of HSL (Logging) network HSL_direct_net_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - OCS-fw + source_type: HEAT + param_name: HSL_direct_net_cidr type: string description: HSL (Logging) network address (CIDR notation) node_templates: @@ -380,4 +652,4 @@ topology_template: members: - Internal2-net - Internal1-net - - Internal3-net \ No newline at end of file + - Internal3-net -- cgit 1.2.3-korg