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, 153 insertions, 88 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3e8b719e50..f20b53326b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,6 +18,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -38,70 +44,84 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      compute_FSB1_availability_zone:
+      port_FSB2_Internal_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+          type: org.openecomp.datatypes.network.IpRequirements
+      vm_flavor_name:
+        type: string
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_FSB2_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_FSB2_Internal_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
+      port_FSB1_Internal_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_FSB1_Internal_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_mac_address:
-        type: string
+      port_FSB1_Internal_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_network_role:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB2_Internal_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_exCP_naming:
+      port_FSB1_Internal_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_network_role_tag:
+      port_FSB1_Internal_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_order:
+      compute_FSB1_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      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_FSB2_Internal_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
+      port_FSB2_Internal_mac_address:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB1_Internal_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -112,14 +132,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_network_role_tag:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
index 9e616c9ba0..3e648300da 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -19,6 +19,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB2_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
@@ -35,6 +40,39 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB2_Internal_network_role:
+      type: string
+      required: true
+    port_FSB1_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_FSB1_Internal_network_role_tag:
+      type: string
+      required: true
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_FSB2_Internal_subnetpoolid:
+      type: string
+      required: true
+    port_FSB1_Internal_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_FSB1_Internal_network_role:
+      type: string
+      required: true
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -50,42 +88,20 @@ topology_template:
     port_FSB2_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_FSB2_Internal_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_flavor_name:
-      type: string
-      required: true
     port_FSB2_Internal_mac_address:
       type: string
       required: true
-    port_FSB2_Internal_network_role:
-      type: string
-      required: true
     port_FSB2_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_FSB1_Internal_network_role_tag:
-      type: string
-      required: true
     port_FSB1_Internal_order:
       type: integer
       required: true
-    port_FSB1_Internal_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal_subnetpoolid:
-      type: string
-      required: true
     port_FSB1_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -94,12 +110,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_FSB1_Internal_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_FSB1_Internal_network_role:
-      type: string
-      required: true
     port_FSB2_Internal_network_role_tag:
       type: string
       required: true
@@ -107,6 +117,12 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_Internal_mac_requirements
+        order:
+          get_input: port_FSB1_Internal_order
+        mac_address:
+          get_input: port_FSB1_Internal_mac_address
         exCP_naming:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
@@ -114,12 +130,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB1_Internal_related_networks
         network_role_tag:
           get_input: port_FSB1_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
-        order:
-          get_input: port_FSB1_Internal_order
         network_role:
           get_input: port_FSB1_Internal_network_role
         subnetpoolid:
@@ -128,8 +142,6 @@ topology_template:
           get_attribute:
           - FSB1_FSB2_Internal
           - att
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -151,6 +163,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_network_role_tag
         network_role:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 397a1a0541..647db5b03f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,6 +18,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -60,6 +66,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_network_role_tag:
         type: string
         required: true
@@ -142,6 +154,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_OAM_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
index bb7bb359c1..33e1cb9752 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -19,6 +19,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB2_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
@@ -52,6 +57,11 @@ topology_template:
     port_FSB2_Internal_network_role:
       type: string
       required: true
+    port_FSB1_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_network_role_tag:
       type: string
       required: true
@@ -117,6 +127,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_OAM_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -135,6 +150,12 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_Internal_mac_requirements
+        order:
+          get_input: port_FSB1_Internal_order
+        mac_address:
+          get_input: port_FSB1_Internal_mac_address
         exCP_naming:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
@@ -142,12 +163,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB1_Internal_related_networks
         network_role_tag:
           get_input: port_FSB1_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
-        order:
-          get_input: port_FSB1_Internal_order
         network_role:
           get_input: port_FSB1_Internal_network_role
         subnetpoolid:
@@ -156,8 +175,6 @@ topology_template:
           get_input:
           - port_FSB1_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -166,6 +183,12 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB2_Internal_mac_requirements
+        order:
+          get_input: port_FSB2_Internal_order
+        mac_address:
+          get_input: port_FSB2_Internal_mac_address
         exCP_naming:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
@@ -173,12 +196,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB2_Internal_mac_requirements
-        order:
-          get_input: port_FSB2_Internal_order
         network_role:
           get_input: port_FSB2_Internal_network_role
         subnetpoolid:
@@ -187,8 +208,6 @@ topology_template:
           get_input:
           - port_FSB2_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB2_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -197,6 +216,10 @@ topology_template:
     FSB1_FSB1_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_OAM_mac_requirements
+        order:
+          get_input: port_FSB1_OAM_order
         exCP_naming:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
@@ -204,20 +227,18 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_OAM_ip_requirements
+        related_networks:
+          get_input: port_FSB1_OAM_related_networks
         network_role_tag:
           get_input: port_FSB1_OAM_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_OAM_mac_requirements
-        order:
-          get_input: port_FSB1_OAM_order
         network_role:
           get_input: port_FSB1_OAM_network_role
-        subnetpoolid:
-          get_input: port_FSB1_OAM_subnetpoolid
         fixed_ips:
           get_input:
           - port_FSB1_OAM_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_FSB1_OAM_subnetpoolid
         network:
           get_input:
           - port_FSB1_OAM_network