diff options
author | Michael Lando <ml636r@att.com> | 2017-06-11 14:22:02 +0300 |
---|---|---|
committer | Michael Lando <ml636r@att.com> | 2017-06-11 17:48:32 +0300 |
commit | b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch) | |
tree | 0609319203be13f6c29ccbe24cb39c9d64f90095 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml | |
parent | af9929df75604ce407d0ca542b200630164e0ae6 (diff) |
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml')
1 files changed, 942 insertions, 168 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5f4738ca50..19dc9b133d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -926,6 +926,12 @@ node_types: org.openecomp.resource.abstract.nodes.1c12_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1c1_t1_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_1c12_scalling_instance_scheduler_hints: type: list required: true @@ -944,10 +950,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_1c1_t1_port_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_1c1_t1_port_mac_requirements: type: list required: true @@ -962,40 +970,68 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1c1_t1_port_name: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + compute_1c12_scalling_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: + port_1c1_t1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_image_name: type: string required: true status: SUPPORTED - compute_1c12_scalling_instance_availability_zone: + port_1c1_t1_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_network: + port_1c1_t1_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c12_scalling_instance_user_data_format: + port_1c1_t1_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_ip_requirements: + port_1c1_t1_port_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string + compute_1c12_scalling_instance_availability_zone: + 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_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer attributes: 1c12_scalling_instance_1c1_t1_port_tenant_id: type: list @@ -1346,16 +1382,24 @@ node_types: org.openecomp.resource.abstract.nodes.1c11_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1c1_t1_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_1c1_t1_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json - vm_image_name: - type: string + port_1c1_t1_port_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_1c1_t1_port_mac_requirements: type: list required: true @@ -1370,52 +1414,80 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1c1_t1_port_name: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + compute_1c11_scalling_instance_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c11_scalling_instance_scheduler_hints: + compute_1c11_scalling_instance_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_1c11_scalling_instance_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c1_t1_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - vm_flavor_name: + vm_image_name: type: string required: true status: SUPPORTED - compute_1c11_scalling_instance_name: + port_1c1_t1_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_network: + compute_1c11_scalling_instance_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c1_t1_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c11_scalling_instance_availability_zone: + port_1c1_t1_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c11_scalling_instance_user_data_format: + port_1c1_t1_port_network_role: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_ip_requirements: + port_1c1_t1_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string + port_1c1_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer attributes: 1c11_scalling_instance_instance_name: type: list @@ -1766,29 +1838,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 @@ -1799,6 +1934,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 @@ -1809,21 +1950,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 @@ -1834,11 +1965,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 @@ -2261,22 +2393,18 @@ node_types: org.openecomp.resource.abstract.nodes.a_single_2a: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - compute_a_single_2a_name: + compute_a_single_2a_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_a_single_2a_user_data_format: + port_1a_t1_port_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_image_name: - type: string - required: true - status: SUPPORTED + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2291,12 +2419,30 @@ node_types: status: SUPPORTED entry_schema: type: json + port_1a_t1_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1a_t1_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_a_single_2a_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json + port_1a_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer compute_a_single_2a_availability_zone: type: list required: true @@ -2307,24 +2453,46 @@ node_types: type: string required: true status: SUPPORTED - compute_a_single_2a_metadata: + port_1a_t1_port_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_1a_t1_port_mac_requirements: + port_1a_t1_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1a_t1_port_network: + type: string + port_1a_t1_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_a_single_2a_name: type: list required: true status: SUPPORTED entry_schema: type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1a_t1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_a_single_2a_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json attributes: a_single_2a_instance_name: type: list @@ -2670,12 +2838,86 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance_2: 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 @@ -2690,22 +2932,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 @@ -2718,11 +2956,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 @@ -3181,6 +3415,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 @@ -3201,50 +3503,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 @@ -3691,12 +3991,86 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance_3: 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 @@ -3711,22 +4085,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 @@ -3739,11 +4109,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 @@ -4201,6 +4567,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 @@ -4227,32 +4661,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 @@ -4265,12 +4703,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 @@ -4705,12 +5143,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 @@ -4725,12 +5237,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 @@ -4743,10 +5249,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 @@ -4759,11 +5267,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 @@ -5221,12 +5725,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 @@ -5241,22 +5819,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 @@ -5269,11 +5843,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 @@ -5726,6 +6296,80 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_2b_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 + compute_b_single_2b_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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 + compute_b_single_2b_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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 + 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 compute_b_single_2b_availability_zone: type: list required: true @@ -5746,6 +6390,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1b_t2_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_1b_t2_port_ip_requirements: type: list required: true @@ -5758,50 +6408,42 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED compute_b_single_2b_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_b_single_2b_metadata: + port_1b_t1_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t1_port_ip_requirements: + type: string + 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 status: SUPPORTED entry_schema: type: json - compute_b_single_2b_scheduler_hints: + port_1b_t2_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t2_port_network: + type: string + port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json attributes: b_single_2b_instance_name: type: list @@ -6225,6 +6867,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 @@ -6251,16 +6961,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 @@ -6273,16 +6985,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 @@ -6295,12 +7003,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 @@ -6741,6 +7449,74 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_2b_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 + compute_b_single_2b_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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 + 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 compute_b_single_2b_availability_zone: type: list required: true @@ -6761,6 +7537,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1b_t2_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_1b_t2_port_ip_requirements: type: list required: true @@ -6773,10 +7555,6 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED port_1b_t1_port_value_specs: type: list required: true @@ -6795,34 +7573,30 @@ 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 status: SUPPORTED entry_schema: type: json - compute_b_single_2b_scheduler_hints: + port_1b_t2_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t2_port_network: + type: string + 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 |