From 90904124f3b392d3bb9b7cdd1a611bbc54f654b3 Mon Sep 17 00:00:00 2001 From: Rahul_cool Date: Fri, 17 Apr 2020 17:47:22 +0530 Subject: [PATCH] sotn nni integration test issue fix 1. te-link-attribute resource unable to query issue fix 2.logical-link relationship with te-link-attribute update 3.label-restriction relationship with te-link-attribute update 4.interlayer-attachment relationship with p-interface update Issue-ID: AAI-2593 Signed-off-by: Rahul_cool Change-Id: I227a8af5ebbe2897d82f56fab0d8acef59fda9b4 --- .../resources/onap/aai_schema/aai_schema_v19.xsd | 18 ++-- .../dbedgerules/v19/DbEdgeRules_ccvpn_v19.json | 98 ++++++++++++++-------- .../main/resources/onap/oxm/v19/aai_oxm_v19.xml | 17 ++-- 3 files changed, 81 insertions(+), 52 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 b07c1e1..de0859b 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 @@ -10582,7 +10582,7 @@ 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 label restriction",indexedProps="id,label-start,label-end,range-bitmap,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}") @@ -10798,7 +10798,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @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(description="Instance of an te-link-attribute",indexedProps="id,link-protection-type,access-type,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}") @@ -10809,13 +10809,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") - - - @@ -10851,6 +10844,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") + + + 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 5856f20..396d970 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 @@ -216,6 +216,30 @@ "default": "true", "description":"For CCVPN Usecase" }, + { + "from": "connectivity", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "uni", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, { "from": "site-resource", "to": "generic-vnf", @@ -401,84 +425,88 @@ "to": "pnf", "label": "tosca.relationships.network.BindsTo", "direction": "OUT", - "multiplicity": "MANY2ONE", - "contains-other-v": "!${direction}", - "delete-other-v": "NONE", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", - "description":"" + "description":"For CCVPN Usecase" }, { "from": "p-interface", "to": "tunnel-termination-point", "label": "tosca.relationships.network.BindsTo", "direction": "OUT", - "multiplicity": "MANY2ONE", - "contains-other-v": "${direction}", - "delete-other-v": "NONE", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", - "description":"" + "description":"For CCVPN Usecase" }, { "from": "p-interface", "to": "interlayer-attachment", - "label": "tosca.relationships.network.BindsTo", + "label": "tosca.relationships.network.LinksTo", "direction": "OUT", - "multiplicity": "MANY2ONE", - "contains-other-v": "${direction}", - "delete-other-v": "NONE", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", - "description":"" + "description":"For CCVPN Usecase" + }, { "from": "tunnel-termination-point", "to": "interlayer-attachment", - "label": "tosca.relationships.network.BindsTo", + "label": "tosca.relationships.network.LinksTo", "direction": "OUT", - "multiplicity": "MANY2ONE", - "contains-other-v": "${direction}", - "delete-other-v": "NONE", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", - "description":"" + "description":"For CCVPN Usecase" + }, { - "from": "p-interface", - "to": "uni", - "label": "tosca.relationships.network.BindsTo", + "from": "uni", + "to": "p-interface", + "label": "org.onap.relationships.inventory.PartOf", "direction": "OUT", - "multiplicity": "MANY2ONE", - "contains-other-v": "${direction}", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", "delete-other-v": "NONE", "prevent-delete": "NONE", "default": "true", - "description":"" + "description":"For CCVPN Usecase" }, { "from": "logical-link", "to": "te-link-attribute", - "label": "tosca.relationships.network.BindsTo", + "label": "tosca.relationships.network.LinksTo", "direction": "OUT", - "multiplicity": "ONE2ONE", - "contains-other-v": "${direction}", - "delete-other-v": "NONE", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", - "description":"" + "description":"For CCVPN Usecase" + }, { "from": "label-restriction", - "to": "te-link-attributes", - "label": "tosca.relationships.network.BindsTo", + "to": "te-link-attribute", + "label": "tosca.relationships.network.LinksTo", "direction": "OUT", - "multiplicity": "MANY2ONE", - "contains-other-v": "${direction}", - "delete-other-v": "NONE", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", - "description":"" + "description":"For CCVPN Usecase" + }, { "from": "bandwidth-attribute", 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 e0ca8f9..613264c 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 @@ -9148,11 +9148,6 @@ - - - - - @@ -9178,6 +9173,12 @@ + + + + + + @@ -9219,7 +9220,7 @@ - + @@ -9326,8 +9327,8 @@ - - + + -- 2.16.6