aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorAssaf, Shay (sa726r) <sa726r@intl.att.com>2018-08-13 14:40:51 +0300
committerAvi Gaffa <avi.gaffa@amdocs.com>2018-08-13 13:34:16 +0000
commit204c6f3e1fb6a1ae97e08fba81b2378d9e69e821 (patch)
tree2a9efc856dcc3035b7fea1b2d45b0797a322797c /common
parent6247e763f9225a9fd298de29085350fa574b1396 (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 'common')
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml24
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml7
2 files changed, 29 insertions, 2 deletions
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
index ef11987f8c..a47e65f7de 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
@@ -28,7 +28,7 @@ data_types:
derived_from: org.openecomp.datatypes.Root
properties:
is_provider_network:
- description: \"true\" indicates that this a Neutron provider type of network
+ description: \"true\" testShouldLocatePathWhenResourcePresentInUrlsindicates that this a Neutron provider type of network
type: boolean
required: true
physical_network_name:
@@ -44,6 +44,9 @@ data_types:
- Physnet44
- Physnet21
- Physnet22
+ - sriovnet1
+ - sriovnet2
+ - oam
numa:
description: |
PNIC instance within the NUMA processor cluster PNIC Instance correlates to the second digit of the Physical Network Name suffix (e.g. "01" = PNIC 1, "02" = "PNIC 2)
@@ -446,6 +449,25 @@ data_types:
description: Reference to VLAN or other address plan ID used to assign subnets to this network
type: string
required: true
+ 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.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.IPv6SubnetAssignments:
derived_from: org.openecomp.datatypes.network.SubnetAssignments
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
index 53e89b12c8..b788c1f5e6 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
@@ -88,7 +88,6 @@ node_types:
type: org.openecomp.datatypes.network.NetworkFlows
required: false
-
org.openecomp.resource.vfc.nodes.Compute:
derived_from: tosca.nodes.Compute
capabilities:
@@ -489,6 +488,12 @@ node_types:
description: subnet pool id
type: string
required: false
+ related_networks:
+ type: list
+ description: Related Networks List.
+ required: false
+ entry_schema:
+ type: org.openecomp.datatypes.network.RelatedNetworksAssignments
capabilities:
network.incoming.packets.rate:
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.