summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreleonorali <eleonoral@amdocs.com>2018-07-31 14:22:08 +0300
committerVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>2018-08-05 13:41:17 +0000
commit8b987d6cf7be94eb493b13da509238626cbdfc02 (patch)
treea3daff6f1fcf8301650201c3b0272899d8cb7bbe
parent81c51aba1e8ba0a801a1d3d0430bf00a88680a9e (diff)
TOSCA - Update Normative Types for Vlan Taggin
Update Normative Types for Vlan Tagging Change-Id: I1f3a4d5d6f589226b7b683ef08d8687fc6e9a774 Issue-ID: SDC-1578 Signed-off-by: eleonorali <eleonoral@amdocs.com>
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml8
-rw-r--r--common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml29
2 files changed, 12 insertions, 25 deletions
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
index 9abb964661..c26eaf0bc6 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
@@ -997,14 +997,6 @@ node_types:
description: All attributes.
type: string
status: SUPPORTED
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: org.openecomp.resource.cp.nodes.network.Port
- relationship: tosca.relationships.network.BindsTo
- occurrences:
- - 1
- - 1
org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface:
derived_from: org.openecomp.resource.cp.nodes.network.SubInterface
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 457770845f..1bbcdd0ab9 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
@@ -432,7 +432,11 @@ node_types:
relationship: tosca.relationships.network.LinksTo
- binding:
capability: tosca.capabilities.network.Bindable
+ node: org.openecomp.resource.cp.nodes.network.Port
relationship: tosca.relationships.network.BindsTo
+ occurrences:
+ - 1
+ - 1
org.openecomp.resource.cp.nodes.network.SubInterface:
derived_from: tosca.nodes.network.Port
@@ -536,6 +540,14 @@ node_types:
- UNBOUNDED
forwarder:
type: org.openecomp.capabilities.Forwarder
+ binding:
+ type: tosca.capabilities.network.Bindable
+ occurrences:
+ - 0
+ - UNBOUNDED
+ valid_source_types:
+ - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ - org.openecomp.resource.cp.nodes.network.v2.SubInterface
org.openecomp.resource.nodes.DeploymentFlavor:
derived_from: tosca.nodes.Root
@@ -772,14 +784,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- binding:
- type: tosca.capabilities.network.Bindable
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
- occurrences:
- - 0
- - UNBOUNDED
org.openecomp.resource.cp.v2.extContrailCP:
derived_from: org.openecomp.resource.cp.v2.extCP
@@ -892,15 +896,6 @@ node_types:
description: All attributes.
type: string
status: SUPPORTED
- capabilities:
- binding:
- type: tosca.capabilities.network.Bindable
- occurrences:
- - 0
- - UNBOUNDED
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
org.openecomp.nodes.ForwardingPath:
derived_from: tosca.nodes.Root