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>

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 df28f23..fb45589 100644 (file)
--- a/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json
@@ -1,5 +1,17 @@
 {
        "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",

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 8231b16..90c6af3 100644 (file)
--- 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,5 +1,17 @@
 {
   "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",

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 fe25845..9db424d 100644 (file)
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -1,5 +1,17 @@
 {
        "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",

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 1b6d940..68f2986 100644 (file)
--- 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,5 +1,17 @@
 {
   "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",

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 2704b74..a0dbf25 100644 (file)
--- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
@@ -1,5 +1,17 @@
 {
        "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",