From 399b9ed2f91c99107e0f357719452cacca3a2ad5 Mon Sep 17 00:00:00 2001
From: lizi00164331 <li.zi30@zte.com.cn>
Date: Wed, 6 Sep 2017 17:27:19 +0800
Subject: Merge the schema of external-system.

Add the schema of external-system, delete the auth-info-item which will not in use. Locally test passed.

Change-Id: I9d65201cd8b222421c8f15fcb9eb421636588b33
Issue-ID: AAI-204
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
---
 .../java/org/openecomp/aai/util/GenerateXsd.java   |  1 +
 .../resources/dbedgerules/DbEdgeRules_v11.json     | 66 ++++++++++++++++++----
 2 files changed, 56 insertions(+), 11 deletions(-)

(limited to 'aai-core/src/main')

diff --git a/aai-core/src/main/java/org/openecomp/aai/util/GenerateXsd.java b/aai-core/src/main/java/org/openecomp/aai/util/GenerateXsd.java
index 99a06f49..b3c78410 100644
--- a/aai-core/src/main/java/org/openecomp/aai/util/GenerateXsd.java
+++ b/aai-core/src/main/java/org/openecomp/aai/util/GenerateXsd.java
@@ -945,6 +945,7 @@ public class GenerateXsd {
 			case "Business":
 			case "LicenseManagement":
 			case "CloudInfrastructure":
+			case "ExternalSystem":
 				break;
 			default:
 				return null;
diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index 7b973150..8f44ebc4 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -11,17 +11,6 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
 		},
-		{
-			"from" : "auth-info-item",
-			"to" : "tenant",
-			"label" : "defaultTenant",
-			"direction" : "OUT",
-			"multiplicity" : "One2One",
-			"isParent" : "false",
-			"usesResource" : "false",
-			"hasDelTarget" : "false",
-			"SVC-INFRA" : "false"
-		},
 		{
 			"from": "generic-vnf",
 			"to": "license-key-resource",
@@ -44,6 +33,61 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}"
 		},
+		{
+			"from": "esr-ems",
+			"to": "esr-system-info",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "esr-vnfm",
+			"to": "esr-system-info",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "esr-thirdparty-sdnc",
+			"to": "esr-system-info",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "esr-thirdparty-sdnc",
+			"to": "pnf",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "cloud-region",
+			"to": "esr-system-info",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
 		{
 			"from": "cloud-region",
 			"to": "complex",
-- 
cgit 1.2.3-korg