Interface definition

Add separate Interface definition for node type and node template

Change-Id: I0c4446227dd096959158fd4a4741cb5aa043e495
Issue-ID: SDC-1043
Signed-off-by: talio <tali.orenbach@amdocs.com>

4 files changed, 104 insertions, 4 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
index f41a92c989..aa69d20865 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
@@ -210,6 +210,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -243,6 +248,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -279,6 +289,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -360,6 +375,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -396,6 +416,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         mac_requirements:

           mac_count_required:

             is_required: false

@@ -424,6 +449,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -907,4 +937,4 @@ topology_template:
       - dependency

       dependency_perimeta_ssc_a_server_0:

       - perimeta_ssc_a_server_0

-      - dependency
\ No newline at end of file
+      - 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/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
index e03377b30d..20b80029a6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
@@ -205,6 +205,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -241,6 +246,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -322,6 +332,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -358,6 +373,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         mac_requirements:

           mac_count_required:

             is_required: false

@@ -418,6 +438,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -454,6 +479,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -893,4 +923,4 @@ topology_template:
       - dependency

       link_perimeta_ssc_b_ha_0_port:

       - perimeta_ssc_b_ha_0_port

-      - link
\ No newline at end of file
+      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
index 50294fa2a2..00014913fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
@@ -286,6 +286,11 @@ topology_template:
           ip_count_required:

             is_required: true

           floating_ip_count_required:

+            is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

             is_required: false

         security_groups:

           get_input: perimeta_sec_groups

@@ -329,6 +334,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -365,6 +375,11 @@ topology_template:
           ip_count_required:

             is_required: true

           floating_ip_count_required:

+            is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

             is_required: false

         security_groups:

           get_input: perimeta_sec_groups

@@ -452,6 +467,11 @@ topology_template:
           ip_count_required:

             is_required: true

           floating_ip_count_required:

+            is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

             is_required: false

         security_groups:

           get_input: perimeta_sec_groups

@@ -815,4 +835,4 @@ topology_template:
       - link

       link_perimeta_rtp_msc_a_ha_0_port:

       - perimeta_rtp_msc_a_ha_0_port

-      - link
\ No newline at end of file
+      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
index 7fc96269cf..171b3ef1c4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
@@ -226,6 +226,11 @@ topology_template:
           ip_count_required:

             is_required: true

           floating_ip_count_required:

+            is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

             is_required: false

         security_groups:

           get_input: perimeta_sec_groups

@@ -268,6 +273,11 @@ topology_template:
           ip_count_required:

             is_required: true

           floating_ip_count_required:

+            is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

             is_required: false

         security_groups:

           get_input: perimeta_sec_groups

@@ -402,6 +412,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         security_groups:

           get_input: perimeta_sec_groups

         fixed_ips:

@@ -438,6 +453,11 @@ topology_template:
           ip_count_required:

             is_required: true

           floating_ip_count_required:

+            is_required: true

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

             is_required: false

         security_groups:

           get_input: perimeta_sec_groups

@@ -801,4 +821,4 @@ topology_template:
       - link

       link_perimeta_rtp_msc_b_untrusted_parent_0_port:

       - perimeta_rtp_msc_b_untrusted_parent_0_port

-      - link
\ No newline at end of file
+      - link
\ No newline at end of file