From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 28 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 44 +-- .../OCS-fw_service_instance_1ServiceTemplate.yaml | 393 ++++++++++++++++++++ .../OCS-fw_service_instance_2ServiceTemplate.yaml | 305 +++++++++++++++ .../service_instance_1ServiceTemplate.yaml | 407 --------------------- .../service_instance_2ServiceTemplate.yaml | 319 ---------------- 6 files changed, 710 insertions(+), 786 deletions(-) create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml delete mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/service_instance_1ServiceTemplate.yaml delete mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/service_instance_2ServiceTemplate.yaml (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index d5a177bddb..d336d8242d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.vfc.nodes.heat.compute_service_template_1: derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute 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 a96c947d9d..b663dca29a 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 @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml topology_template: inputs: service_policy_name: @@ -190,7 +166,7 @@ topology_template: image_name: get_input: st_image service_template_filter: - substitute_service_template: service_instance_1ServiceTemplate.yaml + substitute_service_template: OCS-fw_service_instance_1ServiceTemplate.yaml count: get_input: max_num_fw_instances scaling_enabled: false @@ -233,6 +209,8 @@ topology_template: - management,left,right,other - ',' - 3 + service_instance_name: + get_input: service_instance_name interface_list: - virtual_network: get_input: oam_mgmt_net_0_id @@ -248,8 +226,6 @@ topology_template: get_input: prefix_2 virtual_network: get_input: oam_mgmt_net_1_id - service_instance_name: - get_input: service_instance_name service_mode: get_input: st_mode shared_ip_list: @@ -290,7 +266,7 @@ topology_template: image_name: get_input: st_image_name service_template_filter: - substitute_service_template: service_instance_2ServiceTemplate.yaml + substitute_service_template: OCS-fw_service_instance_2ServiceTemplate.yaml count: 9 mandatory: true service_type: @@ -315,13 +291,13 @@ topology_template: - get_input: st_service_interface_type_list - ',' - 1 + service_instance_name: + get_input: service_instance_name interface_list: - virtual_network: get_input: oam_mgmt_net_0_id - virtual_network: get_input: Cricket_OCS_direct_net_id - service_instance_name: - get_input: service_instance_name service_mode: get_input: st_mode shared_ip_list: @@ -388,7 +364,7 @@ topology_template: node: service_instance_1 relationship: tosca.relationships.DependsOn groups: - OCS-fw: + OCS-fw_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/OCS-fw.yml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml new file mode 100644 index 0000000000..69d73f9034 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml @@ -0,0 +1,393 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: OCS-fw_service_instance_1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + availability_zone: + hidden: false + immutable: false + type: string + description: Availability zone to create servers in + required: false + status: SUPPORTED + static_routes_list: + hidden: false + immutable: false + type: list + description: Static routes enabled + required: false + status: SUPPORTED + entry_schema: + type: boolean + availability_zone_enable: + hidden: false + immutable: false + type: boolean + description: Indicates availability zone is enabled + required: false + default: false + status: SUPPORTED + service_template_name: + hidden: false + immutable: false + type: string + description: Service template name + required: false + status: SUPPORTED + ordered_interfaces: + hidden: false + immutable: false + type: boolean + description: Indicates if service interface are ordered + required: false + default: false + status: SUPPORTED + flavor: + hidden: false + immutable: false + type: string + description: flavor + required: false + status: SUPPORTED + image_name: + hidden: false + immutable: false + type: string + description: Image name + required: true + status: SUPPORTED + service_type: + hidden: false + immutable: false + type: string + description: Service type + required: true + status: SUPPORTED + constraints: + - valid_values: + - firewall + - analyzer + - source-nat + - loadbalancer + service_interface_type_list: + hidden: false + immutable: false + type: list + description: List of interface types + required: true + status: SUPPORTED + entry_schema: + type: string + constraints: + - valid_values: + - management + - left + - right + - other + service_instance_name: + hidden: false + immutable: false + type: string + description: Service instance name + required: true + status: SUPPORTED + interface_list: + hidden: false + immutable: false + type: list + description: List of interfaces + required: false + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.contrail.InterfaceData + service_mode: + hidden: false + immutable: false + type: string + description: Service mode + required: true + status: SUPPORTED + constraints: + - valid_values: + - transparent + - in-network + - in-network-nat + shared_ip_list: + hidden: false + immutable: false + type: list + description: Shared ips enabled + required: false + status: SUPPORTED + entry_schema: + type: boolean + node_templates: + service_instance_1: + type: org.openecomp.resource.vfc.nodes.heat.compute_service_template_1 + properties: + availability_zone: + get_input: availability_zone + static_routes_list: + get_input: static_routes_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name + ordered_interfaces: + get_input: ordered_interfaces + flavor: + get_input: flavor + image_name: + get_input: image_name + service_type: + get_input: service_type + service_interface_type_list: + get_input: service_interface_type_list + service_instance_name: + get_input: service_instance_name + interface_list: + get_input: interface_list + service_mode: + get_input: service_mode + shared_ip_list: + get_input: shared_ip_list + port_0: + type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port + properties: + static_routes: + get_input: + - interface_list + - 0 + - static_routes + virtual_network: + get_input: + - interface_list + - 0 + - virtual_network + static_route: + get_input: + - static_routes_list + - 0 + allowed_address_pairs: + get_input: + - interface_list + - 0 + - allowed_address_pairs + shared_ip: + get_input: + - shared_ip_list + - 0 + ip_address: + get_input: + - interface_list + - 0 + - ip_address + interface_type: + get_input: + - service_interface_type_list + - 0 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: service_instance_1 + relationship: tosca.relationships.network.BindsTo + port_1: + type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port + properties: + static_routes: + get_input: + - interface_list + - 1 + - static_routes + virtual_network: + get_input: + - interface_list + - 1 + - virtual_network + static_route: + get_input: + - static_routes_list + - 1 + allowed_address_pairs: + get_input: + - interface_list + - 1 + - allowed_address_pairs + shared_ip: + get_input: + - shared_ip_list + - 1 + ip_address: + get_input: + - interface_list + - 1 + - ip_address + interface_type: + get_input: + - service_interface_type_list + - 1 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: service_instance_1 + relationship: tosca.relationships.network.BindsTo + port_2: + type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port + properties: + static_routes: + get_input: + - interface_list + - 2 + - static_routes + virtual_network: + get_input: + - interface_list + - 2 + - virtual_network + static_route: + get_input: + - static_routes_list + - 2 + allowed_address_pairs: + get_input: + - interface_list + - 2 + - allowed_address_pairs + shared_ip: + get_input: + - shared_ip_list + - 2 + ip_address: + get_input: + - interface_list + - 2 + - ip_address + interface_type: + get_input: + - service_interface_type_list + - 2 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: service_instance_1 + relationship: tosca.relationships.network.BindsTo + port_3: + type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port + properties: + static_routes: + get_input: + - interface_list + - 3 + - static_routes + virtual_network: + get_input: + - interface_list + - 3 + - virtual_network + static_route: + get_input: + - static_routes_list + - 3 + allowed_address_pairs: + get_input: + - interface_list + - 3 + - allowed_address_pairs + shared_ip: + get_input: + - shared_ip_list + - 3 + ip_address: + get_input: + - interface_list + - 3 + - ip_address + interface_type: + get_input: + - service_interface_type_list + - 3 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: service_instance_1 + relationship: tosca.relationships.network.BindsTo + groups: + service_instance_1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/OCS-fw.yml + members: + - service_instance_1 + - port_0 + - port_1 + - port_2 + - port_3 + outputs: + tenant_id: + description: Tenant id of the Service Instance + value: + get_attribute: + - service_instance_1 + - tenant_id + fq_name: + description: The FQ name of the service instance + value: + get_attribute: + - service_instance_1 + - fq_name + service_template_name: + description: Service Template of the Service Instance + value: + get_attribute: + - service_instance_1 + - service_template_name + show: + description: All attributes + value: + get_attribute: + - service_instance_1 + - show + active_vms: + description: Number of service VMs active for this Service Instance + value: + get_attribute: + - service_instance_1 + - active_vms + service_instance_name: + description: The name of the service instance + value: + get_attribute: + - service_instance_1 + - service_instance_name + virtual_machines: + description: Service VMs for the Service Instance + value: + get_attribute: + - service_instance_1 + - virtual_machines + status: + description: Status of the service instance + value: + get_attribute: + - service_instance_1 + - status + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.service_template_1 + requirements: + link_port_0: + - port_0 + - link + link_port_1: + - port_1 + - link + link_port_2: + - port_2 + - link + link_port_3: + - port_3 + - link \ 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/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml new file mode 100644 index 0000000000..1a0f590d58 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml @@ -0,0 +1,305 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: OCS-fw_service_instance_2 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + availability_zone: + hidden: false + immutable: false + type: string + description: Availability zone to create servers in + required: false + status: SUPPORTED + static_routes_list: + hidden: false + immutable: false + type: list + description: Static routes enabled + required: false + status: SUPPORTED + entry_schema: + type: boolean + availability_zone_enable: + hidden: false + immutable: false + type: boolean + description: Indicates availability zone is enabled + required: false + default: false + status: SUPPORTED + service_template_name: + hidden: false + immutable: false + type: string + description: Service template name + required: false + status: SUPPORTED + ordered_interfaces: + hidden: false + immutable: false + type: boolean + description: Indicates if service interface are ordered + required: false + default: false + status: SUPPORTED + flavor: + hidden: false + immutable: false + type: string + description: flavor + required: false + status: SUPPORTED + image_name: + hidden: false + immutable: false + type: string + description: Image name + required: true + status: SUPPORTED + service_type: + hidden: false + immutable: false + type: string + description: Service type + required: true + status: SUPPORTED + constraints: + - valid_values: + - firewall + - analyzer + - source-nat + - loadbalancer + service_interface_type_list: + hidden: false + immutable: false + type: list + description: List of interface types + required: true + status: SUPPORTED + entry_schema: + type: string + constraints: + - valid_values: + - management + - left + - right + - other + service_instance_name: + hidden: false + immutable: false + type: string + description: Service instance name + required: true + status: SUPPORTED + interface_list: + hidden: false + immutable: false + type: list + description: List of interfaces + required: false + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.contrail.InterfaceData + service_mode: + hidden: false + immutable: false + type: string + description: Service mode + required: true + status: SUPPORTED + constraints: + - valid_values: + - transparent + - in-network + - in-network-nat + shared_ip_list: + hidden: false + immutable: false + type: list + description: Shared ips enabled + required: false + status: SUPPORTED + entry_schema: + type: boolean + node_templates: + service_instance_2: + type: org.openecomp.resource.vfc.nodes.heat.st + properties: + availability_zone: + get_input: availability_zone + static_routes_list: + get_input: static_routes_list + availability_zone_enable: + get_input: availability_zone_enable + service_template_name: + get_input: service_template_name + ordered_interfaces: + get_input: ordered_interfaces + flavor: + get_input: flavor + image_name: + get_input: image_name + service_type: + get_input: service_type + service_interface_type_list: + get_input: service_interface_type_list + service_instance_name: + get_input: service_instance_name + interface_list: + get_input: interface_list + service_mode: + get_input: service_mode + shared_ip_list: + get_input: shared_ip_list + port_0: + type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port + properties: + static_routes: + get_input: + - interface_list + - 0 + - static_routes + virtual_network: + get_input: + - interface_list + - 0 + - virtual_network + static_route: + get_input: + - static_routes_list + - 0 + allowed_address_pairs: + get_input: + - interface_list + - 0 + - allowed_address_pairs + shared_ip: + get_input: + - shared_ip_list + - 0 + ip_address: + get_input: + - interface_list + - 0 + - ip_address + interface_type: + get_input: + - service_interface_type_list + - 0 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: service_instance_2 + relationship: tosca.relationships.network.BindsTo + port_1: + type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port + properties: + static_routes: + get_input: + - interface_list + - 1 + - static_routes + virtual_network: + get_input: + - interface_list + - 1 + - virtual_network + static_route: + get_input: + - static_routes_list + - 1 + allowed_address_pairs: + get_input: + - interface_list + - 1 + - allowed_address_pairs + shared_ip: + get_input: + - shared_ip_list + - 1 + ip_address: + get_input: + - interface_list + - 1 + - ip_address + interface_type: + get_input: + - service_interface_type_list + - 1 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: service_instance_2 + relationship: tosca.relationships.network.BindsTo + groups: + service_instance_2_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/OCS-fw.yml + members: + - service_instance_2 + - port_0 + - port_1 + outputs: + tenant_id: + description: Tenant id of the Service Instance + value: + get_attribute: + - service_instance_2 + - tenant_id + fq_name: + description: The FQ name of the service instance + value: + get_attribute: + - service_instance_2 + - fq_name + service_template_name: + description: Service Template of the Service Instance + value: + get_attribute: + - service_instance_2 + - service_template_name + show: + description: All attributes + value: + get_attribute: + - service_instance_2 + - show + active_vms: + description: Number of service VMs active for this Service Instance + value: + get_attribute: + - service_instance_2 + - active_vms + service_instance_name: + description: The name of the service instance + value: + get_attribute: + - service_instance_2 + - service_instance_name + virtual_machines: + description: Service VMs for the Service Instance + value: + get_attribute: + - service_instance_2 + - virtual_machines + status: + description: Status of the service instance + value: + get_attribute: + - service_instance_2 + - status + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2 + requirements: + link_port_0: + - port_0 + - link + link_port_1: + - port_1 + - link \ 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/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/service_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/service_instance_1ServiceTemplate.yaml deleted file mode 100644 index d84d6c6889..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/service_instance_1ServiceTemplate.yaml +++ /dev/null @@ -1,407 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: service_instance_1 -imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -topology_template: - inputs: - availability_zone: - hidden: false - immutable: false - type: string - description: Availability zone to create servers in - required: false - status: SUPPORTED - static_routes_list: - hidden: false - immutable: false - type: list - description: Static routes enabled - required: false - status: SUPPORTED - entry_schema: - type: boolean - availability_zone_enable: - hidden: false - immutable: false - type: boolean - description: Indicates availability zone is enabled - required: false - default: false - status: SUPPORTED - service_template_name: - hidden: false - immutable: false - type: string - description: Service template name - required: false - status: SUPPORTED - ordered_interfaces: - hidden: false - immutable: false - type: boolean - description: Indicates if service interface are ordered - required: false - default: false - status: SUPPORTED - flavor: - hidden: false - immutable: false - type: string - description: flavor - required: false - status: SUPPORTED - image_name: - hidden: false - immutable: false - type: string - description: Image name - required: true - status: SUPPORTED - service_type: - hidden: false - immutable: false - type: string - description: Service type - required: true - status: SUPPORTED - constraints: - - valid_values: - - firewall - - analyzer - - source-nat - - loadbalancer - service_interface_type_list: - hidden: false - immutable: false - type: list - description: List of interface types - required: true - status: SUPPORTED - entry_schema: - type: string - constraints: - - valid_values: - - management - - left - - right - - other - service_instance_name: - hidden: false - immutable: false - type: string - description: Service instance name - required: true - status: SUPPORTED - interface_list: - hidden: false - immutable: false - type: list - description: List of interfaces - required: false - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.contrail.InterfaceData - service_mode: - hidden: false - immutable: false - type: string - description: Service mode - required: true - status: SUPPORTED - constraints: - - valid_values: - - transparent - - in-network - - in-network-nat - shared_ip_list: - hidden: false - immutable: false - type: list - description: Shared ips enabled - required: false - status: SUPPORTED - entry_schema: - type: boolean - node_templates: - service_instance_1: - type: org.openecomp.resource.vfc.nodes.heat.compute_service_template_1 - properties: - flavor: - get_input: flavor - image_name: - get_input: image_name - availability_zone: - get_input: availability_zone - service_type: - get_input: service_type - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - service_instance_name: - get_input: service_instance_name - service_mode: - get_input: service_mode - port_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port - properties: - static_routes: - get_input: - - interface_list - - 0 - - static_routes - virtual_network: - get_input: - - interface_list - - 0 - - virtual_network - static_route: - get_input: - - static_routes_list - - 0 - allowed_address_pairs: - get_input: - - interface_list - - 0 - - allowed_address_pairs - shared_ip: - get_input: - - shared_ip_list - - 0 - ip_address: - get_input: - - interface_list - - 0 - - ip_address - interface_type: - get_input: - - service_interface_type_list - - 0 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: service_instance_1 - relationship: tosca.relationships.network.BindsTo - port_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port - properties: - static_routes: - get_input: - - interface_list - - 1 - - static_routes - virtual_network: - get_input: - - interface_list - - 1 - - virtual_network - static_route: - get_input: - - static_routes_list - - 1 - allowed_address_pairs: - get_input: - - interface_list - - 1 - - allowed_address_pairs - shared_ip: - get_input: - - shared_ip_list - - 1 - ip_address: - get_input: - - interface_list - - 1 - - ip_address - interface_type: - get_input: - - service_interface_type_list - - 1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: service_instance_1 - relationship: tosca.relationships.network.BindsTo - port_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port - properties: - static_routes: - get_input: - - interface_list - - 2 - - static_routes - virtual_network: - get_input: - - interface_list - - 2 - - virtual_network - static_route: - get_input: - - static_routes_list - - 2 - allowed_address_pairs: - get_input: - - interface_list - - 2 - - allowed_address_pairs - shared_ip: - get_input: - - shared_ip_list - - 2 - ip_address: - get_input: - - interface_list - - 2 - - ip_address - interface_type: - get_input: - - service_interface_type_list - - 2 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: service_instance_1 - relationship: tosca.relationships.network.BindsTo - port_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port - properties: - static_routes: - get_input: - - interface_list - - 3 - - static_routes - virtual_network: - get_input: - - interface_list - - 3 - - virtual_network - static_route: - get_input: - - static_routes_list - - 3 - allowed_address_pairs: - get_input: - - interface_list - - 3 - - allowed_address_pairs - shared_ip: - get_input: - - shared_ip_list - - 3 - ip_address: - get_input: - - interface_list - - 3 - - ip_address - interface_type: - get_input: - - service_interface_type_list - - 3 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: service_instance_1 - relationship: tosca.relationships.network.BindsTo - groups: - service_instance_1: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/OCS-fw.yml - members: - - service_instance_1 - - port_0 - - port_1 - - port_2 - - port_3 - outputs: - tenant_id: - description: Tenant id of the Service Instance - value: - get_attribute: - - service_instance_1 - - tenant_id - fq_name: - description: The FQ name of the service instance - value: - get_attribute: - - service_instance_1 - - fq_name - service_template_name: - description: Service Template of the Service Instance - value: - get_attribute: - - service_instance_1 - - service_template_name - show: - description: All attributes - value: - get_attribute: - - service_instance_1 - - show - active_vms: - description: Number of service VMs active for this Service Instance - value: - get_attribute: - - service_instance_1 - - active_vms - service_instance_name: - description: The name of the service instance - value: - get_attribute: - - service_instance_1 - - service_instance_name - virtual_machines: - description: Service VMs for the Service Instance - value: - get_attribute: - - service_instance_1 - - virtual_machines - status: - description: Status of the service instance - value: - get_attribute: - - service_instance_1 - - status - substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.service_template_1 - requirements: - link_port_0: - - port_0 - - link - link_port_1: - - port_1 - - link - link_port_2: - - port_2 - - link - link_port_3: - - port_3 - - link \ 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/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/service_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/service_instance_2ServiceTemplate.yaml deleted file mode 100644 index 3a2de0696f..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/service_instance_2ServiceTemplate.yaml +++ /dev/null @@ -1,319 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: service_instance_2 -imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -topology_template: - inputs: - availability_zone: - hidden: false - immutable: false - type: string - description: Availability zone to create servers in - required: false - status: SUPPORTED - static_routes_list: - hidden: false - immutable: false - type: list - description: Static routes enabled - required: false - status: SUPPORTED - entry_schema: - type: boolean - availability_zone_enable: - hidden: false - immutable: false - type: boolean - description: Indicates availability zone is enabled - required: false - default: false - status: SUPPORTED - service_template_name: - hidden: false - immutable: false - type: string - description: Service template name - required: false - status: SUPPORTED - ordered_interfaces: - hidden: false - immutable: false - type: boolean - description: Indicates if service interface are ordered - required: false - default: false - status: SUPPORTED - flavor: - hidden: false - immutable: false - type: string - description: flavor - required: false - status: SUPPORTED - image_name: - hidden: false - immutable: false - type: string - description: Image name - required: true - status: SUPPORTED - service_type: - hidden: false - immutable: false - type: string - description: Service type - required: true - status: SUPPORTED - constraints: - - valid_values: - - firewall - - analyzer - - source-nat - - loadbalancer - service_interface_type_list: - hidden: false - immutable: false - type: list - description: List of interface types - required: true - status: SUPPORTED - entry_schema: - type: string - constraints: - - valid_values: - - management - - left - - right - - other - service_instance_name: - hidden: false - immutable: false - type: string - description: Service instance name - required: true - status: SUPPORTED - interface_list: - hidden: false - immutable: false - type: list - description: List of interfaces - required: false - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.contrail.InterfaceData - service_mode: - hidden: false - immutable: false - type: string - description: Service mode - required: true - status: SUPPORTED - constraints: - - valid_values: - - transparent - - in-network - - in-network-nat - shared_ip_list: - hidden: false - immutable: false - type: list - description: Shared ips enabled - required: false - status: SUPPORTED - entry_schema: - type: boolean - node_templates: - service_instance_2: - type: org.openecomp.resource.vfc.nodes.heat.st - properties: - flavor: - get_input: flavor - image_name: - get_input: image_name - availability_zone: - get_input: availability_zone - service_type: - get_input: service_type - availability_zone_enable: - get_input: availability_zone_enable - service_template_name: - get_input: service_template_name - service_instance_name: - get_input: service_instance_name - service_mode: - get_input: service_mode - port_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port - properties: - static_routes: - get_input: - - interface_list - - 0 - - static_routes - virtual_network: - get_input: - - interface_list - - 0 - - virtual_network - static_route: - get_input: - - static_routes_list - - 0 - allowed_address_pairs: - get_input: - - interface_list - - 0 - - allowed_address_pairs - shared_ip: - get_input: - - shared_ip_list - - 0 - ip_address: - get_input: - - interface_list - - 0 - - ip_address - interface_type: - get_input: - - service_interface_type_list - - 0 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: service_instance_2 - relationship: tosca.relationships.network.BindsTo - port_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port - properties: - static_routes: - get_input: - - interface_list - - 1 - - static_routes - virtual_network: - get_input: - - interface_list - - 1 - - virtual_network - static_route: - get_input: - - static_routes_list - - 1 - allowed_address_pairs: - get_input: - - interface_list - - 1 - - allowed_address_pairs - shared_ip: - get_input: - - shared_ip_list - - 1 - ip_address: - get_input: - - interface_list - - 1 - - ip_address - interface_type: - get_input: - - service_interface_type_list - - 1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: service_instance_2 - relationship: tosca.relationships.network.BindsTo - groups: - service_instance_2: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/OCS-fw.yml - members: - - service_instance_2 - - port_0 - - port_1 - outputs: - tenant_id: - description: Tenant id of the Service Instance - value: - get_attribute: - - service_instance_2 - - tenant_id - fq_name: - description: The FQ name of the service instance - value: - get_attribute: - - service_instance_2 - - fq_name - service_template_name: - description: Service Template of the Service Instance - value: - get_attribute: - - service_instance_2 - - service_template_name - show: - description: All attributes - value: - get_attribute: - - service_instance_2 - - show - active_vms: - description: Number of service VMs active for this Service Instance - value: - get_attribute: - - service_instance_2 - - active_vms - service_instance_name: - description: The name of the service instance - value: - get_attribute: - - service_instance_2 - - service_instance_name - virtual_machines: - description: Service VMs for the Service Instance - value: - get_attribute: - - service_instance_2 - - virtual_machines - status: - description: Status of the service instance - value: - get_attribute: - - service_instance_2 - - status - substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2 - requirements: - link_port_0: - - port_0 - - link - link_port_1: - - port_1 - - link \ No newline at end of file -- cgit 1.2.3-korg