From 1b700c8606f319cbda416a8abb70ea16dceb7a29 Mon Sep 17 00:00:00 2001 From: "Assaf, Shay (sa726r)" Date: Sun, 26 Aug 2018 11:53:35 +0300 Subject: related-networks property support as input Change-Id: I2d6fb011f7440127559a8f02b1c8a72095694403 Issue-ID: SDC-1658 Signed-off-by: Assaf, Shay (sa726r) --- .../import/tosca/data-types/dataTypes.yml | 22 +--------------------- .../tosca/heat-types/globalPort/globalPort.yml | 6 ------ .../resources/yamlValidation/test-no-valid.yml | 13 +------------ 3 files changed, 2 insertions(+), 39 deletions(-) (limited to 'catalog-be') diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml index 2462302f5d..e62c8e8f7d 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml @@ -958,17 +958,6 @@ org.openecomp.datatypes.network.NetworkAssignments: type: org.openecomp.datatypes.network.IPv6SubnetAssignments required: true description: IPv6 defualt subnet assignments - related_networks: - type: list - required: false - description: Related Networks List. - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - is_trunked: - type: boolean - required: true - description: \"true\" indicates that network is trunked - default: false org.openecomp.datatypes.network.ProviderNetwork: derived_from: org.openecomp.datatypes.Root @@ -981,7 +970,7 @@ org.openecomp.datatypes.network.ProviderNetwork: type: string required: false constraints: - - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22", "sriovnet1", "sriovnet2", "oam"] + - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22"] description: > Identifies the NUMA processor cluster to which this physical network interface belongs. NUMA instance correlates to the first digit of the Physical Network Name suffix (e.g. \"01\" = NUMA 0, \"11\" = NUMA 1) @@ -1283,15 +1272,6 @@ org.openecomp.datatypes.ImageInfo: type: string required: false default: md5 - -org.openecomp.datatypes.network.RelatedNetworksAssignments: - derived_from: org.openecomp.datatypes.Root - properties: - related_network_role: - type: string - description: The network role of the related network, sharing provider network. - required: false - #ONAP types tosca.datatypes.nfv.VnfcConfigurableProperties: derived_from: tosca.datatypes.Root diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml index a21e151645..c0fd672ee9 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml @@ -40,12 +40,6 @@ node_types: type: boolean required: false default: false - related_networks: - type: list - description: Related Networks List. - required: false - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments capabilities: network.incoming.packets.rate: type: org.openecomp.capabilities.metric.Ceilometer diff --git a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml index 7f6c80cba3..335758e887 100644 --- a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml +++ b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml @@ -940,17 +940,6 @@ org.openecomp.datatypes.network.NetworkAssignments: type: org.openecomp.datatypes.network.IPv6SubnetAssignments required: true description: IPv6 defualt subnet assignments - related_networks: - type: list - description: Related Networks List. - required: false - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - is_trunked: - type: boolean - required: true - description: \"true\" indicates that network is trunked - default: false org.openecomp.datatypes.network.ProviderNetwork: derived_from: org.openecomp.datatypes.Root @@ -963,7 +952,7 @@ org.openecomp.datatypes.network.ProviderNetwork: type: string required: false constraints: - - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22", "sriovnet1", "sriovnet2", "oam"] + - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22"] description: > Identifies the NUMA processor cluster to which this physical network interface belongs. NUMA instance correlates to the first digit of the Physical Network Name suffix (e.g. \"01\" = NUMA 0, \"11\" = NUMA 1) -- cgit 1.2.3-korg