diff options
| author |   ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
| commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
| tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml | |
| parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) | |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
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/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml')
1 files changed, 12 insertions, 12 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index a67096d3d6..cd07a7447d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -19,16 +19,16 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_ip_requirements: + port_pd01_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_1_security_groups: + type: json + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: type: string required: true @@ -65,19 +65,24 @@ topology_template: port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_0_subnetpoolid: - type: string - required: true port_pd01_port_1_network: type: list required: true entry_schema: type: string + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: type: string required: true @@ -86,11 +91,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance |