From 5a0a21b3908e146810a992c575cf0fed102cfeb8 Mon Sep 17 00:00:00 2001 From: zhangqingjie Date: Fri, 7 Feb 2020 10:31:29 +0800 Subject: AAI schema update for 5G Network Slicing Issue-ID: AAI-2600 Support 5G Network Slicing, new communication-service-profile/ service-profile/slicing-profile nodes,and modify service-instance node. Signed-off-by: zhangqingjie Change-Id: Idac59df73d2ed38dcf618167c47560628376ed0b --- .../resources/onap/aai_schema/aai_schema_v19.xsd | 742 ++++++++++++++++----- .../onap/dbedgerules/v19/DbEdgeRules_v19.json | 43 +- .../main/resources/onap/oxm/v19/aai_oxm_v19.xml | 333 ++++++++- 3 files changed, 959 insertions(+), 159 deletions(-) diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd index f4b6bf2..92cf80c 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd @@ -18,22 +18,22 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + + - + - + @@ -67,9 +67,9 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - + + + @@ -101,7 +101,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -184,15 +184,15 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + + - + @@ -258,7 +258,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -303,7 +303,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -359,7 +359,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -393,7 +393,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -406,9 +406,9 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - + @@ -426,7 +426,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -494,7 +494,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -572,7 +572,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -652,7 +652,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -697,7 +697,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -944,15 +944,15 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + + - + @@ -1074,7 +1074,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1202,8 +1202,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + + @@ -1222,7 +1222,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1304,7 +1304,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1377,7 +1377,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1431,7 +1431,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1512,7 +1512,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1524,7 +1524,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1632,7 +1632,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1691,7 +1691,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1792,7 +1792,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1830,7 +1830,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1925,7 +1925,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -1937,7 +1937,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -2244,7 +2244,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -2364,8 +2364,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + + @@ -2385,7 +2385,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -2430,7 +2430,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -2468,7 +2468,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -2627,7 +2627,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -2715,7 +2715,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -2952,7 +2952,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -2964,7 +2964,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3009,7 +3009,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3082,7 +3082,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3127,7 +3127,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3184,7 +3184,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3237,7 +3237,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3283,7 +3283,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3343,7 +3343,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3425,7 +3425,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3463,7 +3463,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3614,7 +3614,436 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Requirement of comunication service.",uniqueProps="profile-id",indexedProps="profile-id",container="communication-service-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/communication-service-profiles/communication-service-profile/{profile-id}",searcheable="profile-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="ID of the profile.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the communication service") + + + + + + + @org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSI can be selected.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User experience data rate of upload.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User experience data rate of download.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s).") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of communication service profile.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Requirement of E2E Slice service.",uniqueProps="profile-id",indexedProps="profile-id",container="service-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/service-profiles/service-profile/{profile-id}",searcheable="profile-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="ID of the profile.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the E2E slice service") + + + + + + + @org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSI can be selected.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s).") + + + + + + + @org.onap.aai.annotations.Metadata(description="User experience data rate of upload.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User experience data rate of download.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The area traffic capbility of upload.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The area traffic capbility of download.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The activity factor.") + + + + + + + @org.onap.aai.annotations.Metadata(description="jitter") + + + + + + + @org.onap.aai.annotations.Metadata(description="Survival Time") + + + + + + + @org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice instance, expressed as a percentage.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice instance, expressed as a percentage.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User experience data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="traffic density") + + + + + + + @org.onap.aai.annotations.Metadata(description="connection density") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of E2E slice service profile.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Requirement of network slice subnet service.",uniqueProps="profile-id",indexedProps="profile-id",container="slice-profiles",dependentOn="service-instance",uriTemplate="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}",searcheable="profile-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="ID of the profile.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the RAN or CN or TN and is used to evaluate utilization performance of the end-to-end network slice instance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The maximum number of UEs may simultaneously access the slice subnet service") + + + + + + + @org.onap.aai.annotations.Metadata(description="A list of TrackingAreas where the NSSI can be selected.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Whether the resources to be allocated to the slice subnet instance may be shared with another network slice instance(s).") + + + + + + + @org.onap.aai.annotations.Metadata(description="User experience data rate of upload.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User experience data rate of download.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The area traffic capbility of upload.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The area traffic capbility of download.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The activity factor.") + + + + + + + @org.onap.aai.annotations.Metadata(description="e2e latency") + + + + + + + @org.onap.aai.annotations.Metadata(description="jitter") + + + + + + + @org.onap.aai.annotations.Metadata(description="Survival Time") + + + + + + + @org.onap.aai.annotations.Metadata(description="The availability requirement for an network slice subnet instance, expressed as a percentage.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.") + + + + + + + @org.onap.aai.annotations.Metadata(description="User experience data rate.") + + + + + + + @org.onap.aai.annotations.Metadata(description="payload size.") + + + + + + + @org.onap.aai.annotations.Metadata(description="traffic density") + + + + + + + @org.onap.aai.annotations.Metadata(description="connection density") + + + + + + + @org.onap.aai.annotations.Metadata(description="service area dimension") + + + + + + + @org.onap.aai.annotations.Metadata(description="S-NSSAI") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of slice subnet service profile.") + + + + @@ -3804,6 +4233,9 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + @@ -3815,7 +4247,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3861,7 +4293,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3914,7 +4346,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3952,7 +4384,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -3997,7 +4429,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4035,7 +4467,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4073,7 +4505,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4153,7 +4585,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4237,7 +4669,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4296,7 +4728,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4341,7 +4773,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4371,7 +4803,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4401,7 +4833,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4435,7 +4867,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4468,7 +4900,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4497,7 +4929,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4567,7 +4999,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4613,7 +5045,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4636,7 +5068,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4645,7 +5077,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4674,7 +5106,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4693,7 +5125,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4707,7 +5139,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4731,7 +5163,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4745,7 +5177,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4932,7 +5364,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -4984,7 +5416,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5058,7 +5490,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5104,7 +5536,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5143,7 +5575,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5188,7 +5620,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5347,7 +5779,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5415,7 +5847,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5467,7 +5899,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5500,7 +5932,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5597,7 +6029,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5642,7 +6074,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5687,7 +6119,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5847,7 +6279,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5881,8 +6313,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + + @@ -5894,7 +6326,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -5999,8 +6431,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + + @@ -6012,7 +6444,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -6066,7 +6498,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -6191,7 +6623,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -6224,7 +6656,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -6262,7 +6694,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -6321,7 +6753,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -6539,7 +6971,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -6586,7 +7018,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -6722,7 +7154,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -7157,7 +7589,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -7195,7 +7627,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -7318,7 +7750,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -7355,7 +7787,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -7424,7 +7856,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -7676,7 +8108,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -7784,7 +8216,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -7803,14 +8235,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @org.onap.aai.annotations.Metadata(description="v4 IP of the vig server") - + @org.onap.aai.annotations.Metadata(description="v6 IP of the vig server") @@ -7831,7 +8263,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8005,7 +8437,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8050,7 +8482,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8137,7 +8569,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8210,7 +8642,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8270,7 +8702,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8332,7 +8764,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8463,7 +8895,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8595,7 +9027,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8635,7 +9067,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8683,7 +9115,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8772,7 +9204,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -8833,7 +9265,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9011,7 +9443,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9119,7 +9551,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9221,7 +9653,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9294,7 +9726,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9402,7 +9834,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9510,7 +9942,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9653,7 +10085,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9845,7 +10277,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9886,7 +10318,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -9971,8 +10403,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - + + @@ -10031,7 +10463,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -10169,7 +10601,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -10186,7 +10618,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -10235,7 +10667,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -10261,7 +10693,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -10378,7 +10810,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -10493,7 +10925,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -10622,7 +11054,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @@ -10751,7 +11183,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + 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 b581854..a4ad903 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 @@ -3177,8 +3177,47 @@ "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", - "description":"" + "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":"" } - + ] } 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 d205af8..6e71593 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 @@ -3127,6 +3127,9 @@ + + + @@ -9184,12 +9187,338 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg