aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMehreen Kaleem <mehreen.kaleem@us.fujitsu.com>2020-12-03 05:51:33 +0000
committerMehreen Kaleem <mehreen.kaleem@us.fujitsu.com>2020-12-03 05:51:39 +0000
commita7e04ac9a1faaa6b219cd1544269f04fa04ddd9b (patch)
treedb8dcab09c204fa431f6b36907742571ead90135
parent1841a8e4a2eb862dc63cc0fca529f10a48a41c61 (diff)
Updated AAI schema and DBEdge rules for the
MDONS use Case Issue-ID: AAI-3225 Signed-off-by: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com> Change-Id: I207ee99270a1bf6d346e9e4fd4431bb79fda3be3
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json12
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json12
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json12
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json4
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml4
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml6
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml6
8 files changed, 12 insertions, 48 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json
index 396d970..9f191f7 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json
@@ -531,18 +531,6 @@
"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_ccvpn_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json
index 883c6ef..2f295e7 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
@@ -532,18 +532,6 @@
"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_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json
index 977af56..a2065da 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
@@ -1481,9 +1481,9 @@
"to": "logical-link",
"label": "tosca.relationships.network.LinksTo",
"direction": "OUT",
- "multiplicity": "MANY2ONE",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "NONE",
+ "delete-other-v": "${direction}",
"prevent-delete": "NONE",
"default": "true",
"description":""
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json
index f1dfae3..0c7e77c 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json
@@ -532,18 +532,6 @@
"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/v21/DbEdgeRules_v21.json b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
index 2c2c0fc..1e748e2 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
@@ -1457,9 +1457,9 @@
"to": "logical-link",
"label": "tosca.relationships.network.LinksTo",
"direction": "OUT",
- "multiplicity": "MANY2ONE",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
- "delete-other-v": "NONE",
+ "delete-other-v": "${direction}",
"prevent-delete": "NONE",
"default": "true",
"description": ""
diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
index fc83e81..60172da 100644
--- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
@@ -2515,7 +2515,7 @@
</xml-properties>
</java-type>
- <java-type name="OTNLabelRestrictions">
+ <!--java-type name="OTNLabelRestrictions">
<xml-properties>
<xml-property name="description" value="Collection of Label Restriction. Added for ENNI in MDONS use case."/>
</xml-properties>
@@ -2563,7 +2563,7 @@
<xml-property name="dependentOn" value="bandwidth-attribute"/>
<xml-property name="requiredProps" value="lr-id"/>
</xml-properties>
- </java-type>
+ </java-type-->
<java-type name="LagInterfaces">
<xml-properties>
diff --git a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
index 41a7e72..0304670 100644
--- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
@@ -2495,7 +2495,7 @@
</xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/>
<xml-element java-attribute="availableBandwidthMap" name="available-bandwidth-map" type="inventory.aai.onap.org.v20.AvailableBandwidthMap"/>
- <xml-element java-attribute="OTNLabelRestrictions" name="otn-label-restrictions" type="inventory.aai.onap.org.v20.OTNLabelRestrictions"/>
+ <!--xml-element java-attribute="OTNLabelRestrictions" name="otn-label-restrictions" type="inventory.aai.onap.org.v20.OTNLabelRestrictions"/-->
</java-attributes>
<xml-properties>
<xml-property name="description" value="Instance of a bandwidth-attribute"/>
@@ -2559,7 +2559,7 @@
</xml-properties>
</java-type>
- <java-type name="OTNLabelRestrictions">
+ <!--java-type name="OTNLabelRestrictions">
<xml-properties>
<xml-property name="description" value="Collection of Label Restriction. Added for ENNI in MDONS use case."/>
</xml-properties>
@@ -2607,7 +2607,7 @@
<xml-property name="dependentOn" value="bandwidth-attribute"/>
<xml-property name="requiredProps" value="lr-id"/>
</xml-properties>
- </java-type>
+ </java-type-->
<java-type name="LagInterfaces">
<xml-properties>
diff --git a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
index 716b98b..aff32ee 100644
--- a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
@@ -3040,7 +3040,7 @@
</xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/>
<xml-element java-attribute="availableBandwidthMap" name="available-bandwidth-map" type="inventory.aai.onap.org.v21.AvailableBandwidthMap"/>
- <xml-element java-attribute="OTNLabelRestrictions" name="otn-label-restrictions" type="inventory.aai.onap.org.v21.OTNLabelRestrictions"/>
+ <!--xml-element java-attribute="OTNLabelRestrictions" name="otn-label-restrictions" type="inventory.aai.onap.org.v21.OTNLabelRestrictions"/-->
</java-attributes>
<xml-properties>
<xml-property name="description" value="Instance of a bandwidth-attribute"/>
@@ -3104,7 +3104,7 @@
</xml-properties>
</java-type>
- <java-type name="OTNLabelRestrictions">
+ <!--java-type name="OTNLabelRestrictions">
<xml-properties>
<xml-property name="description" value="Collection of Label Restriction. Added for ENNI in MDONS use case."/>
</xml-properties>
@@ -3152,7 +3152,7 @@
<xml-property name="dependentOn" value="bandwidth-attribute"/>
<xml-property name="requiredProps" value="lr-id"/>
</xml-properties>
- </java-type>
+ </java-type-->
<java-type name="Vrfs">
<xml-root-element name="vrfs"/>