diff options
author | avigaffa <avi.gaffa@amdocs.com> | 2017-09-10 08:58:51 +0300 |
---|---|---|
committer | avigaffa <avi.gaffa@amdocs.com> | 2017-09-10 10:07:00 +0300 |
commit | 00e935fc6b8baae4d9b9ffef2c748202a60b66b4 (patch) | |
tree | 56d7b608dbb5a53022db0350f04977da8cd960f5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities | |
parent | 75c572279398dc2be7652263843c8802a9406c4f (diff) |
Add latest bug fixes to master
Change-Id: Ieddc2330ad4e093984f14a69b52f2ca5cb465a10
Issue-ID: SDC-293
Signed-off-by: avigaffa <avi.gaffa@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities')
2 files changed, 304 insertions, 1 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 242eb47cbc..2ec44ccb44 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,6 +5,104 @@ 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_scheduler_hints: + 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 + 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_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + 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_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_network: + 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_pd01_port_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + attributes: + pd_server_accessIPv4: + type: string + status: SUPPORTED + pd_server_pd01_port_device_owner: + type: string + status: SUPPORTED org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -439,6 +537,104 @@ node_types: occurrences: - 1 - UNBOUNDED + org.openecomp.resource.vfc.nodes.heat.ps_server: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server + properties: + compute_ps_server_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_ps_server_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_ps_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_ps_server_scheduler_hints: + 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_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + 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_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_network: + 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_pd01_port_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + attributes: + ps_server_accessIPv4: + type: string + status: SUPPORTED + ps_server_pd01_port_device_id: + type: string + status: SUPPORTED org.openecomp.resource.abstract.nodes.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1304,3 +1500,98 @@ node_types: occurrences: - 1 - UNBOUNDED + org.openecomp.resource.vfc.nodes.heat.oam_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_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + 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 + 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_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_network: + 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 + compute_oam_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_oam_server_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_oam_server_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + attributes: + oam_server_accessIPv4: + type: string + status: SUPPORTED
\ 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/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 82259a7a1a..abe0e1701a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -245,6 +245,10 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn + - dependency_server_pd_01_pd_server: + capability: tosca.capabilities.Node + node: packet_mirror_network + relationship: tosca.relationships.DependsOn abstract_ps_server: type: org.openecomp.resource.abstract.nodes.ps_server directives: @@ -294,6 +298,10 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn + - dependency_server_ps_01_ps_server: + capability: tosca.capabilities.Node + node: packet_mirror_network + relationship: tosca.relationships.DependsOn abstract_oam_server: type: org.openecomp.resource.abstract.nodes.oam_server directives: @@ -342,6 +350,10 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn + - dependency_server_oam_01_oam_server: + capability: tosca.capabilities.Node + node: packet_mirror_network + relationship: tosca.relationships.DependsOn network_policy_server_ps: type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: @@ -469,4 +481,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group
\ No newline at end of file |