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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out | |
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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out')
5 files changed, 41 insertions, 5 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 58879ffcb7..418a181568 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,6 +14,12 @@ node_types: status: SUPPORTED entry_schema: type: string + subinterface_nested_vlan_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2429,6 +2435,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + subinterface_nested_vlan_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2950,4 +2962,4 @@ node_types: type: tosca.capabilities.Node 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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml index 6f4882f241..a5bb292d55 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml @@ -132,6 +132,11 @@ topology_template: - get_input: - pd_server_1b_names - 1 + subinterface_nested_vlan_service_template_filter_count: + - 9 + - 9 + - 9 + - 9 vm_flavor_name: get_input: pd_server_1b_flavor subinterface_nested_vlan_net1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml index 08292dc07e..d0798c5e1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -16,6 +16,11 @@ topology_template: required: true entry_schema: type: string + subinterface_nested_vlan_service_template_filter_count: + type: list + required: true + entry_schema: + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -94,8 +99,11 @@ topology_template: - substitutable properties: service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value substitute_service_template: nested_vlanServiceTemplate.yaml - count: 9 mandatory: true parent_interface: get_input: @@ -350,4 +358,4 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency + - dependency
\ 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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 5c43ad9f37..855e842bf5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -19,6 +19,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + subinterface_nested_vlan_service_template_filter_count: + type: list + required: true + entry_schema: + type: float port_ps_server_1b_port_network_role_tag: type: string required: true @@ -109,8 +114,11 @@ topology_template: - substitutable properties: service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value substitute_service_template: nested_vlanServiceTemplate.yaml - count: 9 mandatory: true parent_interface: get_input: @@ -350,4 +358,4 @@ topology_template: - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency + - dependency
\ 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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml index 2372290217..e6bbdf5a12 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -177,6 +177,9 @@ topology_template: port_ps_server_1b_port_mac_requirements: mac_count_required: is_required: false + subinterface_nested_vlan_service_template_filter_count: + - 9 + - 9 port_ps_server_1b_port_fixed_ips: - - ip_address: get_input: |