diff options
| author |   lizi00164331 <li.zi30@zte.com.cn> | 2017-09-06 17:27:19 +0800 |
|---|---|---|
| committer | lizi00164331 <li.zi30@zte.com.cn> | 2017-09-06 18:01:15 +0800 |
| commit | 399b9ed2f91c99107e0f357719452cacca3a2ad5 (patch) | |
| tree | 8bddb246580d7a874982d69666df189ab8dc9507 /aai-core/src/main | |
| parent | 2237e74c55076692d2d849589a424f1a76b4893d (diff) | |
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>
Diffstat (limited to 'aai-core/src/main')
| -rw-r--r-- | aai-core/src/main/java/org/openecomp/aai/util/GenerateXsd.java | 1 | ||||
| -rw-r--r-- | aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json | 66 |
2 files changed, 56 insertions, 11 deletions
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 @@ -12,17 +12,6 @@ "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", "label": "uses", @@ -45,6 +34,61 @@ "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", "label": "locatedIn", |