From: lizi00164331
Date: Tue, 12 Sep 2017 03:46:05 +0000 (+0800)
Subject: Fix the schema about external system.
X-Git-Tag: v1.1.0~43^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F11823%2F2;p=aai%2Faai-common.git
Fix the schema about external system.
move passive/remote-path from esr-ems to esr-system-info.
Change parameters in esr-system-info to be optional.
Fix error about the container definition in esr-system-info.
Remove the label between cloud-region and auth-info-item.
Change-Id: I21ab7d96b3a0b00c738f423b040420fb3c7e0072
Issue-ID: AAI-289
Signed-off-by: lizi00164331
---
diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index 8f44ebc4..a2943e3c 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -121,17 +121,6 @@
"SVC-INFRA": "!${direction}",
"prevent-delete": "${direction}"
},
- {
- "from": "cloud-region",
- "to": "auth-info-item",
- "label": "has",
- "direction": "OUT",
- "multiplicity": "One2Many",
- "contains-other-v": "${direction}",
- "delete-other-v": "NONE",
- "SVC-INFRA": "!${direction}",
- "prevent-delete": "${direction}"
- },
{
"from": "cloud-region",
"to": "image",
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index 2e309ae2..052f4c8d 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -256,16 +256,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -375,10 +365,13 @@
+
+
+
-
+
@@ -391,22 +384,22 @@
-
+
-
+
-
+
-
+
@@ -431,9 +424,9 @@
-
+
-
+
@@ -466,6 +459,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -477,7 +485,7 @@
-
+