diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2017-06-22 18:23:07 +0300 |
---|---|---|
committer | Tal Gitelman <tg851x@intl.att.com> | 2017-06-22 18:23:07 +0300 |
commit | 68ccc45de18f41cddb79de33a245bceb3b063ffb (patch) | |
tree | d80619a8539a8a03f68304c23eef7e3790ca63c6 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn | |
parent | 7d92498efd0ea61097b241287c004965d46b2c12 (diff) |
[sdc] - latest code changes
Change-Id: I861387094b000367218bb417624fe50d3c37f70e
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn')
5 files changed, 326 insertions, 222 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 70506fc553..54adda6e5b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -19,6 +19,12 @@ node_types: description: metadata required: true status: SUPPORTED + port_pcm_port_1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string availabilityzone_name: type: string description: availabilityzone name @@ -29,7 +35,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: type: string description: PCRF CM image name @@ -53,6 +59,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string pcm_server_name: type: string description: PCRF CM server name @@ -64,17 +76,13 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pcm_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json oam_net_name: type: string description: OAM network name @@ -86,6 +94,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway @@ -101,12 +115,16 @@ node_types: description: CPS network ip required: true status: SUPPORTED + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance @@ -122,6 +140,16 @@ node_types: description: CPS Cluman Cinder Volume required: true status: SUPPORTED + port_pcm_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name @@ -571,14 +599,15 @@ node_types: status: SUPPORTED entry_schema: type: string - availabilityzone_name: - type: string - description: availabilityzone name + port_pcm_port_1_network_role_tag: + type: list required: true status: SUPPORTED - oam_net_gw: + entry_schema: + type: string + availabilityzone_name: type: string - description: CPS network gateway + description: availabilityzone name required: true status: SUPPORTED port_pcm_port_0_vlan_requirements: @@ -586,33 +615,12 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json - oam_flavor_name: - type: string - description: flavor name of PCRF CM instance - required: true - status: SUPPORTED - security_group_name: - type: string - description: the name of security group - required: true - status: SUPPORTED - cps_net_ip: - type: string - description: CPS network ip - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements oam_server_name: type: string description: oam server name required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json port_pcm_port_0_order: type: list required: true @@ -631,65 +639,113 @@ node_types: status: SUPPORTED entry_schema: type: string - pcm_vol: - type: string - description: CPS Cluman Cinder Volume + port_pcm_port_0_network_role_tag: + type: list required: true status: SUPPORTED + entry_schema: + type: string oam_image_name: type: string description: oam image name required: true status: SUPPORTED - cps_net_name: - type: string - description: CPS network name - required: true - status: SUPPORTED cps_net_mask: type: string description: CPS network mask required: true status: SUPPORTED - oam_net_ip: - type: string - description: OAM network ip + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - oam_net_mask: + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + oam_net_name: type: string - description: CPS network mask + description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_1_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pcm_port_0_exCP_naming: + type: string + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - oam_net_name: + type: org.openecomp.datatypes.network.IpRequirements + oam_net_gw: type: string - description: OAM network name + description: CPS network gateway required: true status: SUPPORTED - port_pcm_port_1_order: + oam_flavor_name: + type: string + description: flavor name of PCRF CM instance + required: true + status: SUPPORTED + security_group_name: + type: string + description: the name of security group + required: true + status: SUPPORTED + cps_net_ip: + type: string + description: CPS network ip + required: true + status: SUPPORTED + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_pcm_port_1_network_role: + type: org.openecomp.datatypes.network.VlanRequirements + pcm_vol: + type: string + description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED + port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + cps_net_name: + type: string + description: CPS network name + required: true + status: SUPPORTED + oam_net_ip: + type: string + description: OAM network ip + required: true + status: SUPPORTED + oam_net_mask: + type: string + description: CPS network mask + required: true + status: SUPPORTED + port_pcm_port_1_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer attributes: server_oam_id: type: string @@ -1403,4 +1459,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml index f1c5ca1158..96eb3c5023 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -149,8 +149,15 @@ topology_template: directives: - substitutable properties: + port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false oam_net_gw: get_input: oam_net_gw pcm_image_name: @@ -161,6 +168,9 @@ topology_template: get_input: - cps_net_ips - 0 + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false pcm_flavor_name: get_input: pcm_flavor_name service_template_filter: @@ -169,6 +179,16 @@ topology_template: get_input: - pcm_volumes - 0 + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false pcm_server_name: get_input: - pcm_server_names @@ -194,10 +214,30 @@ topology_template: get_input: pcm_flavor_name service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false pcm_image_name: get_input: pcm_image_name + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false pcm_server_name: get_input: - pcm_server_names @@ -218,8 +258,15 @@ topology_template: directives: - substitutable properties: + port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false oam_net_gw: get_input: oam_net_gw oam_flavor_name: @@ -234,12 +281,25 @@ topology_template: get_input: - oam_server_names - 0 + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml pcm_vol: get_input: - pcm_volumes - 0 + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false oam_image_name: get_input: oam_image_name cps_net_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/Nested_computeServiceTemplate.yaml index ddac2173cc..a9f76ff596 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/Nested_computeServiceTemplate.yaml @@ -191,4 +191,4 @@ topology_template: - local_storage dependency_compute: - compute - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 2c29cb26d5..96968c134e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -16,52 +16,28 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - oam_net_gw: - label: CPS network gateway - hidden: false - immutable: false - type: string - description: CPS network gateway port_pcm_port_0_vlan_requirements: type: list required: true entry_schema: - type: json - oam_flavor_name: - label: PCRF CM flavor name - hidden: false - immutable: false - type: string - description: flavor name of PCRF CM instance - security_group_name: - label: security group name - hidden: false - immutable: false - type: string - description: the name of security group - cps_net_ip: - label: CPS network ip - hidden: false - immutable: false - type: string - description: CPS network ip + type: org.openecomp.datatypes.network.VlanRequirements oam_server_name: label: oam server name hidden: false immutable: false type: string description: oam server name - port_pcm_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: json port_pcm_port_0_order: type: list required: true @@ -77,68 +53,114 @@ topology_template: required: true entry_schema: type: string - pcm_vol: - label: CPS Cluman Cinder Volume - hidden: false - immutable: false - type: string - description: CPS Cluman Cinder Volume + port_pcm_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string oam_image_name: label: image name hidden: false immutable: false type: string description: oam image name - cps_net_name: - label: CPS network name - hidden: false - immutable: false - type: string - description: CPS network name cps_net_mask: label: CPS network mask hidden: false immutable: false type: string description: CPS network mask - oam_net_ip: - label: OAM network ip + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + oam_net_name: + label: OAM network name hidden: false immutable: false type: string - description: OAM network ip - oam_net_mask: - label: CPS network mask + description: OAM network name + port_pcm_port_1_network_role: + type: list + required: true + entry_schema: + type: string + port_pcm_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + oam_net_gw: + label: CPS network gateway hidden: false immutable: false type: string - description: CPS network mask - port_pcm_port_1_exCP_naming: + description: CPS network gateway + oam_flavor_name: + label: PCRF CM flavor name + hidden: false + immutable: false + type: string + description: flavor name of PCRF CM instance + security_group_name: + label: security group name + hidden: false + immutable: false + type: string + description: the name of security group + cps_net_ip: + label: CPS network ip + hidden: false + immutable: false + type: string + description: CPS network ip + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: - type: json - port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.network.VlanRequirements + pcm_vol: + label: CPS Cluman Cinder Volume + hidden: false + immutable: false + type: string + description: CPS Cluman Cinder Volume + port_pcm_port_1_ip_requirements: type: list required: true entry_schema: - type: json - oam_net_name: - label: OAM network name + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + cps_net_name: + label: CPS network name hidden: false immutable: false type: string - description: OAM network name + description: CPS network name + oam_net_ip: + label: OAM network ip + hidden: false + immutable: false + type: string + description: OAM network ip + oam_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask port_pcm_port_1_order: type: list required: true entry_schema: type: integer - port_pcm_port_1_network_role: - type: list - required: true - entry_schema: - type: string node_templates: server_oam: type: org.openecomp.resource.vfc.nodes.heat.oam_server @@ -156,42 +178,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_1_network_role - - index_value + get_input: port_pcm_port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_port_1_subnetpoolid - - index_value + get_input: port_pcm_port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_port_1_exCP_naming - - index_value + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_port_1_order - - index_value + get_input: port_pcm_port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -201,42 +209,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_0_network_role - - index_value + get_input: port_pcm_port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_port_0_subnetpoolid - - index_value + get_input: port_pcm_port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_port_0_exCP_naming - - index_value + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_port_0_order - - index_value + get_input: port_pcm_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -466,4 +460,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml index ac4560a682..25e983fe2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: immutable: false type: string description: metadata + port_pcm_port_1_network_role_tag: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -32,7 +37,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false @@ -54,6 +59,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -67,15 +77,11 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pcm_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json oam_net_name: label: OAM network name hidden: false @@ -87,6 +93,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false @@ -105,11 +116,14 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false @@ -128,6 +142,14 @@ topology_template: immutable: false type: string description: CPS Cluman Cinder Volume + port_pcm_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true cps_net_name: label: CPS network name hidden: false @@ -156,42 +178,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_1_network_role - - index_value + get_input: port_pcm_port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_port_1_subnetpoolid - - index_value + get_input: port_pcm_port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_port_1_exCP_naming - - index_value + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_port_1_order - - index_value + get_input: port_pcm_port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -214,42 +222,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_0_network_role - - index_value + get_input: port_pcm_port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_port_0_subnetpoolid - - index_value + get_input: port_pcm_port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_port_0_exCP_naming - - index_value + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_port_0_order - - index_value + get_input: port_pcm_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -479,4 +473,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency |