From 8bced7102e5144aa974ee087ee6ad7a555fdacec Mon Sep 17 00:00:00 2001 From: Srinivasan Ramanathan Date: Wed, 4 Mar 2020 11:15:33 +0000 Subject: ENNI changes for MDONS usecase Added new attribute bandwidth-attribute for ENNI Made changes for AAI cleanup upon 3rd party SDNC Deregistration Change-Id: I493c994db55333b84e5ec66f36b51c5b27ad7f8a Issue-ID: AAI-2804 Signed-off-by: Srinivasan Ramanathan --- .../dbedgerules/v19/DbEdgeRules_ccvpn_v19.json | 42 ++++++++++++++++++++-- .../onap/dbedgerules/v19/DbEdgeRules_esr_v19.json | 4 +-- .../onap/dbedgerules/v19/DbEdgeRules_v19.json | 4 +-- 3 files changed, 43 insertions(+), 7 deletions(-) (limited to 'aai-schema/src/main/resources/onap/dbedgerules') 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 9306ba6..5856f20 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 @@ -103,8 +103,8 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "NONE", - "prevent-delete": "${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -479,6 +479,42 @@ "prevent-delete": "NONE", "default": "true", "description":"" - } + }, + { + "from": "bandwidth-attribute", + "to": "p-interface", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For MDONS usecase" + }, + { + "from": "available-bandwidth", + "to": "bandwidth-attribute", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For MDONS usecase" + }, + { + "from": "label-restriction", + "to": "bandwidth-attribute", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For MDONS usecase" + } ] } diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json index 9849616..0c02671 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json @@ -63,11 +63,11 @@ { "from": "esr-thirdparty-sdnc", "to": "network-resource", - "label": "org.onap.relationships.inventory.AppliesTo", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", "multiplicity": "ONE2MANY", "contains-other-v": "NONE", - "delete-other-v": "NONE", + "delete-other-v": "${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json index a4ad903..e8407cd 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json @@ -1469,9 +1469,9 @@ "to": "logical-link", "label": "tosca.relationships.network.LinksTo", "direction": "OUT", - "multiplicity": "MANY2ONE", + "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "NONE", + "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", "description":"" -- cgit 1.2.3-korg