diff options
author | 2018-04-03 20:24:59 +0530 | |
---|---|---|
committer | 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/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml | |
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/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml')
1 files changed, 200 insertions, 204 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml index ab9cc09215..d22c84d7fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,46 +2,23 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: inputs: 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: @@ -49,27 +26,75 @@ topology_template: 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 description: UID of OAM network template_PortTuple_LB1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: template_PortTuple_LB1 type: string oam_sec_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: oam_sec_group_name type: string lb_st_interface_type_oam: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: lb_st_interface_type_oam type: string virtual_ip_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: virtual_ip_address type: string security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: security_group_name type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -77,39 +102,103 @@ topology_template: 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 vlan_ids: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: vlan_ids type: string shared_network_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id1 type: string description: Flavor for CMAUI server 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 virtual_ipv6_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: virtual_ipv6_address type: string 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 shared_network_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id2 type: list description: Flavor for CMAUI server entry_schema: @@ -117,29 +206,77 @@ topology_template: lb_st_vlan_type_oam: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: lb_st_vlan_type_oam type: string description: dummy mac_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: mac_address type: string 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 subinterface_name_prefix: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: subinterface_name_prefix type: string subinterface_instance_index: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: subinterface_instance_index type: float 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 node_templates: template_VMInt_OAM_lb_1: @@ -150,7 +287,7 @@ topology_template: virtual_network_refs: - get_input: shared_network_id virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -159,10 +296,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_2: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -172,7 +305,7 @@ topology_template: - get_input: shared_network_id - get_input: shared_network_id1 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -181,10 +314,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_3: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -195,7 +324,7 @@ topology_template: - shared_network_id2 - 0 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -205,169 +334,39 @@ topology_template: shared: true network_name: get_input: jsa_net_name - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - test_net: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_input: jsa_net_name - template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + test_nested1: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan + directives: + - substitutable properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: - - shared_network_id2 - - 0 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address + service_template_filter: + substitute_service_template: vlanServiceTemplate.yaml + shared_network_id1: + get_input: shared_network_id1 + p2: + get_input: shared_network_id2 + p3: template_VMInt_OAM_lb_1 + p4: template_VMInt_OAM_lb_2 + p5: template_VMInt_OAM_lb_3 requirements: - - binding: + - binding_template_Vlan_3: capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 + node: template_VMInt_OAM_lb_3 relationship: tosca.relationships.network.BindsTo - template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: shared_network_id - - get_input: shared_network_id1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - binding: + - binding_template_Vlan_2: capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 + node: template_VMInt_OAM_lb_2 relationship: tosca.relationships.network.BindsTo - template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: shared_network_id - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - binding: + - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable node: template_VMInt_OAM_lb_1 relationship: tosca.relationships.network.BindsTo + test_net: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: true + network_name: + get_input: jsa_net_name groups: main_group: type: org.openecomp.groups.heat.HeatStack @@ -387,7 +386,4 @@ topology_template: - template_VMInt_OAM_lb_1 - template_VMInt_OAM_lb_2 - template_VMInt_OAM_lb_3 - - server_cmaui - - template_Vlan_3 - - template_Vlan_2 - - template_Vlan_1
\ No newline at end of file + - test_nested1 |