From fc7f6093277e0d0b0ae00540d7f072ecd9c6f94d Mon Sep 17 00:00:00 2001 From: wreehil Date: Mon, 16 Aug 2021 13:47:59 -0400 Subject: [AAI] Merging the latest v24 schema to ONAP Issue-ID: AAI-3361 Change-Id: I67f37dec9bfcb53b317d85cc6620ef28e7af0fb1 Signed-off-by: wr148d --- .../onap/dbedgerules/v24/DbEdgeRules_v24.json | 277 ++++- .../main/resources/onap/oxm/v24/aai_oxm_v24.xml | 1204 +++++++++++++++++--- 2 files changed, 1305 insertions(+), 176 deletions(-) diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json b/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json index becf3a4..b275b01 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json @@ -937,6 +937,18 @@ "description": "" }, { + "from": "service-instance", + "to": "l3-network", + "label": "org.onap.relationships.inventory.ComposedOf", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "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", @@ -5703,18 +5715,6 @@ "default": "true", "description": "" }, - { - "from": "service-instance", - "to": "l3-network", - "label": "org.onap.relationships.inventory.ComposedOf", - "direction": "OUT", - "multiplicity": "MANY2MANY", - "contains-other-v": "NONE", - "delete-other-v": "NONE", - "prevent-delete": "NONE", - "default": "true", - "description": "" - }, { "from": "service-instance", "to": "owning-entity", @@ -6352,39 +6352,260 @@ "prevent-delete": "NONE", "default": "true", "description":"Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object" - },{ + }, + { + "from": "metadatum", + "to": "rule", + "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": "class-map-member", + "to": "parameter-list", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "${direction}", + "default": "true", + "description":"class-map-member to parameter-list" + },{ + "from": "class-map-member", + "to": "class-map", + "label": "org.onap.relationships.inventory.MemberOf", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"Member of class map" + },{ + "from": "policy-key-term", + "to": "parameter-list", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "${direction}", + "default": "true", + "description":"policy-key-term to parameter-list" + },{ + "from": "policy-map-member", + "to": "policy", + "label": "org.onap.relationships.inventory.MemberOf", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"Member of policy map" + },{ + "from": "policy-map-member", + "to": "policy-key-term", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "${direction}", + "default": "true", + "description":"Policy key term related to policy map member" + },{ + "from": "policy-map-member", + "to": "class-map", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "${direction}", + "default": "true", + "description":"Class-map related to policy-map-member" + },{ + "from": "l-interface", + "to": "object-group", + "label": "org.onap.relationships.inventory.MemberOf", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"Member of l-interface" + },{ + "from": "hold-timer", + "to": "p-interface", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface parameters" + },{ + "from": "gig-ether-option", + "to": "p-interface", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface parameters" + },{ + "from": "temporary-parameter-list", + "to": "p-interface", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface parameters" + },{ + "from": "temporary-parameter-list", + "to": "l-interface", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface parameters" + },{ + "from": "aggregated-ether-option", + "to": "lag-interface", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface parameters" + },{ + "from": "temporary-parameter-list", + "to": "lag-interface", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface parameters" + },{ + "from": "lacp", + "to": "aggregated-ether-option", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface parameters" + },{ + "from": "policy", + "to": "lag-interface", + "label": "tosca.relationships.network.AppliesTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"used to support NCX-Hub" + },{ + "from": "esi", + "to": "lag-interface", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface parameters" + },{ + "from": "vlan-range", + "to": "zone", + "label": "tosca.relationships.network.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"The vlan-range is located in a zone." + },{ + "from": "zone", + "to": "zone", + "label": "tosca.relationships.network.AppliesTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"the zone is associated to another zone." + },{ + "from": "lcmp-unreachable", + "to": "l-interface", + "label": "tosca.relationships.network.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"used for generic interface" + },{ "from": "k8s-resource", "to": "tenant", "label": "org.onap.relationships.inventory.BelongsTo", "direction": "OUT", "multiplicity": "MANY2ONE", - "contains-other-v": "!${direction}", - "delete-other-v": "NONE", - "prevent-delete": "!${direction}", - "default": "true", - "description":"" + "contains-other-v": "!${direction}", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"" },{ "from": "vf-module", "to": "k8s-resource", "label": "org.onap.relationships.inventory.Uses", "direction": "OUT", "multiplicity": "ONE2MANY", - "contains-other-v": "NONE", - "delete-other-v": "NONE", - "prevent-delete": "NONE", - "default": "true", - "description":"" + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" },{ "from": "generic-vnf", "to": "k8s-resource", "label": "tosca.relationships.HostedOn", "direction": "OUT", "multiplicity": "ONE2MANY", - "contains-other-v": "NONE", - "delete-other-v": "NONE", - "prevent-delete": "NONE", - "default": "true", - "description":"" + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" } ] } diff --git a/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml b/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml index 723be8e..4d41c63 100644 --- a/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml +++ b/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml @@ -272,7 +272,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -462,7 +462,7 @@ - + @@ -473,7 +473,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -680,7 +680,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -753,7 +753,7 @@ - + @@ -917,7 +917,7 @@ - + @@ -964,7 +964,7 @@ - + @@ -973,7 +973,7 @@ - + @@ -1029,7 +1029,7 @@ - + @@ -1041,7 +1041,7 @@ - + @@ -1112,7 +1112,7 @@ - + @@ -1214,8 +1214,8 @@ - - + + @@ -1282,7 +1282,7 @@ - + @@ -1362,7 +1362,7 @@ - + @@ -1374,7 +1374,6 @@ - @@ -1418,7 +1417,7 @@ - + @@ -1662,7 +1661,7 @@ - + @@ -1833,7 +1832,7 @@ - + @@ -1978,6 +1977,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1997,6 +2026,8 @@ + + @@ -2014,7 +2045,7 @@ - + @@ -2191,12 +2222,12 @@ - + - + @@ -2313,7 +2344,7 @@ - + @@ -2389,7 +2420,7 @@ - + @@ -2535,7 +2566,7 @@ - + @@ -2637,7 +2668,7 @@ - + @@ -2853,7 +2884,7 @@ - + @@ -2954,7 +2985,7 @@ - + @@ -3154,7 +3185,7 @@ - + @@ -3171,7 +3202,7 @@ - + @@ -3209,7 +3240,7 @@ - + @@ -3359,6 +3390,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3374,17 +3430,20 @@ - + + + + - + @@ -3495,14 +3554,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -3510,7 +3602,7 @@ - + @@ -3578,7 +3670,7 @@ - + @@ -3668,7 +3760,7 @@ - + @@ -3736,7 +3828,7 @@ - + @@ -3788,7 +3880,7 @@ - + @@ -3804,7 +3896,8 @@ - + + @@ -3857,7 +3950,7 @@ - + @@ -3923,7 +4016,7 @@ - + @@ -4069,7 +4162,22 @@ - + + + + + + + + + + + + + + + + @@ -4206,7 +4314,7 @@ - + @@ -4408,7 +4516,7 @@ - + @@ -4718,7 +4826,7 @@ - + @@ -4984,7 +5092,7 @@ - + @@ -5202,7 +5310,7 @@ - + @@ -5547,7 +5655,7 @@ - + @@ -5580,7 +5688,8 @@ - + + @@ -5623,7 +5732,7 @@ - + @@ -6031,7 +6140,7 @@ - + @@ -6047,7 +6156,7 @@ - + @@ -6129,7 +6238,7 @@ - + @@ -6189,7 +6298,7 @@ - + @@ -6428,7 +6537,7 @@ - + @@ -6466,7 +6575,7 @@ - + @@ -6788,7 +6897,7 @@ - + @@ -6802,7 +6911,7 @@ - + @@ -6850,7 +6959,7 @@ - + @@ -6889,9 +6998,9 @@ - + - + @@ -7076,20 +7185,20 @@ - + - + - + @@ -7448,7 +7557,7 @@ - + @@ -7580,7 +7689,7 @@ - + @@ -7909,7 +8018,7 @@ - + @@ -8017,7 +8126,7 @@ - + @@ -8030,13 +8139,13 @@ - + - + @@ -8243,7 +8352,7 @@ - + @@ -8501,7 +8610,7 @@ - + @@ -8604,6 +8713,11 @@ + + + + + @@ -8619,7 +8733,7 @@ - + @@ -8630,7 +8744,8 @@ - + + @@ -8973,7 +9088,7 @@ - + @@ -9055,7 +9170,7 @@ - + @@ -9233,7 +9348,7 @@ - + @@ -9460,6 +9575,7 @@ + @@ -9651,7 +9767,7 @@ - + @@ -9819,7 +9935,7 @@ - + @@ -9838,7 +9954,7 @@ - + @@ -9944,7 +10060,7 @@ - + @@ -10084,7 +10200,7 @@ - + @@ -10354,7 +10470,7 @@ - + @@ -10430,7 +10546,7 @@ - + @@ -10649,6 +10765,11 @@ + + + + + @@ -10677,12 +10798,13 @@ - + + - + @@ -10842,7 +10964,7 @@ - + @@ -10956,7 +11078,7 @@ - + @@ -11192,7 +11314,7 @@ - + @@ -11209,7 +11331,7 @@ - + @@ -11287,7 +11409,7 @@ - + @@ -11295,7 +11417,7 @@ - + @@ -11358,7 +11480,7 @@ - + @@ -11447,7 +11569,7 @@ - + @@ -11613,7 +11735,7 @@ - + @@ -11688,7 +11810,7 @@ - + @@ -11763,7 +11885,7 @@ - + @@ -11841,7 +11963,7 @@ - + @@ -12088,7 +12210,7 @@ - + @@ -12137,7 +12259,7 @@ - + @@ -12468,7 +12590,7 @@ - + @@ -12525,7 +12647,7 @@ - + @@ -12634,7 +12756,7 @@ - + @@ -12822,7 +12944,7 @@ - + @@ -12921,7 +13043,7 @@ - + @@ -13025,7 +13147,7 @@ - + @@ -13104,7 +13226,7 @@ - + @@ -13217,7 +13339,7 @@ - + @@ -13336,7 +13458,7 @@ - + @@ -13471,7 +13593,7 @@ - + @@ -13632,7 +13754,7 @@ - + @@ -13696,7 +13818,7 @@ - + @@ -13803,7 +13925,7 @@ - + @@ -13888,7 +14010,7 @@ - + @@ -13903,7 +14025,7 @@ - + @@ -14004,7 +14126,7 @@ - + @@ -14128,7 +14250,7 @@ - + @@ -14252,7 +14374,7 @@ - + @@ -14282,10 +14404,15 @@ - + + + + + + @@ -14362,7 +14489,7 @@ - + @@ -14389,7 +14516,7 @@ - + @@ -14434,7 +14561,7 @@ - + @@ -14451,7 +14578,7 @@ - + @@ -14522,7 +14649,7 @@ - + @@ -14590,14 +14717,14 @@ - + - + @@ -14639,10 +14766,10 @@ - + - + @@ -14709,9 +14836,9 @@ - + - + @@ -14764,7 +14891,7 @@ - + @@ -14814,7 +14941,7 @@ - + @@ -14918,6 +15045,11 @@ + + + + + @@ -14934,7 +15066,7 @@ - + @@ -14947,7 +15079,7 @@ - + @@ -15065,6 +15197,7 @@ + @@ -15073,7 +15206,7 @@ - + @@ -15142,7 +15275,7 @@ - + @@ -15210,7 +15343,6 @@ - @@ -15348,7 +15480,7 @@ - + @@ -15358,11 +15490,11 @@ - + - + @@ -15432,7 +15564,7 @@ - + @@ -15567,7 +15699,7 @@ - + @@ -15717,7 +15849,7 @@ - + @@ -15800,6 +15932,782 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg