diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-03-27 17:03:51 +0530 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2018-03-29 05:40:56 +0000 |
commit | 707adfa57f63b49519badddbf72e411485269c37 (patch) | |
tree | ba4fc46a73b092b283fad92f1983dea55e6a199c /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface | |
parent | ff31b1eea7a5aec585fbbdf5004d2c1d93f4437e (diff) |
VLAN tagging - Support Pattern 1C2
1. Pattern 1C2 vlan tagging code
2. Count property handling
3. Added tests and updated existing test data
Change-Id: Idef33b142d415e1c0a9663497eed621f35c2393b
Issue-ID: SDC-1174
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface')
4 files changed, 35 insertions, 3 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8f21ba2068..43b1e55eff 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -32,6 +32,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + subinterface_nested_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float vm_flavor_name: type: string required: true @@ -581,6 +587,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + subinterface_nested_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float vm_flavor_name: type: string required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml index 5f16f354ab..885ae52726 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml @@ -714,6 +714,8 @@ topology_template: - get_input: - pd_server_names - 0 + subinterface_nested_service_template_filter_count: + - 9 vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: @@ -767,6 +769,8 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW + subinterface_nested_service_template_filter_count: + - 9 vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: @@ -815,4 +819,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server + - abstract_ps_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/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml index f309435fab..9bec8b6463 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: port_pd01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + subinterface_nested_service_template_filter_count: + type: list + required: true + entry_schema: + type: float vm_flavor_name: type: string required: true @@ -93,8 +98,11 @@ topology_template: - subinterface_nested_p1 - index_value service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value substitute_service_template: nestedServiceTemplate.yaml - count: 9 mandatory: true net1: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml index 06e1e96af1..d05d3f6aca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -41,6 +41,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + subinterface_nested_service_template_filter_count: + type: list + required: true + entry_schema: + type: float vm_flavor_name: type: string required: true @@ -93,8 +98,11 @@ topology_template: - subinterface_nested_p1 - index_value service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value substitute_service_template: nestedServiceTemplate.yaml - count: 9 mandatory: true net1: get_input: |