diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-02-22 14:32:06 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-02-28 09:56:30 +0000 |
commit | 51e051e86f9f5d10c9439e9e5e57d1e9ee8f8e06 (patch) | |
tree | 957583dc6b93667d7024c7258716d6c6b96776c2 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml | |
parent | bc169d4b132891052cc8c642e18e642afd04464f (diff) |
VLAN tagging - Pattern 1A, 1C1
1. Implementation for supporting VLAN
tagging in Pattern 1A and 1C1 heats
2. Updated code for switch case refactor with
command design pattern
3. Added unit tests and bug fixes
Change-Id: I54938ffd6673f865b4506a890ec8e7b9c54597b1
Issue-ID: SDC-1036
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml')
-rw-r--r-- | openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml | 193 |
1 files changed, 61 insertions, 132 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml index 7863cb5f9a..adba9e8c6d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/inputfiles/hot_template.yml @@ -1,132 +1,61 @@ -heat_template_version: 2013-05-23 - -description: cmaui server template for vMMSC - -parameters: - network_ipam_refs_data_ipam_subnets_addr_from_start_true: - description: dummy - type: string - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2: - description: dummy - type: string - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2: - description: dummy - type: string - lb_st_interface_type_oam: - description: dummy - type: string - template_PortTuple_LB1: - description: dummy - type: string - oam_sec_group_name: - description: dummy - type: string - jsa_net_name: - description: dummy - type: string - nems_traffic_name: - description: dummy - type: string - interface_param: - description: dummy - type: string - -resources: - template_VMInt_OAM_lb_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_resource: jsa_net1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - virtual_machine_interface_refs: [{ get_param: interface_param }] - - jsa_net1: - properties: - name: aaa - network_ipam_refs_data: - - - network_ipam_refs_data_ipam_subnets: - - - network_ipam_refs_data_ipam_subnets_addr_from_start: - get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true - network_ipam_refs_data_ipam_subnets_subnet: - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix: - get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2 - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: - get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2 - type: "OS::ContrailV2::VirtualNetwork" - - template_VMInt_OAM_lb_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [ { list_join: [':', { get_attr: [ jsa_net2, fq_name ] } ] }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - - jsa_net2: - properties: - name: aaa - network_ipam_refs_data: - - - network_ipam_refs_data_ipam_subnets: - - - network_ipam_refs_data_ipam_subnets_addr_from_start: - get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true - network_ipam_refs_data_ipam_subnets_subnet: - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix: - get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2 - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: - get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2 - type: "OS::ContrailV2::VirtualNetwork" - - template_VMInt_OAM_lb_3: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_attr: [ jsa_net3, fq_name ] } ] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - - jsa_net3: - properties: - name: aaa - network_ipam_refs_data: - - - network_ipam_refs_data_ipam_subnets: - - - network_ipam_refs_data_ipam_subnets_addr_from_start: - get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true - network_ipam_refs_data_ipam_subnets_subnet: - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix: - get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2 - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: - get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2 - type: "OS::ContrailV2::VirtualNetwork" - - template_VMInt_OAM_lb_4: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_attr: [ jsa_net4, fq_name ] } ] # should not connect to contrail network - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - - jsa_net4: - type: OS::Contrail::VirtualNetwork - properties: - name: {get_param: nems_traffic_name} - +heat_template_version: 2013-05-23
+
+description: cmaui server template for vMMSC
+
+parameters:
+ network_ipam_refs_data_ipam_subnets_addr_from_start_true:
+ description: dummy
+ type: string
+ network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
+ description: dummy
+ type: string
+ network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
+ description: dummy
+ type: string
+ lb_st_interface_type_oam:
+ description: dummy
+ type: string
+ template_PortTuple_LB1:
+ description: dummy
+ type: string
+ oam_sec_group_name:
+ description: dummy
+ type: string
+ jsa_net_name:
+ description: dummy
+ type: string
+ nems_traffic_name:
+ description: dummy
+ type: string
+ interface_param:
+ description: dummy
+ type: string
+
+resources:
+ template_VMInt_OAM_lb_1:
+ type: OS::ContrailV2::VirtualMachineInterface
+ properties:
+ virtual_machine_interface_properties:
+ {
+ virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
+ }
+ virtual_network_refs: [{ get_resource: jsa_net1 }]
+ port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
+ security_group_refs: [{ get_param: oam_sec_group_name}]
+ virtual_machine_interface_refs: [{ get_param: interface_param }]
+
+ jsa_net1:
+ properties:
+ name: aaa
+ network_ipam_refs_data:
+ -
+ network_ipam_refs_data_ipam_subnets:
+ -
+ network_ipam_refs_data_ipam_subnets_addr_from_start:
+ get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true
+ network_ipam_refs_data_ipam_subnets_subnet:
+ network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
+ get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
+ network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
+ get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
+ type: "OS::ContrailV2::VirtualNetwork"
\ No newline at end of file |