aboutsummaryrefslogtreecommitdiffstats
path: root/aai-schema
diff options
context:
space:
mode:
authorHarish Venkata Kajur <vk250x@att.com>2020-09-09 16:04:51 -0400
committerHarish Venkata Kajur <vk250x@att.com>2020-09-09 16:28:24 -0400
commit3fd24c79537eb72274a33f330ac102812dd95fc0 (patch)
tree691077ae0a323a733bf6fe7e5b2893ef6971bbbd /aai-schema
parentfbf222c19e05e3d598b6c5abe0c14e52dbe9834f (diff)
Fix duplicate edgerules causing issues in creation
Issue-ID: SO-3216 Change-Id: I140445445625d34edbc82305da323a5394433e2b Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
Diffstat (limited to 'aai-schema')
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v10/DbEdgeRules_v10.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v11/DbEdgeRules_v11.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v12/DbEdgeRules_v12.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json61
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json113
12 files changed, 53 insertions, 161 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v10/DbEdgeRules_v10.json b/aai-schema/src/main/resources/onap/dbedgerules/v10/DbEdgeRules_v10.json
index 1f74945..b62a5ab 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v10/DbEdgeRules_v10.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v10/DbEdgeRules_v10.json
@@ -687,7 +687,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
@@ -722,7 +722,7 @@
"direction": "OUT",
"multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true"
},
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v11/DbEdgeRules_v11.json b/aai-schema/src/main/resources/onap/dbedgerules/v11/DbEdgeRules_v11.json
index bd9d617..2cde2cb 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v11/DbEdgeRules_v11.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v11/DbEdgeRules_v11.json
@@ -304,7 +304,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true"
},
@@ -819,7 +819,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v12/DbEdgeRules_v12.json b/aai-schema/src/main/resources/onap/dbedgerules/v12/DbEdgeRules_v12.json
index 087a71a..f1a4a4b 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v12/DbEdgeRules_v12.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v12/DbEdgeRules_v12.json
@@ -331,7 +331,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -893,7 +893,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json b/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json
index fb45589..4296bb3 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v13/DbEdgeRules_v13.json
@@ -343,7 +343,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -905,7 +905,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
index f7e762c..6e07bfb 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -343,7 +343,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -689,7 +689,7 @@
"to": "generic-vnf",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
index 34dc328..089b7bb 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
@@ -343,7 +343,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -929,7 +929,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
index 7c905db..31d4d66 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
@@ -343,7 +343,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -929,7 +929,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json b/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json
index 34dc328..089b7bb 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json
@@ -343,7 +343,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -929,7 +929,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json b/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json
index 1f33c7b..267a1ab 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json
@@ -343,7 +343,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -929,7 +929,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
index 575c853..93d5028 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
@@ -343,7 +343,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -929,7 +929,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
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 ee10797..7926dd4 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
@@ -355,7 +355,7 @@
"direction": "OUT",
"multiplicity": "ONE2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "${direction}",
+ "delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
"description":""
@@ -941,7 +941,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
@@ -1025,7 +1025,7 @@
"to": "l-interface",
"label": "org.onap.relationships.inventory.Uses",
"direction": "OUT",
- "multiplicity": "ONE2MANY",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
@@ -1629,7 +1629,7 @@
"delete-other-v": "NONE",
"SVC-INFRA": "NONE",
"prevent-delete": "NONE",
- "default": "true",
+ "default": "false",
"description":""
},
{
@@ -1642,7 +1642,7 @@
"delete-other-v": "NONE",
"SVC-INFRA": "NONE",
"prevent-delete": "NONE",
- "default": "true",
+ "default": "false",
"description":""
},
{
@@ -3029,18 +3029,6 @@
},
{
"from": "vlan-tag",
- "to": "l3-network",
- "label": "org.onap.relationships.inventory.BelongsTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description":""
- },
- {
- "from": "vlan-tag",
"to": "cloud-region",
"label": "org.onap.relationships.inventory.BelongsTo",
"direction": "OUT",
@@ -3290,18 +3278,6 @@
"description":""
},
{
- "from": "configuration",
- "to": "lag-interface",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description":""
- },
- {
"from": "communication-service-profile",
"to": "service-instance",
"label": "org.onap.relationships.inventory.BelongsTo",
@@ -3515,8 +3491,33 @@
"prevent-delete": "NONE",
"default": "true",
"description": "The dns cname record that applies to an A-record (ipv4) and/or quad-A-record (ipv6)."
+ },
+ {
+ "from": "profile",
+ "to": "pnf",
+ "label": "org.onap.relationships.inventory.AppliesTo",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "SVC-INFRA": "NONE",
+ "prevent-delete": "${direction}",
+ "default": "true",
+ "description": "A profile (set of characteristics) applies to the pnf."
+ },
+ {
+ "from": "profile",
+ "to": "pserver",
+ "label": "org.onap.relationships.inventory.AppliesTo",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "SVC-INFRA": "NONE",
+ "prevent-delete": "${direction}",
+ "default": "true",
+ "description": "A profile (set of characteristics) applies to the pserver."
}
-
]
}
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
index fd91b61..e6001b0 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
@@ -349,18 +349,6 @@
"description": ""
},
{
- "from": "configuration",
- "to": "logical-link",
- "label": "org.onap.relationships.inventory.Uses",
- "direction": "OUT",
- "multiplicity": "ONE2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "${direction}",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
- {
"from": "metadatum",
"to": "configuration",
"label": "org.onap.relationships.inventory.BelongsTo",
@@ -421,18 +409,6 @@
"description": ""
},
{
- "from": "service-subscription",
- "to": "customer",
- "label": "org.onap.relationships.inventory.BelongsTo",
- "direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "!${direction}",
- "delete-other-v": "!${direction}",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
- {
"from": "dvs-switch",
"to": "availability-zone",
"label": "org.onap.relationships.inventory.AppliesTo",
@@ -938,18 +914,6 @@
},
{
"from": "service-instance",
- "to": "l3-network",
- "label": "org.onap.relationships.inventory.ComposedOf",
- "direction": "OUT",
- "multiplicity": "ONE2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
- {
- "from": "service-instance",
"to": "p-interface",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",
@@ -1021,18 +985,6 @@
"description": ""
},
{
- "from": "lag-interface",
- "to": "l-interface",
- "label": "org.onap.relationships.inventory.Uses",
- "direction": "OUT",
- "multiplicity": "ONE2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "false",
- "description": ""
- },
- {
"from": "line-of-business",
"to": "generic-vnf",
"label": "org.onap.relationships.inventory.Uses",
@@ -1630,7 +1582,7 @@
"delete-other-v": "NONE",
"SVC-INFRA": "NONE",
"prevent-delete": "NONE",
- "default": "true",
+ "default": "false",
"description": ""
},
{
@@ -1643,7 +1595,7 @@
"delete-other-v": "NONE",
"SVC-INFRA": "NONE",
"prevent-delete": "NONE",
- "default": "true",
+ "default": "false",
"description": ""
},
{
@@ -3030,18 +2982,6 @@
},
{
"from": "vlan-tag",
- "to": "l3-network",
- "label": "org.onap.relationships.inventory.BelongsTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
- {
- "from": "vlan-tag",
"to": "cloud-region",
"label": "org.onap.relationships.inventory.BelongsTo",
"direction": "OUT",
@@ -3115,19 +3055,6 @@
"description": ""
},
{
- "from": "l3-network",
- "to": "l3-network",
- "label": "org.onap.relationships.inventory.Uses",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "SVC-INFRA": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
- {
"from": "generic-vnf",
"to": "instance-group",
"label": "org.onap.relationships.inventory.Uses",
@@ -3227,18 +3154,6 @@
"description": "A vrf uses many l3-networks"
},
{
- "from": "configuration",
- "to": "vrf",
- "label": "org.onap.relationships.inventory.Uses",
- "direction": "OUT",
- "multiplicity": "ONE2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "A Configuration uses VRFs"
- },
- {
"from": "vrf",
"to": "l-interface",
"label": "org.onap.relationships.inventory.Uses",
@@ -3291,18 +3206,6 @@
"description": ""
},
{
- "from": "configuration",
- "to": "lag-interface",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
- {
"from": "communication-service-profile",
"to": "service-instance",
"label": "org.onap.relationships.inventory.BelongsTo",
@@ -5765,18 +5668,6 @@
},
{
"from": "service-instance",
- "to": "service-subscription",
- "label": "org.onap.relationships.inventory.BelongsTo",
- "direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "!${direction}",
- "delete-other-v": "!${direction}",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "service-instance BelongsTo service-subscription"
- },
- {
- "from": "service-instance",
"to": "vrf",
"label": "org.onap.relationships.inventory.ComposedOf",
"direction": "OUT",