From 6655e1388d1f4be0ba3c8b29e4960505588940fb Mon Sep 17 00:00:00 2001 From: Karthik Sethuraman Date: Fri, 28 Jun 2019 10:57:15 -0400 Subject: [PATCH 1/3] UML & corresponding Yang updates to align with PR #439 - created an CentralFrequencyBand datatype and using that in OtsiCapability pac instead of in-lining as in previous Yang commit --- UML/TapiPhotonicMedia.notation | 2229 +++++++++++----------- UML/TapiPhotonicMedia.uml | 44 +- YANG/tapi-photonic-media@2019-03-31.yang | 46 +- 3 files changed, 1203 insertions(+), 1116 deletions(-) diff --git a/UML/TapiPhotonicMedia.notation b/UML/TapiPhotonicMedia.notation index 3f6e6070..389bf559 100644 --- a/UML/TapiPhotonicMedia.notation +++ b/UML/TapiPhotonicMedia.notation @@ -30,7 +30,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -493,125 +493,165 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -642,155 +682,165 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + @@ -896,13 +946,13 @@ - - - + + + - + @@ -917,7 +967,10 @@ - + + +
+ @@ -951,10 +1004,6 @@ - - - - @@ -981,7 +1030,7 @@ - + @@ -1173,7 +1222,10 @@ - + + +
+ @@ -1207,7 +1259,10 @@ - + + +
+ @@ -1323,7 +1378,10 @@ - + + +
+ @@ -1365,7 +1423,10 @@ - + + +
+ @@ -1407,205 +1468,205 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -1670,9 +1731,9 @@ - - - + + + @@ -1824,9 +1885,9 @@ - - - + + + @@ -1859,7 +1920,7 @@ - + @@ -1890,7 +1951,7 @@ - + @@ -1921,7 +1982,7 @@ - + @@ -1952,265 +2013,265 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2855,78 +2916,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3095,77 +3084,149 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + @@ -3301,96 +3362,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3471,86 +3442,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3597,15 +3488,185 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3743,213 +3804,213 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -4197,265 +4258,265 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -4573,85 +4634,85 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -4719,105 +4780,105 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/UML/TapiPhotonicMedia.uml b/UML/TapiPhotonicMedia.uml index 7fcaf4e2..7eaee503 100644 --- a/UML/TapiPhotonicMedia.uml +++ b/UML/TapiPhotonicMedia.uml @@ -328,20 +328,16 @@ License: This module is distributed under the Apache License 2.0 Can read the status of the warning for the upper value that the power can reach. - + - The lower frequency of the channel spectrum + Each spectrum band supported for otsi trasmitter to be tuned on, is specified +as per it's lower and upper central frequencies supported and its frequency constraints, +consisting in the frequency Grid and the AdjustmentGranularity, used to uniquely identify all +central frequencies supported within the band. - - - The Upper frequency of the channel spectrum - - - - The list of supportable ApplicationIdentifiers. @@ -823,6 +819,27 @@ Any combination of frequency slots is allowed as long as no two frequency slots + + + This data-type represents a range of central frequency spectrum band specified as lower and upper bounds, inclusive of the bound values. +It also holds frequency constraints in terms of GridType ( FIXED grid (DWDM or CWDM) or FLEX grid) and AdjustmentGranularity. + + + + The lower central frequency that can be tuned in the laser specified in MHz. +It is the oscillation frequency of the corresponding electromagnetic wave. + + + + + + The upper central frequency that can be tuned in the laser specified in MHz. + It is the oscillation frequency of the corresponding electromagnetic wave. + + + + + @@ -903,8 +920,6 @@ Any combination of frequency slots is allowed as long as no two frequency slots - - @@ -1231,4 +1246,11 @@ Any combination of frequency slots is allowed as long as no two frequency slots + + + + + + + diff --git a/YANG/tapi-photonic-media@2019-03-31.yang b/YANG/tapi-photonic-media@2019-03-31.yang index 42a1857b..4d6165ca 100644 --- a/YANG/tapi-photonic-media@2019-03-31.yang +++ b/YANG/tapi-photonic-media@2019-03-31.yang @@ -271,7 +271,7 @@ module tapi-photonic-media { } /************************** * package object-classes - **************************/ + **************************/ grouping otsi-server-adaptation-pac { leaf number-of-otsi { type uint64; @@ -393,26 +393,13 @@ module tapi-photonic-media { description "none"; } grouping otsi-capability-pac { - list supportable-central-frequency-spectrum-band { - leaf lower-central-frequency { - type uint64; - description "The lower central frequency can be tuned in the laser specified in MHz. - It is the oscillation frequency of the corresponding electromagnetic wave. "; - } - leaf upper-central-frequency { - type uint64; - description "The lower central frequency can be tuned in the laser specified in MHz. - It is the oscillation frequency of the corresponding electromagnetic wave. "; - } - container frequency-constraint { - uses frequency-constraint; - description "none"; - } + list supportable-central-frequency-band { config false; + uses central-frequency-band; description "Each spectrum band supported for otsi trasmitter to be tuned on, is specified - as per it's lower and upper central frequencies supported and its frequency constraints, - consisting in the frequency Grid and the AdjustmentGranularity, used to uniquely identify all - central frequencies supported within the band."; + as per it's lower and upper central frequencies supported and its frequency constraints, + consisting in the frequency Grid and the AdjustmentGranularity, used to uniquely identify all + central frequencies supported within the band."; } list supportable-application-identifier { key 'application-code'; @@ -623,9 +610,8 @@ module tapi-photonic-media { /************************** * package type-definitions - **************************/ + **************************/ identity PHOTONIC_LAYER_QUALIFIER { - base tapi-common:LAYER_PROTOCOL_QUALIFIER; description "none"; } identity PHOTONIC_LAYER_QUALIFIER_OTSi { @@ -971,5 +957,23 @@ module tapi-photonic-media { } description "none"; } + grouping central-frequency-band { + leaf lower-central-frequency { + type uint64; + description "The lower central frequency that can be tuned in the laser specified in MHz. + It is the oscillation frequency of the corresponding electromagnetic wave. "; + } + leaf upper-central-frequency { + type uint64; + description "The upper central frequency that can be tuned in the laser specified in MHz. + It is the oscillation frequency of the corresponding electromagnetic wave. "; + } + container frequency-constraint { + uses frequency-constraint; + description "none"; + } + description "This data-type represents a range of central frequency spectrum band specified as lower and upper bounds, inclusive of the bound values. + It also holds frequency constraints in terms of GridType ( FIXED grid (DWDM or CWDM) or FLEX grid) and AdjustmentGranularity."; + } } From a7677de36cbcc1106862d506a046d054f570ff53 Mon Sep 17 00:00:00 2001 From: Karthik Sethuraman Date: Fri, 28 Jun 2019 14:32:47 -0400 Subject: [PATCH 2/3] Yang updates related to PR #428 - minor UML organization to move atrifacts into appropriate folders --- UML/TapiEth.notation | 1602 ++++++++++++++++----------------- UML/TapiEth.uml | 265 +++--- YANG/tapi-eth@2019-03-31.yang | 161 +++- 3 files changed, 1066 insertions(+), 962 deletions(-) diff --git a/UML/TapiEth.notation b/UML/TapiEth.notation index 4d9ecc37..a910c165 100644 --- a/UML/TapiEth.notation +++ b/UML/TapiEth.notation @@ -15883,309 +15883,309 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - + @@ -16487,280 +16487,280 @@ - - - + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + @@ -19452,349 +19452,349 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -20201,435 +20201,435 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/UML/TapiEth.uml b/UML/TapiEth.uml index 1661dfef..ac4a90cd 100644 --- a/UML/TapiEth.uml +++ b/UML/TapiEth.uml @@ -1715,20 +1715,6 @@ It models the ETH-LAG_FT_Sk_MI_SSF_Reported defined in G.8021. - - - - - - - - - - - - - - @@ -3088,6 +3074,120 @@ Frame delay variation is a measure of the variations in the frame delay between + + + + G.8021: The loss of continuity defect is calculated at the ETH layer. It monitors the presence of continuity in ETH trails. + + + + + G.8021: Reception of a CCM frame with an invalid MEL value. +Monitoring of the connectivity in a maintenance entity group. + + + + + G.8021: Reception of a CCM frame with an invalid MEP value, but with valid MEL and MEG values. +Monitoring of the connectivity in a maintenance entity group. + + + + + + G.8021: Reception of a CCM frame with an invalid MEG value, but with a valid MEL value. +Monitoring of the connectivity in a maintenance entity group. + + + + + + G.8021: Reception of a CCM frame with an invalid periodicity value, but with valid MEL, MEG and MEP values. +It detects the configuration of different periodicities at different MEPs belonging to the same MEG. + + + + + + G.8021: Reception of a CCM frame with an invalid priority value, but with valid MEL, MEG, MEP and periodicity values. +It detects the configuration of different priorities for CCM at different MEPs belonging to the same MEG. + + + + + + G.8021: Reception of a LCK frame. + + + + + G.8021: Reception of an AIS frame. + + + + + G.8021: The defect is detected if there are MI_LM_DEGM (lmDegm of EthMepSink) consecutive bad seconds and cleared if there are MI_LM_M (lmM of EthMepSink) consecutive good seconds. +In order to declare a bad second the number of transmitted frames must exceed a threshold (MI_LM_TFMIN, lmTfMin of EthMepSink). +Furthermore, if the frame loss ratio (lost frames/transmitted frames) is greater than MI_LM_DEGTHR (lmDegThr of EthMepSink), a bad second is declared. +This defect is only defined for point-to-point ETH connections. It monitors the connectivity of an ETH trail. + + + + + + G.8021: Remote defect indicator defect, reception by an MEP (indexed by "i", this index not included in the "cause" cRDI) of a CCM frame with valid MEL, MEG, MEP and periodicity values and the RDI flag set to x; where x=0 (remote defect clear) and x=1 (remote defect set). + + + + + G.8021 - ETH layer: Reception of a CSF frame that indicates a client loss of signal (dCSF-LOS) or a client forward defect indication (dCSF-FDI) or a client reverse defect indication (dCSF-RDI). +The CSF (CSF-LOS, CSF-FDI, and CSF-RDI) defect is calculated at the ETH layer. It monitors the presence of a CSF maintenance signal. +G.8021 - GFP: dCSF is Client-specific GFP-F and GFP-T (resp. Frame and Transparent) sink processes. +dCSF-RDI: GFP client signal fail-remote defect indication is raised when a GFP client management frame with the RDI UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. +dCSF-RDI is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received. +dCSF-FDI: GFP client signal fail-forward defect indication is raised when a GFP client management frame with the FDI UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. +dCSF-FDI is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received. +dCSF-LOS: GFP client signal fail-loss of signal is raised when a GFP client management frame with the LOS UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. +dCSF-LOS is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received. + + + + + G.8021: LAG - fault cause will be raised if no ports are active for an aggregator. + + + + + G.8021: LAG - fault cause shall be raised if the number of active ports is less than the provisioned threshold. + + + + + G.806: The payload label mismatch defect (dPLM) shall be detected if the "accepted TSL" code does not match the "expected TSL" code. If the "accepted TSL" is "equipped non-specific", the mismatch is not detected (TSL: Trail Signal Label). +Payload type supervision checks that compatible adaptation functions are used at the source and the sink. +This is normally done by adding a signal type identifier at the source adaptation function and comparing it with the expected identifier at the sink. +If they do not match, a payload mismatch is detected. + + + + + G.806 - Server layer-specific GFP sink processes: GFP loss of frame delineation (dLFD) is raised when the frame delineation process (clause 6.3.1 of [ITU-T G.7041]) is not in the "SYNC" state. +dLFD is cleared when the frame delineation process is in the "SYNC" state. + + + + + G.806 - Common GFP sink processes: GFP extension header mismatch (dEXM) is raised when the accepted EXI (AcEXI) is different from the expected EXI. +dEXM is cleared when AcEXI matches the expected EXI or GFP_SF is active. + + + + + G.806 - Client-specific GFP-F (Frame) and GFP-T (Transparent) sink processes: GFP user payload mismatch (dUPM) is raised when the accepted UPI (AcUPI) is different from the expected UPI. +dUPM is cleared when AcUPI matches the expected UPI or GFP_SF is active. + + + @@ -3696,6 +3796,23 @@ Frame delay variation is a measure of the variations in the frame delay between + + + + + + + + + + + + + + + + + @@ -3711,125 +3828,7 @@ Frame delay variation is a measure of the variations in the frame delay between - - - - - G.8021: The loss of continuity defect is calculated at the ETH layer. It monitors the presence of continuity in ETH trails. - - - - - G.8021: Reception of a CCM frame with an invalid MEL value. -Monitoring of the connectivity in a maintenance entity group. - - - - - G.8021: Reception of a CCM frame with an invalid MEP value, but with valid MEL and MEG values. -Monitoring of the connectivity in a maintenance entity group. - - - - - - G.8021: Reception of a CCM frame with an invalid MEG value, but with a valid MEL value. -Monitoring of the connectivity in a maintenance entity group. - - - - - - G.8021: Reception of a CCM frame with an invalid periodicity value, but with valid MEL, MEG and MEP values. -It detects the configuration of different periodicities at different MEPs belonging to the same MEG. - - - - - - G.8021: Reception of a CCM frame with an invalid priority value, but with valid MEL, MEG, MEP and periodicity values. -It detects the configuration of different priorities for CCM at different MEPs belonging to the same MEG. - - - - - - G.8021: Reception of a LCK frame. - - - - - G.8021: Reception of an AIS frame. - - - - - G.8021: The defect is detected if there are MI_LM_DEGM (lmDegm of EthMepSink) consecutive bad seconds and cleared if there are MI_LM_M (lmM of EthMepSink) consecutive good seconds. -In order to declare a bad second the number of transmitted frames must exceed a threshold (MI_LM_TFMIN, lmTfMin of EthMepSink). -Furthermore, if the frame loss ratio (lost frames/transmitted frames) is greater than MI_LM_DEGTHR (lmDegThr of EthMepSink), a bad second is declared. -This defect is only defined for point-to-point ETH connections. It monitors the connectivity of an ETH trail. - - - - - - G.8021: Remote defect indicator defect, reception by an MEP (indexed by "i", this index not included in the "cause" cRDI) of a CCM frame with valid MEL, MEG, MEP and periodicity values and the RDI flag set to x; where x=0 (remote defect clear) and x=1 (remote defect set). - - - - - G.8021 - ETH layer: Reception of a CSF frame that indicates a client loss of signal (dCSF-LOS) or a client forward defect indication (dCSF-FDI) or a client reverse defect indication (dCSF-RDI). -The CSF (CSF-LOS, CSF-FDI, and CSF-RDI) defect is calculated at the ETH layer. It monitors the presence of a CSF maintenance signal. -G.8021 - GFP: dCSF is Client-specific GFP-F and GFP-T (resp. Frame and Transparent) sink processes. -dCSF-RDI: GFP client signal fail-remote defect indication is raised when a GFP client management frame with the RDI UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. -dCSF-RDI is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received. -dCSF-FDI: GFP client signal fail-forward defect indication is raised when a GFP client management frame with the FDI UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. -dCSF-FDI is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received. -dCSF-LOS: GFP client signal fail-loss of signal is raised when a GFP client management frame with the LOS UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. -dCSF-LOS is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received. - - - - - G.8021: LAG - fault cause will be raised if no ports are active for an aggregator. - - - - - G.8021: LAG - fault cause shall be raised if the number of active ports is less than the provisioned threshold. - - - - - G.806: The payload label mismatch defect (dPLM) shall be detected if the "accepted TSL" code does not match the "expected TSL" code. If the "accepted TSL" is "equipped non-specific", the mismatch is not detected (TSL: Trail Signal Label). -Payload type supervision checks that compatible adaptation functions are used at the source and the sink. -This is normally done by adding a signal type identifier at the source adaptation function and comparing it with the expected identifier at the sink. -If they do not match, a payload mismatch is detected. - - - - - G.806 - Server layer-specific GFP sink processes: GFP loss of frame delineation (dLFD) is raised when the frame delineation process (clause 6.3.1 of [ITU-T G.7041]) is not in the "SYNC" state. -dLFD is cleared when the frame delineation process is in the "SYNC" state. - - - - - G.806 - Common GFP sink processes: GFP extension header mismatch (dEXM) is raised when the accepted EXI (AcEXI) is different from the expected EXI. -dEXM is cleared when AcEXI matches the expected EXI or GFP_SF is active. - - - - - G.806 - Client-specific GFP-F (Frame) and GFP-T (Transparent) sink processes: GFP user payload mismatch (dUPM) is raised when the accepted UPI (AcUPI) is different from the expected UPI. -dUPM is cleared when AcUPI matches the expected UPI or GFP_SF is active. - - - - - - - +
diff --git a/YANG/tapi-eth@2019-03-31.yang b/YANG/tapi-eth@2019-03-31.yang index 7cd9ee91..7c18bcfb 100644 --- a/YANG/tapi-eth@2019-03-31.yang +++ b/YANG/tapi-eth@2019-03-31.yang @@ -76,34 +76,6 @@ module tapi-eth { reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model "; } - augment "/tapi-oam:update-oam-service/tapi-oam:input/tapi-oam:oam-service-point" { - container eth-oam-mep-service-point { - uses eth-oam-mep-service-point; - description "none"; - } - description "none"; - } - augment "/tapi-oam:create-oam-service/tapi-oam:input/tapi-oam:oam-service-point" { - container eth-oam-mep-service-point { - uses eth-oam-mep-service-point; - description "none"; - } - description "none"; - } - augment "/tapi-oam:create-oam-service/tapi-oam:input/tapi-oam:oam-service-point" { - container eth-oam-mip-service-point { - uses eth-oam-mip-service-point; - description "none"; - } - description "none"; - } - augment "/tapi-oam:update-oam-service/tapi-oam:input/tapi-oam:oam-service-point" { - container eth-oam-mip-service-point { - uses eth-oam-mip-service-point; - description "none"; - } - description "none"; - } augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" { container eth-connection-end-point-spec { uses eth-connection-end-point-spec; @@ -951,6 +923,34 @@ module tapi-eth { } description "none"; } + augment "/tapi-oam:create-oam-service/tapi-oam:input/tapi-oam:oam-service-point" { + container eth-oam-mep-service-point { + uses eth-oam-mep-service-point; + description "none"; + } + description "none"; + } + augment "/tapi-oam:create-oam-service/tapi-oam:input/tapi-oam:oam-service-point" { + container eth-oam-mip-service-point { + uses eth-oam-mip-service-point; + description "none"; + } + description "none"; + } + augment "/tapi-oam:update-oam-service/tapi-oam:input/tapi-oam:oam-service-point" { + container eth-oam-mep-service-point { + uses eth-oam-mep-service-point; + description "none"; + } + description "none"; + } + augment "/tapi-oam:update-oam-service/tapi-oam:input/tapi-oam:oam-service-point" { + container eth-oam-mip-service-point { + uses eth-oam-mip-service-point; + description "none"; + } + description "none"; + } /************************** * package object-classes **************************/ @@ -2504,6 +2504,105 @@ module tapi-eth { base ETH_PM_PARAMETER_NAME; description "none"; } + identity ETH_ALARM_CONDITION_NAME { + base tapi-oam:ALARM_CONDITION_NAME; + description "none"; + } + identity ETH_ALARM_CONDITION_NAME_LOSS_OF_CONTINUITY { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: The loss of continuity defect is calculated at the ETH layer. It monitors the presence of continuity in ETH trails."; + } + identity ETH_ALARM_CONDITION_NAME_UNEXPECTED_MEL { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: Reception of a CCM frame with an invalid MEL value. + Monitoring of the connectivity in a maintenance entity group."; + } + identity ETH_ALARM_CONDITION_NAME_UNEXPECTED_MEP { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: Reception of a CCM frame with an invalid MEP value, but with valid MEL and MEG values. + Monitoring of the connectivity in a maintenance entity group. + "; + } + identity ETH_ALARM_CONDITION_NAME_MISMERGE_UNEXPECTED_MEG { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: Reception of a CCM frame with an invalid MEG value, but with a valid MEL value. + Monitoring of the connectivity in a maintenance entity group. + "; + } + identity ETH_ALARM_CONDITION_NAME_UNEXPECTED_PERIODICITY { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: Reception of a CCM frame with an invalid periodicity value, but with valid MEL, MEG and MEP values. + It detects the configuration of different periodicities at different MEPs belonging to the same MEG. + "; + } + identity ETH_ALARM_CONDITION_NAME_UNEXPECTED_PRIORITY { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: Reception of a CCM frame with an invalid priority value, but with valid MEL, MEG, MEP and periodicity values. + It detects the configuration of different priorities for CCM at different MEPs belonging to the same MEG. + "; + } + identity ETH_ALARM_CONDITION_NAME_LOCKED { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: Reception of a LCK frame."; + } + identity ETH_ALARM_CONDITION_NAME_AIS { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: Reception of an AIS frame."; + } + identity ETH_ALARM_CONDITION_NAME_DEGRADED { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: The defect is detected if there are MI_LM_DEGM (lmDegm of EthMepSink) consecutive bad seconds and cleared if there are MI_LM_M (lmM of EthMepSink) consecutive good seconds. + In order to declare a bad second the number of transmitted frames must exceed a threshold (MI_LM_TFMIN, lmTfMin of EthMepSink). + Furthermore, if the frame loss ratio (lost frames/transmitted frames) is greater than MI_LM_DEGTHR (lmDegThr of EthMepSink), a bad second is declared. + This defect is only defined for point-to-point ETH connections. It monitors the connectivity of an ETH trail. + "; + } + identity ETH_ALARM_CONDITION_NAME_RDI { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: Remote defect indicator defect, reception by an MEP (indexed by 'i', this index not included in the 'cause' cRDI) of a CCM frame with valid MEL, MEG, MEP and periodicity values and the RDI flag set to x; where x=0 (remote defect clear) and x=1 (remote defect set)."; + } + identity ETH_ALARM_CONDITION_NAME_CSF { + base ETH_ALARM_CONDITION_NAME; + description "G.8021 - ETH layer: Reception of a CSF frame that indicates a client loss of signal (dCSF-LOS) or a client forward defect indication (dCSF-FDI) or a client reverse defect indication (dCSF-RDI). + The CSF (CSF-LOS, CSF-FDI, and CSF-RDI) defect is calculated at the ETH layer. It monitors the presence of a CSF maintenance signal. + G.8021 - GFP: dCSF is Client-specific GFP-F and GFP-T (resp. Frame and Transparent) sink processes. + dCSF-RDI: GFP client signal fail-remote defect indication is raised when a GFP client management frame with the RDI UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. + dCSF-RDI is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received. + dCSF-FDI: GFP client signal fail-forward defect indication is raised when a GFP client management frame with the FDI UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. + dCSF-FDI is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received. + dCSF-LOS: GFP client signal fail-loss of signal is raised when a GFP client management frame with the LOS UPI (as defined in Table 6-4 of [ITU-T G.7041]) is received. + dCSF-LOS is cleared when no such GFP client management frame is received in N x 1000 ms (a value of 3 is suggested for N), a valid GFP client data frame is received, or a GFP client management frame with the DCI UPI is received."; + } + identity ETH_ALARM_CONDITION_NAME_TOTAL_LINK_LOSS { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: LAG - fault cause will be raised if no ports are active for an aggregator."; + } + identity ETH_ALARM_CONDITION_NAME_PARTIAL_LINK_LOSS { + base ETH_ALARM_CONDITION_NAME; + description "G.8021: LAG - fault cause shall be raised if the number of active ports is less than the provisioned threshold."; + } + identity ETH_ALARM_CONDITION_NAME_PLM { + base ETH_ALARM_CONDITION_NAME; + description "G.806: The payload label mismatch defect (dPLM) shall be detected if the 'accepted TSL' code does not match the 'expected TSL' code. If the 'accepted TSL' is 'equipped non-specific', the mismatch is not detected (TSL: Trail Signal Label). + Payload type supervision checks that compatible adaptation functions are used at the source and the sink. + This is normally done by adding a signal type identifier at the source adaptation function and comparing it with the expected identifier at the sink. + If they do not match, a payload mismatch is detected."; + } + identity ETH_ALARM_CONDITION_NAME_LFD { + base ETH_ALARM_CONDITION_NAME; + description "G.806 - Server layer-specific GFP sink processes: GFP loss of frame delineation (dLFD) is raised when the frame delineation process (clause 6.3.1 of [ITU-T G.7041]) is not in the 'SYNC' state. + dLFD is cleared when the frame delineation process is in the 'SYNC' state."; + } + identity ETH_ALARM_CONDITION_NAME_EXM { + base ETH_ALARM_CONDITION_NAME; + description "G.806 - Common GFP sink processes: GFP extension header mismatch (dEXM) is raised when the accepted EXI (AcEXI) is different from the expected EXI. + dEXM is cleared when AcEXI matches the expected EXI or GFP_SF is active."; + } + identity ETH_ALARM_CONDITION_NAME_UPM { + base ETH_ALARM_CONDITION_NAME; + description "G.806 - Client-specific GFP-F (Frame) and GFP-T (Transparent) sink processes: GFP user payload mismatch (dUPM) is raised when the accepted UPI (AcUPI) is different from the expected UPI. + dUPM is cleared when AcUPI matches the expected UPI or GFP_SF is active."; + } grouping priority-configuration { leaf priority { type uint64 { @@ -3408,5 +3507,11 @@ module tapi-eth { } description "none"; } + typedef eth-alarm-condition-name { + type identityref { + base ETH_ALARM_CONDITION_NAME; + } + description "none"; + } } From fff795940f9f3a9cebe8971a2537cb6764228d61 Mon Sep 17 00:00:00 2001 From: karthik-sethuraman Date: Fri, 28 Jun 2019 18:22:11 -0400 Subject: [PATCH 3/3] UML/YANG/TREE file updates to align & be consistent with PR #441 - Updated all UML-Operations/YANG-RPCs to use UUIDs so that it is consistent with the REST CRUD data APIs flavor - used consistent labels (uuid) for the UUID key parameters and fixed parameter type to TapiCommon::Uuid (instead of String) - other minor bug fixes (explicit config=false statements) --- UML/TapiCommon.notation | 491 +++-- UML/TapiCommon.uml | 33 +- UML/TapiConnectivity.notation | 640 +++--- UML/TapiConnectivity.uml | 87 +- UML/TapiEquipment.notation | 1220 +++++------ UML/TapiEquipment.uml | 18 +- UML/TapiNotification.notation | 280 +-- UML/TapiNotification.uml | 75 +- UML/TapiOam.notation | 2230 +++++++++++--------- UML/TapiOam.uml | 299 ++- UML/TapiPathComputation.notation | 945 +++++---- UML/TapiPathComputation.uml | 45 +- UML/TapiTopology.notation | 949 +++++---- UML/TapiTopology.uml | 90 +- UML/TapiVirtualNetwork.notation | 629 +++--- UML/TapiVirtualNetwork.uml | 51 +- YANG/tapi-common@2019-03-31.tree | 6 +- YANG/tapi-common@2019-03-31.yang | 29 +- YANG/tapi-connectivity@2019-03-31.tree | 23 +- YANG/tapi-connectivity@2019-03-31.yang | 87 +- YANG/tapi-equipment@2019-03-31.tree | 4 +- YANG/tapi-equipment@2019-03-31.yang | 24 +- YANG/tapi-eth@2019-03-31.tree | 132 +- YANG/tapi-notification@2019-03-31.tree | 17 +- YANG/tapi-notification@2019-03-31.yang | 60 +- YANG/tapi-oam@2019-03-31.tree | 197 +- YANG/tapi-oam@2019-03-31.yang | 319 ++- YANG/tapi-path-computation@2019-03-31.tree | 53 +- YANG/tapi-path-computation@2019-03-31.yang | 52 +- YANG/tapi-photonic-media@2019-03-31.tree | 12 +- YANG/tapi-topology@2019-03-31.tree | 16 +- YANG/tapi-topology@2019-03-31.yang | 88 +- YANG/tapi-virtual-network@2019-03-31.tree | 34 +- YANG/tapi-virtual-network@2019-03-31.yang | 44 +- 34 files changed, 5341 insertions(+), 3938 deletions(-) diff --git a/UML/TapiCommon.notation b/UML/TapiCommon.notation index 7eaab241..f8102ac7 100644 --- a/UML/TapiCommon.notation +++ b/UML/TapiCommon.notation @@ -659,53 +659,53 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -713,65 +713,65 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -1086,14 +1086,41 @@ + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + @@ -1109,7 +1136,7 @@ - + @@ -1605,37 +1632,37 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -1731,58 +1758,58 @@ - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + @@ -2142,14 +2169,6 @@ - - - - - - - - @@ -2180,14 +2199,6 @@ - - - - - - - - @@ -2222,14 +2233,6 @@ - - - - - - - - @@ -2264,14 +2267,6 @@ - - - - - - - - @@ -2306,13 +2301,129 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + @@ -2320,55 +2431,75 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UML/TapiCommon.uml b/UML/TapiCommon.uml index b7b6f8a9..3bdcb463 100644 --- a/UML/TapiCommon.uml +++ b/UML/TapiCommon.uml @@ -45,7 +45,8 @@ License: This module is distributed under the Apache License 2.0 - UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. An UUID carries no semantics with respect to the purpose or state of the entity. + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 @@ -54,8 +55,9 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 - - List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity. + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. @@ -75,8 +77,9 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 - - List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity. + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. @@ -617,8 +620,14 @@ The timeticks type represents a non-negative integer that represents the time, m - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + @@ -629,8 +638,14 @@ The timeticks type represents a non-negative integer that represents the time, m - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + diff --git a/UML/TapiConnectivity.notation b/UML/TapiConnectivity.notation index 1558131e..77fdb395 100644 --- a/UML/TapiConnectivity.notation +++ b/UML/TapiConnectivity.notation @@ -1010,149 +1010,149 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -1669,185 +1669,185 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -5790,117 +5790,117 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -6205,145 +6205,145 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/UML/TapiConnectivity.uml b/UML/TapiConnectivity.uml index 6f56e6f7..7bdf1b50 100644 --- a/UML/TapiConnectivity.uml +++ b/UML/TapiConnectivity.uml @@ -353,8 +353,6 @@ License: This module is distributed under the Apache License 2.0 - -
@@ -365,6 +363,7 @@ License: This module is distributed under the Apache License 2.0 + @@ -379,8 +378,15 @@ License: This module is distributed under the Apache License 2.0 - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + @@ -391,16 +397,34 @@ License: This module is distributed under the Apache License 2.0 - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + @@ -433,10 +457,21 @@ License: This module is distributed under the Apache License 2.0 - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + @@ -469,22 +504,27 @@ License: This module is distributed under the Apache License 2.0 - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - - - - - - - - - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + @@ -1406,10 +1446,6 @@ The determination of a fault condition on a serial compound link connection with - - - - @@ -1446,4 +1482,5 @@ The determination of a fault condition on a serial compound link connection with + diff --git a/UML/TapiEquipment.notation b/UML/TapiEquipment.notation index e32b875a..a4c54bf9 100644 --- a/UML/TapiEquipment.notation +++ b/UML/TapiEquipment.notation @@ -339,157 +339,157 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -849,195 +849,195 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -1617,213 +1617,213 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -2300,265 +2300,265 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3078,133 +3078,133 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -3517,165 +3517,165 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/UML/TapiEquipment.uml b/UML/TapiEquipment.uml index 0ace3a32..93a22c65 100644 --- a/UML/TapiEquipment.uml +++ b/UML/TapiEquipment.uml @@ -648,13 +648,27 @@ In some cases it may not be relevant to represent the pin detail and hence the r - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + diff --git a/UML/TapiNotification.notation b/UML/TapiNotification.notation index 20c883eb..133eaefd 100644 --- a/UML/TapiNotification.notation +++ b/UML/TapiNotification.notation @@ -743,117 +743,117 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -1079,144 +1079,144 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/UML/TapiNotification.uml b/UML/TapiNotification.uml index 4d1e7252..d716f92a 100644 --- a/UML/TapiNotification.uml +++ b/UML/TapiNotification.uml @@ -88,26 +88,75 @@ Copyright: 2018 Open Networking Foundation (ONF). + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + + + + + - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + + + + - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + @@ -118,8 +167,15 @@ Copyright: 2018 Open Networking Foundation (ONF). - - + + + UUID of the associated Notification Subscription Service: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + @@ -467,4 +523,7 @@ This specifics of this is typically dependent on the implementation protocol &am + + + diff --git a/UML/TapiOam.notation b/UML/TapiOam.notation index af0d2639..1e8250c0 100644 --- a/UML/TapiOam.notation +++ b/UML/TapiOam.notation @@ -1088,173 +1088,189 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - - - - - - - - - + @@ -2207,215 +2223,235 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + - - - + + + - - - + + + @@ -4541,165 +4577,205 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -5755,205 +5831,255 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -7198,141 +7324,157 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - - - - - - - - - - - - - - - - - + @@ -8232,175 +8374,195 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -9556,245 +9718,245 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -10544,305 +10706,305 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -11389,109 +11551,109 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -11634,135 +11796,135 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/UML/TapiOam.uml b/UML/TapiOam.uml index f633a3c8..057401e9 100644 --- a/UML/TapiOam.uml +++ b/UML/TapiOam.uml @@ -312,33 +312,65 @@ Identification of the PM Session for which the TCA Function was configured. + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + - - - - + + + + - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + @@ -350,7 +382,14 @@ Identification of the PM Session for which the TCA Function was configured. - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + @@ -359,47 +398,90 @@ Identification of the PM Session for which the TCA Function was configured. - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + - - - - + + + + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - - - - - + + UUID of the parent OamService: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - + + + UUID of the associated SIP to be monitored: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - - + + + UUID of the CSEP to be monitored: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + + + + + @@ -409,25 +491,37 @@ Identification of the PM Session for which the TCA Function was configured. - - - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + - - - @@ -436,10 +530,14 @@ Identification of the PM Session for which the TCA Function was configured. - - - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + @@ -448,25 +546,57 @@ Identification of the PM Session for which the TCA Function was configured. + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - - - - - - + + UUID of the associated OamService: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - + + UUID of the associated OSEPs: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + UUID of the OamProfile to be applied: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + + + + + + @@ -476,15 +606,37 @@ Identification of the PM Session for which the TCA Function was configured. - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + + + UUID of the OamProfile to be applied: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + - @@ -498,12 +650,26 @@ Identification of the PM Session for which the TCA Function was configured. - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + @@ -518,9 +684,20 @@ Identification of the PM Session for which the TCA Function was configured. + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + @@ -535,10 +712,21 @@ Identification of the PM Session for which the TCA Function was configured. - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + @@ -550,12 +738,26 @@ Identification of the PM Session for which the TCA Function was configured. - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + @@ -1054,21 +1256,18 @@ Identification of the PM Session for which the TCA Function was configured. - - - diff --git a/UML/TapiPathComputation.notation b/UML/TapiPathComputation.notation index 8b7b7382..710184c2 100644 --- a/UML/TapiPathComputation.notation +++ b/UML/TapiPathComputation.notation @@ -735,221 +735,229 @@ - - - + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -1797,275 +1805,285 @@ - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2121,7 +2139,7 @@ - + @@ -2621,125 +2639,198 @@ - - - + + + + + + + + + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + + + + + + + + + @@ -2807,7 +2898,7 @@ - + @@ -2979,155 +3070,165 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + diff --git a/UML/TapiPathComputation.uml b/UML/TapiPathComputation.uml index 57dfcb90..f50d6a46 100644 --- a/UML/TapiPathComputation.uml +++ b/UML/TapiPathComputation.uml @@ -101,30 +101,52 @@ License: This module is distributed under the Apache License 2.0 + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + - - - - + + + + - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + @@ -135,8 +157,15 @@ License: This module is distributed under the Apache License 2.0 - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + diff --git a/UML/TapiTopology.notation b/UML/TapiTopology.notation index 72fff921..30a288ee 100644 --- a/UML/TapiTopology.notation +++ b/UML/TapiTopology.notation @@ -1657,213 +1657,312 @@ - - - + + + + + + + + + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + + + + + + + + + @@ -2248,265 +2347,275 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + @@ -2783,133 +2892,133 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -3273,165 +3382,165 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/UML/TapiTopology.uml b/UML/TapiTopology.uml index 5a94a171..aa397f19 100644 --- a/UML/TapiTopology.uml +++ b/UML/TapiTopology.uml @@ -328,39 +328,95 @@ License: This module is distributed under the Apache License 2.0 - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - + + + UUID of the parent Topology: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - + + + UUID of the Node: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - + + + UUID of the parent Node's Topology: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - + + + UUID of the parent Node: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - + + + UUID of the parent Topology: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + - - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + @@ -509,7 +565,7 @@ At the lowest level of recursion, an FD (within a network element (NE)) represen - + diff --git a/UML/TapiVirtualNetwork.notation b/UML/TapiVirtualNetwork.notation index daba84cf..46be1be4 100644 --- a/UML/TapiVirtualNetwork.notation +++ b/UML/TapiVirtualNetwork.notation @@ -371,157 +371,157 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -866,208 +866,208 @@ - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + @@ -1183,10 +1183,6 @@ - - - - @@ -1205,7 +1201,7 @@ - + @@ -1297,53 +1293,139 @@ - - - + + + + + + + + + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + parametersName + parametersDirection + parametersMultiplicity + visibility + name + parametersType + returnType + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + + + + + + + + + @@ -1373,6 +1455,7 @@ + @@ -1451,65 +1534,75 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + diff --git a/UML/TapiVirtualNetwork.uml b/UML/TapiVirtualNetwork.uml index 6b078e69..3f93390b 100644 --- a/UML/TapiVirtualNetwork.uml +++ b/UML/TapiVirtualNetwork.uml @@ -91,22 +91,59 @@ License: This module is distributed under the Apache License 2.0 - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + + + + List of names. This value is unique in some namespace but may change during the life of the entity. +A name carries no semantics with respect to the purpose of the entity. + + + + + + - - + + - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + - + + + UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. +An UUID carries no semantics with respect to the purpose or state of the entity. +UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. +Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} +Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6 + + + @@ -188,7 +225,7 @@ At the lowest level of recursion, a FC represents a cross-connection within an N - + @@ -369,4 +406,6 @@ The ForwadingConstruct can be considered as a component and the EndPoint as a Po + + diff --git a/YANG/tapi-common@2019-03-31.tree b/YANG/tapi-common@2019-03-31.tree index e658d9f1..ff5abf70 100644 --- a/YANG/tapi-common@2019-03-31.tree +++ b/YANG/tapi-common@2019-03-31.tree @@ -26,7 +26,7 @@ module: tapi-common rpcs: +---x get-service-interface-point-details | +---w input - | | +---w sip-id-or-name? string + | | +---w uuid? uuid | +--ro output | +--ro sip | +--ro layer-protocol-name? layer-protocol-name @@ -68,5 +68,5 @@ module: tapi-common | +--ro unit? capacity-unit +---x update-service-interface-point +---w input - +---w sip-id-or-name? string - +---w state? administrative-state + +---w uuid? uuid + +---w state? administrative-state diff --git a/YANG/tapi-common@2019-03-31.yang b/YANG/tapi-common@2019-03-31.yang index c52262bb..d1b77426 100644 --- a/YANG/tapi-common@2019-03-31.yang +++ b/YANG/tapi-common@2019-03-31.yang @@ -100,7 +100,8 @@ module tapi-common { grouping global-class { leaf uuid { type uuid; - description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. An UUID carries no semantics with respect to the purpose or state of the entity. + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; @@ -108,7 +109,8 @@ module tapi-common { list name { key 'value-name'; uses name-and-value; - description "List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity."; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } description "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. "; } @@ -128,7 +130,8 @@ module tapi-common { list name { key 'value-name'; uses name-and-value; - description "List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity."; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } description "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. "; } @@ -612,9 +615,13 @@ module tapi-common { rpc get-service-interface-point-details { description "none"; input { - leaf sip-id-or-name { - type string; - description "none"; + leaf uuid { + type uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -637,9 +644,13 @@ module tapi-common { rpc update-service-interface-point { description "none"; input { - leaf sip-id-or-name { - type string; - description "none"; + leaf uuid { + type uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } leaf state { type administrative-state; diff --git a/YANG/tapi-connectivity@2019-03-31.tree b/YANG/tapi-connectivity@2019-03-31.tree index 939a66f5..50f8453f 100644 --- a/YANG/tapi-connectivity@2019-03-31.tree +++ b/YANG/tapi-connectivity@2019-03-31.tree @@ -102,7 +102,7 @@ module: tapi-connectivity | | +--rw max-switch-times? uint64 | | +--rw preferred-restoration-layer* tapi-common:layer-protocol-name | | +--rw selection-control? selection-control - | +--rw direction? tapi-common:forwarding-direction + | +--ro direction? tapi-common:forwarding-direction | +--rw layer-protocol-name? tapi-common:layer-protocol-name | +--rw uuid uuid | +--rw name* [value-name] @@ -213,7 +213,7 @@ module: tapi-connectivity rpcs: +---x get-connection-details | +---w input - | | +---w connection-id-or-name? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro connection | +--ro connection-end-point* [topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid] @@ -397,7 +397,7 @@ module: tapi-connectivity | +--ro lifecycle-state? lifecycle-state +---x get-connectivity-service-details | +---w input - | | +---w service-id-or-name? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro service | +--ro end-point* [local-id] @@ -510,6 +510,11 @@ module: tapi-connectivity | +--ro lifecycle-state? lifecycle-state +---x create-connectivity-service | +---w input + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string + | | +---w layer-protocol-name? tapi-common:layer-protocol-name | | +---w end-point* [local-id] | | | +---w layer-protocol-name? tapi-common:layer-protocol-name | | | +---w layer-protocol-qualifier? tapi-common:layer-protocol-qualifier @@ -720,7 +725,10 @@ module: tapi-connectivity | +--ro lifecycle-state? lifecycle-state +---x update-connectivity-service | +---w input - | | +---w service-id-or-name? string + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w end-point* [local-id] | | | +---w layer-protocol-name? tapi-common:layer-protocol-name | | | +---w layer-protocol-qualifier? tapi-common:layer-protocol-qualifier @@ -931,13 +939,10 @@ module: tapi-connectivity | +--ro lifecycle-state? lifecycle-state +---x delete-connectivity-service | +---w input - | +---w service-id-or-name? string + | +---w uuid? tapi-common:uuid +---x get-connection-end-point-details +---w input - | +---w topology-id-or-name? string - | +---w node-id-or-name? string - | +---w nep-id-or-name? string - | +---w cep-id-or-name? string + | +---w uuid? tapi-common:uuid +--ro output +--ro connection-end-point +--ro layer-protocol-name? tapi-common:layer-protocol-name diff --git a/YANG/tapi-connectivity@2019-03-31.yang b/YANG/tapi-connectivity@2019-03-31.yang index 0b6ab339..571c6cc9 100644 --- a/YANG/tapi-connectivity@2019-03-31.yang +++ b/YANG/tapi-connectivity@2019-03-31.yang @@ -316,6 +316,7 @@ module tapi-connectivity { } leaf direction { type tapi-common:forwarding-direction; + config false; description "none"; } leaf layer-protocol-name { @@ -725,9 +726,13 @@ module tapi-connectivity { rpc get-connection-details { description "none"; input { - leaf connection-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -750,9 +755,13 @@ module tapi-connectivity { rpc get-connectivity-service-details { description "none"; input { - leaf service-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -765,6 +774,24 @@ module tapi-connectivity { rpc create-connectivity-service { description "none"; input { + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; + } + leaf layer-protocol-name { + type tapi-common:layer-protocol-name; + description "none"; + } list end-point { key 'local-id'; min-elements 2; @@ -803,9 +830,19 @@ module tapi-connectivity { rpc update-connectivity-service { description "none"; input { - leaf service-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } list end-point { key 'local-id'; @@ -844,30 +881,26 @@ module tapi-connectivity { rpc delete-connectivity-service { description "none"; input { - leaf service-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } } rpc get-connection-end-point-details { description "none"; input { - leaf topology-id-or-name { - type string; - description "none"; - } - leaf node-id-or-name { - type string; - description "none"; - } - leaf nep-id-or-name { - type string; - description "none"; - } - leaf cep-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { diff --git a/YANG/tapi-equipment@2019-03-31.tree b/YANG/tapi-equipment@2019-03-31.tree index cb71e0b3..570fa3ba 100644 --- a/YANG/tapi-equipment@2019-03-31.tree +++ b/YANG/tapi-equipment@2019-03-31.tree @@ -263,7 +263,7 @@ module: tapi-equipment | +--ro value? string +---x get-device | +---w input - | | +---w device-id? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro device | +--ro equipment* [uuid] @@ -361,7 +361,7 @@ module: tapi-equipment | +--ro value? string +---x get-physical-span +---w input - | +---w span-id? string + | +---w uuid? tapi-common:uuid +--ro output +--ro physical-span +--ro access-port* [device-uuid access-port-uuid] diff --git a/YANG/tapi-equipment@2019-03-31.yang b/YANG/tapi-equipment@2019-03-31.yang index d4caa13a..8a1bbe03 100644 --- a/YANG/tapi-equipment@2019-03-31.yang +++ b/YANG/tapi-equipment@2019-03-31.yang @@ -483,6 +483,7 @@ module tapi-equipment { grouping holder { container occupying-fru { uses equipment-ref; + config false; description "The FRU that is occupying the holder. A holder may be unoccupied. An FRU may occupy more hat one holder (using or blocking are intentionally not distinguished here)."; @@ -516,6 +517,7 @@ module tapi-equipment { list access-port { uses access-port-ref; key "device-uuid access-port-uuid"; + config false; min-elements 2; max-elements 2; description "none"; @@ -536,11 +538,13 @@ module tapi-equipment { list adjacent-strand { uses abstract-strand-ref; key "physical-span-uuid abstract-strand-local-id"; + config false; description "none"; } list spliced-strand { uses abstract-strand-ref; key "physical-span-uuid abstract-strand-local-id"; + config false; max-elements 2; description "none"; } @@ -645,9 +649,13 @@ module tapi-equipment { rpc get-device { description "none"; input { - leaf device-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -660,9 +668,13 @@ module tapi-equipment { rpc get-physical-span { description "none"; input { - leaf span-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { diff --git a/YANG/tapi-eth@2019-03-31.tree b/YANG/tapi-eth@2019-03-31.tree index 36aacb46..b15430a8 100644 --- a/YANG/tapi-eth@2019-03-31.tree +++ b/YANG/tapi-eth@2019-03-31.tree @@ -1,71 +1,5 @@ module: tapi-eth - augment /tapi-oam:update-oam-service/tapi-oam:input/tapi-oam:oam-service-point: - +-- eth-oam-mep-service-point - +-- eth-mep-sink - | +-- ais-priority? uint64 - | +-- ais-period? oam-period - | +-- is-csf-reported? boolean - | +-- is-csf-rdi-fdi-enabled? boolean - | +--ro bandwidth-report - | | +--ro source-mac-address? mac-address - | | +--ro port-id? uint64 - | | +--ro nominal-bandwidth? uint64 - | | +--ro current-bandwidth? uint64 - | +-- lm-degm? uint64 - | +-- lm-deg-thr? uint64 - | +-- lm-m? uint64 - | +-- lm-tf-min? uint64 - | +-- peer-mep-identifier* uint64 - | +-- unexpected-ltr-received? uint64 - +-- eth-mep-source - | +-- aps-priority? uint64 - | +-- csf-priority? uint64 - | +-- csf-period? oam-period - | +-- csf-config? csf-config - +-- eth-mep-common - +-- cc-priority? uint64 - +-- lck-period? oam-period - +-- lck-priority? uint64 - +-- mep-identifier? uint64 - +-- codirectional? boolean - augment /tapi-oam:create-oam-service/tapi-oam:input/tapi-oam:oam-service-point: - +-- eth-oam-mep-service-point - +-- eth-mep-sink - | +-- ais-priority? uint64 - | +-- ais-period? oam-period - | +-- is-csf-reported? boolean - | +-- is-csf-rdi-fdi-enabled? boolean - | +--ro bandwidth-report - | | +--ro source-mac-address? mac-address - | | +--ro port-id? uint64 - | | +--ro nominal-bandwidth? uint64 - | | +--ro current-bandwidth? uint64 - | +-- lm-degm? uint64 - | +-- lm-deg-thr? uint64 - | +-- lm-m? uint64 - | +-- lm-tf-min? uint64 - | +-- peer-mep-identifier* uint64 - | +-- unexpected-ltr-received? uint64 - +-- eth-mep-source - | +-- aps-priority? uint64 - | +-- csf-priority? uint64 - | +-- csf-period? oam-period - | +-- csf-config? csf-config - +-- eth-mep-common - +-- cc-priority? uint64 - +-- lck-period? oam-period - +-- lck-priority? uint64 - +-- mep-identifier? uint64 - +-- codirectional? boolean - augment /tapi-oam:create-oam-service/tapi-oam:input/tapi-oam:oam-service-point: - +-- eth-oam-mip-service-point - +-- eth-mip-common - +--ro is-full-mip? boolean - augment /tapi-oam:update-oam-service/tapi-oam:input/tapi-oam:oam-service-point: - +-- eth-oam-mip-service-point - +-- eth-mip-common - +--ro is-full-mip? boolean augment /tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point: +--ro eth-connection-end-point-spec +--ro ety-term @@ -2598,3 +2532,69 @@ module: tapi-eth +-- eth-test-job-sink-point | +-- source-address? mac-address +-- number? uint64 + augment /tapi-oam:create-oam-service/tapi-oam:input/tapi-oam:oam-service-point: + +-- eth-oam-mep-service-point + +-- eth-mep-sink + | +-- ais-priority? uint64 + | +-- ais-period? oam-period + | +-- is-csf-reported? boolean + | +-- is-csf-rdi-fdi-enabled? boolean + | +--ro bandwidth-report + | | +--ro source-mac-address? mac-address + | | +--ro port-id? uint64 + | | +--ro nominal-bandwidth? uint64 + | | +--ro current-bandwidth? uint64 + | +-- lm-degm? uint64 + | +-- lm-deg-thr? uint64 + | +-- lm-m? uint64 + | +-- lm-tf-min? uint64 + | +-- peer-mep-identifier* uint64 + | +-- unexpected-ltr-received? uint64 + +-- eth-mep-source + | +-- aps-priority? uint64 + | +-- csf-priority? uint64 + | +-- csf-period? oam-period + | +-- csf-config? csf-config + +-- eth-mep-common + +-- cc-priority? uint64 + +-- lck-period? oam-period + +-- lck-priority? uint64 + +-- mep-identifier? uint64 + +-- codirectional? boolean + augment /tapi-oam:create-oam-service/tapi-oam:input/tapi-oam:oam-service-point: + +-- eth-oam-mip-service-point + +-- eth-mip-common + +--ro is-full-mip? boolean + augment /tapi-oam:update-oam-service/tapi-oam:input/tapi-oam:oam-service-point: + +-- eth-oam-mep-service-point + +-- eth-mep-sink + | +-- ais-priority? uint64 + | +-- ais-period? oam-period + | +-- is-csf-reported? boolean + | +-- is-csf-rdi-fdi-enabled? boolean + | +--ro bandwidth-report + | | +--ro source-mac-address? mac-address + | | +--ro port-id? uint64 + | | +--ro nominal-bandwidth? uint64 + | | +--ro current-bandwidth? uint64 + | +-- lm-degm? uint64 + | +-- lm-deg-thr? uint64 + | +-- lm-m? uint64 + | +-- lm-tf-min? uint64 + | +-- peer-mep-identifier* uint64 + | +-- unexpected-ltr-received? uint64 + +-- eth-mep-source + | +-- aps-priority? uint64 + | +-- csf-priority? uint64 + | +-- csf-period? oam-period + | +-- csf-config? csf-config + +-- eth-mep-common + +-- cc-priority? uint64 + +-- lck-period? oam-period + +-- lck-priority? uint64 + +-- mep-identifier? uint64 + +-- codirectional? boolean + augment /tapi-oam:update-oam-service/tapi-oam:input/tapi-oam:oam-service-point: + +-- eth-oam-mip-service-point + +-- eth-mip-common + +--ro is-full-mip? boolean diff --git a/YANG/tapi-notification@2019-03-31.tree b/YANG/tapi-notification@2019-03-31.tree index 6c4661f0..c50be094 100644 --- a/YANG/tapi-notification@2019-03-31.tree +++ b/YANG/tapi-notification@2019-03-31.tree @@ -83,6 +83,10 @@ module: tapi-notification | +--ro supported-object-types* tapi-common:object-type +---x create-notification-subscription-service | +---w input + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w subscription-filter | | | +---w requested-notification-types* notification-type | | | +---w requested-object-types* tapi-common:object-type @@ -146,7 +150,10 @@ module: tapi-notification | +--ro value? string +---x update-notification-subscription-service | +---w input - | | +---w subscription-id-or-name? string + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w subscription-filter | | | +---w requested-notification-types* notification-type | | | +---w requested-object-types* tapi-common:object-type @@ -157,7 +164,7 @@ module: tapi-notification | | | +---w name* [value-name] | | | +---w value-name string | | | +---w value? string - | | +---w subscription-state? subscription-state + | | +---w subscription-state? subscription-state | +--ro output | +--ro subscription-service | +--ro notification* [uuid] @@ -210,10 +217,10 @@ module: tapi-notification | +--ro value? string +---x delete-notification-subscription-service | +---w input - | +---w subscription-id-or-name? string + | +---w uuid? tapi-common:uuid +---x get-notification-subscription-service-details | +---w input - | | +---w subscription-id-or-name? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro subscription-service | +--ro notification* [uuid] @@ -317,7 +324,7 @@ module: tapi-notification | +--ro value? string +---x get-notification-list +---w input - | +---w subscription-id-or-name? string + | +---w subscription-id? tapi-common:uuid | +---w time-range | +---w end-time? date-and-time | +---w start-time? date-and-time diff --git a/YANG/tapi-notification@2019-03-31.yang b/YANG/tapi-notification@2019-03-31.yang index 5af90a2c..2d9f8a1f 100644 --- a/YANG/tapi-notification@2019-03-31.yang +++ b/YANG/tapi-notification@2019-03-31.yang @@ -332,6 +332,20 @@ module tapi-notification { rpc create-notification-subscription-service { description "none"; input { + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; + } container subscription-filter { uses subscription-filter; description "none"; @@ -351,9 +365,19 @@ module tapi-notification { rpc update-notification-subscription-service { description "none"; input { - leaf subscription-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } container subscription-filter { uses subscription-filter; @@ -374,18 +398,26 @@ module tapi-notification { rpc delete-notification-subscription-service { description "none"; input { - leaf subscription-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } } rpc get-notification-subscription-service-details { description "none"; input { - leaf subscription-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -408,9 +440,13 @@ module tapi-notification { rpc get-notification-list { description "none"; input { - leaf subscription-id-or-name { - type string; - description "none"; + leaf subscription-id { + type tapi-common:uuid; + description "UUID of the associated Notification Subscription Service: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } container time-range { uses tapi-common:time-range; diff --git a/YANG/tapi-oam@2019-03-31.tree b/YANG/tapi-oam@2019-03-31.tree index c34ac4d5..9009a8fc 100644 --- a/YANG/tapi-oam@2019-03-31.tree +++ b/YANG/tapi-oam@2019-03-31.tree @@ -192,29 +192,33 @@ module: tapi-oam rpcs: +---x create-oam-service | +---w input - | | +---w oam-service-point* [local-id] - | | | +---w service-interface-point - | | | | +---w service-interface-point-uuid? -> /tapi-common:context/service-interface-point/uuid - | | | +---w connectivity-service-end-point - | | | | +---w connectivity-service-uuid? -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid - | | | | +---w connectivity-service-end-point-local-id? -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id - | | | +---w mep - | | | | +---w meg-uuid? -> /tapi-common:context/tapi-oam:oam-context/meg/uuid - | | | | +---w mep-local-id? -> /tapi-common:context/tapi-oam:oam-context/meg/mep/local-id - | | | +---w mip - | | | | +---w meg-uuid? -> /tapi-common:context/tapi-oam:oam-context/meg/uuid - | | | | +---w mip-local-id? -> /tapi-common:context/tapi-oam:oam-context/meg/mip/local-id - | | | +---w layer-protocol-name? tapi-common:layer-protocol-name - | | | +---w is-mip? boolean - | | | +---w local-id string - | | | +---w name* [value-name] - | | | | +---w value-name string - | | | | +---w value? string - | | | +---w administrative-state? administrative-state - | | | +---w operational-state? operational-state - | | | +---w lifecycle-state? lifecycle-state + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w layer-protocol-name? tapi-common:layer-protocol-name | | +---w state? tapi-common:administrative-state + | | +---w oam-service-point* [local-id] + | | +---w service-interface-point + | | | +---w service-interface-point-uuid? -> /tapi-common:context/service-interface-point/uuid + | | +---w connectivity-service-end-point + | | | +---w connectivity-service-uuid? -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid + | | | +---w connectivity-service-end-point-local-id? -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id + | | +---w mep + | | | +---w meg-uuid? -> /tapi-common:context/tapi-oam:oam-context/meg/uuid + | | | +---w mep-local-id? -> /tapi-common:context/tapi-oam:oam-context/meg/mep/local-id + | | +---w mip + | | | +---w meg-uuid? -> /tapi-common:context/tapi-oam:oam-context/meg/uuid + | | | +---w mip-local-id? -> /tapi-common:context/tapi-oam:oam-context/meg/mip/local-id + | | +---w layer-protocol-name? tapi-common:layer-protocol-name + | | +---w is-mip? boolean + | | +---w local-id string + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string + | | +---w administrative-state? administrative-state + | | +---w operational-state? operational-state + | | +---w lifecycle-state? lifecycle-state | +--ro output | +--ro oam-service | +--ro layer-protocol-name? tapi-common:layer-protocol-name @@ -250,10 +254,10 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x delete-oam-service | +---w input - | +---w oam-service-id? string + | +---w uuid? tapi-common:uuid +---x get-oam-service | +---w input - | | +---w oam-service-id? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro oam-service | +--ro layer-protocol-name? tapi-common:layer-protocol-name @@ -323,7 +327,7 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x get-meg | +---w input - | | +---w oam-service-id? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro meg | +--ro mep* [local-id] @@ -349,29 +353,32 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x update-oam-service | +---w input - | | +---w oam-service-id? string - | | +---w oam-service-point* [local-id] - | | | +---w service-interface-point - | | | | +---w service-interface-point-uuid? -> /tapi-common:context/service-interface-point/uuid - | | | +---w connectivity-service-end-point - | | | | +---w connectivity-service-uuid? -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid - | | | | +---w connectivity-service-end-point-local-id? -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id - | | | +---w mep - | | | | +---w meg-uuid? -> /tapi-common:context/tapi-oam:oam-context/meg/uuid - | | | | +---w mep-local-id? -> /tapi-common:context/tapi-oam:oam-context/meg/mep/local-id - | | | +---w mip - | | | | +---w meg-uuid? -> /tapi-common:context/tapi-oam:oam-context/meg/uuid - | | | | +---w mip-local-id? -> /tapi-common:context/tapi-oam:oam-context/meg/mip/local-id - | | | +---w layer-protocol-name? tapi-common:layer-protocol-name - | | | +---w is-mip? boolean - | | | +---w local-id string - | | | +---w name* [value-name] - | | | | +---w value-name string - | | | | +---w value? string - | | | +---w administrative-state? administrative-state - | | | +---w operational-state? operational-state - | | | +---w lifecycle-state? lifecycle-state + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w state? tapi-common:administrative-state + | | +---w oam-service-point* [local-id] + | | +---w service-interface-point + | | | +---w service-interface-point-uuid? -> /tapi-common:context/service-interface-point/uuid + | | +---w connectivity-service-end-point + | | | +---w connectivity-service-uuid? -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/uuid + | | | +---w connectivity-service-end-point-local-id? -> /tapi-common:context/tapi-connectivity:connectivity-context/connectivity-service/end-point/local-id + | | +---w mep + | | | +---w meg-uuid? -> /tapi-common:context/tapi-oam:oam-context/meg/uuid + | | | +---w mep-local-id? -> /tapi-common:context/tapi-oam:oam-context/meg/mep/local-id + | | +---w mip + | | | +---w meg-uuid? -> /tapi-common:context/tapi-oam:oam-context/meg/uuid + | | | +---w mip-local-id? -> /tapi-common:context/tapi-oam:oam-context/meg/mip/local-id + | | +---w layer-protocol-name? tapi-common:layer-protocol-name + | | +---w is-mip? boolean + | | +---w local-id string + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string + | | +---w administrative-state? administrative-state + | | +---w operational-state? operational-state + | | +---w lifecycle-state? lifecycle-state | +--ro output | +--ro oam-service | +--ro layer-protocol-name? tapi-common:layer-protocol-name @@ -407,11 +414,15 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x create-oam-service-point | +---w input - | | +---w oam-service-id? string - | | +---w sip-id? string - | | +---w c-sep-id? string - | | +---w layer-protocol-name? tapi-common:layer-protocol-name - | | +---w state? tapi-common:administrative-state + | | +---w uuid? tapi-common:uuid + | | +---w oam-service-id? tapi-common:uuid + | | +---w service-interface-point-id? tapi-common:uuid + | | +---w connectivity-service-end-point-id? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string + | | +---w layer-protocol-name? tapi-common:layer-protocol-name + | | +---w state? tapi-common:administrative-state | +--ro output | +--ro oam-service-point | +--ro service-interface-point @@ -436,13 +447,14 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x delete-oam-service-point | +---w input - | +---w oam-service-id? string - | +---w oam-service-point-id? string + | +---w uuid? tapi-common:uuid +---x update-oam-service-point | +---w input - | | +---w oam-service-id? string - | | +---w oam-service-point-id? string - | | +---w state? tapi-common:administrative-state + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string + | | +---w state? tapi-common:administrative-state | +--ro output | +--ro oam-service-point | +--ro service-interface-point @@ -467,8 +479,7 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x get-oam-service-point | +---w input - | | +---w oam-service-id? string - | | +---w oam-service-point-id? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro oam-service-point | +--ro service-interface-point @@ -493,12 +504,18 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x create-oam-job | +---w input + | | +---w uuid? tapi-common:uuid + | | +---w oam-service-id? tapi-common:uuid + | | +---w oam-service-point-id? tapi-common:uuid + | | +---w oam-profile-id? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w oam-job-type? oam-job-type - | | +---w oam-service-id? string - | | +---w oam-service-point-id* string - | | +---w oam-profile-id? string | | +---w state? tapi-common:administrative-state - | | +---w schedule? string + | | +---w schedule + | | +---w end-time? date-and-time + | | +---w start-time? date-and-time | +--ro output | +--ro oam-job | +--ro oam-service-point* [oam-service-uuid oam-service-point-local-id] @@ -547,36 +564,15 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x update-oam-job | +---w input - | | +---w oam-job-id? string - | | +---w oam-profile - | | | +---w pm-threshold-data* [local-id] - | | | | +---w applicable-job-type* oam-job-type - | | | | +---w threshold-parameter* [pm-parameter-name threshold-location] - | | | | | +---w pm-parameter-name pm-parameter-name - | | | | | +---w threshold-location threshold-crossing-qualifier - | | | | | +---w pm-parameter-above-thrs - | | | | | | +---w pm-parameter-int-value? uint64 - | | | | | | +---w pm-parameter-real-value? decimal64 - | | | | | +---w pm-parameter-below-thrs - | | | | | | +---w pm-parameter-int-value? uint64 - | | | | | | +---w pm-parameter-real-value? decimal64 - | | | | | +---w pm-parameter-clear-thrs - | | | | | +---w pm-parameter-int-value? uint64 - | | | | | +---w pm-parameter-real-value? decimal64 - | | | | +---w granularity-period - | | | | | +---w value? uint64 - | | | | | +---w unit? time-unit - | | | | +---w is-transient? boolean - | | | | +---w local-id string - | | | | +---w name* [value-name] - | | | | +---w value-name string - | | | | +---w value? string - | | | +---w uuid? uuid - | | | +---w name* [value-name] - | | | +---w value-name string - | | | +---w value? string - | | +---w state? tapi-common:administrative-state - | | +---w schedule? string + | | +---w uuid? tapi-common:uuid + | | +---w oam-profile-id? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string + | | +---w state? tapi-common:administrative-state + | | +---w schedule + | | +---w end-time? date-and-time + | | +---w start-time? date-and-time | +--ro output | +--ro oam-job | +--ro oam-service-point* [oam-service-uuid oam-service-point-local-id] @@ -625,10 +621,10 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x delete-oam-job | +---w input - | +---w oam-job-id? string + | +---w uuid? tapi-common:uuid +---x get-oam-job | +---w input - | | +---w oam-job-id? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro oam-job | +--ro oam-service-point* [oam-service-uuid oam-service-point-local-id] @@ -724,6 +720,10 @@ module: tapi-oam | +--ro lifecycle-state? lifecycle-state +---x create-oam-profile | +---w input + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w pm-threshold-data* [] | | +---w applicable-job-type* oam-job-type | | +---w threshold-parameter* [pm-parameter-name threshold-location] @@ -776,7 +776,10 @@ module: tapi-oam | +--ro value? string +---x update-oam-profile | +---w input - | | +---w oam-profile-id? string + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w pm-threshold-data* [] | | +---w applicable-job-type* oam-job-type | | +---w threshold-parameter* [pm-parameter-name threshold-location] @@ -829,10 +832,10 @@ module: tapi-oam | +--ro value? string +---x delete-oam-profile | +---w input - | +---w oam-profile-id? string + | +---w uuid? tapi-common:uuid +---x get-oam-profile | +---w input - | | +---w oam-profile-id? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro oam-profile | +--ro pm-threshold-data* [local-id] diff --git a/YANG/tapi-oam@2019-03-31.yang b/YANG/tapi-oam@2019-03-31.yang index 29a2a9d5..752880ae 100644 --- a/YANG/tapi-oam@2019-03-31.yang +++ b/YANG/tapi-oam@2019-03-31.yang @@ -764,11 +764,19 @@ module tapi-oam { rpc create-oam-service { description "none"; input { - list oam-service-point { - key 'local-id'; - min-elements 2; - uses oam-service-point; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } leaf layer-protocol-name { type tapi-common:layer-protocol-name; @@ -778,6 +786,12 @@ module tapi-oam { type tapi-common:administrative-state; description "none"; } + list oam-service-point { + key 'local-id'; + min-elements 2; + uses oam-service-point; + description "none"; + } } output { container oam-service { @@ -789,18 +803,26 @@ module tapi-oam { rpc delete-oam-service { description "none"; input { - leaf oam-service-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } } rpc get-oam-service { description "none"; input { - leaf oam-service-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -823,9 +845,13 @@ module tapi-oam { rpc get-meg { description "none"; input { - leaf oam-service-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -838,8 +864,22 @@ module tapi-oam { rpc update-oam-service { description "none"; input { - leaf oam-service-id { - type string; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; + } + leaf state { + type tapi-common:administrative-state; description "none"; } list oam-service-point { @@ -847,10 +887,6 @@ module tapi-oam { uses oam-service-point; description "none"; } - leaf state { - type tapi-common:administrative-state; - description "none"; - } } output { container oam-service { @@ -862,17 +898,43 @@ module tapi-oam { rpc create-oam-service-point { description "none"; input { - leaf oam-service-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } - leaf sip-id { - type string; - description "none"; - } - leaf c-sep-id { - type string; - description "none"; + leaf oam-service-id { + type tapi-common:uuid; + description "UUID of the parent OamService: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + leaf service-interface-point-id { + type tapi-common:uuid; + description "UUID of the associated SIP to be monitored: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + leaf connectivity-service-end-point-id { + type tapi-common:uuid; + description "UUID of the CSEP to be monitored: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } leaf layer-protocol-name { type tapi-common:layer-protocol-name; @@ -893,26 +955,32 @@ module tapi-oam { rpc delete-oam-service-point { description "none"; input { - leaf oam-service-id { - type string; - description "none"; - } - leaf oam-service-point-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } } rpc update-oam-service-point { description "none"; input { - leaf oam-service-id { - type string; - description "none"; - } - leaf oam-service-point-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } leaf state { type tapi-common:administrative-state; @@ -929,13 +997,13 @@ module tapi-oam { rpc get-oam-service-point { description "none"; input { - leaf oam-service-id { - type string; - description "none"; - } - leaf oam-service-point-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -948,29 +1016,54 @@ module tapi-oam { rpc create-oam-job { description "none"; input { - leaf oam-job-type { - type oam-job-type; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } leaf oam-service-id { - type string; - description "none"; + type tapi-common:uuid; + description "UUID of the associated OamService: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } - leaf-list oam-service-point-id { - type string; - min-elements 1; - description "none"; + leaf oam-service-point-id { + type tapi-common:uuid; + description "UUID of the associated OSEPs: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } leaf oam-profile-id { - type string; + type tapi-common:uuid; + description "UUID of the OamProfile to be applied: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; + } + leaf oam-job-type { + type oam-job-type; description "none"; } leaf state { type tapi-common:administrative-state; description "none"; } - leaf schedule { - type string; + container schedule { + uses tapi-common:time-range; description "none"; } } @@ -984,20 +1077,34 @@ module tapi-oam { rpc update-oam-job { description "none"; input { - leaf oam-job-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } - container oam-profile { - uses oam-profile; - description "none"; + leaf oam-profile-id { + type tapi-common:uuid; + description "UUID of the OamProfile to be applied: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } leaf state { type tapi-common:administrative-state; description "none"; } - leaf schedule { - type string; + container schedule { + uses tapi-common:time-range; description "none"; } } @@ -1011,18 +1118,26 @@ module tapi-oam { rpc delete-oam-job { description "none"; input { - leaf oam-job-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } } rpc get-oam-job { description "none"; input { - leaf oam-job-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -1045,6 +1160,20 @@ module tapi-oam { rpc create-oam-profile { description "none"; input { + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; + } list pm-threshold-data { min-elements 1; uses pm-threshold-data; @@ -1061,9 +1190,19 @@ module tapi-oam { rpc update-oam-profile { description "none"; input { - leaf oam-profile-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } list pm-threshold-data { min-elements 1; @@ -1081,18 +1220,26 @@ module tapi-oam { rpc delete-oam-profile { description "none"; input { - leaf oam-profile-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } } rpc get-oam-profile { description "none"; input { - leaf oam-profile-id { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { diff --git a/YANG/tapi-path-computation@2019-03-31.tree b/YANG/tapi-path-computation@2019-03-31.tree index adc876b2..042ac5d6 100644 --- a/YANG/tapi-path-computation@2019-03-31.tree +++ b/YANG/tapi-path-computation@2019-03-31.tree @@ -109,21 +109,10 @@ module: tapi-path-computation rpcs: +---x compute-p-2-p-path | +---w input - | | +---w sep* [local-id] - | | | +---w service-interface-point - | | | | +---w service-interface-point-uuid? -> /tapi-common:context/service-interface-point/uuid - | | | +---w layer-protocol-name? tapi-common:layer-protocol-name - | | | +---w layer-protocol-qualifier? tapi-common:layer-protocol-qualifier - | | | +---w capacity - | | | | +---w total-size - | | | | +---w value? uint64 - | | | | +---w unit? capacity-unit - | | | +---w role? tapi-common:port-role - | | | +---w direction? tapi-common:port-direction - | | | +---w local-id string - | | | +---w name* [value-name] - | | | +---w value-name string - | | | +---w value? string + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w routing-constraint | | | +---w cost-characteristic* [cost-name] | | | | +---w cost-name string @@ -160,12 +149,27 @@ module: tapi-path-computation | | | +---w value-name string | | | +---w value? string | | +---w objective-function - | | +---w bandwidth-optimization? tapi-common:directive-value - | | +---w concurrent-paths? tapi-common:directive-value - | | +---w cost-optimization? tapi-common:directive-value - | | +---w link-utilization? tapi-common:directive-value - | | +---w resource-sharing? tapi-common:directive-value - | | +---w local-id? string + | | | +---w bandwidth-optimization? tapi-common:directive-value + | | | +---w concurrent-paths? tapi-common:directive-value + | | | +---w cost-optimization? tapi-common:directive-value + | | | +---w link-utilization? tapi-common:directive-value + | | | +---w resource-sharing? tapi-common:directive-value + | | | +---w local-id? string + | | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string + | | +---w end-point* [local-id] + | | +---w service-interface-point + | | | +---w service-interface-point-uuid? -> /tapi-common:context/service-interface-point/uuid + | | +---w layer-protocol-name? tapi-common:layer-protocol-name + | | +---w layer-protocol-qualifier? tapi-common:layer-protocol-qualifier + | | +---w capacity + | | | +---w total-size + | | | +---w value? uint64 + | | | +---w unit? capacity-unit + | | +---w role? tapi-common:port-role + | | +---w direction? tapi-common:port-direction + | | +---w local-id string | | +---w name* [value-name] | | +---w value-name string | | +---w value? string @@ -247,7 +251,10 @@ module: tapi-path-computation | +--ro value? string +---x optimize-p-2-p-path | +---w input - | | +---w path-id-or-name? string + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string | | +---w routing-constraint | | | +---w cost-characteristic* [cost-name] | | | | +---w cost-name string @@ -360,7 +367,7 @@ module: tapi-path-computation | +--ro value? string +---x delete-p-2-p-path +---w input - | +---w path-id-or-name? string + | +---w uuid? tapi-common:uuid +--ro output +--ro service +--ro path* [path-uuid] diff --git a/YANG/tapi-path-computation@2019-03-31.yang b/YANG/tapi-path-computation@2019-03-31.yang index 2daa1e81..416c9c66 100644 --- a/YANG/tapi-path-computation@2019-03-31.yang +++ b/YANG/tapi-path-computation@2019-03-31.yang @@ -445,12 +445,19 @@ module tapi-path-computation { rpc compute-p-2-p-path { description "none"; input { - list sep { - key 'local-id'; - min-elements 2; - max-elements 2; - uses path-service-end-point; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } container routing-constraint { uses routing-constraint; @@ -464,6 +471,13 @@ module tapi-path-computation { uses path-objective-function; description "none"; } + list end-point { + key 'local-id'; + min-elements 2; + max-elements 2; + uses path-service-end-point; + description "none"; + } } output { container service { @@ -475,9 +489,19 @@ module tapi-path-computation { rpc optimize-p-2-p-path { description "none"; input { - leaf path-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; } container routing-constraint { uses routing-constraint; @@ -502,9 +526,13 @@ module tapi-path-computation { rpc delete-p-2-p-path { description "none"; input { - leaf path-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { diff --git a/YANG/tapi-photonic-media@2019-03-31.tree b/YANG/tapi-photonic-media@2019-03-31.tree index e6d6023a..33df21c2 100644 --- a/YANG/tapi-photonic-media@2019-03-31.tree +++ b/YANG/tapi-photonic-media@2019-03-31.tree @@ -64,7 +64,7 @@ module: tapi-photonic-media augment /tapi-common:context/tapi-common:service-interface-point: +--rw otsi-service-interface-point-spec +--ro otsi-capability - | +--ro supportable-central-frequency-spectrum-band* [] + | +--ro supportable-central-frequency-band* [] | | +--ro lower-central-frequency? uint64 | | +--ro upper-central-frequency? uint64 | | +--ro frequency-constraint @@ -73,7 +73,7 @@ module: tapi-photonic-media | +--ro supportable-application-identifier* [application-code] | | +--ro application-identifier-type? application-identifier-type | | +--ro application-code string - | +--ro supportable-modulation* modulation-technique + | +--ro supportable-modulation* modulation-technique | +--ro total-power-warn-threshold | +--ro total-power-upper-warn-threshold-default? decimal64 | +--ro total-power-upper-warn-threshold-min? decimal64 @@ -557,7 +557,7 @@ module: tapi-photonic-media augment /tapi-common:get-service-interface-point-details/tapi-common:output/tapi-common:sip: +-- otsi-service-interface-point-spec +--ro otsi-capability - | +--ro supportable-central-frequency-spectrum-band* [] + | +--ro supportable-central-frequency-band* [] | | +--ro lower-central-frequency? uint64 | | +--ro upper-central-frequency? uint64 | | +--ro frequency-constraint @@ -566,7 +566,7 @@ module: tapi-photonic-media | +--ro supportable-application-identifier* [application-code] | | +--ro application-identifier-type? application-identifier-type | | +--ro application-code string - | +--ro supportable-modulation* modulation-technique + | +--ro supportable-modulation* modulation-technique | +--ro total-power-warn-threshold | +--ro total-power-upper-warn-threshold-default? decimal64 | +--ro total-power-upper-warn-threshold-min? decimal64 @@ -590,7 +590,7 @@ module: tapi-photonic-media augment /tapi-common:get-service-interface-point-list/tapi-common:output/tapi-common:sip: +-- otsi-service-interface-point-spec +--ro otsi-capability - | +--ro supportable-central-frequency-spectrum-band* [] + | +--ro supportable-central-frequency-band* [] | | +--ro lower-central-frequency? uint64 | | +--ro upper-central-frequency? uint64 | | +--ro frequency-constraint @@ -599,7 +599,7 @@ module: tapi-photonic-media | +--ro supportable-application-identifier* [application-code] | | +--ro application-identifier-type? application-identifier-type | | +--ro application-code string - | +--ro supportable-modulation* modulation-technique + | +--ro supportable-modulation* modulation-technique | +--ro total-power-warn-threshold | +--ro total-power-upper-warn-threshold-default? decimal64 | +--ro total-power-upper-warn-threshold-min? decimal64 diff --git a/YANG/tapi-topology@2019-03-31.tree b/YANG/tapi-topology@2019-03-31.tree index d26ed855..451db9ed 100644 --- a/YANG/tapi-topology@2019-03-31.tree +++ b/YANG/tapi-topology@2019-03-31.tree @@ -220,7 +220,7 @@ module: tapi-topology rpcs: +---x get-topology-details | +---w input - | | +---w topology-id-or-name? string + | | +---w topology-id? tapi-common:uuid | +--ro output | +--ro topology | +--ro node* [uuid] @@ -431,8 +431,8 @@ module: tapi-topology | +--ro value? string +---x get-node-details | +---w input - | | +---w topology-id-or-name? string - | | +---w node-id-or-name? string + | | +---w topology-id? tapi-common:uuid + | | +---w node-id? tapi-common:uuid | +--ro output | +--ro node | +--ro node-edge-point* [uuid] @@ -585,9 +585,9 @@ module: tapi-topology | +--ro wander-characteristic? string +---x get-node-edge-point-details | +---w input - | | +---w topology-id-or-name? string - | | +---w node-id-or-name? string - | | +---w ep-id-or-name? string + | | +---w topology-id? tapi-common:uuid + | | +---w node-id? tapi-common:uuid + | | +---w node-edge-point-id? tapi-common:uuid | +--ro output | +--ro node-edge-point | +--ro layer-protocol-name? tapi-common:layer-protocol-name @@ -621,8 +621,8 @@ module: tapi-topology | +--ro unit? capacity-unit +---x get-link-details | +---w input - | | +---w topology-id-or-name? string - | | +---w link-id-or-name? string + | | +---w topology-id? tapi-common:uuid + | | +---w link-id? tapi-common:uuid | +--ro output | +--ro link | +--ro node-edge-point* [topology-uuid node-uuid node-edge-point-uuid] diff --git a/YANG/tapi-topology@2019-03-31.yang b/YANG/tapi-topology@2019-03-31.yang index 55d54039..38406c64 100644 --- a/YANG/tapi-topology@2019-03-31.yang +++ b/YANG/tapi-topology@2019-03-31.yang @@ -685,9 +685,13 @@ module tapi-topology { rpc get-topology-details { description "none"; input { - leaf topology-id-or-name { - type string; - description "none"; + leaf topology-id { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -700,13 +704,21 @@ module tapi-topology { rpc get-node-details { description "none"; input { - leaf topology-id-or-name { - type string; - description "none"; - } - leaf node-id-or-name { - type string; - description "none"; + leaf topology-id { + type tapi-common:uuid; + description "UUID of the parent Topology: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + leaf node-id { + type tapi-common:uuid; + description "UUID of the Node: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -719,17 +731,29 @@ module tapi-topology { rpc get-node-edge-point-details { description "none"; input { - leaf topology-id-or-name { - type string; - description "none"; - } - leaf node-id-or-name { - type string; - description "none"; - } - leaf ep-id-or-name { - type string; - description "none"; + leaf topology-id { + type tapi-common:uuid; + description "UUID of the parent Node's Topology: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + leaf node-id { + type tapi-common:uuid; + description "UUID of the parent Node: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + leaf node-edge-point-id { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -742,13 +766,21 @@ module tapi-topology { rpc get-link-details { description "none"; input { - leaf topology-id-or-name { - type string; - description "none"; - } - leaf link-id-or-name { - type string; - description "none"; + leaf topology-id { + type tapi-common:uuid; + description "UUID of the parent Topology: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + leaf link-id { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { diff --git a/YANG/tapi-virtual-network@2019-03-31.tree b/YANG/tapi-virtual-network@2019-03-31.tree index 44cac5d7..3f5ec544 100644 --- a/YANG/tapi-virtual-network@2019-03-31.tree +++ b/YANG/tapi-virtual-network@2019-03-31.tree @@ -42,7 +42,9 @@ module: tapi-virtual-network | +--rw name* [value-name] | +--rw value-name string | +--rw value? string - +--rw schedule? string + +--rw schedule + | +--rw end-time? date-and-time + | +--rw start-time? date-and-time +--rw state | +--rw administrative-state? administrative-state | +--ro operational-state? operational-state @@ -56,7 +58,11 @@ module: tapi-virtual-network rpcs: +---x create-virtual-network-service | +---w input - | | +---w sep* [local-id] + | | +---w uuid? tapi-common:uuid + | | +---w name* [value-name] + | | | +---w value-name string + | | | +---w value? string + | | +---w end-point* [local-id] | | | +---w service-interface-point | | | | +---w service-interface-point-uuid? -> /tapi-common:context/service-interface-point/uuid | | | +---w role? tapi-common:port-role @@ -93,7 +99,9 @@ module: tapi-virtual-network | | | +---w name* [value-name] | | | +---w value-name string | | | +---w value? string - | | +---w conn-schedule? string + | | +---w schedule + | | +---w end-time? date-and-time + | | +---w start-time? date-and-time | +--ro output | +--ro service | +--ro topology @@ -135,7 +143,9 @@ module: tapi-virtual-network | | +--ro name* [value-name] | | +--ro value-name string | | +--ro value? string - | +--ro schedule? string + | +--ro schedule + | | +--ro end-time? date-and-time + | | +--ro start-time? date-and-time | +--ro state | | +--ro administrative-state? administrative-state | | +--ro operational-state? operational-state @@ -147,7 +157,7 @@ module: tapi-virtual-network | +--ro value? string +---x delete-virtual-network-service | +---w input - | | +---w service-id-or-name? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro service | +--ro topology @@ -189,7 +199,9 @@ module: tapi-virtual-network | | +--ro name* [value-name] | | +--ro value-name string | | +--ro value? string - | +--ro schedule? string + | +--ro schedule + | | +--ro end-time? date-and-time + | | +--ro start-time? date-and-time | +--ro state | | +--ro administrative-state? administrative-state | | +--ro operational-state? operational-state @@ -201,7 +213,7 @@ module: tapi-virtual-network | +--ro value? string +---x get-virtual-network-service-details | +---w input - | | +---w service-id-or-name? string + | | +---w uuid? tapi-common:uuid | +--ro output | +--ro service | +--ro topology @@ -243,7 +255,9 @@ module: tapi-virtual-network | | +--ro name* [value-name] | | +--ro value-name string | | +--ro value? string - | +--ro schedule? string + | +--ro schedule + | | +--ro end-time? date-and-time + | | +--ro start-time? date-and-time | +--ro state | | +--ro administrative-state? administrative-state | | +--ro operational-state? operational-state @@ -295,7 +309,9 @@ module: tapi-virtual-network | +--ro name* [value-name] | +--ro value-name string | +--ro value? string - +--ro schedule? string + +--ro schedule + | +--ro end-time? date-and-time + | +--ro start-time? date-and-time +--ro state | +--ro administrative-state? administrative-state | +--ro operational-state? operational-state diff --git a/YANG/tapi-virtual-network@2019-03-31.yang b/YANG/tapi-virtual-network@2019-03-31.yang index 81047a5f..094a6e74 100644 --- a/YANG/tapi-virtual-network@2019-03-31.yang +++ b/YANG/tapi-virtual-network@2019-03-31.yang @@ -153,8 +153,8 @@ module tapi-virtual-network { uses virtual-network-constraint; description "none"; } - leaf schedule { - type string; + container schedule { + uses tapi-common:time-range; description "none"; } container state { @@ -237,7 +237,21 @@ module tapi-virtual-network { rpc create-virtual-network-service { description "none"; input { - list sep { + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; + } + list name { + key 'value-name'; + uses tapi-common:name-and-value; + description "List of names. This value is unique in some namespace but may change during the life of the entity. + A name carries no semantics with respect to the purpose of the entity."; + } + list end-point { key 'local-id'; min-elements 2; uses virtual-network-service-end-point; @@ -247,8 +261,8 @@ module tapi-virtual-network { uses virtual-network-constraint; description "none"; } - leaf conn-schedule { - type string; + container schedule { + uses tapi-common:time-range; description "none"; } } @@ -262,9 +276,13 @@ module tapi-virtual-network { rpc delete-virtual-network-service { description "none"; input { - leaf service-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output { @@ -277,9 +295,13 @@ module tapi-virtual-network { rpc get-virtual-network-service-details { description "none"; input { - leaf service-id-or-name { - type string; - description "none"; + leaf uuid { + type tapi-common:uuid; + description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. + An UUID carries no semantics with respect to the purpose or state of the entity. + UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters. + Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} + Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6"; } } output {