From 68ccc45de18f41cddb79de33a245bceb3b063ffb Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 22 Jun 2017 18:23:07 +0300 Subject: [sdc] - latest code changes Change-Id: I861387094b000367218bb417624fe50d3c37f70e Signed-off-by: Tal Gitelman --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 174 ++++++++++++++------- 1 file changed, 115 insertions(+), 59 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml') 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 -- cgit 1.2.3-korg