diff options
author | Michael Lando <ml636r@att.com> | 2017-06-11 14:22:02 +0300 |
---|---|---|
committer | Michael Lando <ml636r@att.com> | 2017-06-11 17:48:32 +0300 |
commit | b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch) | |
tree | 0609319203be13f6c29ccbe24cb39c9d64f90095 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn | |
parent | af9929df75604ce407d0ca542b200630164e0ae6 (diff) |
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn')
3 files changed, 382 insertions, 82 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 45251124c8..a0430c354b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_0_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string p1: type: string description: UID of OAM network @@ -23,16 +29,73 @@ node_types: description: availabilityzone name required: true status: SUPPORTED - oam_net_gw: - type: string - description: CPS network gateway + port_pcm_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: json pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED + port_pcm_port_0_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pcm_port_0_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pcm_port_1_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + pcm_server_name: + type: string + description: PCRF CM server name + required: true + status: SUPPORTED + cps_net_mask: + type: string + description: CPS network mask + required: true + status: SUPPORTED + port_pcm_port_1_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pcm_port_0_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + oam_net_name: + type: string + description: OAM network name + required: true + status: SUPPORTED + port_pcm_port_1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + oam_net_gw: + type: string + description: CPS network gateway + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group @@ -43,6 +106,12 @@ node_types: description: CPS network ip required: true status: SUPPORTED + port_pcm_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json pcm_flavor_name: type: string description: flavor name of PCRF CM instance @@ -53,21 +122,11 @@ node_types: description: CPS Cluman Cinder Volume required: true status: SUPPORTED - pcm_server_name: - type: string - description: PCRF CM server name - required: true - status: SUPPORTED cps_net_name: type: string description: CPS network name required: true status: SUPPORTED - cps_net_mask: - type: string - description: CPS network mask - required: true - status: SUPPORTED oam_net_ip: type: string description: OAM network ip @@ -78,11 +137,12 @@ node_types: description: CPS network mask required: true status: SUPPORTED - oam_net_name: - type: string - description: OAM network name + port_pcm_port_1_order: + type: list required: true status: SUPPORTED + entry_schema: + type: integer attributes: server_pcm_id: type: string @@ -510,11 +570,67 @@ node_types: description: UID of OAM network required: true status: SUPPORTED + port_oam_port_1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string availabilityzone_name: type: string description: availabilityzone name required: true status: SUPPORTED + port_oam_port_0_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + oam_server_name: + type: string + description: oam server name + required: true + status: SUPPORTED + port_oam_port_0_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_oam_port_1_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_oam_port_1_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_oam_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + oam_image_name: + type: string + description: oam image name + required: true + status: SUPPORTED + cps_net_mask: + type: string + description: CPS network mask + required: true + status: SUPPORTED + oam_net_name: + type: string + description: OAM network name + required: true + status: SUPPORTED oam_net_gw: type: string description: CPS network gateway @@ -535,29 +651,38 @@ node_types: description: CPS network ip required: true status: SUPPORTED - oam_server_name: - type: string - description: oam server name + port_oam_port_0_order: + type: list required: true status: SUPPORTED - pcm_vol: - type: string - description: CPS Cluman Cinder Volume + entry_schema: + type: integer + port_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - oam_image_name: - type: string - description: oam image name + entry_schema: + type: json + port_oam_port_1_exCP_naming: + type: list required: true status: SUPPORTED - cps_net_name: + entry_schema: + type: json + port_oam_port_0_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + pcm_vol: type: string - description: CPS network name + description: CPS Cluman Cinder Volume required: true status: SUPPORTED - cps_net_mask: + cps_net_name: type: string - description: CPS network mask + description: CPS network name required: true status: SUPPORTED oam_net_ip: @@ -575,11 +700,6 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - oam_net_name: - type: string - description: OAM network name - required: true - status: SUPPORTED attributes: server_oam_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml index 007006b550..2decadf3c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -16,12 +16,66 @@ topology_template: immutable: false type: string description: UID of OAM network + port_oam_port_1_network_role: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name + port_oam_port_0_network_role: + type: list + required: true + entry_schema: + type: string + oam_server_name: + label: oam server name + hidden: false + immutable: false + type: string + description: oam server name + port_oam_port_0_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_oam_port_1_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_oam_port_1_order: + type: list + required: true + entry_schema: + type: integer + port_oam_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: json + oam_image_name: + label: image name + hidden: false + immutable: false + type: string + description: oam image name + cps_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + oam_net_name: + label: OAM network name + hidden: false + immutable: false + type: string + description: OAM network name oam_net_gw: label: CPS network gateway hidden: false @@ -46,36 +100,38 @@ topology_template: immutable: false type: string description: CPS network ip - oam_server_name: - label: oam server name - hidden: false - immutable: false - type: string - description: oam server name + port_oam_port_0_order: + type: list + required: true + entry_schema: + type: integer + port_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_oam_port_1_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_oam_port_0_exCP_naming: + type: list + required: true + entry_schema: + type: json pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - 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 hidden: false @@ -93,12 +149,6 @@ topology_template: immutable: false type: string description: UID of OAM network - oam_net_name: - label: OAM network name - hidden: false - immutable: false - type: string - description: OAM network name node_templates: oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -111,15 +161,35 @@ topology_template: is_required: false security_groups: - get_input: shared_security_group_id1 + network_role: + get_input: + - port_oam_port_0_network_role + - index_value fixed_ips: - ip_address: get_input: cps_net_ip + subnetpoolid: + get_input: + - port_oam_port_0_subnetpoolid + - index_value mac_requirements: mac_count_required: is_required: false + exCP_naming: + get_input: + - port_oam_port_0_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_oam_port_0_vlan_requirements + - index_value network_role_tag: cps network: get_input: cps_net_name + order: + get_input: + - port_oam_port_0_order + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,15 +219,35 @@ topology_template: security_groups: - get_input: shared_security_group_id1 - get_input: security_group_name + network_role: + get_input: + - port_oam_port_1_network_role + - index_value fixed_ips: - ip_address: get_input: oam_net_ip + subnetpoolid: + get_input: + - port_oam_port_1_subnetpoolid + - index_value mac_requirements: mac_count_required: is_required: false + exCP_naming: + get_input: + - port_oam_port_1_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_oam_port_1_vlan_requirements + - index_value network_role_tag: oam network: get_input: oam_net_name + order: + get_input: + - port_oam_port_1_order + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml index 458a0e54bb..b07c726b57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_0_network_role: + type: list + required: true + entry_schema: + type: string p1: hidden: false immutable: false @@ -27,18 +32,71 @@ topology_template: 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 pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name + port_pcm_port_0_order: + type: list + required: true + entry_schema: + type: integer + port_pcm_port_0_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pcm_port_1_subnetpoolid: + type: list + required: true + entry_schema: + type: string + pcm_server_name: + label: PCRF CM server name + hidden: false + immutable: false + type: string + description: PCRF CM server name + cps_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + port_pcm_port_1_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_pcm_port_0_exCP_naming: + type: list + required: true + entry_schema: + type: json + oam_net_name: + label: OAM network name + hidden: false + immutable: false + type: string + description: OAM network name + port_pcm_port_1_network_role: + type: list + required: true + entry_schema: + type: string + oam_net_gw: + label: CPS network gateway + hidden: false + immutable: false + type: string + description: CPS network gateway security_group_name: label: security group name hidden: false @@ -51,6 +109,11 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: json pcm_flavor_name: label: PCRF CM flavor name hidden: false @@ -63,24 +126,12 @@ topology_template: immutable: false type: string description: CPS Cluman Cinder Volume - pcm_server_name: - label: PCRF CM server name - hidden: false - immutable: false - type: string - description: PCRF CM server 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 hidden: false @@ -93,12 +144,11 @@ topology_template: immutable: false type: string description: CPS network mask - oam_net_name: - label: OAM network name - hidden: false - immutable: false - type: string - description: OAM network name + port_pcm_port_1_order: + type: list + required: true + entry_schema: + type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -111,15 +161,35 @@ topology_template: is_required: false security_groups: - get_input: p1 + network_role: + get_input: + - port_pcm_port_1_network_role + - index_value fixed_ips: - ip_address: get_input: oam_net_ip + subnetpoolid: + get_input: + - port_pcm_port_1_subnetpoolid + - index_value mac_requirements: mac_count_required: is_required: false + exCP_naming: + get_input: + - port_pcm_port_1_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pcm_port_1_vlan_requirements + - index_value network_role_tag: oam network: get_input: oam_net_name + order: + get_input: + - port_pcm_port_1_order + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -150,15 +220,35 @@ topology_template: security_groups: - get_input: p1 - get_input: p2 + network_role: + get_input: + - port_pcm_port_0_network_role + - index_value fixed_ips: - ip_address: get_input: cps_net_ip + subnetpoolid: + get_input: + - port_pcm_port_0_subnetpoolid + - index_value mac_requirements: mac_count_required: is_required: false + exCP_naming: + get_input: + - port_pcm_port_0_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pcm_port_0_vlan_requirements + - index_value network_role_tag: cps network: get_input: cps_net_name + order: + get_input: + - port_pcm_port_0_order + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable |