[SDC-29] rebase continue work to align source

[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / fulltest / mixPatterns / connectivityBetweenPatterns / out / GlobalSubstitutionTypesServiceTemplate.yaml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index da7b597..a921a8e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -926,29 +926,92 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      server_group:
-        type: string
-        required: true
-        status: SUPPORTED
-      connectivityChk:
-        type: json
+      port_pcm_port_0_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
+      port_pcm_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      pcm_server_name:
+        type: string
+        description: PCRF CM server name
+        required: true
+        status: SUPPORTED
+      cps_net_mask:
+        type: string
+        description: CPS network mask
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      oam_net_name:
+        type: string
+        description: OAM network name
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      server_group:
+        type: string
+        required: true
+        status: SUPPORTED
+      connectivityChk:
+        type: json
+        required: true
+        status: SUPPORTED
+      oam_net_gw:
+        type: string
+        description: CPS network gateway
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
@@ -959,6 +1022,12 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -969,21 +1038,11 @@ node_types:
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      pcm_server_name:
-        type: string
-        description: PCRF CM server name
-        required: true
-        status: SUPPORTED
       cps_net_name:
         type: string
         description: CPS network name
         required: true
         status: SUPPORTED
-      cps_net_mask:
-        type: string
-        description: CPS network mask
-        required: true
-        status: SUPPORTED
       oam_net_ip:
         type: string
         description: OAM network ip
@@ -994,11 +1053,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
+      port_pcm_port_1_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -1421,7 +1481,13 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c1_scalling_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1c1_t1_port_fixed_ips:
+      port_1c1_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -1433,24 +1499,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_ip_requirements:
+      port_1c1_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c1_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t1_port_mac_requirements:
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_1c1_scalling_instance_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t2_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t2_port_network_role_tag:
+      port_1c1_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t1_port_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_mac_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
@@ -1459,80 +1581,84 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1c1_t2_port_mac_requirements:
+      port_1c1_t2_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
+          type: string
+      port_1c1_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c1_t2_port_mac_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_ip_requirements:
+      port_1c1_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_1c1_t2_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_1c1_scalling_instance_metadata:
+      port_1c1_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_1c1_scalling_instance_name:
+      compute_1c1_scalling_instance_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1c1_t1_port_name:
+          type: json
+      port_1c1_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_network:
+      port_1c1_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_fixed_ips:
+      port_1c1_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1c1_t2_port_network:
+          type: string
+      port_1c1_t1_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: integer
     attributes:
       1c1_scalling_instance_1c1_t1_port_tenant_id:
         type: list
@@ -1972,6 +2098,74 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1a_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t2_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_a_single_1a_availability_zone:
         type: list
         required: true
@@ -1992,50 +2186,48 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1a_t1_port_ip_requirements:
+      port_1a_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1a_t2_port_network_role_tag:
+          type: string
+      port_1a_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1a_t1_port_order:
+        type: list
         required: true
         status: SUPPORTED
-      port_1a_t2_port_network:
+        entry_schema:
+          type: integer
+      port_1a_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1a_t1_port_mac_requirements:
+          type: json
+      port_1a_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1a_t1_port_network:
+      port_1a_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1a_t2_port_ip_requirements:
+      port_1a_t2_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -2482,6 +2674,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -2508,16 +2768,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1b_t1_port_value_specs:
         type: list
         required: true
@@ -2530,16 +2792,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t1_port_ip_requirements:
+      port_1b_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -2552,12 +2810,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       port_1b_t1_port_network:
         type: list
         required: true
@@ -2998,12 +3256,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3018,12 +3350,6 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       compute_1c2_catalog_instance_metadata:
         type: list
         required: true
@@ -3036,10 +3362,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1c2_t1_port_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3052,11 +3380,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -3514,12 +3838,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3534,22 +3932,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3562,11 +3956,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -4024,6 +4414,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -4050,32 +4508,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t1_port_ip_requirements:
+      port_1b_t2_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
+      port_1b_t1_port_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_b_single_1b_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1b_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -4088,12 +4550,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       compute_b_single_1b_name:
         type: list
         required: true