diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-03 20:24:59 +0530 |
---|---|---|
committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-04 13:54:59 +0530 |
commit | d6982006c27288936d8b0d9eee18068854036f45 (patch) | |
tree | 7b71be074b5303d442971d0bd59b2accd7940604 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles | |
parent | 4b6709601c47050c853e6eaa5525259f066d5277 (diff) |
Added new nodes type
Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.
Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles')
3 files changed, 63 insertions, 87 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml index 507bfcaa08..6be5882f0d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml @@ -4,6 +4,10 @@ description: > Version 2.0 02-09-2016 (Authors: John Doe, user PROD) parameters: + jsa_net_name: + type: string + description: network name of jsa log network + shared_network_id1: type: string description: network name of jsa log network @@ -14,11 +18,21 @@ parameters: resources: + test_net3: + type: OS::Neutron::Net + properties: + name: {get_param: jsa_net_name} + shared: True + test_nested1: type: nested1.yml properties: shared_network_id1: { get_param: shared_network_id1} p2: { get_param: shared_network_id2} + p3: { get_param: template_VMInt_OAM_lb_1} + p4: { get_param: template_VMInt_OAM_lb_2} + p5: { get_param: template_VMInt_OAM_lb_3} + test_nested2: type: nested2.yml @@ -29,4 +43,38 @@ resources: type: nested1.yml properties: shared_network_id1: { get_param: shared_network_id1} - p2: { get_param: shared_network_id2}
\ No newline at end of file + p2: { get_param: shared_network_id2} + + template_VMInt_OAM_lb_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}] + + + template_VMInt_OAM_lb_2: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}] + + template_VMInt_OAM_lb_3: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}]
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml index 6687a32f2a..ce0336d766 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml @@ -9,6 +9,15 @@ parameters: p2: type: string description: UID of OAM network + p3: + type: string + description: UID of OAM network + p4: + type: string + description: UID of OAM network + p5: + type: string + description: UID of OAM network cmaui_names: type: comma_delimited_list description: CMAUI1, CMAUI2 server names @@ -61,17 +70,6 @@ parameters: type: number 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_param: shared_network_id1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -113,18 +111,7 @@ resources: ] } virtual_network_refs: [{ get_param: shared_network_id1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - - 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: [{ get_param: p2 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: p3 }] template_Vlan_2: type: OS::ContrailV2::VirtualMachineInterface @@ -167,18 +154,7 @@ resources: ] } virtual_network_refs: [{ get_param: p2 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_2 }] - - 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_param: p2 },{ get_param: shared_network_id1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: p4 }] template_Vlan_3: type: OS::ContrailV2::VirtualMachineInterface @@ -221,34 +197,4 @@ resources: ] } virtual_network_refs: [{ get_param: p2 },{ get_param: shared_network_id1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_3 }] - - abc_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: p2 } - fixed_ips: [{"ip_address": {get_param: [abc_oam_ips, 0]}}] - security_groups: [{get_param: security_group_name}] - replacement_policy: AUTO - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_1 } - - port: { get_resource: template_VMInt_OAM_lb_2 } - - port: { get_resource: template_VMInt_OAM_lb_3 } - - server_abc: - type: OS::Nova::Server - properties: - name: { get_param: [abc_names, 0]} - image: { get_param: abc_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: abc_flavor } - networks: - - port: { get_resource: abc_port_1 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p5 }] diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml index 0381298528..1e5a41699b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml @@ -43,15 +43,7 @@ parameters: type: number resources: - cmaui_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: p1 } - fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] - security_groups: [{get_param: security_group_name}] - replacement_policy: AUTO - - template_Vlan_3: + template_subint_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -92,14 +84,4 @@ resources: ] } virtual_network_refs: [{ get_param: p1 }] - virtual_machine_interface_refs: [{ get_resource: cmaui_port_1 }] - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: cmaui_port_1 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p2 }]
\ No newline at end of file |