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 / singleSubstitution / generalVf / out / GlobalSubstitutionTypesServiceTemplate.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0b1b45b..a3e595f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,125 +9,29 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_FSB_OAM_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal2_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal1_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      compute_FSB2_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal2_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_FSB_OAM_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal1_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal2_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      compute_FSB2_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal1_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal1_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_FSB_OAM_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal1_network:
+      port_FSB2_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB2_Internal2_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_subnetpoolid:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_FSB_OAM_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB2_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.MacRequirements
       port_FSB2_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -136,37 +40,41 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB_OAM_order:
+      port_FSB2_Internal2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_FSB2_Internal2_network:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_FSB2_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal2_vlan_requirements:
+      port_FSB_OAM_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB2_Internal1_order:
+      port_FSB2_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_FSB2_Internal2_subnetpoolid:
+          type: json
+      compute_FSB2_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal1_network_role_tag:
+      port_FSB2_Internal1_mac_address:
         type: list
         required: true
         status: SUPPORTED
@@ -177,29 +85,31 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+          type: json
       port_FSB2_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal2_order:
+        entry_schema:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_FSB_OAM_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_FSB2_Internal1_subnetpoolid:
+          type: string
+      port_FSB2_Internal1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB_OAM_exCP_naming:
+      port_FSB2_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
     requirements:
     - dependency_FSB2_FSB_OAM:
         capability: tosca.capabilities.Node
@@ -695,32 +605,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.VLC2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_VLC_GTP_exCP_naming:
+      port_VLC_SCTP_A_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_VLC_OAM_network_role_tag:
-        type: string
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_VLC_GTP_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: json
       port_VLC2_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: json
       port_VLC_SCTP_A_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.MacRequirements
       vm_flavor_name:
         type: string
         required: true
@@ -730,219 +644,83 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: json
       port_VLC_SCTP_A_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_VLC2_Internal1_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC2_Internal2_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_VLC_GTP_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_VLC2_Internal1_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_VLC2_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_VLC2_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_VLC_SCTP_B_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_GTP_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC2_Internal1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_VLC_GTP_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_VLC_OAM_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_SCTP_A_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_GTP_vlan_requirements:
+      port_VLC_OAM_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_GTP_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_VLC_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC2_Internal2_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_SCTP_A_network:
+      port_VLC2_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_SCTP_A_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC_SCTP_A_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_VLC_SCTP_B_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC_SCTP_A_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC_OAM_vlan_requirements:
+      port_VLC_OAM_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_OAM_ip_requirements:
-        type: list
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_VLC_OAM_fixed_ips:
+      port_VLC2_Internal1_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_VLC2_Internal1_order:
+          type: string
+      port_VLC2_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_VLC_OAM_network_role:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_VLC2_Internal1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.MacRequirements
       port_VLC_SCTP_A_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_VLC2_Internal2_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_SCTP_A_subnetpoolid:
+      port_VLC_SCTP_B_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_OAM_subnetpoolid:
+      port_VLC_GTP_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_SCTP_B_network_role_tag:
+      port_VLC2_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       compute_VLC2_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_OAM_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_VLC2_Internal1_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC2_Internal2_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -951,46 +729,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_VLC_SCTP_B_subnetpoolid:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC2_Internal2_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       port_VLC_SCTP_B_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_VLC_GTP_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_SCTP_A_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC2_Internal2_order:
+          type: json
+      port_VLC_GTP_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_VLC_GTP_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.MacRequirements
       port_VLC2_Internal1_network:
         type: list
         required: true
@@ -1003,63 +753,31 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC2_Internal1_exCP_naming:
+      port_VLC_GTP_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
       port_VLC_OAM_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_VLC2_Internal1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_VLC2_Internal2_subnetpoolid:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_VLC_OAM_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
       port_VLC_SCTP_B_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_VLC2_Internal2_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_VLC_SCTP_B_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_VLC_GTP_subnetpoolid:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC2_Internal1_subnetpoolid:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_SCTP_B_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC_SCTP_B_network_role:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_VLC2_Internal2_network:
         type: list
         required: true
         status: SUPPORTED
@@ -1794,24 +1512,32 @@ node_types:
   org.openecomp.resource.abstract.nodes.NCB1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_NCB1_Internal1_network_role:
+      port_NCB1_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB1_Internal2_network_role:
+      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_NCB1_Internal1_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB1_Internal1_network_role_tag:
+      port_NCB1_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       vm_flavor_name:
         type: string
         required: true
