From da561af6b1ad032df484665d9e6c16aed47f9df4 Mon Sep 17 00:00:00 2001 From: "shashikanth.vh" Date: Thu, 5 Dec 2019 07:44:29 +0800 Subject: CCVPN use case SOTN NNI AAI schema AAI schema update for UNI, te-link-attribute,label-restriction tunnel-termination-point Change-Id: I5a9c5aef805d83c423cc59ef43d466ed7a8e8318 Issue-ID: AAI-2593 Signed-off-by: shashikanth.vh --- .../resources/onap/aai_schema/aai_schema_v19.xsd | 459 ++++++++++++++++++++- .../dbedgerules/v19/DbEdgeRules_ccvpn_v19.json | 60 +++ .../main/resources/onap/oxm/v19/aai_oxm_v19.xml | 388 +++++++++++++++++ 3 files changed, 906 insertions(+), 1 deletion(-) (limited to 'aai-schema') diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd index 36b5c5f..9bd7a24 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd @@ -2592,6 +2592,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="connect interdomain link") + + + @@ -4734,7 +4741,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc") + @org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc,intra-optical-domain, inter-optical-domain, inter-operator-domain") @@ -9191,6 +9198,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Store network type(ETH, OTN) of this network-resource.") + + + @@ -9806,6 +9820,445 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tpId,cVLAN,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI") + + + + + + + @org.onap.aai.annotations.Metadata(description="Termination point ID.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of User network interface.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,linkProtectionType,accessType,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,labelStart,labelEnd,rangeBitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction") + + + + + + + @org.onap.aai.annotations.Metadata(description="First number in the label range") + + + + + + + @org.onap.aai.annotations.Metadata(description="Last number in the label range") + + + + + + + @org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Step of labels in label range.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Priority.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point") + + + + + + + @org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller") + + + + + + + @org.onap.aai.annotations.Metadata(description="Name of tunnel termination point") + + + + + + + @org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.") + + + + + + + @org.onap.aai.annotations.Metadata(description="correlation between related objects in ETH and OTN topology.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.") + + + + + + + @@ -9844,6 +10297,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json index 0de9bee..6d2509f 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json @@ -395,6 +395,66 @@ "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" + }, + { + "from": "tunnel-termination-point", + "to": "pnf", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, + { + "from": "p-interface", + "to": "tunnel-termination-point", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "${direction}", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, + { + "from": "p-interface", + "to": "uni", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "${direction}", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, + { + "from": "logical-link", + "to": "te-link-attribute", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "${direction}", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, + { + "from": "label-restriction", + "to": "te-link-attributes", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "${direction}", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" } ] } diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml index 030bc67..9ec8320 100644 --- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml +++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml @@ -2344,6 +2344,11 @@ + + + + + @@ -8093,6 +8098,11 @@ + + + + + @@ -8637,6 +8647,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg