Skip to content

Commit

Permalink
Bugfixes for issues #429 and #386 in v2.1.2
Browse files Browse the repository at this point in the history 
This commit includes the following changes:
* Fix bug on Connectivity Service End-Points (CSEPs) media-channel augmentation: media-channel-service-end-point-spec replaces media-channel-service-interface-point-spec which was wrongly used by the previous augment.
* Fix bug detected in otsi-service-interface-point-spec/otsi-capability: NEW "supportable-central-frequency-spectrum-band" replaces "supportable-lower-central-frequency" and "supportable-upper-central-frequency". After discussions into the TAPI calls on18/06/2019 and 25/06/2019, the group agreed on defining the tunabilty capabilities of otsi transmitters as a single list of bands defined by the lower and upper central frequencies of the band, and the frequency-contrains which specify the rest of feasible central frequencies within the band. An OTSi transmitter can have associated more than one band (i.e., C and L bands).

This two changes are already present in newer v2.2.0.
  • Loading branch information
Arturo Mayoral committed Jul 11, 2019
1 parent 61bf9b0 commit f9b25d8
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 62 deletions.
76 changes: 26 additions & 50 deletions YANG/tapi-photonic-media@2018-12-10.tree
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,16 @@ module: tapi-photonic-media
augment /tapi-common:context/tapi-common:service-interface-point:
+--rw otsi-service-interface-point-spec
+--ro otsi-capability
+--ro supportable-lower-central-frequency* [central-frequency]
+--ro supportable-central-frequency-spectrum-band* []
| +--ro lower-central-frequency? uint64
| +--ro upper-central-frequency? uint64
| +--ro frequency-constraint
| | +--ro adjustment-granularity? adjustment-granularity
| | +--ro grid-type? grid-type
| +--ro central-frequency uint64
+--ro supportable-upper-central-frequency* [central-frequency]
| +--ro frequency-constraint
| | +--ro adjustment-granularity? adjustment-granularity
| | +--ro grid-type? grid-type
| +--ro central-frequency uint64
| +--ro adjustment-granularity? adjustment-granularity
| +--ro grid-type? grid-type
+--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
Expand Down Expand Up @@ -131,26 +127,14 @@ module: tapi-photonic-media
+--ro adjustment-granularity? adjustment-granularity
+--ro grid-type? grid-type
augment /tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point:
+--rw media-channel-service-interface-point-spec
+--ro mc-pool
+--ro supportable-spectrum* [upper-frequency lower-frequency]
| +--ro upper-frequency uint64
| +--ro lower-frequency uint64
| +--ro frequency-constraint
| +--ro adjustment-granularity? adjustment-granularity
| +--ro grid-type? grid-type
+--ro available-spectrum* [upper-frequency lower-frequency]
| +--ro upper-frequency uint64
| +--ro lower-frequency uint64
| +--ro frequency-constraint
| +--ro adjustment-granularity? adjustment-granularity
| +--ro grid-type? grid-type
+--ro occupied-spectrum* [upper-frequency lower-frequency]
+--ro upper-frequency uint64
+--ro lower-frequency uint64
+--ro frequency-constraint
+--ro adjustment-granularity? adjustment-granularity
+--ro grid-type? grid-type
+--rw media-channel-connectivity-service-end-point-spec
+--rw mc-config
+--rw spectrum
+--rw upper-frequency? uint64
+--rw lower-frequency? uint64
+--rw frequency-constraint
+--rw adjustment-granularity? adjustment-granularity
+--rw grid-type? grid-type
augment /tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point:
+--ro media-channel-connection-end-point-spec
+--ro media-channel
Expand Down Expand Up @@ -186,20 +170,16 @@ 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-lower-central-frequency* [central-frequency]
+--ro supportable-central-frequency-spectrum-band* []
| +--ro lower-central-frequency? uint64
| +--ro upper-central-frequency? uint64
| +--ro frequency-constraint
| | +--ro adjustment-granularity? adjustment-granularity
| | +--ro grid-type? grid-type
| +--ro central-frequency uint64
+--ro supportable-upper-central-frequency* [central-frequency]
| +--ro frequency-constraint
| | +--ro adjustment-granularity? adjustment-granularity
| | +--ro grid-type? grid-type
| +--ro central-frequency uint64
| +--ro adjustment-granularity? adjustment-granularity
| +--ro grid-type? grid-type
+--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
Expand All @@ -210,20 +190,16 @@ 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-lower-central-frequency* [central-frequency]
| +--ro frequency-constraint
| | +--ro adjustment-granularity? adjustment-granularity
| | +--ro grid-type? grid-type
| +--ro central-frequency uint64
+--ro supportable-upper-central-frequency* [central-frequency]
+--ro supportable-central-frequency-spectrum-band* []
| +--ro lower-central-frequency? uint64
| +--ro upper-central-frequency? uint64
| +--ro frequency-constraint
| | +--ro adjustment-granularity? adjustment-granularity
| | +--ro grid-type? grid-type
| +--ro central-frequency uint64
| +--ro adjustment-granularity? adjustment-granularity
| +--ro grid-type? grid-type
+--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
Expand Down
33 changes: 21 additions & 12 deletions YANG/tapi-photonic-media@2018-12-10.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ module tapi-photonic-media {
description "none";
}
augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {
container media-channel-service-interface-point-spec {
uses media-channel-service-interface-point-spec;
container media-channel-connectivity-service-end-point-spec {
uses media-channel-connectivity-service-end-point-spec;
description "none";
}
description "none";
Expand Down Expand Up @@ -401,17 +401,26 @@ module tapi-photonic-media {
description "none";
}
grouping otsi-capability-pac {
list supportable-lower-central-frequency {
key 'central-frequency';
config false;
uses central-frequency;
description "The lower frequency of the channel spectrum";
}
list supportable-upper-central-frequency {
key 'central-frequency';
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";
}
config false;
uses central-frequency;
description "The Upper frequency of the channel spectrum";
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.";
}
list supportable-application-identifier {
key 'application-code';
Expand Down

0 comments on commit f9b25d8

Please sign in to comment.