diff options
author | talio <tali.orenbach@amdocs.com> | 2017-10-02 13:54:55 +0300 |
---|---|---|
committer | talio <tali.orenbach@amdocs.com> | 2017-10-02 14:28:15 +0300 |
commit | 100491b13595ffeb8f847fc25b46192b607118af (patch) | |
tree | 33d7d93b64180c49ee83c0e6df12ae8293b06dc5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity | |
parent | 9cee73a8b2a2ac82c57d100d5d3aebffec6d2f19 (diff) |
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 <tali.orenbach@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity')
5 files changed, 8 insertions, 372 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1c8f548356..9c2d3e605d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,97 +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: - port_pd_server_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - 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_pd_server_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - 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_pd_server_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd_server_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd_server_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd_server_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd_server_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -2015,188 +1924,6 @@ node_types: occurrences: - 1 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.ps_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_ps_server_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_ps_server_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_ps_server_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_ps_server_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_port_network_role: - type: string - required: true - status: SUPPORTED - 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_ps_server_port_order: - type: integer - required: true - status: SUPPORTED - port_ps_server_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_ps_server_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_ps_server_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_ps_server_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_ps_server_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_port_network_role_tag: - type: string - required: true - status: SUPPORTED - org.openecomp.resource.vfc.nodes.heat.sm_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - 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_sm_server_port_order: - type: integer - required: true - status: SUPPORTED - port_sm_server_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_sm_server_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_sm_server_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_sm_server_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_sm_server_port_network_role: - type: string - required: true - status: SUPPORTED - port_sm_server_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_sm_server_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_sm_server_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - status: SUPPORTED - compute_sm_server_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_sm_server_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_sm_server_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_sm_server_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_sm_server_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json org.openecomp.resource.abstract.nodes.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -3478,94 +3205,3 @@ node_types: occurrences: - 1 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.oam_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_oam_server_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_oam_server_port_order: - type: integer - required: true - status: SUPPORTED - 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_oam_server_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_oam_server_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_oam_server_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_oam_server_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - compute_oam_server_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_image_name: - type: string - required: true - status: SUPPORTED - port_oam_server_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_server_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_oam_server_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_oam_server_port_network_role: - type: string - required: true - status: SUPPORTED - port_oam_server_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_oam_server_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_oam_server_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements
\ 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/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml index 4b4ec5e6e5..d90e25d8e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.oam_server: + org.openecomp.resource.vfc.compute.nodes.heat.oam_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -84,7 +84,7 @@ topology_template: type: org.openecomp.datatypes.network.IpRequirements node_templates: oam_server: - type: org.openecomp.resource.vfc.nodes.heat.oam_server + type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml index e3396eb9ef..992d43315e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/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: @@ -84,7 +84,7 @@ topology_template: required: true node_templates: pd_server: - type: org.openecomp.resource.vfc.nodes.heat.pd_server + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml index 2513bf731f..47aed72dbf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.ps_server: + org.openecomp.resource.vfc.compute.nodes.heat.ps_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -122,7 +122,7 @@ topology_template: node: ps_server relationship: tosca.relationships.network.BindsTo ps_server: - type: org.openecomp.resource.vfc.nodes.heat.ps_server + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml index 08e4b3afe4..bffd6472b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.sm_server: + org.openecomp.resource.vfc.compute.nodes.heat.sm_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -84,7 +84,7 @@ topology_template: type: json node_templates: sm_server: - type: org.openecomp.resource.vfc.nodes.heat.sm_server + type: org.openecomp.resource.vfc.compute.nodes.heat.sm_server properties: availability_zone: get_input: |