[SDC] Onboarding 1710 rebase.

[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / fulltest / singleSubstitution / threeNovaSameTypeWithGetAttrFromPort / 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/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
index 46f451d..217da7b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
@@ -185,8 +185,8 @@ topology_template:
         network_role_tag: oam
         network:
           get_input: oam_net_name
-    abstract_pd_server_2:
-      type: org.openecomp.resource.abstract.nodes.pd_server_2
+    abstract_pd_server:
+      type: org.openecomp.resource.abstract.nodes.pd_server
       directives:
       - substitutable
       properties:
@@ -195,7 +195,7 @@ topology_template:
         compute_pd_server_name:
         - get_input:
           - pd_server_names
-          - 2
+          - 1
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
@@ -209,26 +209,18 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
-          substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml
+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
         index_value:
           get_property:
           - SELF
           - service_template_filter
           - index_value
-    network_policy_server:
-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
-      properties:
-        name:
-          get_input: dummy_net_name_1
-    abstract_pd_server_0:
-      type: org.openecomp.resource.abstract.nodes.pd_server_0
+    abstract_pd_server_2:
+      type: org.openecomp.resource.abstract.nodes.pd_server_2
       directives:
       - substitutable
       properties:
@@ -237,7 +229,7 @@ topology_template:
         compute_pd_server_name:
         - get_input:
           - pd_server_names
-          - 1
+          - 2
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
@@ -251,16 +243,24 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        port_pd01_port_network:
+        - get_input: oam_net_name
+        port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
-          substitute_service_template: Nested_pd_server_0ServiceTemplate.yaml
+          substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml
           count: 1
         index_value:
           get_property:
           - SELF
           - service_template_filter
           - index_value
+    network_policy_server:
+      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
+      properties:
+        name:
+          get_input: dummy_net_name_1
     abstract_pd_server_1:
       type: org.openecomp.resource.abstract.nodes.pd_server_1
       directives:
@@ -304,6 +304,6 @@ topology_template:
       members:
       - pd01_port_3
       - network_policy_server
-      - abstract_pd_server_0
+      - abstract_pd_server
       - abstract_pd_server_1
       - abstract_pd_server_2