From: Kajur, Harish (vk250x) Date: Thu, 29 Mar 2018 12:25:25 +0000 (-0400) Subject: Fix the edge rules for esr X-Git-Tag: v1.2.2~9^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bfd538330ae2efa00669397bb3f6f3210d6a509f;p=aai%2Faai-common.git Fix the edge rules for esr Issue-ID: AAI-922 Issue-ID: AAI-923 Issue-ID: AAI-924 Issue-ID: AAI-925 Change-Id: Ifb7604b2ecdf55b6f96250063bd097c7b9b1251b Signed-off-by: Kajur, Harish (vk250x) --- diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json index a32ba86e..dc8565ee 100644 --- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json +++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json @@ -1,37 +1,37 @@ { "rules": [ { - "from": "esr-ems", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-ems", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2Many", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" }, { - "from": "esr-vnfm", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-vnfm", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2One", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" }, { - "from": "esr-thirdparty-sdnc", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-thirdparty-sdnc", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2One", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" @@ -39,9 +39,9 @@ { "from": "esr-thirdparty-sdnc", "to": "pnf", - "label": "has", + "label": "org.onap.relationships.inventory.AppliesTo", "direction": "OUT", - "multiplicity": "One2Many", + "multiplicity": "ONE2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "SVC-INFRA": "NONE", diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json index 8ed9c93b..89c68068 100644 --- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json +++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json @@ -1,37 +1,37 @@ { "rules": [ { - "from": "esr-ems", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-ems", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2Many", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" }, { - "from": "esr-vnfm", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-vnfm", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2One", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" }, { - "from": "esr-thirdparty-sdnc", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-thirdparty-sdnc", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2One", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" @@ -39,9 +39,9 @@ { "from": "esr-thirdparty-sdnc", "to": "pnf", - "label": "has", + "label": "org.onap.relationships.inventory.AppliesTo", "direction": "OUT", - "multiplicity": "One2Many", + "multiplicity": "ONE2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "SVC-INFRA": "NONE", diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json index 8ed9c93b..89c68068 100644 --- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json +++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json @@ -1,37 +1,37 @@ { "rules": [ { - "from": "esr-ems", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-ems", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2Many", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" }, { - "from": "esr-vnfm", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-vnfm", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2One", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" }, { - "from": "esr-thirdparty-sdnc", - "to": "esr-system-info", - "label": "has", + "from": "esr-system-info", + "to": "esr-thirdparty-sdnc", + "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", - "multiplicity": "One2One", - "contains-other-v": "${direction}", - "delete-other-v": "${direction}", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true" @@ -39,9 +39,9 @@ { "from": "esr-thirdparty-sdnc", "to": "pnf", - "label": "has", + "label": "org.onap.relationships.inventory.AppliesTo", "direction": "OUT", - "multiplicity": "One2Many", + "multiplicity": "ONE2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "SVC-INFRA": "NONE",