From 8ae8a3d3543cb5b67bba762e2d2b93a6cf360d9d Mon Sep 17 00:00:00 2001 From: "shashikanth.vh" Date: Thu, 27 Feb 2020 17:00:14 +0530 Subject: Added interlayerAttachment resource SOTN NNI usecase Added interlayerAttachment resource to associate overlay TP(p-interface) to underlay TTP and edge rule. Change-Id: Ibb5b109bc930edaa2da554a33901f812d45954f4 Issue-ID: AAI-2593 Signed-off-by: shashikanth.vh --- .../resources/onap/aai_schema/aai_schema_v19.xsd | 848 +++++++++++---------- .../dbedgerules/v19/DbEdgeRules_ccvpn_v19.json | 24 + .../main/resources/onap/oxm/v19/aai_oxm_v19.xml | 74 ++ pom.xml | 3 +- 4 files changed, 563 insertions(+), 386 deletions(-) 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 58e80aa..eaa28a1 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 @@ -10322,244 +10322,109 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid") - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid") - - - - - - - - - - - - - - - - - - - - - - - + - @org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name") + @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="Name of the contact") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction") - + - @org.onap.aai.annotations.Metadata(description="Tel no. of contact") + @org.onap.aai.annotations.Metadata(description="First number in the label range") - + - @org.onap.aai.annotations.Metadata(description="e-mail of contact") + @org.onap.aai.annotations.Metadata(description="Last number in the label range") - + - @org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM") + @org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.") - + - @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="Step of labels in label range.") - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Collection of contacts") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version") - - - - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC") + @org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") + @org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port") - + - @org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") + @org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.") - + - @org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") + @org.onap.aai.annotations.Metadata(description="Priority.") - + - @org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - + - @org.onap.aai.annotations.Metadata(description="Version") + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") - + - @org.onap.aai.annotations.Metadata(description="Description") + @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}") @@ -10570,168 +10435,27 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - - @org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query") - - - - - - - - - - - - - - + - @org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") + @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") - + - - - - - - + - @org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties") - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id") - - - - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - - - - - - - - - @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(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}") @@ -10929,74 +10653,25 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @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(description="Instance of an inter layer topology attachment",indexedProps="id,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="interlayer-attachments",namespace="network",requiredProps="id",uriTemplate="/network/interlayer-attachments/interlayer-attachment/{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(isKey=true,description="Id that identifies the interlayer topology attachment") - + - @org.onap.aai.annotations.Metadata(description="Priority.") + @org.onap.aai.annotations.Metadata(description="Inter layer lock id") @@ -11007,13 +10682,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") - - - @@ -11046,15 +10714,15 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") + @org.onap.aai.annotations.Metadata(description="Collection of interlayer topology connectivities.") - + @@ -11187,6 +10855,416 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.") + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid") + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid") + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact") + + + + + + + @org.onap.aai.annotations.Metadata(description="Tel no. of contact") + + + + + + + @org.onap.aai.annotations.Metadata(description="e-mail of contact") + + + + + + + @org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM") + + + + + + + @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 contacts") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.") + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") + + + + + + + @org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") + + + + + + + @org.onap.aai.annotations.Metadata(description="Version") + + + + + + + @org.onap.aai.annotations.Metadata(description="Description") + + + + + + + @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="QueryParameters for performing a named-query or model query") + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties") + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") + + + + + + 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 6d2509f..9306ba6 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 @@ -420,6 +420,30 @@ "default": "true", "description":"" }, + { + "from": "p-interface", + "to": "interlayer-attachment", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "${direction}", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, + { + "from": "tunnel-termination-point", + "to": "interlayer-attachment", + "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", 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 6e71593..f5f243d 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 @@ -3340,6 +3340,11 @@ + + + + + @@ -8770,6 +8775,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index e6602bd..b335caf 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.aai-common aai-parent - 1.6.5 + 1.6.8 org.onap.aai.schema-service schema-service @@ -45,6 +45,7 @@ Nexus Proxy Properties and Snapshot Locations Ideally this can be overwritten at runtime per internal environment specific values at runtime --> + 1.6.5 https://nexus.onap.org /content/sites/site/org/onap/aai/resources/${project.artifactId}/${project.version} /content/repositories/releases/ -- cgit 1.2.3-korg