diff options
| author |   Avi Gaffa <avi.gaffa@amdocs.com> | 2017-11-14 07:03:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-14 07:03:21 +0000 |
| commit | a9d5be7f13a3f09436a557a3f34c1bbeb2760d5d (patch) | |
| tree | fee23a7ad44b0b37d4af1fe2926ecc2861869570 | |
| parent | a383aa4c3d0c56b6ab5c85964bfe473425d3262f (diff) | |
| parent | ea93b82a8ebe93952de61d71a90f7d9ff33f9ccb (diff) | |
Merge "forwarder GT"
3 files changed, 26 insertions, 2 deletions
diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml index 285d6b28f3..9f0977868e 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml @@ -128,6 +128,9 @@ capability_types: tosca.capabilities.nfv.Forwarder: derived_from: tosca.capabilities.Root + org.openecomp.capabilities.Forwarder: + derived_from: tosca.capabilities.Root + tosca.capabilities.nfv.ext.Compute.Container.Architecture: derived_from: tosca.capabilities.Root properties: diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml index 810bf304c1..8142c26bcd 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml @@ -1342,4 +1342,21 @@ node_types: required: false type: list connectivity_type: - type: tosca.datatypes.nfv.ConnectivityType
\ No newline at end of file + type: tosca.datatypes.nfv.ConnectivityType + + org.openecomp.nodes.ForwardingPath: + derived_from: tosca.nodes.Root + properties: + target_range: + type: list + entry_schema: + description: Identifier of the reciever port of the VNF or the service + type: integer + protocol: + type: string + description: protocol type that runs on the link + requirements: + - forwarder: + capability: org.openecomp.capabilities.Forwarder + relationship: org.openecomp.relationships.ForwardsTo + occurrences: [ 0, UNBOUNDED ]
\ No newline at end of file diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml index 220658a8bf..5a43b79350 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml @@ -65,4 +65,8 @@ relationship_types: derived_from: tosca.relationships.Root tosca.relationships.nfv.VirtualLinksTo: - derived_from: tosca.relationships.Root
\ No newline at end of file + derived_from: tosca.relationships.Root + + org.openecomp.relationships.ForwardsTo: + derived_from: tosca.relationships.Root + valid_target_types: [org.openecomp.capabilities.Forwarder]
\ No newline at end of file |