From d6982006c27288936d8b0d9eee18068854036f45 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Tue, 3 Apr 2018 20:24:59 +0530 Subject: 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 --- .../expectedoutputfiles/MainServiceTemplate.yaml | 166 ++++++++++++--------- 1 file changed, 96 insertions(+), 70 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml index c26430b3aa..1262fef985 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,38 +2,8 @@ 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 +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: @@ -41,16 +11,41 @@ topology_template: 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: network name of jsa log network 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: 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 node_templates: @@ -70,14 +65,33 @@ topology_template: service_template_filter: substitute_service_template: nested2ServiceTemplate.yaml requirements: - - link_cmaui_port_1: + - subinterface_link_template_subint_oam_vmi_1: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + template_VMInt_OAM_lb_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net1 + node: test_net3 relationship: tosca.relationships.network.LinksTo + test_net3: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: true + network_name: + get_input: jsa_net_name test_nested3: type: org.openecomp.resource.abstract.nodes.heat.nested1 directives: @@ -90,33 +104,51 @@ topology_template: p2: get_input: shared_network_id2 requirements: - - link_abc_port_1: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_3: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable - node: test_net2 + node: test_net1 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2: + template_VMInt_OAM_lb_2: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net2 + node: test_net3 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: + template_VMInt_OAM_lb_3: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net1 + node: test_net3 relationship: tosca.relationships.network.LinksTo test_net1: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net @@ -135,32 +167,22 @@ topology_template: get_input: shared_network_id1 p2: get_input: shared_network_id2 + p3: + get_input: template_VMInt_OAM_lb_1 + p4: + get_input: template_VMInt_OAM_lb_2 + p5: + get_input: template_VMInt_OAM_lb_3 requirements: - - link_abc_port_1: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_3: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -182,5 +204,9 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - test_nested2 + - template_VMInt_OAM_lb_1 + - test_net3 - test_nested3 + - template_VMInt_OAM_lb_2 + - template_VMInt_OAM_lb_3 - test_nested1 \ No newline at end of file -- cgit 1.2.3-korg