diff options
author | Assaf, Shay (sa726r) <sa726r@intl.att.com> | 2018-08-26 11:53:35 +0300 |
---|---|---|
committer | Assaf, Shay (sa726r) <sa726r@intl.att.com> | 2018-08-26 11:53:35 +0300 |
commit | 1b700c8606f319cbda416a8abb70ea16dceb7a29 (patch) | |
tree | 1febba7da1dbdddccf917612acab08363a476f93 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut | |
parent | b111bbed40e9fe02d980fe0af360f60ca47f5ac6 (diff) |
related-networks property support as input
Change-Id: I2d6fb011f7440127559a8f02b1c8a72095694403
Issue-ID: SDC-1658
Signed-off-by: Assaf, Shay (sa726r) <sa726r@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut')
3 files changed, 110 insertions, 84 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 615de8dc2e..7055e47c27 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,14 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC 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 compute_pd_server_availability_zone: type: list required: true @@ -28,60 +20,92 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_network_role_tag: + type: string required: true status: SUPPORTED - vm_flavor_name: + 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_pd02_port_order: - type: integer + port_pd01_port_ip_requirements: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd01_port_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd02_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + 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_pd02_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_network_role: - type: string - required: true - status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -108,24 +132,12 @@ node_types: 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 port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -551,4 +563,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 0feb8ef859..acaaee9ca4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -838,9 +838,6 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_attribute: - network_policy_server @@ -857,6 +854,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + compute_pd_server_user_data_format: + - RAW + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false port_pd01_port_network: - get_attribute: - network_policy_server @@ -869,8 +871,6 @@ topology_template: is_required: false port_pd02_port_network: - get_input: oam_net_name - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -892,4 +892,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server + - abstract_pd_server
\ 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/oneComputeDiffPortTypesAndGetAttOut/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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index 3c0aeaee28..e894e5c65f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,13 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,32 +21,15 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: - type: string - required: true port_pd02_port_network_role_tag: type: string required: true port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true @@ -62,14 +38,58 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd02_port_network_role: + type: string + required: true + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_network_role: + port_pd02_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_order: + type: integer + required: true + port_pd02_port_subnetpoolid: type: string required: true + port_pd02_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_network: + type: list + required: true + entry_schema: + type: string port_pd01_port_order: type: integer required: true @@ -90,21 +110,11 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -133,6 +143,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_related_networks ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -162,6 +174,8 @@ topology_template: vlan_requirements: get_input: port_pd02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd02_port_related_networks ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: @@ -399,4 +413,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - dependency + - dependency
\ No newline at end of file |