From 100491b13595ffeb8f847fc25b46192b607118af Mon Sep 17 00:00:00 2001 From: talio Date: Mon, 2 Oct 2017 13:54:55 +0300 Subject: Change node template prefix Add "".compute" to nested compute node types in substitution service templates Issue - Id : SDC-425 Change-Id: I00902576a3adf8d0463ef1352961629663efd96c Signed-off-by: talio --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 419 +-------------------- .../out/Nested_pd_serverServiceTemplate.yaml | 4 +- 2 files changed, 3 insertions(+), 420 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 839624153b..6f8a16604a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,423 +5,6 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - compute_pd_server_key_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_personality: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - compute_pd_server_image_update_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties - required: true - status: SUPPORTED - port_pd01_port_device_id: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_admin_state_up: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - port_pd01_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_metadata: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_template_VMInt_OAM_lb_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_pd_server_diskConfig: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_mac_address: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - compute_pd_server_admin_pass: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_flavor_update_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_template_VMInt_OAM_lb_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_template_VMInt_OAM_lb_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_pd01_port_value_specs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - compute_pd_server_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_template_VMInt_OAM_lb_port_tuple_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - compute_pd_server_software_config_transport: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - compute_pd_server_scheduler_hints: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_pd01_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_contrail_service_instance_ind: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - compute_pd_server_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_template_VMInt_OAM_lb_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_binding:vnic_type: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_device_owner: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_qos_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_config_drive: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_template_VMInt_OAM_lb_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_template_VMInt_OAM_lb_order: - type: integer - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_template_VMInt_OAM_lb_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_port_security_enabled: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - port_template_VMInt_OAM_lb_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_update_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_reservation_id: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_security_group_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - attributes: - pd_server_pd01_port_allowed_address_pairs: - type: list - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: - type: list - status: SUPPORTED - entry_schema: - type: string - pd_server_template_VMInt_OAM_lb_virtual_network_refs: - type: list - status: SUPPORTED - entry_schema: - type: string - pd_server_template_VMInt_OAM_lb_fq_name: - type: string - status: SUPPORTED - pd_server_show: - type: string - status: SUPPORTED - pd_server_console_urls: - type: string - status: SUPPORTED - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - status: SUPPORTED - pd_server_pd01_port_security_groups: - type: list - status: SUPPORTED - entry_schema: - type: string - pd_server_pd01_port_port_security_enabled: - type: boolean - status: SUPPORTED - pd_server_pd01_port_status: - type: string - status: SUPPORTED - pd_server_template_VMInt_OAM_lb_port_tuple_refs: - type: list - status: SUPPORTED - entry_schema: - type: string - pd_server_pd01_port_fixed_ips: - type: list - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - pd_server_accessIPv6: - type: string - status: SUPPORTED - pd_server_pd01_port_admin_state_up: - type: boolean - status: SUPPORTED - pd_server_instance_name: - type: string - status: SUPPORTED - pd_server_template_VMInt_OAM_lb_name: - type: string - status: SUPPORTED - pd_server_accessIPv4: - type: string - status: SUPPORTED - pd_server_pd01_port_device_owner: - type: string - status: SUPPORTED - pd_server_pd01_port_show: - type: string - status: SUPPORTED - pd_server_pd01_port_network: - type: string - status: SUPPORTED - pd_server_pd01_port_qos_policy: - type: string - status: SUPPORTED - pd_server_pd01_port_mac_address: - type: string - status: SUPPORTED - pd_server_addresses: - type: map - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - pd_server_pd01_port_tenant_id: - type: string - status: SUPPORTED - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties - status: SUPPORTED - pd_server_pd01_port_device_id: - type: string - status: SUPPORTED - pd_server_pd01_port_name: - type: string - status: SUPPORTED - pd_server_template_VMInt_OAM_lb_show: - type: string - status: SUPPORTED - pd_server_pd01_port_subnets: - type: list - status: SUPPORTED - entry_schema: - type: string org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1247,4 +830,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml index b834aaab1b..803161a283 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server: + org.openecomp.resource.vfc.compute.nodes.heat.pd_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -266,7 +266,7 @@ topology_template: type: json node_templates: pd_server: - type: org.openecomp.resource.vfc.nodes.heat.pd_server + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server properties: admin_pass: get_input: -- cgit 1.2.3-korg