aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2018-03-29 13:24:00 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-29 13:24:00 +0000
commit1ea271f2c395172d9f999da5748877b3cdbcd44b (patch)
tree86669d2d1b02dcd3c3b7da2ced92b57cc3e8699e
parenta813f54f56f933aed461b367068651deec6518cb (diff)
parentbfd538330ae2efa00669397bb3f6f3210d6a509f (diff)
Merge "Fix the edge rules for esr"
-rw-r--r--aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json40
-rw-r--r--aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json40
-rw-r--r--aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json40
3 files changed, 60 insertions, 60 deletions
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",