@@ -1822,112 +1548,40 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB1_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_NCB1_Internal2_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_NCB1_Internal2_ip_requirements:
+      port_NCB1_Internal1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_NCB1_Internal1_exCP_naming:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_NCB1_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_NCB1_Internal1_subnetpoolid:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_NCB1_Internal1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB1_Internal2_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_NCB1_Internal2_subnetpoolid:
+      compute_NCB1_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB1_Internal2_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      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_NCB1_Internal1_mac_address:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_NCB1_Internal1_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_NCB1_Internal2_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_NCB1_Internal1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_NCB1_Internal1_vlan_requirements:
+      port_NCB1_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_NCB1_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_NCB1_Internal1_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      compute_NCB1_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_NCB1_Internal2_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       port_NCB1_Internal2_network:
         type: list
         required: true
@@ -2351,58 +2005,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.NCB2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      compute_NCB2_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_NCB2_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_NCB2_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_NCB2_Internal1_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_NCB2_Internal2_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_NCB2_Internal1_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_NCB2_Internal1_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_NCB2_Internal2_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -2417,69 +2019,57 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB2_Internal2_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_NCB2_Internal2_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_NCB2_Internal2_network:
+      compute_NCB2_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB2_Internal2_vlan_requirements:
+      port_NCB2_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_NCB2_Internal1_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_NCB2_Internal2_mac_address:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_NCB2_Internal1_subnetpoolid:
+      port_NCB2_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_NCB2_Internal1_network_role_tag:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_NCB2_Internal2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB2_Internal2_order:
+      port_NCB2_Internal1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      compute_NCB2_name:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_NCB2_Internal1_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB2_Internal1_vlan_requirements:
+      port_NCB2_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_NCB2_Internal2_subnetpoolid:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_NCB2_name:
         type: list
         required: true
         status: SUPPORTED
@@ -2490,7 +2080,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: json
     requirements:
     - dependency_NCB2:
         capability: tosca.capabilities.Node
@@ -2908,89 +2498,25 @@ node_types:
   org.openecomp.resource.abstract.nodes.GPB2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_GPB2_Internal2_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_GPB2_Internal2_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_GPB2_Internal1_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_GPB2_Internal1_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_GPB2_Internal2_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_GPB2_Internal2_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_GPB2_Internal1_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      compute_GPB2_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_GPB2_Internal1_subnetpoolid:
+      port_GPB2_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_GPB2_Internal2_subnetpoolid:
+      port_GPB2_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_GPB2_Internal2_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_GPB2_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.MacRequirements
       port_GPB2_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_GPB2_Internal2_network_role:
+          type: json
+      port_GPB2_Internal1_network:
         type: list
         required: true
         status: SUPPORTED
@@ -3010,38 +2536,38 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_GPB2_Internal2_exCP_naming:
-        type: list
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
-      port_GPB2_Internal1_order:
+      port_GPB2_Internal1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_GPB2_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_GPB2_Internal1_exCP_naming:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_GPB2_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_GPB2_Internal1_network_role_tag:
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_GPB2_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
       port_GPB2_Internal1_mac_address:
-        type: string
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_GPB2_Internal2_network:
         type: list
         required: true
@@ -3466,171 +2992,11 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_VLC1_Internal2_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_VLC_GTP_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC_OAM_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_VLC1_Internal1_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_VLC_GTP_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_VLC1_Internal2_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC1_Internal2_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_SCTP_A_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_VLC1_Internal2_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_SCTP_B_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_VLC_SCTP_A_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_VLC1_Internal2_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_GTP_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_VLC1_Internal1_subnetpoolid:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_SCTP_B_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC1_Internal1_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_GTP_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_GTP_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_VLC_OAM_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC1_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_VLC1_Internal1_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC1_Internal1_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_VLC_SCTP_A_network_role_tag:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_VLC_GTP_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC_GTP_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_VLC_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      compute_VLC1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC1_Internal2_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       port_VLC1_Internal1_network:
         type: list
         required: true
