summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkata Harish K Kajur <vk250x@att.com>2017-08-20 22:43:54 -0400
committerVenkata Harish K Kajur <vk250x@att.com>2017-08-21 16:39:03 -0400
commit841848979f6c3c13a2f50d418cd8d7871f06b4dd (patch)
tree0f7702f6740eeddd1959a0ac1a4637e7e6faadf8
parentdc5186ed8d5a9a280a36afb40b6b7f457a8c82f2 (diff)
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>
-rw-r--r--aai-core/src/main/resources/EdgeRules.ftl2
-rw-r--r--aai-core/src/main/resources/dbedgerules/DbEdgeRules_v10.json4
-rw-r--r--aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json4
-rw-r--r--aai-core/src/main/resources/dbedgerules/DbEdgeRules_v9.json4
4 files changed, 7 insertions, 7 deletions
diff --git a/aai-core/src/main/resources/EdgeRules.ftl b/aai-core/src/main/resources/EdgeRules.ftl
index ccabb7da..837f9377 100644
--- 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 1b530356..03810909 100644
--- 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 d8f33b3e..6d5b06f1 100644
--- 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 80096274..88801e4c 100644
--- 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",