From 399b9ed2f91c99107e0f357719452cacca3a2ad5 Mon Sep 17 00:00:00 2001
From: lizi00164331
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
---
.../java/org/openecomp/aai/util/GenerateXsd.java | 1 +
.../resources/dbedgerules/DbEdgeRules_v11.json | 66 ++++++++++++++++++----
.../aai/query/builder/SimplePathTest.java | 19 +++++++
.../org/openecomp/aai/query/builder/UntilTest.java | 19 +++++++
4 files changed, 94 insertions(+), 11 deletions(-)
(limited to 'aai-core/src')
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",
diff --git a/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java b/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java
index e6e510c6..072ba694 100644
--- a/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java
@@ -1,3 +1,22 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.openecomp.aai
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
package org.openecomp.aai.query.builder;
import static org.junit.Assert.*;
diff --git a/aai-core/src/test/java/org/openecomp/aai/query/builder/UntilTest.java b/aai-core/src/test/java/org/openecomp/aai/query/builder/UntilTest.java
index 9da2c0e0..fa434b44 100644
--- a/aai-core/src/test/java/org/openecomp/aai/query/builder/UntilTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/query/builder/UntilTest.java
@@ -1,3 +1,22 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.openecomp.aai
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
package org.openecomp.aai.query.builder;
import static org.junit.Assert.assertTrue;
--
cgit 1.2.3-korg