@@ -3643,120 +3009,98 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_SCTP_A_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC1_Internal1_network_role:
+      port_VLC_OAM_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_SCTP_A_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_VLC_SCTP_B_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_VLC_SCTP_A_exCP_naming:
+      port_VLC1_Internal1_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_VLC_OAM_vlan_requirements:
+          type: string
+      port_VLC_GTP_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_OAM_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_VLC1_Internal1_ip_requirements:
+      port_VLC_SCTP_A_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_VLC_OAM_fixed_ips:
+          type: org.openecomp.datatypes.network.MacRequirements
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_VLC1_Internal2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_VLC1_Internal2_vlan_requirements:
+          type: string
+      port_VLC_SCTP_B_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_OAM_network_role:
+      port_VLC_SCTP_A_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_VLC1_Internal2_order:
+          type: json
+      port_VLC_OAM_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_VLC1_Internal2_subnetpoolid:
+          type: json
+      port_VLC1_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_VLC_SCTP_A_ip_requirements:
+          type: json
+      port_VLC_OAM_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_VLC_SCTP_A_subnetpoolid:
-        type: list
+          type: json
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      compute_VLC1_availability_zone:
+      port_VLC_SCTP_A_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_VLC_OAM_subnetpoolid:
+          type: json
+      port_VLC_SCTP_B_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_SCTP_B_network_role_tag:
+      port_VLC_GTP_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_OAM_order:
+      compute_VLC1_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -3765,76 +3109,66 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_VLC1_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_VLC1_Internal1_mac_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_VLC_SCTP_B_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_VLC1_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.MacRequirements
       port_VLC_SCTP_B_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_VLC_GTP_network_role:
+          type: json
+      port_VLC_GTP_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_VLC_SCTP_A_network_role:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_VLC_GTP_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_VLC_GTP_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: json
       port_VLC_OAM_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_VLC1_Internal1_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_VLC_SCTP_B_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_VLC_SCTP_B_order:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_VLC_OAM_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_VLC_GTP_subnetpoolid:
+          type: string
+      compute_VLC1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_SCTP_B_vlan_requirements:
+      port_VLC_SCTP_B_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_VLC_SCTP_B_network_role:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_VLC1_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
     requirements:
     - dependency_VLC1_VLC_SCTP_B:
         capability: tosca.capabilities.Node
@@ -4565,119 +3899,35 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_FSB1_Internal1_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal2_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal1_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_FSB1_Internal2_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal1_subnetpoolid:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal2_subnetpoolid:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB_OAM_network_role:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal1_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      port_FSB_OAM_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB1_Internal2_network_role:
+      port_FSB_OAM_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB1_Internal1_network_role_tag:
+      port_FSB1_Internal2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB_OAM_subnetpoolid:
+      port_FSB_OAM_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB_OAM_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.MacRequirements
       compute_FSB1_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB1_Internal1_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -4686,76 +3936,70 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB_OAM_order:
+      port_FSB1_Internal1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_FSB1_Internal1_network_role:
-        type: list
+          type: string
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB1_Internal2_network_role_tag:
+      port_FSB1_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB1_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal2_ip_requirements:
+      port_FSB_OAM_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB1_Internal2_order:
+          type: json
+      port_FSB1_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_FSB_OAM_fixed_ips:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_FSB1_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_FSB1_Internal1_exCP_naming:
+          type: json
+      port_FSB_OAM_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB_OAM_exCP_naming:
+      compute_FSB1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      compute_FSB1_name:
+          type: string
+      port_FSB1_Internal1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB1_Internal2_exCP_naming:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_FSB1_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB1_Internal2_vlan_requirements:
+      port_FSB_OAM_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
     requirements:
     - dependency_FSB1_FSB1_Internal2:
         capability: tosca.capabilities.Node
@@ -5251,13 +4495,21 @@ node_types:
   org.openecomp.resource.abstract.nodes.GPB1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_GPB1_Internal1_network_role:
+      port_GPB1_Internal2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_GPB1_Internal2_network_role:
+      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_GPB1_Internal1_network:
         type: list
         required: true
         status: SUPPORTED
@@ -5273,124 +4525,52 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_GPB1_Internal2_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_GPB1_Internal1_order:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: integer
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_GPB1_Internal1_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_GPB1_Internal2_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_GPB1_Internal1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      compute_GPB1_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_GPB1_Internal1_exCP_naming:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_GPB1_Internal2_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_GPB1_Internal2_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_GPB1_Internal1_network_role_tag:
+      port_GPB1_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_GPB1_Internal2_network:
+          type: org.openecomp.datatypes.network.MacRequirements
+      port_GPB1_Internal1_mac_address:
         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_GPB1_Internal1_network:
+      port_GPB1_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_GPB1_Internal2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_GPB1_Internal1_mac_address:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_GPB1_Internal1_subnetpoolid:
+      port_GPB1_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_GPB1_Internal2_subnetpoolid:
+          type: json
+      port_GPB1_Internal1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_GPB1_Internal2_network_role_tag:
+          type: org.openecomp.datatypes.network.MacRequirements
+      compute_GPB1_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_GPB1_Internal1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_GPB1_Internal2_order:
+      port_GPB1_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
+          type: json
     requirements:
     - dependency_GPB1:
         capability: tosca.capabilities.Node
@@ -5804,4 +4984,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
SDC Parent Project Catalog FE and BE