Add the EdgeRules ftl and additional changes to

the dbedgerules json

Issue-Id: AAI-198

Change-Id: I426563d7647f521fd9542773cf46f679b26a8801
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/aai-core/src/main/resources/EdgeRules.ftl b/aai-core/src/main/resources/EdgeRules.ftl
index ccabb7d..837f937 100644 (file)
--- a/aai-core/src/main/resources/EdgeRules.ftl
+++ b/aai-core/src/main/resources/EdgeRules.ftl
@@ -21,6 +21,6 @@
 public static final Multimap<String, String> EdgeRules = new ImmutableSetMultimap.Builder<String, String>()
 <#list edgeRules as edgeRule>
         .putAll("${edgeRule["nodes"]}",
-                "${edgeRule["edge"]},${edgeRule["direction"]},${edgeRule["multiplicity"]},${edgeRule["lineage"]},${edgeRule["usesResource"]},${edgeRule["hasDelTarget"]},${edgeRule["SVC-INFRA"]}")
+                "${edgeRule["edge"]},${edgeRule["direction"]},${edgeRule["multiplicity"]},${edgeRule["lineage"]},${edgeRule["uses-resource"]},${edgeRule["has-del-target"]},${edgeRule["SVC-INFRA"]}")
 </#list>
 .build();

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json
index 1b53035..0381090 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json
@@ -504,7 +504,7 @@
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
                        "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE"
+                       "prevent-delete": "!${direction}"
                },
                {
                        "from": "l3-interface-ipv6-address-list",
@@ -515,7 +515,7 @@
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
                        "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE"
+                       "prevent-delete": "!${direction}"
                },
                {
                        "from": "l3-network",

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
index d8f33b3..6d5b06f 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
@@ -438,7 +438,7 @@
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
                        "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE"
+                       "prevent-delete": "!${direction}"
                },
                {
                        "from": "l3-interface-ipv6-address-list",
@@ -449,7 +449,7 @@
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
                        "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE"
+                       "prevent-delete": "!${direction}"
                },
                {
                        "from": "l3-network",

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json
index 8009627..88801e4 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json
@@ -449,7 +449,7 @@
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
                        "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE"
+                       "prevent-delete": "!${direction}"
                },
                {
                        "from": "l3-interface-ipv6-address-list",
@@ -460,7 +460,7 @@
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
                        "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE"
+                       "prevent-delete": "!${direction}"
                },
                {
                        "from": "l3-network",