diff options
| author |   Keong Lim <keong.lim@huawei.com> | 2019-07-05 13:51:23 +1000 |
|---|---|---|
| committer | Keong Lim <keong.lim@huawei.com> | 2019-07-05 14:00:10 +1000 |
| commit | 9a9ff9771b719b68ab7ee0e6fdda474784aff57e (patch) | |
| tree | d5b570ef3a138e9ac0e1739580bf9dc7fbb520f6 | |
| parent | fad060963cdfea8363eaeba4b8e7d4dc12e8ed22 (diff) | |
AAI-2507 re-fix EdgeRules in v15 and v16 CCVPN
re-fix AAI-1671 and AAI-1923 in v15 and v16 EdgeRules
Change-Id: Ib7982024bd6d0922f75a44c9407b7bd3252a0acc
Issue-ID: AAI-2507
Signed-off-by: Keong Lim <keong.lim@huawei.com>
| -rw-r--r-- | aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json | 28 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json | 28 |
2 files changed, 28 insertions, 28 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json index 68f2986..90c6af3 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json @@ -80,7 +80,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -103,7 +103,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" @@ -209,7 +209,7 @@ "to": "service-instance", "label": "org.onap.relationships.inventory.PartOf", "direction": "OUT", - "multiplicity": "ONE2MANY", + "multiplicity": "MANY2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "prevent-delete": "NONE", @@ -224,7 +224,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "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" @@ -343,7 +343,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" diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json index 485bd66..0de9bee 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json @@ -80,7 +80,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -103,7 +103,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" @@ -257,7 +257,7 @@ "to": "service-instance", "label": "org.onap.relationships.inventory.PartOf", "direction": "OUT", - "multiplicity": "ONE2MANY", + "multiplicity": "MANY2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "prevent-delete": "NONE", @@ -272,7 +272,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "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" @@ -343,7 +343,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" @@ -355,7 +355,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" @@ -367,7 +367,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" @@ -379,7 +379,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" @@ -391,7 +391,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" |