From: Keong Lim <keong.lim@huawei.com>
Date: Fri, 16 Nov 2018 05:33:08 +0000 (+1100)
Subject: AAI-1923 Problem deleting due to EdgeRules
X-Git-Tag: 1.3.4~3^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=04694a8e17d599bc8fd8b7732c648acfb2378f82;p=aai%2Faai-common.git

AAI-1923 Problem deleting due to EdgeRules

Issue-ID: AAI-1923

Fixed EdgeRules for ext-aai-info to esr-system-info
Fixed EdgeRules for lan-port-config to dhcp-service

Fixed EdgeRules for pnf to network-resource
Fixed EdgeRules for logical-link to ext-aai-network
Fixed EdgeRules for vpn-binding to ext-aai-network
Fixed EdgeRules for pnf to ext-aai-network
Fixed EdgeRules for connectivity to ext-aai-network
Fixed EdgeRules for lan-port-config to ext-aai-network
Fixed EdgeRules for network-resource to ext-aai-network
Fixed EdgeRules for site-resource to ext-aai-network
Fixed EdgeRules for sdwan-vpn to ext-aai-network
Fixed EdgeRules for device to ext-aai-network
Fixed EdgeRules for wan-port-config to ext-aai-network

Appears to be a problem with this combo in EdgeRules:

- "delete-other-v": "${direction}",
- "prevent-delete": "!${direction}",

Break the dependency by making one of these values "NONE".

Change-Id: I82eba77a9cf924c91a0f8de88408c9d103875160
Signed-off-by: Keong Lim <keong.lim@huawei.com>
---

diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
index 62b6c52e..8231b16a 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
@@ -68,7 +68,7 @@
 		"multiplicity": "ONE2MANY",
 		"contains-other-v": "${direction}",
 		"delete-other-v": "${direction}",
-		"prevent-delete": "!${direction}",
+		"prevent-delete": "NONE",
 		"default": "true",
 		"description":"For CCVPN Usecase"
 	},
@@ -91,7 +91,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "!${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -212,7 +212,7 @@
 		"multiplicity": "ONE2MANY",
 		"contains-other-v": "${direction}",
 		"delete-other-v": "${direction}",
-		"prevent-delete": "!${direction}",
+		"prevent-delete": "NONE",
 		"default": "true",
 		"description":"For CCVPN Usecase"
 	},
@@ -223,7 +223,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -235,7 +235,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -247,7 +247,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -259,7 +259,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -271,7 +271,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -283,7 +283,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -295,7 +295,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -307,7 +307,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -319,7 +319,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"
@@ -331,7 +331,7 @@
 		"direction": "OUT",
 		"multiplicity": "MANY2MANY",
 		"contains-other-v": "NONE",
-		"delete-other-v": "${direction}",
+		"delete-other-v": "NONE",
 		"prevent-delete": "!${direction}",
 		"default": "true",
 		"description":"For CCVPN Usecase"