aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeong Lim <keong.lim@huawei.com>2018-11-22 11:03:09 +1100
committerKeong Lim <keong.lim@huawei.com>2018-11-22 11:06:14 +1100
commit49c37cdfbb9378cbc4531b8731c68c33c7cf1d18 (patch)
tree1285732c141349931ba7cd7ff2dc473213c0ddfb
parent3985d3b0e00c8137010c73770aecb1bb7b62b46f (diff)
AAI-1926 Fix EdgeRules for Dublin
Issue-ID: AAI-1926 Fix EdgeRules for Dublin, rework AAI-1925 instead of cherry-pick. Fix EdgeRule for allotted-resource to allotted-resource in main json. Fix EdgeRule for allotted-resource to p-interface in ccvpn json. Change-Id: I32c404f48583fc7d770e65fbff0b23afb0320245 Signed-off-by: Keong Lim <keong.lim@huawei.com>
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json12
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json12
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json12
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json12
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json12
5 files changed, 60 insertions, 0 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json b/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json
index df28f23d..fb455895 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json
@@ -2,6 +2,18 @@
"rules": [
{
"from": "allotted-resource",
+ "to": "allotted-resource",
+ "label": "tosca.relationships.network.BindsTo",
+ "direction": "OUT",
+ "multiplicity": "ONE2ONE",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"AAI-1925"
+ },
+ {
+ "from": "allotted-resource",
"to": "generic-vnf",
"label": "org.onap.relationships.inventory.PartOf",
"direction": "OUT",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
index 8231b16a..90c6af32 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
@@ -1,6 +1,18 @@
{
"rules": [
{
+ "from": "allotted-resource",
+ "to": "p-interface",
+ "label": "org.onap.relationships.inventory.Uses",
+ "direction": "OUT",
+ "multiplicity": "ONE2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"AAI-1925 For CCVPN Usecase"
+ },
+ {
"from": "vpn-binding",
"to": "p-interface",
"label": "org.onap.relationships.inventory.BindsTo",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
index fe258453..9db424d5 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -2,6 +2,18 @@
"rules": [
{
"from": "allotted-resource",
+ "to": "allotted-resource",
+ "label": "tosca.relationships.network.BindsTo",
+ "direction": "OUT",
+ "multiplicity": "ONE2ONE",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"AAI-1925"
+ },
+ {
+ "from": "allotted-resource",
"to": "generic-vnf",
"label": "org.onap.relationships.inventory.PartOf",
"direction": "OUT",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json
index 1b6d9405..68f29865 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json
@@ -1,6 +1,18 @@
{
"rules": [
{
+ "from": "allotted-resource",
+ "to": "p-interface",
+ "label": "org.onap.relationships.inventory.Uses",
+ "direction": "OUT",
+ "multiplicity": "ONE2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"AAI-1925 For CCVPN Usecase"
+ },
+ {
"from": "vpn-binding",
"to": "p-interface",
"label": "org.onap.relationships.inventory.BindsTo",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
index 2704b743..a0dbf258 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
@@ -2,6 +2,18 @@
"rules": [
{
"from": "allotted-resource",
+ "to": "allotted-resource",
+ "label": "tosca.relationships.network.BindsTo",
+ "direction": "OUT",
+ "multiplicity": "ONE2ONE",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"AAI-1925"
+ },
+ {
+ "from": "allotted-resource",
"to": "generic-vnf",
"label": "org.onap.relationships.inventory.PartOf",
"direction": "OUT",