related-networks property support as input

Change-Id: I2d6fb011f7440127559a8f02b1c8a72095694403
Issue-ID: SDC-1658
Signed-off-by: Assaf, Shay (sa726r) <sa726r@intl.att.com>

4 files changed, 145 insertions, 93 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d4f3cb8ffb..dff3ddaa23 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,14 +8,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -28,60 +20,92 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd02_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_order:
-        type: integer
+      port_pd01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd02_port_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd02_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_network_role_tag:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_pd_server_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd02_port_vlan_requirements:
+      port_pd01_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd02_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd02_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd02_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_order:
         type: integer
         required: true
@@ -108,24 +132,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -555,6 +567,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -592,6 +610,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -1159,4 +1183,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
index e7fa960d3b..e615ef760e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
@@ -869,9 +869,6 @@ topology_template:
         - get_input:
           - pd_server_names
           - 0
-        port_pd02_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd02_port_network_role_tag: oam
@@ -886,6 +883,11 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd02_port_mac_requirements:
+          mac_count_required:
+            is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
         port_pd02_port_ip_requirements:
@@ -897,8 +899,6 @@ topology_template:
         port_pd01_port_network_role_tag: oam
         port_pd02_port_network:
         - get_input: oam_net_name
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -915,4 +915,4 @@ topology_template:
         description: heat template that creates MOG stack
       members:
       - server_pcm_003
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/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/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
index 3c0aeaee28..e894e5c65f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/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/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -28,32 +21,15 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd02_port_order:
-      type: integer
-      required: true
-    port_pd02_port_subnetpoolid:
-      type: string
-      required: true
     port_pd02_port_network_role_tag:
       type: string
       required: true
     port_pd01_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd02_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
@@ -62,14 +38,58 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_pd02_port_network_role:
+      type: string
+      required: true
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_pd_server_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd02_port_network_role:
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd02_port_order:
+      type: integer
+      required: true
+    port_pd02_port_subnetpoolid:
       type: string
       required: true
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_order:
       type: integer
       required: true
@@ -90,21 +110,11 @@ topology_template:
     port_pd01_port_network_role_tag:
       type: string
       required: true
-    port_pd01_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd02_port_network:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - 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/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
index 02aa261eac..5ca8297db0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -46,6 +51,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -161,6 +171,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -170,8 +186,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -181,8 +195,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -206,6 +218,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -215,8 +233,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -226,8 +242,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -486,4 +500,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file