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 | 90 ++++++++++++++++++---- 1 file changed, 73 insertions(+), 17 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/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 a0430c354b..3e8521f381 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 @@ -24,6 +24,12 @@ node_types: description: UID of OAM network 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 @@ -34,7 +40,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 @@ -58,6 +64,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 @@ -69,17 +81,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 @@ -91,6 +99,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 @@ -106,12 +120,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 @@ -587,6 +615,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_oam_port_1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string oam_server_name: type: string description: oam server name @@ -604,18 +638,34 @@ node_types: status: SUPPORTED entry_schema: type: string + port_oam_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_oam_port_1_order: type: list required: true status: SUPPORTED entry_schema: type: integer + port_oam_port_0_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_oam_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements oam_image_name: type: string description: oam image name @@ -636,6 +686,10 @@ node_types: description: CPS network gateway required: true status: SUPPORTED + port_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED oam_flavor_name: type: string description: flavor name of PCRF CM instance @@ -662,19 +716,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_oam_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_oam_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json pcm_vol: type: string description: CPS Cluman Cinder Volume @@ -695,6 +745,12 @@ node_types: description: CPS network mask required: true status: SUPPORTED + port_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements shared_security_group_id1: type: string description: UID of OAM network @@ -1419,4 +1475,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED -- cgit 1.2.3-korg