diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution')
37 files changed, 3004 insertions, 2639 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index 48d9735fb9..86c41415ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -419,8 +419,8 @@ topology_template: description: csb internal network name default: int_mog_csb_net node_templates: - abstract_pcm_server_0: - type: org.openecomp.resource.abstract.nodes.heat.pcm_server + server_pcm_003: + type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 directives: - substitutable properties: @@ -506,5 +506,5 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: + - server_pcm_003 - abstract_pd_server - - abstract_pcm_server_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index f78767abf9..e68bf0fb94 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -128,20 +128,14 @@ node_types: type: string attributes: pd_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string pd_server_pd02_port_device_owner: - type: list + type: string status: SUPPORTED - entry_schema: - type: string pd_server_pd01_port_device_id: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index cab0a4485f..d70887911a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -183,29 +183,23 @@ topology_template: relationship: tosca.relationships.network.BindsTo outputs: pd_server_accessIPv4: - type: list + type: string value: get_attribute: - pd_server - accessIPv4 - entry_schema: - type: string pd_server_pd02_port_device_owner: - type: list + type: string value: get_attribute: - pd_server_pd02_port - device_owner - entry_schema: - type: string pd_server_pd01_port_device_id: - type: list + type: string value: get_attribute: - pd_server_pd01_port - device_id - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: 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 0b1b45b112..a3e595f5da 100644 --- 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,214 +2992,64 @@ 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: + port_VLC1_Internal1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC1_Internal1_network_role_tag: + port_VLC_SCTP_A_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_GTP_network: + port_VLC_OAM_network_role_tag: 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: + port_VLC1_Internal1_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_GTP_vlan_requirements: + port_VLC_GTP_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 - 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 - status: SUPPORTED - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC_SCTP_A_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_VLC_SCTP_A_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: json - port_VLC1_Internal1_network_role: + port_VLC1_Internal2_network: 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_VLC_SCTP_B_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_OAM_vlan_requirements: + port_VLC_SCTP_A_fixed_ips: type: list required: true status: SUPPORTED @@ -3684,79 +3060,47 @@ node_types: required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC1_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC1_Internal2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: type: json - port_VLC_OAM_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC1_Internal2_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC1_Internal2_subnetpoolid: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_SCTP_A_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_SCTP_A_subnetpoolid: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_VLC1_availability_zone: + type: json + 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: + compute_VLC1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_OAM_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml index a9acfcc5c3..d9a7752ac7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml @@ -12,98 +12,30 @@ node_types: topology_template: inputs: port_FSB1_Internal1_mac_address: - type: string - required: true - port_FSB_OAM_network_role_tag: - type: string - required: true - port_FSB1_Internal2_network: - type: list - required: true - entry_schema: - type: string - port_FSB1_Internal1_network: - type: list - required: true - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - port_FSB_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_FSB1_Internal2_mac_address: - type: string - required: true - port_FSB_OAM_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal1_subnetpoolid: type: list required: true entry_schema: type: string - port_FSB1_Internal2_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_FSB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_FSB_OAM_network_role: - type: list - required: true - entry_schema: - type: string - port_FSB1_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal1_order: - type: list - required: true - entry_schema: - type: integer - port_FSB_OAM_network: - type: list - required: true - entry_schema: - type: string - port_FSB1_Internal2_network_role: + port_FSB_OAM_network_role_tag: type: list required: true entry_schema: type: string - port_FSB1_Internal1_network_role_tag: + port_FSB1_Internal2_network: type: list required: true entry_schema: type: string - port_FSB_OAM_subnetpoolid: + port_FSB_OAM_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements compute_FSB1_availability_zone: type: list required: true entry_schema: type: string - port_FSB1_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -111,102 +43,79 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_Internal1_network: type: list required: true entry_schema: - type: integer - port_FSB1_Internal1_network_role: + type: string + vm_flavor_name: + type: string + required: true + port_FSB1_Internal2_mac_address: type: list required: true entry_schema: type: string - port_FSB1_Internal2_network_role_tag: + port_FSB_OAM_ip_requirements: type: list required: true entry_schema: - type: string + type: json port_FSB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_FSB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal2_order: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: integer + type: json port_FSB_OAM_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB1_Internal1_exCP_naming: - type: list - required: true - entry_schema: type: json - port_FSB_OAM_exCP_naming: + compute_FSB1_name: type: list required: true entry_schema: - type: json - compute_FSB1_name: + type: string + port_FSB1_Internal1_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal2_exCP_naming: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal1_ip_requirements: type: list required: true entry_schema: type: json - port_FSB1_Internal2_vlan_requirements: + port_FSB_OAM_network: type: list required: true entry_schema: - type: json + type: string node_templates: FSB1_FSB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_FSB1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_FSB1_Internal2_ip_requirements - network_role_tag: get_input: - - port_FSB1_Internal2_network_role_tag + - port_FSB1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_FSB1_Internal2_mac_requirements - order: - get_input: - - port_FSB1_Internal2_order - - index_value - network_role: - get_input: - - port_FSB1_Internal2_network_role - - index_value - subnetpoolid: get_input: - - port_FSB1_Internal2_subnetpoolid + - port_FSB1_Internal2_mac_requirements - index_value network: get_input: - port_FSB1_Internal2_network - index_value mac_address: - get_input: port_FSB1_Internal2_mac_address + get_input: + - port_FSB1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -215,40 +124,22 @@ topology_template: FSB1_FSB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_FSB1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_FSB1_Internal1_ip_requirements - network_role_tag: get_input: - - port_FSB1_Internal1_network_role_tag + - port_FSB1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_FSB1_Internal1_mac_requirements - order: get_input: - - port_FSB1_Internal1_order - - index_value - network_role: - get_input: - - port_FSB1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_FSB1_Internal1_subnetpoolid + - port_FSB1_Internal1_mac_requirements - index_value network: get_input: - port_FSB1_Internal1_network - index_value mac_address: - get_input: port_FSB1_Internal1_mac_address + get_input: + - port_FSB1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -257,34 +148,22 @@ topology_template: FSB1_FSB_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_FSB_OAM_vlan_requirements + - port_FSB_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: port_FSB_OAM_network_role_tag - mac_requirements: - get_input: port_FSB_OAM_mac_requirements - order: get_input: - - port_FSB_OAM_order + - port_FSB_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_FSB_OAM_network_role + - port_FSB_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_FSB_OAM_subnetpoolid + - port_FSB_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -556,4 +435,4 @@ topology_template: - dependency link_FSB1_FSB_OAM: - FSB1_FSB_OAM - - link + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml index 24b75d7835..9bb94360f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml @@ -12,103 +12,25 @@ node_types: topology_template: inputs: port_FSB_OAM_network_role_tag: - type: string - required: true - port_FSB2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - vm_flavor_name: - type: string - required: true - port_FSB_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: json - compute_FSB2_availability_zone: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_FSB_OAM_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal2_network_role: - type: list - required: true - entry_schema: - type: string - compute_FSB2_name: type: list required: true entry_schema: type: string - port_FSB2_Internal1_mac_address: - type: string - required: true - port_FSB2_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_FSB_OAM_network_role: - type: list - required: true - entry_schema: - type: string - port_FSB_OAM_network: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal1_network: + port_FSB2_Internal2_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB2_Internal2_mac_address: - type: string - required: true - port_FSB_OAM_subnetpoolid: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB_OAM_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_FSB_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements port_FSB2_Internal2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -116,32 +38,35 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB2_Internal2_network: type: list required: true entry_schema: - type: integer - port_FSB2_Internal2_network: + type: string + vm_flavor_name: + type: string + required: true + compute_FSB2_availability_zone: type: list required: true entry_schema: type: string - port_FSB2_Internal2_vlan_requirements: + port_FSB_OAM_ip_requirements: type: list required: true entry_schema: type: json - port_FSB2_Internal1_order: + port_FSB2_Internal1_ip_requirements: type: list required: true entry_schema: - type: integer - port_FSB2_Internal2_subnetpoolid: + type: json + compute_FSB2_name: type: list required: true entry_schema: type: string - port_FSB2_Internal1_network_role_tag: + port_FSB2_Internal1_mac_address: type: list required: true entry_schema: @@ -150,57 +75,47 @@ topology_template: type: list required: true 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 - port_FSB2_Internal2_order: + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB_OAM_network: type: list required: true entry_schema: - type: integer - port_FSB2_Internal1_subnetpoolid: + type: string + port_FSB2_Internal1_network: type: list required: true entry_schema: type: string - port_FSB_OAM_exCP_naming: + port_FSB2_Internal2_mac_address: type: list required: true entry_schema: - type: json + type: string node_templates: FSB2_FSB_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_FSB_OAM_vlan_requirements + - port_FSB_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: port_FSB_OAM_network_role_tag - mac_requirements: - get_input: port_FSB_OAM_mac_requirements - order: get_input: - - port_FSB_OAM_order + - port_FSB_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_FSB_OAM_network_role + - port_FSB_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_FSB_OAM_subnetpoolid + - port_FSB_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -226,40 +141,22 @@ topology_template: FSB2_FSB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_FSB2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_FSB2_Internal2_ip_requirements - network_role_tag: get_input: - - port_FSB2_Internal2_network_role_tag + - port_FSB2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_FSB2_Internal2_mac_requirements - order: - get_input: - - port_FSB2_Internal2_order - - index_value - network_role: get_input: - - port_FSB2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_FSB2_Internal2_subnetpoolid + - port_FSB2_Internal2_mac_requirements - index_value network: get_input: - port_FSB2_Internal2_network - index_value mac_address: - get_input: port_FSB2_Internal2_mac_address + get_input: + - port_FSB2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -268,40 +165,22 @@ topology_template: FSB2_FSB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_FSB2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_FSB2_Internal1_ip_requirements - network_role_tag: get_input: - - port_FSB2_Internal1_network_role_tag + - port_FSB2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_FSB2_Internal1_mac_requirements - order: get_input: - - port_FSB2_Internal1_order - - index_value - network_role: - get_input: - - port_FSB2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_FSB2_Internal1_subnetpoolid + - port_FSB2_Internal1_mac_requirements - index_value network: get_input: - port_FSB2_Internal1_network - index_value mac_address: - get_input: port_FSB2_Internal1_mac_address + get_input: + - port_FSB2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -556,4 +435,4 @@ topology_template: - local_storage link_FSB2_FSB2_Internal2: - FSB2_FSB2_Internal2 - - link + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml index 6b23277221..eb3a63e8b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml @@ -11,12 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_GPB1_Internal1_network_role: + port_GPB1_Internal2_network: type: list required: true 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 + constraints: + - greater_or_equal: 0 + port_GPB1_Internal1_network: type: list required: true entry_schema: @@ -29,103 +36,44 @@ topology_template: vm_flavor_name: type: string required: true - port_GPB1_Internal2_mac_address: - type: string - required: true - port_GPB1_Internal1_order: - type: list - required: true - entry_schema: - type: integer - vm_image_name: - type: string - required: true - port_GPB1_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_GPB1_availability_zone: - type: list - required: true - entry_schema: - type: string - port_GPB1_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB1_Internal2_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal1_network_role_tag: + port_GPB1_Internal2_mac_requirements: type: list required: true entry_schema: - type: string - port_GPB1_Internal2_network: + type: org.openecomp.datatypes.network.MacRequirements + port_GPB1_Internal1_mac_address: type: list required: true entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_GPB1_Internal1_network: + port_GPB1_Internal2_mac_address: type: list required: true entry_schema: type: string - port_GPB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_GPB1_Internal1_mac_address: + vm_image_name: type: string required: true - port_GPB1_Internal1_subnetpoolid: + port_GPB1_Internal1_ip_requirements: type: list required: true entry_schema: - type: string - port_GPB1_Internal2_subnetpoolid: + type: json + port_GPB1_Internal1_mac_requirements: type: list required: true entry_schema: - type: string - port_GPB1_Internal2_network_role_tag: + type: org.openecomp.datatypes.network.MacRequirements + compute_GPB1_availability_zone: type: list required: true entry_schema: type: string - port_GPB1_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB1_Internal2_order: + port_GPB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: integer + type: json node_templates: GPB1: type: org.openecomp.resource.vfc.nodes.heat.GPB1 @@ -145,40 +93,22 @@ topology_template: GPB1_GPB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_GPB1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_GPB1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_GPB1_Internal1_ip_requirements - network_role_tag: get_input: - - port_GPB1_Internal1_network_role_tag + - port_GPB1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_GPB1_Internal1_mac_requirements - order: get_input: - - port_GPB1_Internal1_order - - index_value - network_role: - get_input: - - port_GPB1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_GPB1_Internal1_subnetpoolid + - port_GPB1_Internal1_mac_requirements - index_value network: get_input: - port_GPB1_Internal1_network - index_value mac_address: - get_input: port_GPB1_Internal1_mac_address + get_input: + - port_GPB1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -187,40 +117,22 @@ topology_template: GPB1_GPB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_GPB1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_GPB1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_GPB1_Internal2_ip_requirements - network_role_tag: get_input: - - port_GPB1_Internal2_network_role_tag + - port_GPB1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_GPB1_Internal2_mac_requirements - order: - get_input: - - port_GPB1_Internal2_order - - index_value - network_role: get_input: - - port_GPB1_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_GPB1_Internal2_subnetpoolid + - port_GPB1_Internal2_mac_requirements - index_value network: get_input: - port_GPB1_Internal2_network - index_value mac_address: - get_input: port_GPB1_Internal2_mac_address + get_input: + - port_GPB1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - local_storage link_GPB1_GPB1_Internal1: - GPB1_GPB1_Internal1 - - link + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml index 133d43efe2..d18d8f578f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml @@ -11,74 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_GPB2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_GPB2_Internal2_order: - type: list - required: true - entry_schema: - type: integer - port_GPB2_Internal1_network: - type: list - required: true - entry_schema: - type: string - port_GPB2_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json - vm_flavor_name: - type: string - required: true - port_GPB2_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - port_GPB2_Internal2_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_GPB2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - compute_GPB2_name: - type: list - required: true - entry_schema: - type: string - port_GPB2_Internal1_subnetpoolid: + port_GPB2_Internal2_mac_address: type: list required: true entry_schema: type: string - port_GPB2_Internal2_subnetpoolid: + port_GPB2_Internal2_mac_requirements: type: list required: true entry_schema: - type: string - port_GPB2_Internal2_mac_address: - type: string - required: true - port_GPB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements port_GPB2_Internal1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB2_Internal2_network_role: + type: json + port_GPB2_Internal1_network: type: list required: true entry_schema: @@ -95,32 +43,32 @@ topology_template: required: true entry_schema: type: string - port_GPB2_Internal2_exCP_naming: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: json - port_GPB2_Internal1_order: + port_GPB2_Internal1_mac_requirements: type: list required: true entry_schema: - type: integer - port_GPB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_GPB2_Internal1_exCP_naming: + type: org.openecomp.datatypes.network.MacRequirements + port_GPB2_Internal2_ip_requirements: type: list required: true entry_schema: type: json - port_GPB2_Internal1_network_role_tag: + vm_image_name: + type: string + required: true + compute_GPB2_name: type: list required: true entry_schema: type: string port_GPB2_Internal1_mac_address: - type: string + type: list required: true + entry_schema: + type: string port_GPB2_Internal2_network: type: list required: true @@ -130,40 +78,22 @@ topology_template: GPB2_GPB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_GPB2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_GPB2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_GPB2_Internal2_ip_requirements - network_role_tag: get_input: - - port_GPB2_Internal2_network_role_tag + - port_GPB2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_GPB2_Internal2_mac_requirements - order: - get_input: - - port_GPB2_Internal2_order - - index_value - network_role: get_input: - - port_GPB2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_GPB2_Internal2_subnetpoolid + - port_GPB2_Internal2_mac_requirements - index_value network: get_input: - port_GPB2_Internal2_network - index_value mac_address: - get_input: port_GPB2_Internal2_mac_address + get_input: + - port_GPB2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -172,40 +102,22 @@ topology_template: GPB2_GPB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_GPB2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_GPB2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_GPB2_Internal1_ip_requirements - network_role_tag: get_input: - - port_GPB2_Internal1_network_role_tag + - port_GPB2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_GPB2_Internal1_mac_requirements - order: - get_input: - - port_GPB2_Internal1_order - - index_value - network_role: get_input: - - port_GPB2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_GPB2_Internal1_subnetpoolid + - port_GPB2_Internal1_mac_requirements - index_value network: get_input: - port_GPB2_Internal1_network - index_value mac_address: - get_input: port_GPB2_Internal1_mac_address + get_input: + - port_GPB2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - dependency dependency_GPB2_GPB2_Internal1: - GPB2_GPB2_Internal1 - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml index 2da2afc1ba..4e33b89be8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml @@ -11,68 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_NCB1_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_network_role: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal1_network_role_tag: - type: list - required: true - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - compute_NCB1_name: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_NCB1_Internal2_order: - type: list - required: true - entry_schema: - type: integer - port_NCB1_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB1_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_NCB1_Internal1_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_NCB1_Internal2_subnetpoolid: + port_NCB1_Internal2_mac_address: type: list required: true entry_schema: type: string - port_NCB1_Internal2_mac_address: - type: string - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,31 +24,33 @@ topology_template: constraints: - greater_or_equal: 0 port_NCB1_Internal1_mac_address: - type: string - required: true - port_NCB1_Internal1_order: type: list required: true entry_schema: - type: integer - port_NCB1_Internal2_exCP_naming: + type: string + port_NCB1_Internal1_ip_requirements: type: list required: true entry_schema: type: json - port_NCB1_Internal1_ip_requirements: + vm_flavor_name: + type: string + required: true + compute_NCB1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB1_Internal1_vlan_requirements: + type: string + port_NCB1_Internal1_mac_requirements: type: list required: true entry_schema: - type: json - port_NCB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.MacRequirements + port_NCB1_Internal2_mac_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements port_NCB1_Internal1_network: type: list required: true @@ -116,11 +61,14 @@ topology_template: required: true entry_schema: type: string - port_NCB1_Internal2_network_role_tag: + vm_image_name: + type: string + required: true + port_NCB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: string + type: json port_NCB1_Internal2_network: type: list required: true @@ -145,40 +93,22 @@ topology_template: NCB1_NCB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB1_Internal1_ip_requirements - network_role_tag: get_input: - - port_NCB1_Internal1_network_role_tag + - port_NCB1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_NCB1_Internal1_mac_requirements - order: get_input: - - port_NCB1_Internal1_order - - index_value - network_role: - get_input: - - port_NCB1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB1_Internal1_subnetpoolid + - port_NCB1_Internal1_mac_requirements - index_value network: get_input: - port_NCB1_Internal1_network - index_value mac_address: - get_input: port_NCB1_Internal1_mac_address + get_input: + - port_NCB1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -187,40 +117,22 @@ topology_template: NCB1_NCB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB1_Internal2_ip_requirements - network_role_tag: get_input: - - port_NCB1_Internal2_network_role_tag + - port_NCB1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_NCB1_Internal2_mac_requirements - order: - get_input: - - port_NCB1_Internal2_order - - index_value - network_role: get_input: - - port_NCB1_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB1_Internal2_subnetpoolid + - port_NCB1_Internal2_mac_requirements - index_value network: get_input: - port_NCB1_Internal2_network - index_value mac_address: - get_input: port_NCB1_Internal2_mac_address + get_input: + - port_NCB1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - dependency dependency_NCB1_NCB1_Internal2: - NCB1_NCB1_Internal2 - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml index bdc13693f5..f7525eb8f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml @@ -11,48 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - compute_NCB2_availability_zone: - type: list - required: true - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - port_NCB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_NCB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_NCB2_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_NCB2_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_NCB2_Internal1_order: - type: list - required: true - entry_schema: - type: integer - port_NCB2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_NCB2_Internal2_network_role: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -65,58 +23,48 @@ topology_template: required: true entry_schema: type: string - port_NCB2_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_NCB2_Internal2_network: + compute_NCB2_availability_zone: type: list required: true entry_schema: type: string - port_NCB2_Internal2_vlan_requirements: + port_NCB2_Internal2_ip_requirements: type: list required: true entry_schema: type: json - port_NCB2_Internal1_mac_address: - type: string - required: true - port_NCB2_Internal2_mac_address: + vm_flavor_name: type: string required: true - port_NCB2_Internal1_subnetpoolid: + port_NCB2_Internal2_mac_requirements: type: list required: true entry_schema: - type: string - port_NCB2_Internal1_network_role_tag: + type: org.openecomp.datatypes.network.MacRequirements + port_NCB2_Internal2_network: type: list required: true entry_schema: type: string - port_NCB2_Internal2_order: + port_NCB2_Internal1_mac_requirements: type: list required: true entry_schema: - type: integer - compute_NCB2_name: + type: org.openecomp.datatypes.network.MacRequirements + port_NCB2_Internal1_mac_address: type: list required: true entry_schema: type: string - port_NCB2_Internal1_vlan_requirements: + port_NCB2_Internal2_mac_address: type: list required: true entry_schema: - type: json - port_NCB2_Internal2_subnetpoolid: + type: string + vm_image_name: + type: string + required: true + compute_NCB2_name: type: list required: true entry_schema: @@ -125,7 +73,7 @@ topology_template: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json node_templates: NCB2: type: org.openecomp.resource.vfc.nodes.heat.NCB2 @@ -145,40 +93,22 @@ topology_template: NCB2_NCB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB2_Internal1_ip_requirements - network_role_tag: get_input: - - port_NCB2_Internal1_network_role_tag + - port_NCB2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_NCB2_Internal1_mac_requirements - order: - get_input: - - port_NCB2_Internal1_order - - index_value - network_role: get_input: - - port_NCB2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB2_Internal1_subnetpoolid + - port_NCB2_Internal1_mac_requirements - index_value network: get_input: - port_NCB2_Internal1_network - index_value mac_address: - get_input: port_NCB2_Internal1_mac_address + get_input: + - port_NCB2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -187,40 +117,22 @@ topology_template: NCB2_NCB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB2_Internal2_ip_requirements - network_role_tag: get_input: - - port_NCB2_Internal2_network_role_tag + - port_NCB2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_NCB2_Internal2_mac_requirements - order: - get_input: - - port_NCB2_Internal2_order - - index_value - network_role: get_input: - - port_NCB2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB2_Internal2_subnetpoolid + - port_NCB2_Internal2_mac_requirements - index_value network: get_input: - port_NCB2_Internal2_network - index_value mac_address: - get_input: port_NCB2_Internal2_mac_address + get_input: + - port_NCB2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - link dependency_NCB2: - NCB2 - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml index 9f5a49cea9..90056b2c9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml @@ -12,177 +12,54 @@ node_types: topology_template: inputs: port_VLC1_Internal2_mac_address: - type: string - required: true - port_VLC_GTP_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_OAM_network_role_tag: - type: string - required: true - port_VLC1_Internal1_mac_address: - type: string - required: true - port_VLC_GTP_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC1_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC1_Internal2_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_flavor_name: - type: string - required: true - port_VLC1_Internal2_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_SCTP_A_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC1_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_VLC_GTP_network_role_tag: - type: list - required: true - entry_schema: - type: string - vm_image_name: - type: string - required: true - port_VLC1_Internal1_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_B_network: + port_VLC1_Internal1_network: type: list required: true entry_schema: type: string - port_VLC1_Internal1_network_role_tag: + port_VLC_SCTP_A_network: type: list required: true entry_schema: type: string - port_VLC_GTP_network: + port_VLC_OAM_network_role_tag: type: list required: true entry_schema: type: string - port_VLC_GTP_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_OAM_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC1_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_VLC1_Internal1_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_SCTP_A_network_role_tag: + port_VLC1_Internal1_mac_address: type: list required: true entry_schema: type: string - port_VLC_GTP_vlan_requirements: + port_VLC_GTP_ip_requirements: type: list required: true entry_schema: type: json - port_VLC_GTP_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_OAM_network: - type: list - required: true - entry_schema: - type: string - compute_VLC1_name: - type: list - required: true - entry_schema: - type: string - port_VLC1_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC1_Internal1_network: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC_SCTP_A_mac_requirements: type: list required: true entry_schema: - type: string - port_VLC_SCTP_A_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true - entry_schema: - type: json - port_VLC1_Internal1_network_role: + port_VLC1_Internal2_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_A_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_SCTP_B_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_A_exCP_naming: + port_VLC_SCTP_B_ip_requirements: type: list required: true entry_schema: type: json - port_VLC_OAM_vlan_requirements: + port_VLC_SCTP_A_fixed_ips: type: list required: true entry_schema: @@ -191,67 +68,40 @@ topology_template: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC1_Internal1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_OAM_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC1_Internal2_vlan_requirements: - type: list - required: true - entry_schema: type: json - port_VLC_OAM_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC1_Internal2_order: - type: list - required: true - entry_schema: - type: integer - port_VLC1_Internal2_subnetpoolid: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: string port_VLC_SCTP_A_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_SCTP_A_subnetpoolid: - type: list - required: true - entry_schema: - type: string - compute_VLC1_availability_zone: + type: json + port_VLC_SCTP_B_network: type: list required: true entry_schema: type: string - port_VLC_OAM_subnetpoolid: + port_VLC_GTP_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_network_role_tag: + compute_VLC1_availability_zone: type: list required: true entry_schema: type: string - port_VLC_OAM_order: - type: list - required: true - entry_schema: - type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -259,97 +109,72 @@ topology_template: default: 0 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 - port_VLC_SCTP_B_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC1_Internal2_mac_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.MacRequirements port_VLC_SCTP_B_fixed_ips: type: list required: true 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 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 entry_schema: - type: string - port_VLC_GTP_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: json port_VLC_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC1_Internal1_exCP_naming: type: list required: true entry_schema: - type: json - port_VLC_SCTP_B_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC_SCTP_B_order: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_OAM_network: type: list required: true entry_schema: - type: integer - port_VLC_GTP_subnetpoolid: + type: string + compute_VLC1_name: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_vlan_requirements: + port_VLC_SCTP_B_mac_requirements: type: list required: true 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 entry_schema: - type: string + type: json node_templates: VLC1_VLC_SCTP_B: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_B_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_B_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_B_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_B_network_role_tag + - port_VLC_SCTP_B_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_B_mac_requirements - order: get_input: - - port_VLC_SCTP_B_order + - port_VLC_SCTP_B_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_B_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_B_subnetpoolid + - port_VLC_SCTP_B_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -362,40 +187,22 @@ topology_template: VLC1_VLC1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC1_Internal2_ip_requirements - network_role_tag: get_input: - - port_VLC1_Internal2_network_role_tag + - port_VLC1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_VLC1_Internal2_mac_requirements - order: - get_input: - - port_VLC1_Internal2_order - - index_value - network_role: get_input: - - port_VLC1_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC1_Internal2_subnetpoolid + - port_VLC1_Internal2_mac_requirements - index_value network: get_input: - port_VLC1_Internal2_network - index_value mac_address: - get_input: port_VLC1_Internal2_mac_address + get_input: + - port_VLC1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -404,40 +211,22 @@ topology_template: VLC1_VLC1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC1_Internal1_ip_requirements - network_role_tag: get_input: - - port_VLC1_Internal1_network_role_tag + - port_VLC1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_VLC1_Internal1_mac_requirements - order: - get_input: - - port_VLC1_Internal1_order - - index_value - network_role: get_input: - - port_VLC1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC1_Internal1_subnetpoolid + - port_VLC1_Internal1_mac_requirements - index_value network: get_input: - port_VLC1_Internal1_network - index_value mac_address: - get_input: port_VLC1_Internal1_mac_address + get_input: + - port_VLC1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -446,34 +235,22 @@ topology_template: VLC1_VLC_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_VLC_OAM_vlan_requirements + - port_VLC_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: port_VLC_OAM_network_role_tag - mac_requirements: - get_input: port_VLC_OAM_mac_requirements - order: get_input: - - port_VLC_OAM_order + - port_VLC_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_VLC_OAM_network_role + - port_VLC_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_OAM_subnetpoolid + - port_VLC_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -486,36 +263,18 @@ topology_template: VLC1_VLC_SCTP_A: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_A_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_A_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_A_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_A_network_role_tag + - port_VLC_SCTP_A_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_A_mac_requirements - order: get_input: - - port_VLC_SCTP_A_order + - port_VLC_SCTP_A_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_A_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_A_subnetpoolid + - port_VLC_SCTP_A_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -543,36 +302,18 @@ topology_template: VLC1_VLC_GTP: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_GTP_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_GTP_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_GTP_ip_requirements - network_role_tag: get_input: - - port_VLC_GTP_network_role_tag + - port_VLC_GTP_ip_requirements - index_value mac_requirements: - get_input: port_VLC_GTP_mac_requirements - order: - get_input: - - port_VLC_GTP_order - - index_value - network_role: get_input: - - port_VLC_GTP_network_role + - port_VLC_GTP_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_GTP_subnetpoolid + - port_VLC_GTP_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -948,4 +689,4 @@ topology_template: - dependency dependency_VLC1_VLC_SCTP_A: - VLC1_VLC_SCTP_A - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml index 0254ce3d48..48c2c1d7b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml @@ -11,27 +11,31 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_VLC_GTP_exCP_naming: + port_VLC_SCTP_A_network: type: list required: true entry_schema: - type: json + type: string port_VLC_OAM_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_VLC_GTP_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC2_Internal2_ip_requirements: type: list required: true 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 + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements vm_flavor_name: type: string required: true @@ -39,182 +43,70 @@ topology_template: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_SCTP_A_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC2_Internal1_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_mac_address: - type: string - required: true - port_VLC_GTP_network_role_tag: - type: list - required: true - entry_schema: - type: string - vm_image_name: - type: string - required: true - port_VLC2_Internal1_mac_address: - type: string - required: true - port_VLC2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC_SCTP_B_network: - type: list - required: true - entry_schema: - type: string - port_VLC_GTP_network: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_GTP_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_OAM_exCP_naming: - type: list - required: true - entry_schema: type: json - port_VLC_SCTP_A_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_VLC_GTP_vlan_requirements: + port_VLC_OAM_ip_requirements: type: list required: true entry_schema: type: json - port_VLC_GTP_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_OAM_network: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC2_Internal2_mac_address: type: list required: true entry_schema: type: string - port_VLC_SCTP_A_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_A_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_SCTP_B_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_A_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_OAM_vlan_requirements: + port_VLC_OAM_fixed_ips: type: list required: true entry_schema: type: json - port_VLC_OAM_ip_requirements: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_OAM_fixed_ips: + port_VLC2_Internal1_mac_address: type: list required: true 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 entry_schema: - type: integer - port_VLC_OAM_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC2_Internal1_mac_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.MacRequirements port_VLC_SCTP_A_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC2_Internal2_vlan_requirements: - type: list - required: true - entry_schema: type: json - port_VLC_SCTP_A_subnetpoolid: + port_VLC_SCTP_B_network: type: list required: true entry_schema: type: string - port_VLC_OAM_subnetpoolid: + port_VLC_GTP_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_network_role_tag: + port_VLC2_Internal1_ip_requirements: type: list required: true entry_schema: - type: string + type: json compute_VLC2_name: type: list required: true entry_schema: type: string - port_VLC_OAM_order: - type: list - required: true - entry_schema: - type: integer - port_VLC2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network_role: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -222,39 +114,16 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_VLC_SCTP_B_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string port_VLC_SCTP_B_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_GTP_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_order: + type: json + port_VLC_GTP_mac_requirements: type: list required: true entry_schema: - type: integer - port_VLC_GTP_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements port_VLC2_Internal1_network: type: list required: true @@ -265,53 +134,27 @@ topology_template: required: true entry_schema: type: string - port_VLC2_Internal1_exCP_naming: + port_VLC_GTP_fixed_ips: type: list required: true entry_schema: type: json port_VLC_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal1_vlan_requirements: type: list required: true entry_schema: - type: json - port_VLC2_Internal2_subnetpoolid: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_OAM_network: type: list required: true entry_schema: type: string port_VLC_SCTP_B_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_B_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_GTP_subnetpoolid: type: list required: true entry_schema: - type: string - port_VLC2_Internal1_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_B_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_B_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC2_Internal2_network: type: list required: true entry_schema: @@ -320,40 +163,22 @@ topology_template: VLC2_VLC2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC2_Internal2_ip_requirements - network_role_tag: get_input: - - port_VLC2_Internal2_network_role_tag + - port_VLC2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_VLC2_Internal2_mac_requirements - order: - get_input: - - port_VLC2_Internal2_order - - index_value - network_role: get_input: - - port_VLC2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC2_Internal2_subnetpoolid + - port_VLC2_Internal2_mac_requirements - index_value network: get_input: - port_VLC2_Internal2_network - index_value mac_address: - get_input: port_VLC2_Internal2_mac_address + get_input: + - port_VLC2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -362,34 +187,22 @@ topology_template: VLC2_VLC_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_VLC_OAM_vlan_requirements + - port_VLC_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: port_VLC_OAM_network_role_tag - mac_requirements: - get_input: port_VLC_OAM_mac_requirements - order: get_input: - - port_VLC_OAM_order + - port_VLC_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_VLC_OAM_network_role + - port_VLC_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_OAM_subnetpoolid + - port_VLC_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -402,40 +215,22 @@ topology_template: VLC2_VLC2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC2_Internal1_ip_requirements - network_role_tag: get_input: - - port_VLC2_Internal1_network_role_tag + - port_VLC2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_VLC2_Internal1_mac_requirements - order: get_input: - - port_VLC2_Internal1_order - - index_value - network_role: - get_input: - - port_VLC2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC2_Internal1_subnetpoolid + - port_VLC2_Internal1_mac_requirements - index_value network: get_input: - port_VLC2_Internal1_network - index_value mac_address: - get_input: port_VLC2_Internal1_mac_address + get_input: + - port_VLC2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -444,36 +239,18 @@ topology_template: VLC2_VLC_SCTP_A: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_A_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_A_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_A_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_A_network_role_tag + - port_VLC_SCTP_A_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_A_mac_requirements - order: get_input: - - port_VLC_SCTP_A_order + - port_VLC_SCTP_A_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_A_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_A_subnetpoolid + - port_VLC_SCTP_A_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -486,36 +263,18 @@ topology_template: VLC2_VLC_SCTP_B: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_B_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_B_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_B_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_B_network_role_tag + - port_VLC_SCTP_B_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_B_mac_requirements - order: get_input: - - port_VLC_SCTP_B_order + - port_VLC_SCTP_B_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_B_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_B_subnetpoolid + - port_VLC_SCTP_B_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -528,36 +287,18 @@ topology_template: VLC2_VLC_GTP: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_GTP_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_GTP_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_GTP_ip_requirements - network_role_tag: get_input: - - port_VLC_GTP_network_role_tag + - port_VLC_GTP_ip_requirements - index_value mac_requirements: - get_input: port_VLC_GTP_mac_requirements - order: - get_input: - - port_VLC_GTP_order - - index_value - network_role: get_input: - - port_VLC_GTP_network_role + - port_VLC_GTP_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_GTP_subnetpoolid + - port_VLC_GTP_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -948,4 +689,4 @@ topology_template: - dependency dependency_VLC2_VLC_GTP: - VLC2_VLC_GTP - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/MANIFEST.json new file mode 100644 index 0000000000..40c2b4c296 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/MANIFEST.json @@ -0,0 +1,17 @@ +{ + "name": "hot-mog", + "description": "HOT template to create hot mog server", + "version": "2013-05-23", + "data": [ + { + "file": "hot-mog-0108-bs1271.yml", + "type": "HEAT", + "data": [ + { + "file": "hot-mog-0108-bs1271.env", + "type": "HEAT_ENV" + } + ] + } + ] +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/hot-mog-0108-bs1271.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/hot-mog-0108-bs1271.env new file mode 100644 index 0000000000..40b3e20438 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/hot-mog-0108-bs1271.env @@ -0,0 +1,6 @@ +parameters: + pd_server_names: ZRDM1MOGX01MPD001,ZRDM1MOGX01MPD002 + pd_image_name: MOG_BASE_8.0 + pd_flavor_name: m3.xlarge + availabilityzone_name: nova + dummy_net_name_1: mog_dummy_1
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/hot-mog-0108-bs1271.yml new file mode 100644 index 0000000000..a60998e147 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in/hot-mog-0108-bs1271.yml @@ -0,0 +1,229 @@ +heat_template_version: 2013-05-23 + +description: heat template that creates MOG stack + +parameters: + pd_server_names: + type: comma_delimited_list + label: PD server names + description: name of the PD instance + pd_image_name: + type: string + label: image name + description: PD image name + pd_flavor_name: + type: string + label: PD flavor name + description: flavor name of PD instance + availabilityzone_name: + type: string + label: availabilityzone name + description: availabilityzone name + pd_security_group_name: + type: string + label: pd_security_group_name + description: pd_security_group_name + dummy_net_name_1: + type: string + label: csb ineternal cidr + description: csb internal cidr + lb_st_interface_type_oam: + description: dummy + type: string + lb_st_interface_vlan_tag_oam: + description: dummy + type: string + template_PortTuple_LB1: + description: dummy + type: string + oam_sec_group_name: + description: dummy + type: string + jsa_net_name: + description: dummy + type: string + nems_traffic_name: + description: dummy + type: string + pd_port_fixed_ips_address: + description: dummy + type: string + pd_port_fixed_ips_subnet: + description: dummy + type: string + mac_address: + description: dummy + type: string + virtual_ip_address: + description: dummy + type: string + virtual_ipv6_address: + description: dummy + type: string + parent_interface: + description: dummy + type: string + +resources: + server_pd_01: + type: OS::Nova::Server + properties: + name: {get_param: [pd_server_names, 0]} + image: {get_param: pd_image_name} + flavor: {get_param: pd_flavor_name} + availability_zone: {get_param: availabilityzone_name} + admin_pass: SERVER_PD_ADMIN_PASS + config_drive: true + diskConfig: AUTO + flavor_update_policy: REPLACE + image_update_policy: REBUILD_PRESERVE_EPHEMERAL + key_name: SERVER_PD_KEY_NAME + metadata: {value: SERVER_PD_METADATA} + personality: {value: SERVER_PD_PERSONALITY} + reservation_id: SERVER_PD_RESERVATION_ID + scheduler_hints: { group: { get_resource: DB_Affinity } } + security_groups: [{ get_param: pd_security_group_name }] + software_config_transport: POLL_SERVER_HEAT + user_data_update_policy: IGNORE + user_data_format: RAW + networks: + - port: {get_resource: pd01_port_0} + - port: {get_resource: template_VMInt_OAM_lb_4} + + pd01_port_0: + type: OS::Neutron::Port + properties: + network: PORT_PD_NETWORK + network_id: PORT_PD_NETWORK_ID + admin_state_up: true + allowed_address_pairs: [ + {ip_address: 10.12.13.134, mac_address: 00-14-22-01-23-45}, + {ip_address: 127.0.13.134, mac_address: 00-13-24-01-44-35} + ] + binding:vnic_type: direct-physical + device_id: PORT_PD_DEVICE_ID + device_owner: PORT_PD_DEVICE_OWNER + mac_address: 00-13-24-01-44-35 + name: PORT_PD_NAME + port_security_enabled: false + qos_policy: PORT_PD_QOS_POLICY + security_groups: [{get_resource: DB_Affinity}] + value_specs: {value: PORT_PD_VALUE_SPECS} + replacement_policy: AUTO + fixed_ips: + - ip_address: { get_param: pd_port_fixed_ips_address } + - subnet: {get_param: pd_port_fixed_ips_subnet} + + template_VMInt_OAM_lb_4: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam } + #virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_interface_vlan_tag_oam } + } + virtual_network_refs: [{ get_attr: [ jsa_net4, fq_name ] } ] + port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] + security_group_refs: [{ get_param: oam_sec_group_name}] + name: template_VMInt_OAM_lb_NAME + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }] + } + virtual_machine_interface_allowed_address_pairs: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 + } + }, + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 + } + } + ] + } + virtual_machine_interface_refs: [{ get_param: parent_interface }] + + cmaui_volume_test_compute_properties: + type: OS::Cinder::Volume + properties: + availability_zone: {get_attr: [server_pd_01, console_urls ] } + backup_id: {get_attr: [server_pd_01, instance_name ] } + description: {get_attr: [server_pd_01, show ] } + #image: {get_attr: [server_pd_01, config_drive ] } + #metadata: {get_attr: [server_pd_01, instance_name ] } + multiattach: {get_attr: [server_pd_01, addresses ] } + #name: {get_attr: [server_pd_01, image ] } + #read_only: false + #scheduler_hints: {get_attr: [server_pd_01, key_name ] } + #size: {get_attr: [server_pd_01, diskConfig ] } + #snapshot_id: {get_attr: [server_pd_01, name ] } + #source_volid: {get_attr: [server_pd_01, personality ] } + #volume_id: {get_attr: [server_pd_01, reservation_id ] } + #volume_type: {get_attr: [server_pd_01, scheduler_hints ] } + #delete_on_termination: {get_attr: [server_pd_01, security_groups ] } + #volume_size: {get_attr: [server_pd_01, software_config_transport ] } + #device_type: {get_attr: [server_pd_01, user_data_format ] } + #disk_bus: {get_attr: [server_pd_01, user_data_update_policy ] } + swap_size: {get_attr: [server_pd_01, accessIPv4 ] } + image_id: {get_attr: [server_pd_01, accessIPv6 ] } + + cmaui_volume_test_neutron_port_properties: + type: OS::Cinder::Volume + properties: + backup_id: {get_attr: [pd01_port_0, network ] } + image: {get_attr: [pd01_port_0, admin_state_up ] } + metadata: {get_attr: [pd01_port_0, allowed_address_pairs ] } + name: {get_attr: [pd01_port_0, device_id ] } + read_only: {get_attr: [pd01_port_0, device_owner ] } + scheduler_hints: {get_attr: [pd01_port_0, fixed_ips ] } + size: {get_attr: [pd01_port_0, mac_address ] } + snapshot_id: {get_attr: [pd01_port_0, name ] } + source_volid: {get_attr: [pd01_port_0, port_security_enabled ] } + volume_id: {get_attr: [pd01_port_0, qos_policy ] } + volume_type: {get_attr: [pd01_port_0, security_groups ] } + volume_size: {get_attr: [pd01_port_0, network_id ] } + device_type: {get_attr: [pd01_port_0, show ] } + delete_on_termination: {get_attr: [pd01_port_0, status ] } + disk_bus: {get_attr: [pd01_port_0, subnets ] } + swap_size: {get_attr: [pd01_port_0, tenant_id ] } + + cmaui_volume_test_contrailv2_VMI_properties: + type: OS::Cinder::Volume + properties: + availability_zone: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_mac_addresses, virtual_machine_interface_mac_addresses_mac_address ] } + description: {get_attr: [template_VMInt_OAM_lb_4, virtual_network_refs ] } + image: {get_attr: [template_VMInt_OAM_lb_4, port_tuple_refs ] } + metadata: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_mac_addresses ] } + multiattach: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_properties ] } + name: {get_attr: [template_VMInt_OAM_lb_4, name ] } + size: 50 + snapshot_id: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_allowed_address_pairs, virtual_machine_interface_allowed_address_pairs_allowed_address_pair, 0, virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode ] } + source_volid: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_allowed_address_pairs, virtual_machine_interface_allowed_address_pairs_allowed_address_pair, 0, virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac ] } + volume_id: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_allowed_address_pairs, virtual_machine_interface_allowed_address_pairs_allowed_address_pair, 0, virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip, virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix ] } + volume_type: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_allowed_address_pairs, virtual_machine_interface_allowed_address_pairs_allowed_address_pair, 0, virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip, virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len ] } + device_type: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_properties, virtual_machine_interface_properties_service_interface_type] } + disk_bus: {get_attr: [template_VMInt_OAM_lb_4, virtual_machine_interface_allowed_address_pairs, virtual_machine_interface_allowed_address_pairs_allowed_address_pair, 0, virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip ] } + delete_on_termination: {get_attr: [template_VMInt_OAM_lb_4, fq_name ] } + swap_size: {get_attr: [template_VMInt_OAM_lb_4, show ] } + + jsa_net4: + type: OS::Contrail::VirtualNetwork + properties: + name: {get_param: nems_traffic_name} + + DB_Affinity: + type: OS::Nova::ServerGroup + properties: + policies: ["anti-affinity"]
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml new file mode 100644 index 0000000000..6f8a16604a --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -0,0 +1,833 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: GlobalSubstitutionTypes +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.abstract.nodes.pd_server: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + compute_pd_server_key_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_pd_server_personality: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_pd_server_image_update_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_pd01_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + required: true + status: SUPPORTED + port_pd01_port_device_id: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_admin_state_up: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_template_VMInt_OAM_lb_subnetpoolid: + type: string + required: true + status: SUPPORTED + compute_pd_server_diskConfig: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_mac_address: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_allowed_address_pairs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_pd_server_admin_pass: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_pd_server_flavor_update_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_template_VMInt_OAM_lb_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_template_VMInt_OAM_lb_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED + port_pd01_port_value_specs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_pd_server_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_template_VMInt_OAM_lb_port_tuple_refs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_pd_server_software_config_transport: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_network_role_tag: + type: string + required: true + status: SUPPORTED + compute_pd_server_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_pd_server_contrail_service_instance_ind: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + compute_pd_server_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_pd_server_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_template_VMInt_OAM_lb_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_binding:vnic_type: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_device_owner: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_qos_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_pd_server_config_drive: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_template_VMInt_OAM_lb_virtual_network_refs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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_template_VMInt_OAM_lb_order: + type: integer + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_template_VMInt_OAM_lb_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_port_security_enabled: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_template_VMInt_OAM_lb_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_update_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_pd_server_reservation_id: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_order: + type: integer + required: true + status: SUPPORTED + port_pd01_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_network_role: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_security_group_refs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + attributes: + pd_server_pd01_port_allowed_address_pairs: + type: list + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: list + status: SUPPORTED + entry_schema: + type: string + pd_server_template_VMInt_OAM_lb_virtual_network_refs: + type: list + status: SUPPORTED + entry_schema: + type: string + pd_server_template_VMInt_OAM_lb_fq_name: + type: string + status: SUPPORTED + pd_server_show: + type: string + status: SUPPORTED + pd_server_console_urls: + type: string + status: SUPPORTED + pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + status: SUPPORTED + pd_server_pd01_port_security_groups: + type: list + status: SUPPORTED + entry_schema: + type: string + pd_server_pd01_port_port_security_enabled: + type: boolean + status: SUPPORTED + pd_server_pd01_port_status: + type: string + status: SUPPORTED + pd_server_template_VMInt_OAM_lb_port_tuple_refs: + type: list + status: SUPPORTED + entry_schema: + type: string + pd_server_pd01_port_fixed_ips: + type: list + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + pd_server_accessIPv6: + type: string + status: SUPPORTED + pd_server_pd01_port_admin_state_up: + type: boolean + status: SUPPORTED + pd_server_instance_name: + type: string + status: SUPPORTED + pd_server_template_VMInt_OAM_lb_name: + type: string + status: SUPPORTED + pd_server_accessIPv4: + type: string + status: SUPPORTED + pd_server_pd01_port_device_owner: + type: string + status: SUPPORTED + pd_server_pd01_port_show: + type: string + status: SUPPORTED + pd_server_pd01_port_network: + type: string + status: SUPPORTED + pd_server_pd01_port_qos_policy: + type: string + status: SUPPORTED + pd_server_pd01_port_mac_address: + type: string + status: SUPPORTED + pd_server_addresses: + type: map + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo + pd_server_pd01_port_tenant_id: + type: string + status: SUPPORTED + pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + status: SUPPORTED + pd_server_pd01_port_device_id: + type: string + status: SUPPORTED + pd_server_pd01_port_name: + type: string + status: SUPPORTED + pd_server_template_VMInt_OAM_lb_show: + type: string + status: SUPPORTED + pd_server_pd01_port_subnets: + type: list + status: SUPPORTED + entry_schema: + type: string + requirements: + - dependency_pd_server: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_template_VMInt_OAM_lb: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_template_VMInt_OAM_lb: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pd_server_pd01_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pd01_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + scalable_pd_server: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_pd_server: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pd_server_pd01_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pd_server_template_VMInt_OAM_lb: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_pd01_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pd01_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_pd_server: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + attachment_pd_server_pd01_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_template_VMInt_OAM_lb: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.allocation_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pd_server: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pd_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.usage_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd01_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pd_server_template_VMInt_OAM_lb: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_template_VMInt_OAM_lb: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_template_VMInt_OAM_lb: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_pd_server: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_template_VMInt_OAM_lb: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.requests.rate_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_pd01_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml new file mode 100644 index 0000000000..5d546b60d4 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml @@ -0,0 +1,417 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + type: string + description: flavor name of PD instance + default: m3.xlarge + dummy_net_name_1: + label: csb ineternal cidr + hidden: false + immutable: false + type: string + description: csb internal cidr + default: mog_dummy_1 + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + default: nova + template_PortTuple_LB1: + hidden: false + immutable: false + type: string + description: dummy + lb_st_interface_type_oam: + hidden: false + immutable: false + type: string + description: dummy + oam_sec_group_name: + hidden: false + immutable: false + type: string + description: dummy + virtual_ip_address: + hidden: false + immutable: false + type: string + description: dummy + nems_traffic_name: + hidden: false + immutable: false + type: string + description: dummy + pd_image_name: + label: image name + hidden: false + immutable: false + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + pd_security_group_name: + label: pd_security_group_name + hidden: false + immutable: false + type: string + description: pd_security_group_name + jsa_net_name: + hidden: false + immutable: false + type: string + description: dummy + pd_port_fixed_ips_address: + hidden: false + immutable: false + type: string + description: dummy + parent_interface: + hidden: false + immutable: false + type: string + description: dummy + virtual_ipv6_address: + hidden: false + immutable: false + type: string + description: dummy + mac_address: + hidden: false + immutable: false + type: string + description: dummy + pd_port_fixed_ips_subnet: + hidden: false + immutable: false + type: string + description: dummy + lb_st_interface_vlan_tag_oam: + hidden: false + immutable: false + type: string + description: dummy + node_templates: + cmaui_volume_test_contrailv2_VMI_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - mac_address + image: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_port_tuple_refs + metadata: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + volume_type: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - allowed_address_pair + - 0 + - ip + - ip_prefix_len + volume_id: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - allowed_address_pair + - 0 + - ip + - ip_prefix + snapshot_id: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - allowed_address_pair + - 0 + - address_mode + description: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_network_refs + device_type: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties + - virtual_machine_interface_properties_service_interface_type + disk_bus: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - allowed_address_pair + - 0 + - ip + source_volid: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - allowed_address_pair + - 0 + - mac + size: 50*1024 + name: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_name + swap_size: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_show + delete_on_termination: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_fq_name + multiattach: + get_attribute: + - abstract_pd_server + - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties + cmaui_volume_test_neutron_port_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + image: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_admin_state_up + metadata: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_allowed_address_pairs + volume_type: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_security_groups + volume_id: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_qos_policy + snapshot_id: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_name + device_type: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_show + disk_bus: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_subnets + backup_id: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_network + source_volid: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_port_security_enabled + size: '(get_attribute : [pd01_port_0, network]) * 1024' + read_only: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_device_owner + name: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_device_id + scheduler_hints: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_fixed_ips + swap_size: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_tenant_id + delete_on_termination: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_status + jsa_net4: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + network_name: + get_input: nems_traffic_name + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_key_name: + - SERVER_PD_KEY_NAME + port_pd01_port_replacement_policy: + - AUTO + compute_pd_server_personality: + - value: SERVER_PD_PERSONALITY + compute_pd_server_image_update_policy: + - REBUILD_PRESERVE_EPHEMERAL + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_security_groups: + - - DB_Affinity_group + port_pd01_port_mac_requirements: + mac_count_required: + is_required: true + vm_image_name: + get_input: pd_image_name + port_pd01_port_device_id: + - PORT_PD_DEVICE_ID + port_pd01_port_admin_state_up: + - true + compute_pd_server_metadata: + - value: SERVER_PD_METADATA + compute_pd_server_diskConfig: + - AUTO + port_pd01_port_mac_address: 00-13-24-01-44-35 + port_pd01_port_allowed_address_pairs: + - mac_address: 00-14-22-01-23-45 + ip_address: 10.12.13.134 + - mac_address: 00-13-24-01-44-35 + ip_address: 127.0.13.134 + compute_pd_server_admin_pass: + - SERVER_PD_ADMIN_PASS + compute_pd_server_flavor_update_policy: + - REPLACE + port_pd01_port_value_specs: + - value: PORT_PD_VALUE_SPECS + compute_pd_server_security_groups: + - - get_input: pd_security_group_name + port_template_VMInt_OAM_lb_port_tuple_refs: + - - get_input: template_PortTuple_LB1 + compute_pd_server_software_config_transport: + - POLL_SERVER_HEAT + compute_pd_server_scheduler_hints: + - group: DB_Affinity_group + port_pd01_port_name: + - PORT_PD_NAME + compute_pd_server_contrail_service_instance_ind: + - true + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 0 + port_pd01_port_binding:vnic_type: + - direct-physical + port_pd01_port_device_owner: + - PORT_PD_DEVICE_OWNER + port_pd01_port_fixed_ips: + - ip_address: + get_input: pd_port_fixed_ips_address + - subnet: + get_input: pd_port_fixed_ips_subnet + port_pd01_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pd01_port_qos_policy: + - PORT_PD_QOS_POLICY + compute_pd_server_config_drive: + - true + compute_pd_server_user_data_format: + - RAW + port_template_VMInt_OAM_lb_virtual_network_refs: + - - get_attribute: + - jsa_net4 + - fq_name + port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + - - get_input: mac_address + port_template_VMInt_OAM_lb_name: + - template_VMInt_OAM_lb_NAME + port_pd01_port_port_security_enabled: + - false + compute_pd_server_user_data_update_policy: + - IGNORE + port_pd01_port_network: + - PORT_PD_NETWORK_ID + compute_pd_server_reservation_id: + - SERVER_PD_RESERVATION_ID + port_template_VMInt_OAM_lb_security_group_refs: + - - get_input: oam_sec_group_name + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + cmaui_volume_test_compute_properties: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + availability_zone: + get_attribute: + - abstract_pd_server + - pd_server_console_urls + backup_id: + get_attribute: + - abstract_pd_server + - pd_server_instance_name + image: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv6 + swap_size: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + description: + get_attribute: + - abstract_pd_server + - pd_server_show + multiattach: + get_attribute: + - abstract_pd_server + - pd_server_addresses + groups: + DB_Affinity_group: + type: tosca.groups.Root + members: + - abstract_pd_server + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - cmaui_volume_test_contrailv2_VMI_properties + - cmaui_volume_test_neutron_port_properties + - jsa_net4 + - cmaui_volume_test_compute_properties + - abstract_pd_server + policies: + DB_Affinity_policy: + type: org.openecomp.policies.placement.Antilocate + properties: + container_type: host + targets: + - DB_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml new file mode 100644 index 0000000000..b834aaab1b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -0,0 +1,867 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Nested_pd_server +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.pd_server: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + compute_pd_server_key_name: + type: list + required: true + entry_schema: + type: string + port_pd01_port_replacement_policy: + type: list + required: true + entry_schema: + type: string + compute_pd_server_personality: + type: list + required: true + entry_schema: + type: json + compute_pd_server_image_update_policy: + type: list + required: true + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + port_pd01_port_security_groups: + type: list + required: true + entry_schema: + type: json + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + vm_image_name: + type: string + required: true + port_template_VMInt_OAM_lb_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + required: true + port_pd01_port_device_id: + type: list + required: true + entry_schema: + type: string + port_pd01_port_admin_state_up: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_metadata: + type: list + required: true + entry_schema: + type: json + port_template_VMInt_OAM_lb_subnetpoolid: + type: string + required: true + compute_pd_server_diskConfig: + type: list + required: true + entry_schema: + type: string + port_pd01_port_mac_address: + type: string + required: true + port_template_VMInt_OAM_lb_network_role: + type: string + required: true + port_pd01_port_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_pd_server_admin_pass: + type: list + required: true + entry_schema: + type: string + compute_pd_server_flavor_update_policy: + type: list + required: true + entry_schema: + type: string + port_template_VMInt_OAM_lb_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_template_VMInt_OAM_lb_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + port_pd01_port_value_specs: + type: list + required: true + entry_schema: + type: json + compute_pd_server_security_groups: + type: list + required: true + entry_schema: + type: json + port_template_VMInt_OAM_lb_port_tuple_refs: + type: list + required: true + entry_schema: + type: json + compute_pd_server_software_config_transport: + type: list + required: true + entry_schema: + type: string + port_pd01_port_network_role_tag: + type: string + required: true + compute_pd_server_scheduler_hints: + type: list + required: true + entry_schema: + type: json + port_pd01_port_name: + type: list + required: true + entry_schema: + type: string + compute_pd_server_contrail_service_instance_ind: + type: list + required: true + entry_schema: + type: boolean + compute_pd_server_availability_zone: + type: list + required: true + entry_schema: + type: string + compute_pd_server_name: + type: list + required: true + entry_schema: + type: string + port_template_VMInt_OAM_lb_network_role_tag: + type: string + required: true + port_pd01_port_binding:vnic_type: + type: list + required: true + entry_schema: + type: string + port_pd01_port_device_owner: + type: list + required: true + entry_schema: + type: string + port_pd01_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd01_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_qos_policy: + type: list + required: true + entry_schema: + type: string + compute_pd_server_config_drive: + type: list + required: true + entry_schema: + type: boolean + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string + port_template_VMInt_OAM_lb_virtual_network_refs: + type: list + required: true + entry_schema: + type: json + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_template_VMInt_OAM_lb_order: + type: integer + required: true + port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + port_template_VMInt_OAM_lb_name: + type: list + required: true + entry_schema: + type: string + port_pd01_port_port_security_enabled: + type: list + required: true + entry_schema: + type: boolean + port_template_VMInt_OAM_lb_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_update_policy: + type: list + required: true + entry_schema: + type: string + port_pd01_port_network: + type: list + required: true + entry_schema: + type: string + compute_pd_server_reservation_id: + type: list + required: true + entry_schema: + type: string + port_pd01_port_order: + type: integer + required: true + port_pd01_port_subnetpoolid: + type: string + required: true + port_template_VMInt_OAM_lb_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_network_role: + type: string + required: true + port_template_VMInt_OAM_lb_security_group_refs: + type: list + required: true + entry_schema: + type: json + node_templates: + pd_server: + type: org.openecomp.resource.vfc.nodes.heat.pd_server + properties: + admin_pass: + get_input: + - compute_pd_server_admin_pass + - index_value + key_name: + get_input: + - compute_pd_server_key_name + - index_value + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_pd_server_metadata + - index_value + contrail_service_instance_ind: + get_input: + - compute_pd_server_contrail_service_instance_ind + - index_value + scheduler_hints: + get_input: + - compute_pd_server_scheduler_hints + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + user_data_update_policy: + get_input: + - compute_pd_server_user_data_update_policy + - index_value + security_groups: + get_input: + - compute_pd_server_security_groups + - index_value + personality: + get_input: + - compute_pd_server_personality + - index_value + software_config_transport: + get_input: + - compute_pd_server_software_config_transport + - index_value + config_drive: + get_input: + - compute_pd_server_config_drive + - index_value + image: + get_input: vm_image_name + diskConfig: + get_input: + - compute_pd_server_diskConfig + - index_value + reservation_id: + get_input: + - compute_pd_server_reservation_id + - index_value + name: + get_input: + - compute_pd_server_name + - index_value + image_update_policy: + get_input: + - compute_pd_server_image_update_policy + - index_value + flavor_update_policy: + get_input: + - compute_pd_server_flavor_update_policy + - index_value + pd_server_template_VMInt_OAM_lb: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_template_VMInt_OAM_lb_mac_requirements + order: + get_input: port_template_VMInt_OAM_lb_order + exCP_naming: + get_input: port_template_VMInt_OAM_lb_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_template_VMInt_OAM_lb_vlan_requirements + virtual_machine_interface_properties: + get_input: + - port_template_VMInt_OAM_lb_virtual_machine_interface_properties + - index_value + security_group_refs: + get_input: + - port_template_VMInt_OAM_lb_security_group_refs + - index_value + virtual_network_refs: + get_input: + - port_template_VMInt_OAM_lb_virtual_network_refs + - index_value + ip_requirements: + get_input: port_template_VMInt_OAM_lb_ip_requirements + network_role_tag: + get_input: port_template_VMInt_OAM_lb_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - index_value + port_tuple_refs: + get_input: + - port_template_VMInt_OAM_lb_port_tuple_refs + - index_value + network_role: + get_input: port_template_VMInt_OAM_lb_network_role + subnetpoolid: + get_input: port_template_VMInt_OAM_lb_subnetpoolid + name: + get_input: + - port_template_VMInt_OAM_lb_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: pd_server + relationship: tosca.relationships.network.BindsTo + pd_server_pd01_port: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: + get_input: + - port_pd01_port_replacement_policy + - index_value + mac_requirements: + get_input: port_pd01_port_mac_requirements + allowed_address_pairs: + get_input: port_pd01_port_allowed_address_pairs + order: + get_input: port_pd01_port_order + binding:vnic_type: + get_input: + - port_pd01_port_binding:vnic_type + - index_value + device_owner: + get_input: + - port_pd01_port_device_owner + - index_value + mac_address: + get_input: port_pd01_port_mac_address + value_specs: + get_input: + - port_pd01_port_value_specs + - index_value + security_groups: + get_input: + - port_pd01_port_security_groups + - index_value + exCP_naming: + get_input: port_pd01_port_exCP_naming + vlan_requirements: + get_input: port_pd01_port_vlan_requirements + qos_policy: + get_input: + - port_pd01_port_qos_policy + - index_value + ip_requirements: + get_input: port_pd01_port_ip_requirements + network_role_tag: + get_input: port_pd01_port_network_role_tag + port_security_enabled: + get_input: + - port_pd01_port_port_security_enabled + - index_value + admin_state_up: + get_input: + - port_pd01_port_admin_state_up + - index_value + network_role: + get_input: port_pd01_port_network_role + subnetpoolid: + get_input: port_pd01_port_subnetpoolid + fixed_ips: + get_input: port_pd01_port_fixed_ips + name: + get_input: + - port_pd01_port_name + - index_value + device_id: + get_input: + - port_pd01_port_device_id + - index_value + network: + get_input: + - port_pd01_port_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: pd_server + relationship: tosca.relationships.network.BindsTo + outputs: + pd_server_pd01_port_allowed_address_pairs: + type: list + value: + get_attribute: + - pd_server_pd01_port + - allowed_address_pairs + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: list + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb + - virtual_machine_interface_mac_addresses + entry_schema: + type: string + pd_server_template_VMInt_OAM_lb_virtual_network_refs: + type: list + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb + - virtual_network_refs + entry_schema: + type: string + pd_server_template_VMInt_OAM_lb_fq_name: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb + - fq_name + pd_server_show: + type: string + value: + get_attribute: + - pd_server + - show + pd_server_console_urls: + type: string + value: + get_attribute: + - pd_server + - console_urls + pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb + - virtual_machine_interface_allowed_address_pairs + pd_server_pd01_port_security_groups: + type: list + value: + get_attribute: + - pd_server_pd01_port + - security_groups + entry_schema: + type: string + pd_server_pd01_port_port_security_enabled: + type: boolean + value: + get_attribute: + - pd_server_pd01_port + - port_security_enabled + pd_server_pd01_port_status: + type: string + value: + get_attribute: + - pd_server_pd01_port + - status + pd_server_template_VMInt_OAM_lb_port_tuple_refs: + type: list + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb + - port_tuple_refs + entry_schema: + type: string + pd_server_pd01_port_fixed_ips: + type: list + value: + get_attribute: + - pd_server_pd01_port + - fixed_ips + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + pd_server_accessIPv6: + type: string + value: + get_attribute: + - pd_server + - accessIPv6 + pd_server_pd01_port_admin_state_up: + type: boolean + value: + get_attribute: + - pd_server_pd01_port + - admin_state_up + pd_server_instance_name: + type: string + value: + get_attribute: + - pd_server + - instance_name + pd_server_template_VMInt_OAM_lb_name: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb + - name + pd_server_accessIPv4: + type: string + value: + get_attribute: + - pd_server + - accessIPv4 + pd_server_pd01_port_device_owner: + type: string + value: + get_attribute: + - pd_server_pd01_port + - device_owner + pd_server_pd01_port_show: + type: string + value: + get_attribute: + - pd_server_pd01_port + - show + pd_server_pd01_port_network: + type: string + value: + get_attribute: + - pd_server_pd01_port + - network + pd_server_pd01_port_qos_policy: + type: string + value: + get_attribute: + - pd_server_pd01_port + - qos_policy + pd_server_pd01_port_mac_address: + type: string + value: + get_attribute: + - pd_server_pd01_port + - mac_address + pd_server_addresses: + type: map + value: + get_attribute: + - pd_server + - addresses + entry_schema: + type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo + pd_server_pd01_port_tenant_id: + type: string + value: + get_attribute: + - pd_server_pd01_port + - tenant_id + pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb + - virtual_machine_interface_properties + pd_server_pd01_port_device_id: + type: string + value: + get_attribute: + - pd_server_pd01_port + - device_id + pd_server_pd01_port_name: + type: string + value: + get_attribute: + - pd_server_pd01_port + - name + pd_server_template_VMInt_OAM_lb_show: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb + - show + pd_server_pd01_port_subnets: + type: list + value: + get_attribute: + - pd_server_pd01_port + - subnets + entry_schema: + type: string + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.pd_server + capabilities: + scalable_pd_server: + - pd_server + - scalable + disk.read.bytes.rate_pd_server: + - pd_server + - disk.read.bytes.rate + memory.usage_pd_server: + - pd_server + - memory.usage + memory_pd_server: + - pd_server + - memory + disk.device.usage_pd_server: + - pd_server + - disk.device.usage + network.outgoing.packets.rate_pd_server_pd01_port: + - pd_server_pd01_port + - network.outgoing.packets.rate + network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - network.outgoing.packets.rate + os_pd_server: + - pd_server + - os + disk.write.bytes.rate_pd_server: + - pd_server + - disk.write.bytes.rate + network.incoming.bytes_pd_server_pd01_port: + - pd_server_pd01_port + - network.incoming.bytes + cpu_pd_server: + - pd_server + - cpu + network.outpoing.packets_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - network.outpoing.packets + cpu_util_pd_server: + - pd_server + - cpu_util + disk.device.write.requests.rate_pd_server: + - pd_server + - disk.device.write.requests.rate + disk.read.bytes_pd_server: + - pd_server + - disk.read.bytes + disk.device.read.bytes.rate_pd_server: + - pd_server + - disk.device.read.bytes.rate + network.outgoing.bytes_pd_server_pd01_port: + - pd_server_pd01_port + - network.outgoing.bytes + disk.iops_pd_server: + - pd_server + - disk.iops + network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - network.incoming.packets.rate + memory.resident_pd_server: + - pd_server + - memory.resident + cpu.delta_pd_server: + - pd_server + - cpu.delta + network.incoming.packets.rate_pd_server_pd01_port: + - pd_server_pd01_port + - network.incoming.packets.rate + vcpus_pd_server: + - pd_server + - vcpus + disk.device.write.bytes.rate_pd_server: + - pd_server + - disk.device.write.bytes.rate + disk.device.write.requests_pd_server: + - pd_server + - disk.device.write.requests + endpoint_pd_server: + - pd_server + - endpoint + attachment_pd_server_pd01_port: + - pd_server_pd01_port + - attachment + network.outgoing.bytes_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - network.outgoing.bytes + disk.capacity_pd_server: + - pd_server + - disk.capacity + disk.device.allocation_pd_server: + - pd_server + - disk.device.allocation + disk.allocation_pd_server: + - pd_server + - disk.allocation + binding_pd_server: + - pd_server + - binding + disk.read.requests_pd_server: + - pd_server + - disk.read.requests + feature_pd_server: + - pd_server + - feature + disk.usage_pd_server: + - pd_server + - disk.usage + binding_pd_server_pd01_port: + - pd_server_pd01_port + - binding + disk.write.bytes_pd_server: + - pd_server + - disk.write.bytes + network.incoming.bytes.rate_pd_server_pd01_port: + - pd_server_pd01_port + - network.incoming.bytes.rate + network.incoming.packets_pd_server_pd01_port: + - pd_server_pd01_port + - network.incoming.packets + disk.device.read.requests.rate_pd_server: + - pd_server + - disk.device.read.requests.rate + disk.root.size_pd_server: + - pd_server + - disk.root.size + disk.device.read.bytes_pd_server: + - pd_server + - disk.device.read.bytes + network.incoming.bytes_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - network.incoming.bytes + disk.device.write.bytes_pd_server: + - pd_server + - disk.device.write.bytes + feature_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - feature + disk.device.read.requests_pd_server: + - pd_server + - disk.device.read.requests + network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - network.incoming.bytes.rate + network.incoming.packets_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - network.incoming.packets + instance_pd_server: + - pd_server + - instance + host_pd_server: + - pd_server + - host + network.outpoing.packets_pd_server_pd01_port: + - pd_server_pd01_port + - network.outpoing.packets + binding_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - binding + disk.write.requests.rate_pd_server: + - pd_server + - disk.write.requests.rate + disk.ephemeral.size_pd_server: + - pd_server + - disk.ephemeral.size + disk.write.requests_pd_server: + - pd_server + - disk.write.requests + network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - network.outgoing.bytes.rate + feature_pd_server_pd01_port: + - pd_server_pd01_port + - feature + disk.device.latency_pd_server: + - pd_server + - disk.device.latency + disk.latency_pd_server: + - pd_server + - disk.latency + disk.device.capacity_pd_server: + - pd_server + - disk.device.capacity + network.outgoing.bytes.rate_pd_server_pd01_port: + - pd_server_pd01_port + - network.outgoing.bytes.rate + disk.device.iops_pd_server: + - pd_server + - disk.device.iops + requirements: + local_storage_pd_server: + - pd_server + - local_storage + dependency_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - dependency + link_pd_server_pd01_port: + - pd_server_pd01_port + - link + dependency_pd_server_pd01_port: + - pd_server_pd01_port + - dependency + dependency_pd_server: + - pd_server + - dependency + link_pd_server_template_VMInt_OAM_lb: + - pd_server_template_VMInt_OAM_lb + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 27c09dd6f4..31466870a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -128,15 +128,11 @@ node_types: type: string attributes: pd_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string pd_server_pd01_port_device_owner: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index 21e31509e7..62a1f4e1e6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -183,21 +183,17 @@ topology_template: relationship: tosca.relationships.network.BindsTo outputs: pd_server_accessIPv4: - type: list + type: string value: get_attribute: - pd_server - accessIPv4 - entry_schema: - type: string pd_server_pd01_port_device_owner: - type: list + type: string value: get_attribute: - pd_server_pd01_port - device_owner - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5b0d254fda..deb8b3db25 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -128,20 +128,14 @@ node_types: type: string attributes: pd_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string pd_server_pd01_port_1_device_owner: - type: list + type: string status: SUPPORTED - entry_schema: - type: string pd_server_pd01_port_0_device_owner: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index a55c9d4f43..24e44ad1ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -183,29 +183,23 @@ topology_template: relationship: tosca.relationships.network.BindsTo outputs: pd_server_accessIPv4: - type: list + type: string value: get_attribute: - pd_server - accessIPv4 - entry_schema: - type: string pd_server_pd01_port_1_device_owner: - type: list + type: string value: get_attribute: - pd_server_pd01_port_1 - device_owner - entry_schema: - type: string pd_server_pd01_port_0_device_owner: - type: list + type: string value: get_attribute: - pd_server_pd01_port_0 - device_owner - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0ef3218a86..3cf557e3a7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -128,20 +128,14 @@ node_types: type: string attributes: pd_server_pd01_port_0_device_id: - type: list + type: string status: SUPPORTED - entry_schema: - type: string pd_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string pd_server_pd01_port_1_device_owner: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 0ab61b87f4..feb25c4662 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -183,29 +183,23 @@ topology_template: relationship: tosca.relationships.network.BindsTo outputs: pd_server_pd01_port_0_device_id: - type: list + type: string value: get_attribute: - pd_server_pd01_port_0 - device_id - entry_schema: - type: string pd_server_accessIPv4: - type: list + type: string value: get_attribute: - pd_server - accessIPv4 - entry_schema: - type: string pd_server_pd01_port_1_device_owner: - type: list + type: string value: get_attribute: - pd_server_pd01_port_1 - device_owner - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 753e1c5654..242eb47cbc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -98,15 +98,11 @@ node_types: type: string attributes: pd_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string pd_server_pd01_port_device_owner: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -536,10 +532,8 @@ node_types: type: json attributes: oam_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_oam_server_pd01_port: capability: tosca.capabilities.Node @@ -969,15 +963,11 @@ node_types: type: org.openecomp.datatypes.network.VlanRequirements attributes: ps_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string ps_server_pd01_port_device_id: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_ps_server_pd01_port: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index edf8bd21d5..b8e5a718c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -140,13 +140,11 @@ topology_template: - index_value outputs: oam_server_accessIPv4: - type: list + type: string value: get_attribute: - oam_server - accessIPv4 - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam_server capabilities: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index 19c74bf61a..f12470a8c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -140,21 +140,17 @@ topology_template: relationship: tosca.relationships.network.BindsTo outputs: pd_server_accessIPv4: - type: list + type: string value: get_attribute: - pd_server - accessIPv4 - entry_schema: - type: string pd_server_pd01_port_device_owner: - type: list + type: string value: get_attribute: - pd_server_pd01_port - device_owner - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index c9443f5c9d..fbfc486926 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -140,21 +140,17 @@ topology_template: - index_value outputs: ps_server_accessIPv4: - type: list + type: string value: get_attribute: - ps_server - accessIPv4 - entry_schema: - type: string ps_server_pd01_port_device_id: - type: list + type: string value: get_attribute: - ps_server_pd01_port - device_id - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 44ad0fecd5..8a723e741d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,7 +5,7 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.abstract.nodes.pd_server_0: + org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: index_value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 46f451d8a2..217da7b6a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -185,8 +185,8 @@ topology_template: network_role_tag: oam network: get_input: oam_net_name - abstract_pd_server_2: - type: org.openecomp.resource.abstract.nodes.pd_server_2 + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server directives: - substitutable properties: @@ -195,7 +195,7 @@ topology_template: compute_pd_server_name: - get_input: - pd_server_names - - 2 + - 1 vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: @@ -209,26 +209,18 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: - substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml + substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 index_value: get_property: - SELF - service_template_filter - index_value - network_policy_server: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - name: - get_input: dummy_net_name_1 - abstract_pd_server_0: - type: org.openecomp.resource.abstract.nodes.pd_server_0 + abstract_pd_server_2: + type: org.openecomp.resource.abstract.nodes.pd_server_2 directives: - substitutable properties: @@ -237,7 +229,7 @@ topology_template: compute_pd_server_name: - get_input: - pd_server_names - - 1 + - 2 vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: @@ -251,16 +243,24 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_network: + - get_input: oam_net_name + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: - substitute_service_template: Nested_pd_server_0ServiceTemplate.yaml + substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 index_value: get_property: - SELF - service_template_filter - index_value + network_policy_server: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_input: dummy_net_name_1 abstract_pd_server_1: type: org.openecomp.resource.abstract.nodes.pd_server_1 directives: @@ -304,6 +304,6 @@ topology_template: members: - pd01_port_3 - network_policy_server - - abstract_pd_server_0 + - abstract_pd_server - abstract_pd_server_1 - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml index a44d0824ee..06cdbd86fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml @@ -1,6 +1,6 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: - template_name: Nested_pd_server_0 + template_name: Nested_pd_server imports: - openecomp_heat_index: file: openecomp-heat/_index.yml @@ -116,7 +116,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.pd_server_0 + node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: scalable_pd_server: - pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 74f9812851..892749544e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,7 +5,7 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.abstract.nodes.pd_server_0: + org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: index_value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index f50bc8b417..f379c67f1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -170,8 +170,8 @@ topology_template: description: name of the oam network default: oam_protected_net_0 node_templates: - abstract_pd_server_2: - type: org.openecomp.resource.abstract.nodes.pd_server_2 + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server directives: - substitutable properties: @@ -180,54 +180,37 @@ topology_template: compute_pd_server_name: - get_input: - pd_server_names - - 2 + - 1 vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: oam - port_pd01_port_3_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_3_mac_requirements: + port_pd01_port_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network: - - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_2_network: - - get_input: oam_net_name - port_pd01_port_2_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_3_network_role_tag: oam - compute_pd_server_user_data_format: - - RAW - port_pd01_port_2_ip_requirements: + port_pd01_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_network: + - get_input: oam_net_name + port_pd01_port_network_role_tag: oam + compute_pd_server_user_data_format: + - RAW service_template_filter: - substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml + substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 index_value: get_property: - SELF - service_template_filter - index_value - network_policy_server: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - name: - get_input: dummy_net_name_1 - abstract_pd_server_0: - type: org.openecomp.resource.abstract.nodes.pd_server_0 + abstract_pd_server_2: + type: org.openecomp.resource.abstract.nodes.pd_server_2 directives: - substitutable properties: @@ -236,35 +219,52 @@ topology_template: compute_pd_server_name: - get_input: - pd_server_names - - 1 + - 2 vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: + port_pd01_port_2_network_role_tag: oam + port_pd01_port_3_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_3_mac_requirements: mac_count_required: is_required: false + port_pd01_port_3_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_2_network: + - get_input: oam_net_name + port_pd01_port_2_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_3_network_role_tag: oam + compute_pd_server_user_data_format: + - RAW + port_pd01_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam - compute_pd_server_user_data_format: - - RAW service_template_filter: - substitute_service_template: Nested_pd_server_0ServiceTemplate.yaml + substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 index_value: get_property: - SELF - service_template_filter - index_value + network_policy_server: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_input: dummy_net_name_1 abstract_pd_server_1: type: org.openecomp.resource.abstract.nodes.pd_server_1 directives: @@ -313,6 +313,6 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server_0 + - abstract_pd_server - abstract_pd_server_1 - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml index b1f51f3f57..fc9395c618 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml @@ -1,6 +1,6 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: - template_name: Nested_pd_server_0 + template_name: Nested_pd_server imports: - openecomp_heat_index: file: openecomp-heat/_index.yml @@ -121,7 +121,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.pd_server_0 + node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: scalable_pd_server: - pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index b5daf7ce6f..0521146745 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -86,10 +86,8 @@ node_types: type: string attributes: pd_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -507,10 +505,8 @@ node_types: status: SUPPORTED attributes: ps_server_accessIPv4: - type: list + type: string status: SUPPORTED - entry_schema: - type: string requirements: - dependency_ps_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index 38b011e2e3..095769b3ca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -122,13 +122,11 @@ topology_template: relationship: tosca.relationships.network.BindsTo outputs: pd_server_accessIPv4: - type: list + type: string value: get_attribute: - pd_server - accessIPv4 - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml index 4d002e7f4b..b25b14b9a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml @@ -122,13 +122,11 @@ topology_template: relationship: tosca.relationships.network.BindsTo outputs: ps_server_accessIPv4: - type: list + type: string value: get_attribute: - ps_server - accessIPv4 - entry_schema: - type: string substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: |