From: Kajur, Harish (vk250x) <vk250x@att.com>
Date: Thu, 29 Nov 2018 22:35:42 +0000 (-0500)
Subject: Add support for generic vnf to cloud region
X-Git-Tag: 1.4.0~2^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Faai-common.git;a=commitdiff_plain;h=2810bad62ad9d480333341e6c0b3c186a70d4e23

Add support for generic vnf to cloud region

Issue-ID: AAI-1980
Change-Id: Ic1a5689a891dac0ca13ab1b26760174985f304de
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
---

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 9db424d5..2eed8007 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
@@ -612,6 +612,30 @@
 			"default": "true",
 			"description":""
 		},
+		{
+			"from": "generic-vnf",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
 		{
 			"from": "lag-interface",
 			"to": "generic-vnf",
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 a0dbf258..1f6829c5 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
@@ -564,6 +564,30 @@
 			"default": "true",
 			"description":""
 		},
+		{
+			"from": "generic-vnf",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
 		{
 			"from": "vnfc",
 			"to": "generic-vnf",