Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[SDC] Onboarding 1710 rebase.
[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / fulltest / nestedSingleCompute / nestedOutputParamGetAttrIn / out / MainServiceTemplate.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index d434ddd..4c0c96f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -144,11 +144,15 @@ topology_template:
       description: OAM network name
       default: oam_protected_net_0
   node_templates:
-    abstract_pcm_server_1:
-      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
+    server_pcm_002:
+      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
       directives:
       - substitutable
       properties:
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
         port_pcm_port_1_network_role_tag: oam
         availabilityzone_name:
           get_input: availabilityzone_name
@@ -158,27 +162,11 @@ topology_template:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        oam_net_gw:
-          get_input: oam_net_gw
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name:
-          get_input: security_group_name
-        cps_net_ip:
-          get_input:
-          - cps_net_ips
-          - 0
         port_pcm_port_1_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        pcm_vol:
-          get_input:
-          - pcm_volumes
-          - 0
         port_pcm_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -193,27 +181,11 @@ topology_template:
           get_input:
           - pcm_server_names
           - 0
-        cps_net_name:
-          get_input: cps_net_name
-        cps_net_mask:
-          get_input: cps_net_mask
-        oam_net_ip:
-          get_input:
-          - oam_net_ips
-          - 0
-        oam_net_mask:
-          get_input: oam_net_mask
-        oam_net_name:
-          get_input: oam_net_name
-    abstract_pcm_server_0:
-      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
+    server_oam_001:
+      type: org.openecomp.resource.abstract.nodes.heat.nested-oam_v0.1
       directives:
       - substitutable
       properties:
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
         port_pcm_port_1_network_role_tag: oam
         availabilityzone_name:
           get_input: availabilityzone_name
@@ -223,11 +195,29 @@ topology_template:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        pcm_image_name:
-          get_input: pcm_image_name
+        oam_net_gw:
+          get_input: oam_net_gw
+        oam_flavor_name:
+          get_input: oam_flavor_name
+        security_group_name:
+          get_input: security_group_name
+        cps_net_ip:
+          get_input:
+          - cps_net_ips
+          - 0
+        oam_server_name:
+          get_input:
+          - oam_server_names
+          - 0
         port_pcm_port_1_mac_requirements:
           mac_count_required:
             is_required: false
+        service_template_filter:
+          substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml
+        pcm_vol:
+          get_input:
+          - pcm_volumes
+          - 0
         port_pcm_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -238,23 +228,22 @@ topology_template:
         port_pcm_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_server_name:
+        oam_image_name:
+          get_input: oam_image_name
+        cps_net_name:
+          get_input: cps_net_name
+        cps_net_mask:
+          get_input: cps_net_mask
+        oam_net_ip:
           get_input:
-          - pcm_server_names
+          - oam_net_ips
           - 0
-    packet_mirror_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        tenant_id:
-          get_attribute:
-          - abstract_compute
-          - compute_instance_name
-        network_name:
-          get_attribute:
-          - abstract_pcm_server_1
-          - instance_name
-    abstract_oam_server_0:
-      type: org.openecomp.resource.abstract.nodes.heat.oam_server
+        oam_net_mask:
+          get_input: oam_net_mask
+        oam_net_name:
+          get_input: oam_net_name
+    server_pcm_001:
+      type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
       directives:
       - substitutable
       properties:
@@ -269,23 +258,21 @@ topology_template:
             is_required: false
         oam_net_gw:
           get_input: oam_net_gw
-        oam_flavor_name:
-          get_input: oam_flavor_name
+        pcm_image_name:
+          get_input: pcm_image_name
         security_group_name:
           get_input: security_group_name
         cps_net_ip:
           get_input:
           - cps_net_ips
           - 0
-        oam_server_name:
-          get_input:
-          - oam_server_names
-          - 0
         port_pcm_port_1_mac_requirements:
           mac_count_required:
             is_required: false
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
         service_template_filter:
-          substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
         pcm_vol:
           get_input:
           - pcm_volumes
@@ -300,8 +287,10 @@ topology_template:
         port_pcm_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        oam_image_name:
-          get_input: oam_image_name
+        pcm_server_name:
+          get_input:
+          - pcm_server_names
+          - 0
         cps_net_name:
           get_input: cps_net_name
         cps_net_mask:
@@ -314,6 +303,17 @@ topology_template:
           get_input: oam_net_mask
         oam_net_name:
           get_input: oam_net_name
+    packet_mirror_network:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        tenant_id:
+          get_attribute:
+          - abstract_compute
+          - compute_instance_name
+        network_name:
+          get_attribute:
+          - server_pcm_001
+          - instance_name
     compute_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -372,17 +372,17 @@ topology_template:
         heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml
         description: heat template that creates PCRF Cluman stack
       members:
+      - server_pcm_002
+      - server_oam_001
+      - server_pcm_001
       - packet_mirror_network
       - compute_port_0
       - abstract_compute
-      - abstract_pcm_server_0
-      - abstract_oam_server_0
-      - abstract_pcm_server_1
   outputs:
     output_attr_nested_resource_same_type:
       value:
         get_attribute:
-        - abstract_pcm_server_1
+        - server_pcm_001
         - server_pcm_id
     output_attr_non_nested_compute:
       value:
@@ -392,12 +392,12 @@ topology_template:
     output_attr_nested_resource_different_type:
       value:
         get_attribute:
-        - abstract_oam_server_0
+        - server_oam_001
         - server_oam_id
     output_attr_nested_resource1:
       value:
         get_attribute:
-        - abstract_pcm_server_1
+        - server_pcm_001
         - server_pcm_id
     output_attr_non_consolidation_entity:
       value:
@@ -407,5 +407,5 @@ topology_template:
     output_attr_nested_resource2:
       value:
         get_attribute:
-        - abstract_pcm_server_0
+        - server_pcm_002
         - server_pcm_id
SDC Parent Project Catalog FE and BE