Code Review
/
sdc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[SDC-29] rebase continue work to align source
[sdc.git]
/
openecomp-be
/
lib
/
openecomp-sdc-translator-lib
/
openecomp-sdc-translator-core
/
src
/
test
/
resources
/
mock
/
services
/
heattotosca
/
fulltest
/
singleSubstitution
/
twoSetsOfSingle
/
out
/
MainServiceTemplate.yaml
diff --git
a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
index
bbbd7da
..
645929f
100644
(file)
--- a/
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
+++ b/
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
@@
-355,6
+355,14
@@
topology_template:
directives:
- substitutable
properties:
directives:
- substitutable
properties:
+ compute_pd_server_availability_zone:
+ - get_input: availabilityzone_name
+ compute_pd_server_name:
+ - get_input:
+ - pd_server_names
+ - 0
+ vm_flavor_name:
+ get_input: pd_flavor_name
port_pd01_port_mac_requirements:
- mac_count_required:
is_required: false
port_pd01_port_mac_requirements:
- mac_count_required:
is_required: false
@@
-368,14
+376,6
@@
topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 0
- vm_flavor_name:
- get_input: pd_flavor_name
port_pd01_port_network_role_tag:
- oam
compute_pd_server_user_data_format:
port_pd01_port_network_role_tag:
- oam
compute_pd_server_user_data_format:
@@
-397,19
+397,19
@@
topology_template:
- get_input:
- ps_server_names
- 0
- get_input:
- ps_server_names
- 0
- vm_image_name:
- get_input: pd_image_name
compute_ps_server_availability_zone:
- get_input: availabilityzone_name
compute_ps_server_user_data_format:
- RAW
compute_ps_server_availability_zone:
- get_input: availabilityzone_name
compute_ps_server_user_data_format:
- RAW
+ vm_flavor_name:
+ get_input: pd_flavor_name
+ vm_image_name:
+ get_input: pd_image_name
port_ps01_port_mac_requirements:
- mac_count_required:
is_required: false
port_ps01_port_network:
- get_input: oam_net_name
port_ps01_port_mac_requirements:
- mac_count_required:
is_required: false
port_ps01_port_network:
- get_input: oam_net_name
- vm_flavor_name:
- get_input: pd_flavor_name
port_ps01_port_ip_requirements:
- - ip_version: 4
ip_count_required:
port_ps01_port_ip_requirements:
- - ip_version: 4
ip_count_required: