From adaf2794b46570a95f58bbbf4c61d4d41b3bb052 Mon Sep 17 00:00:00 2001 From: "LaMont, William(wl2432)" Date: Thu, 30 Apr 2020 20:12:25 -0400 Subject: fix v20 schema changes Issue-ID: AAI-2894 Change-Id: I74db10c3e5150a172307b9c974d9589b75513b0a Signed-off-by: LaMont, William(wl2432) --- .../dbedgerules/v20/DbEdgeRules_ccvpn_v20.json | 227 +++++++++++++++++++-- .../onap/dbedgerules/v20/DbEdgeRules_esr_v20.json | 14 ++ .../onap/dbedgerules/v20/DbEdgeRules_v20.json | 54 ++++- 3 files changed, 279 insertions(+), 16 deletions(-) (limited to 'aai-schema/src/main/resources/onap/dbedgerules') diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json index 68f2986..f007e0a 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json @@ -1,3 +1,4 @@ + { "rules": [ { @@ -80,7 +81,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -104,7 +105,7 @@ "multiplicity": "MANY2MANY", "contains-other-v": "NONE", "delete-other-v": "!${direction}", - "prevent-delete": "${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -204,12 +205,84 @@ "default": "true", "description":"For CCVPN Usecase" }, + { + "from": "sdwan-vpn", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "connectivity", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "uni", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "site-resource", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "wan-port-config", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "lan-port-config", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, { "from": "wan-port-config", "to": "service-instance", "label": "org.onap.relationships.inventory.PartOf", "direction": "OUT", - "multiplicity": "ONE2MANY", + "multiplicity": "MANY2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "prevent-delete": "NONE", @@ -224,7 +297,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -235,7 +308,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -247,7 +320,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -259,7 +332,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -271,7 +344,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -283,7 +356,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -295,7 +368,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -307,7 +380,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -319,7 +392,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -331,7 +404,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -343,10 +416,134 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" - } + }, + { + "from": "tunnel-termination-point", + "to": "pnf", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "p-interface", + "to": "tunnel-termination-point", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "p-interface", + "to": "interlayer-attachment", + "label": "tosca.relationships.network.LinksTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + + }, + { + "from": "tunnel-termination-point", + "to": "interlayer-attachment", + "label": "tosca.relationships.network.LinksTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + + }, + { + "from": "uni", + "to": "p-interface", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "logical-link", + "to": "te-link-attribute", + "label": "tosca.relationships.network.LinksTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + + }, + { + "from": "label-restriction", + "to": "te-link-attribute", + "label": "tosca.relationships.network.LinksTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + + }, + { + "from": "bandwidth-attribute", + "to": "p-interface", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For MDONS usecase" + }, + { + "from": "available-bandwidth", + "to": "bandwidth-attribute", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For MDONS usecase" + }, + { + "from": "label-restriction", + "to": "bandwidth-attribute", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"For MDONS usecase" + } ] } diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_esr_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_esr_v20.json index baa6ab8..88d5560 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_esr_v20.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_esr_v20.json @@ -60,6 +60,19 @@ "prevent-delete": "NONE", "default": "true" }, + { + "from": "esr-thirdparty-sdnc", + "to": "network-resource", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For MDONS Usecase" + }, { "from": "esr-system-info", "to": "cloud-region", @@ -86,3 +99,4 @@ } ] } + diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json index 5b94725..7a292f4 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json @@ -936,6 +936,18 @@ "default": "true", "description":"" }, + { + "from": "service-instance", + "to": "p-interface", + "label": "org.onap.relationships.inventory.ComposedOf", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For MDONS Use case" + }, { "from": "subnet", "to": "l3-network", @@ -3166,7 +3178,46 @@ "prevent-delete": "NONE", "default": "true", "description":"" - },{ + }, + { + "from": "communication-service-profile", + "to": "service-instance", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "NONE", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, + { + "from": "service-profile", + "to": "service-instance", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "NONE", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, + { + "from": "slice-profile", + "to": "service-instance", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "NONE", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + },{ "from": "configuration", "to": "lag-interface", "label": "org.onap.relationships.inventory.AppliesTo", @@ -3214,3 +3265,4 @@ ] } + -- cgit 1.2.3-korg