Merge "Convert cloud region to esr edge"

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index dc8565e..3117bc0 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -49,13 +49,13 @@
                        "default": "true"
                },
                {
-                       "from": "cloud-region",
-                       "to": "esr-system-info",
-                       "label": "has",
+                       "from": "esr-system-info",
+                       "to": "cloud-region",
+                       "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"

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
index 89c6806..7bb8ad8 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
@@ -49,13 +49,13 @@
                        "default": "true"
                },
                {
-                       "from": "cloud-region",
-                       "to": "esr-system-info",
-                       "label": "has",
+                       "from": "esr-system-info",
+                       "to": "cloud-region",
+                       "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"

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
index 89c6806..7bb8ad8 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
@@ -49,13 +49,13 @@
                        "default": "true"
                },
                {
-                       "from": "cloud-region",
-                       "to": "esr-system-info",
-                       "label": "has",
+                       "from": "esr-system-info",
+                       "to": "cloud-region",
+                       "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"