diff options
| author |   Assaf, Shay (sa726r) <sa726r@intl.att.com> | 2018-08-13 14:40:51 +0300 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2018-08-13 13:34:16 +0000 |
| commit | 204c6f3e1fb6a1ae97e08fba81b2378d9e69e821 (patch) | |
| tree | 2a9efc856dcc3035b7fea1b2d45b0797a322797c /catalog-be | |
| parent | 6247e763f9225a9fd298de29085350fa574b1396 (diff) | |
Network Cloud onboarding model sync with sdc model
Change-Id: Id3ab68276b25ad06c22b34412cf841e4209a17f6
Issue-ID: SDC-1621
Signed-off-by: Assaf, Shay (sa726r) <sa726r@intl.att.com>
Diffstat (limited to 'catalog-be')
3 files changed, 27 insertions, 2 deletions
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 b3635dc09f..d4c6bf10b8 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 @@ -930,6 +930,14 @@ org.openecomp.datatypes.network.IPv6SubnetAssignments: required: true description: Indicates IPv6 subnet assignments +org.openecomp.datatypes.network.RelatedNetworksAssignments: + derived_from: org.openecomp.datatypes.Root + properties: + related_network_role: + description: The network role of the related network, sharing provider network + type: string + required: false + org.openecomp.datatypes.network.NetworkAssignments: derived_from: org.openecomp.datatypes.Root properties: @@ -970,7 +978,7 @@ org.openecomp.datatypes.network.ProviderNetwork: type: string required: false constraints: - - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22"] + - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22", "sriovnet1", "sriovnet2", "oam"] 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) 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 c0fd672ee9..a21e151645 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,6 +40,12 @@ 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 335758e887..7f6c80cba3 100644 --- a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml +++ b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml @@ -940,6 +940,17 @@ 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 @@ -952,7 +963,7 @@ org.openecomp.datatypes.network.ProviderNetwork: type: string required: false constraints: - - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22"] + - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22", "sriovnet1", "sriovnet2", "oam"] 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) |