From 7499a5fac91a406f184e8146d410c00d82388040 Mon Sep 17 00:00:00 2001 From: agva123 Date: Fri, 1 Mar 2024 01:13:19 +0800 Subject: [PATCH] align wdm path computation with wdm tunnel yang model --- ietf-wdm-path-computation-all.tree | 64 +++++++++++++++--------------- ietf-wdm-path-computation.tree | 64 +++++++++++++++--------------- ietf-wdm-path-computation.yang | 12 +++--- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/ietf-wdm-path-computation-all.tree b/ietf-wdm-path-computation-all.tree index ff2b176..c15c812 100644 --- a/ietf-wdm-path-computation-all.tree +++ b/ietf-wdm-path-computation-all.tree @@ -127,10 +127,10 @@ module: ietf-te-path-computation | | | | | | | | | frequency-thz | | | | | | | | +-- wdm-pc:transceiver-tunability? | | | | | | | | frequency-ghz - | | | | | | | +-- wdm-pc:line-coding-bitrate? + | | | | | | | +-- wdm-pc:line-coding-bitrate* | | | | | | | | identityref | | | | | | | +-- wdm-pc:tx-channel-power? - | | | | | | | | power-dbm-or-null + | | | | | | | | l0-types:power-dbm | | | | | | | +-- wdm-pc:preferred-rx-channel-power? | | | | | | | l0-types:power-dbm | | | | | | +-- wdm-pc:path-out-transceiver @@ -149,10 +149,10 @@ module: ietf-te-path-computation | | | | | | | | frequency-thz | | | | | | | +-- wdm-pc:transceiver-tunability? | | | | | | | frequency-ghz - | | | | | | +-- wdm-pc:line-coding-bitrate? + | | | | | | +-- wdm-pc:line-coding-bitrate* | | | | | | | identityref | | | | | | +-- wdm-pc:tx-channel-power? - | | | | | | | power-dbm-or-null + | | | | | | | l0-types:power-dbm | | | | | | +-- wdm-pc:preferred-rx-channel-power? | | | | | | l0-types:power-dbm | | | | | +--:(numbered-link-hop) @@ -201,7 +201,7 @@ module: ietf-te-path-computation | | | | | | | | +-- wdm-pc:flexi-m? | | | | | | | | l0-types:flexi-m | | | | | | | x--:(wdm-pc:super) - | | | | | | | | +-- wdm-pc:subcarrier-flexi-n* + | | | | | | | | x-- wdm-pc:subcarrier-flexi-n* | | | | | | | | [flexi-n] | | | | | | | | +-- wdm-pc:flexi-n | | | | | | | | | l0-types:flexi-n @@ -249,10 +249,10 @@ module: ietf-te-path-computation | | | | | | | | frequency-thz | | | | | | | +-- wdm-pc:transceiver-tunability? | | | | | | | frequency-ghz - | | | | | | +-- wdm-pc:line-coding-bitrate? + | | | | | | +-- wdm-pc:line-coding-bitrate* | | | | | | | identityref | | | | | | +-- wdm-pc:tx-channel-power? - | | | | | | | power-dbm-or-null + | | | | | | | l0-types:power-dbm | | | | | | +-- wdm-pc:preferred-rx-channel-power? | | | | | | l0-types:power-dbm | | | | | +-- wdm-pc:path-out-transceiver @@ -271,10 +271,10 @@ module: ietf-te-path-computation | | | | | | | frequency-thz | | | | | | +-- wdm-pc:transceiver-tunability? | | | | | | frequency-ghz - | | | | | +-- wdm-pc:line-coding-bitrate? + | | | | | +-- wdm-pc:line-coding-bitrate* | | | | | | identityref | | | | | +-- wdm-pc:tx-channel-power? - | | | | | | power-dbm-or-null + | | | | | | l0-types:power-dbm | | | | | +-- wdm-pc:preferred-rx-channel-power? | | | | | l0-types:power-dbm | | | | +--:(numbered-link-hop) @@ -323,7 +323,7 @@ module: ietf-te-path-computation | | | | | | | +-- wdm-pc:flexi-m? | | | | | | | l0-types:flexi-m | | | | | | x--:(wdm-pc:super) - | | | | | | | +-- wdm-pc:subcarrier-flexi-n* + | | | | | | | x-- wdm-pc:subcarrier-flexi-n* | | | | | | | [flexi-n] | | | | | | | +-- wdm-pc:flexi-n | | | | | | | | l0-types:flexi-n @@ -406,10 +406,10 @@ module: ietf-te-path-computation | | | | | | | frequency-thz | | | | | | +-- wdm-pc:transceiver-tunability? | | | | | | frequency-ghz - | | | | | +-- wdm-pc:line-coding-bitrate? + | | | | | +-- wdm-pc:line-coding-bitrate* | | | | | | identityref | | | | | +-- wdm-pc:tx-channel-power? - | | | | | | power-dbm-or-null + | | | | | | l0-types:power-dbm | | | | | +-- wdm-pc:preferred-rx-channel-power? | | | | | l0-types:power-dbm | | | | +-- wdm-pc:path-out-transceiver @@ -428,10 +428,10 @@ module: ietf-te-path-computation | | | | | | frequency-thz | | | | | +-- wdm-pc:transceiver-tunability? | | | | | frequency-ghz - | | | | +-- wdm-pc:line-coding-bitrate? + | | | | +-- wdm-pc:line-coding-bitrate* | | | | | identityref | | | | +-- wdm-pc:tx-channel-power? - | | | | | power-dbm-or-null + | | | | | l0-types:power-dbm | | | | +-- wdm-pc:preferred-rx-channel-power? | | | | l0-types:power-dbm | | | +--:(numbered-link-hop) @@ -479,7 +479,7 @@ module: ietf-te-path-computation | | | | | | +-- wdm-pc:flexi-m? | | | | | | l0-types:flexi-m | | | | | x--:(wdm-pc:super) - | | | | | | +-- wdm-pc:subcarrier-flexi-n* + | | | | | | x-- wdm-pc:subcarrier-flexi-n* | | | | | | [flexi-n] | | | | | | +-- wdm-pc:flexi-n | | | | | | | l0-types:flexi-n @@ -522,10 +522,10 @@ module: ietf-te-path-computation | | | | | | frequency-thz | | | | | +-- wdm-pc:transceiver-tunability? | | | | | frequency-ghz - | | | | +-- wdm-pc:line-coding-bitrate? + | | | | +-- wdm-pc:line-coding-bitrate* | | | | | identityref | | | | +-- wdm-pc:tx-channel-power? - | | | | | power-dbm-or-null + | | | | | l0-types:power-dbm | | | | +-- wdm-pc:preferred-rx-channel-power? | | | | l0-types:power-dbm | | | +-- wdm-pc:path-out-transceiver @@ -544,10 +544,10 @@ module: ietf-te-path-computation | | | | | frequency-thz | | | | +-- wdm-pc:transceiver-tunability? | | | | frequency-ghz - | | | +-- wdm-pc:line-coding-bitrate? + | | | +-- wdm-pc:line-coding-bitrate* | | | | identityref | | | +-- wdm-pc:tx-channel-power? - | | | | power-dbm-or-null + | | | | l0-types:power-dbm | | | +-- wdm-pc:preferred-rx-channel-power? | | | l0-types:power-dbm | | +--:(numbered-link-hop) @@ -595,7 +595,7 @@ module: ietf-te-path-computation | | | | | +-- wdm-pc:flexi-m? | | | | | l0-types:flexi-m | | | | x--:(wdm-pc:super) - | | | | | +-- wdm-pc:subcarrier-flexi-n* + | | | | | x-- wdm-pc:subcarrier-flexi-n* | | | | | [flexi-n] | | | | | +-- wdm-pc:flexi-n | | | | | | l0-types:flexi-n @@ -838,9 +838,9 @@ module: ietf-te-path-computation | | | +-- wdm-pc:min-central-frequency? frequency-thz | | | +-- wdm-pc:max-central-frequency? frequency-thz | | | +-- wdm-pc:transceiver-tunability? frequency-ghz - | | +-- wdm-pc:line-coding-bitrate? identityref + | | +-- wdm-pc:line-coding-bitrate* identityref | | +-- wdm-pc:tx-channel-power? - | | | power-dbm-or-null + | | | l0-types:power-dbm | | +-- wdm-pc:preferred-rx-channel-power? | | l0-types:power-dbm | +-- wdm-pc:gsnr-extra-margin? snr @@ -894,10 +894,10 @@ module: ietf-te-path-computation | | | | | frequency-thz | | | | +-- wdm-pc:transceiver-tunability? | | | | frequency-ghz - | | | +-- wdm-pc:line-coding-bitrate? + | | | +-- wdm-pc:line-coding-bitrate* | | | | identityref | | | +-- wdm-pc:tx-channel-power? - | | | | power-dbm-or-null + | | | | l0-types:power-dbm | | | +-- wdm-pc:preferred-rx-channel-power? | | | l0-types:power-dbm | | +-- wdm-pc:path-out-transceiver @@ -916,10 +916,10 @@ module: ietf-te-path-computation | | | | frequency-thz | | | +-- wdm-pc:transceiver-tunability? | | | frequency-ghz - | | +-- wdm-pc:line-coding-bitrate? + | | +-- wdm-pc:line-coding-bitrate* | | | identityref | | +-- wdm-pc:tx-channel-power? - | | | power-dbm-or-null + | | | l0-types:power-dbm | | +-- wdm-pc:preferred-rx-channel-power? | | l0-types:power-dbm | +--:(numbered-link-hop) @@ -967,7 +967,7 @@ module: ietf-te-path-computation | | | | +-- wdm-pc:flexi-m? | | | | l0-types:flexi-m | | | x--:(wdm-pc:super) - | | | | +-- wdm-pc:subcarrier-flexi-n* + | | | | x-- wdm-pc:subcarrier-flexi-n* | | | | [flexi-n] | | | | +-- wdm-pc:flexi-n | | | | | l0-types:flexi-n @@ -1048,10 +1048,10 @@ module: ietf-te-path-computation | | | | | | frequency-thz | | | | | +--ro wdm-pc:transceiver-tunability? | | | | | frequency-ghz - | | | | +--ro wdm-pc:line-coding-bitrate? + | | | | +--ro wdm-pc:line-coding-bitrate* | | | | | identityref | | | | +--ro wdm-pc:tx-channel-power? - | | | | | power-dbm-or-null + | | | | | l0-types:power-dbm | | | | +--ro wdm-pc:preferred-rx-channel-power? | | | | l0-types:power-dbm | | | +--ro wdm-pc:path-out-transceiver @@ -1070,10 +1070,10 @@ module: ietf-te-path-computation | | | | | frequency-thz | | | | +--ro wdm-pc:transceiver-tunability? | | | | frequency-ghz - | | | +--ro wdm-pc:line-coding-bitrate? + | | | +--ro wdm-pc:line-coding-bitrate* | | | | identityref | | | +--ro wdm-pc:tx-channel-power? - | | | | power-dbm-or-null + | | | | l0-types:power-dbm | | | +--ro wdm-pc:preferred-rx-channel-power? | | | l0-types:power-dbm | | +--:(numbered-link-hop) @@ -1122,7 +1122,7 @@ module: ietf-te-path-computation | | | | | +--ro wdm-pc:flexi-m? | | | | | l0-types:flexi-m | | | | x--:(wdm-pc:super) - | | | | | +--ro wdm-pc:subcarrier-flexi-n* + | | | | | x--ro wdm-pc:subcarrier-flexi-n* | | | | | [flexi-n] | | | | | +--ro wdm-pc:flexi-n | | | | | | l0-types:flexi-n diff --git a/ietf-wdm-path-computation.tree b/ietf-wdm-path-computation.tree index 6358dcc..dee6239 100644 --- a/ietf-wdm-path-computation.tree +++ b/ietf-wdm-path-computation.tree @@ -9,8 +9,8 @@ module: ietf-wdm-path-computation | | +-- min-central-frequency? frequency-thz | | +-- max-central-frequency? frequency-thz | | +-- transceiver-tunability? frequency-ghz - | +-- line-coding-bitrate? identityref - | +-- tx-channel-power? power-dbm-or-null + | +-- line-coding-bitrate* identityref + | +-- tx-channel-power? l0-types:power-dbm | +-- preferred-rx-channel-power? l0-types:power-dbm +-- gsnr-extra-margin? snr +-- use-regen? boolean @@ -36,8 +36,8 @@ module: ietf-wdm-path-computation | | +-- min-central-frequency? frequency-thz | | +-- max-central-frequency? frequency-thz | | +-- transceiver-tunability? frequency-ghz - | +-- line-coding-bitrate? identityref - | +-- tx-channel-power? power-dbm-or-null + | +-- line-coding-bitrate* identityref + | +-- tx-channel-power? l0-types:power-dbm | +-- preferred-rx-channel-power? l0-types:power-dbm +-- path-out-transceiver +-- transponder-id? uint32 @@ -49,8 +49,8 @@ module: ietf-wdm-path-computation | +-- min-central-frequency? frequency-thz | +-- max-central-frequency? frequency-thz | +-- transceiver-tunability? frequency-ghz - +-- line-coding-bitrate? identityref - +-- tx-channel-power? power-dbm-or-null + +-- line-coding-bitrate* identityref + +-- tx-channel-power? l0-types:power-dbm +-- preferred-rx-channel-power? l0-types:power-dbm augment /te:tunnels-path-compute/te:input/te:path-compute-info /tepc:path-request/tepc:optimizations/tepc:algorithm @@ -75,8 +75,8 @@ module: ietf-wdm-path-computation | | +-- min-central-frequency? frequency-thz | | +-- max-central-frequency? frequency-thz | | +-- transceiver-tunability? frequency-ghz - | +-- line-coding-bitrate? identityref - | +-- tx-channel-power? power-dbm-or-null + | +-- line-coding-bitrate* identityref + | +-- tx-channel-power? l0-types:power-dbm | +-- preferred-rx-channel-power? l0-types:power-dbm +-- path-out-transceiver +-- transponder-id? uint32 @@ -88,8 +88,8 @@ module: ietf-wdm-path-computation | +-- min-central-frequency? frequency-thz | +-- max-central-frequency? frequency-thz | +-- transceiver-tunability? frequency-ghz - +-- line-coding-bitrate? identityref - +-- tx-channel-power? power-dbm-or-null + +-- line-coding-bitrate* identityref + +-- tx-channel-power? l0-types:power-dbm +-- preferred-rx-channel-power? l0-types:power-dbm augment /te:tunnels-path-compute/te:input/te:path-compute-info /tepc:path-request/tepc:optimizations/tepc:algorithm @@ -112,8 +112,8 @@ module: ietf-wdm-path-computation | | +-- min-central-frequency? frequency-thz | | +-- max-central-frequency? frequency-thz | | +-- transceiver-tunability? frequency-ghz - | +-- line-coding-bitrate? identityref - | +-- tx-channel-power? power-dbm-or-null + | +-- line-coding-bitrate* identityref + | +-- tx-channel-power? l0-types:power-dbm | +-- preferred-rx-channel-power? l0-types:power-dbm +-- path-out-transceiver +-- transponder-id? uint32 @@ -125,8 +125,8 @@ module: ietf-wdm-path-computation | +-- min-central-frequency? frequency-thz | +-- max-central-frequency? frequency-thz | +-- transceiver-tunability? frequency-ghz - +-- line-coding-bitrate? identityref - +-- tx-channel-power? power-dbm-or-null + +-- line-coding-bitrate* identityref + +-- tx-channel-power? l0-types:power-dbm +-- preferred-rx-channel-power? l0-types:power-dbm augment /te:tunnels-path-compute/te:input/te:path-compute-info /tepc:path-request/tepc:explicit-route-objects @@ -147,8 +147,8 @@ module: ietf-wdm-path-computation | | +-- min-central-frequency? frequency-thz | | +-- max-central-frequency? frequency-thz | | +-- transceiver-tunability? frequency-ghz - | +-- line-coding-bitrate? identityref - | +-- tx-channel-power? power-dbm-or-null + | +-- line-coding-bitrate* identityref + | +-- tx-channel-power? l0-types:power-dbm | +-- preferred-rx-channel-power? l0-types:power-dbm +-- path-out-transceiver +-- transponder-id? uint32 @@ -160,8 +160,8 @@ module: ietf-wdm-path-computation | +-- min-central-frequency? frequency-thz | +-- max-central-frequency? frequency-thz | +-- transceiver-tunability? frequency-ghz - +-- line-coding-bitrate? identityref - +-- tx-channel-power? power-dbm-or-null + +-- line-coding-bitrate* identityref + +-- tx-channel-power? l0-types:power-dbm +-- preferred-rx-channel-power? l0-types:power-dbm augment /te:tunnels-path-compute/te:input/te:path-compute-info /tepc:path-request/tepc:explicit-route-objects @@ -181,8 +181,8 @@ module: ietf-wdm-path-computation | | +-- min-central-frequency? frequency-thz | | +-- max-central-frequency? frequency-thz | | +-- transceiver-tunability? frequency-ghz - | +-- line-coding-bitrate? identityref - | +-- tx-channel-power? power-dbm-or-null + | +-- line-coding-bitrate* identityref + | +-- tx-channel-power? l0-types:power-dbm | +-- preferred-rx-channel-power? l0-types:power-dbm +-- path-out-transceiver +-- transponder-id? uint32 @@ -194,8 +194,8 @@ module: ietf-wdm-path-computation | +-- min-central-frequency? frequency-thz | +-- max-central-frequency? frequency-thz | +-- transceiver-tunability? frequency-ghz - +-- line-coding-bitrate? identityref - +-- tx-channel-power? power-dbm-or-null + +-- line-coding-bitrate* identityref + +-- tx-channel-power? l0-types:power-dbm +-- preferred-rx-channel-power? l0-types:power-dbm augment /te:tunnels-path-compute/te:input/te:path-compute-info /tepc:synchronization/tepc:exclude-objects/tepc:excludes @@ -223,8 +223,8 @@ module: ietf-wdm-path-computation | | +--ro min-central-frequency? frequency-thz | | +--ro max-central-frequency? frequency-thz | | +--ro transceiver-tunability? frequency-ghz - | +--ro line-coding-bitrate? identityref - | +--ro tx-channel-power? power-dbm-or-null + | +--ro line-coding-bitrate* identityref + | +--ro tx-channel-power? l0-types:power-dbm | +--ro preferred-rx-channel-power? l0-types:power-dbm +--ro path-out-transceiver +--ro transponder-id? uint32 @@ -236,8 +236,8 @@ module: ietf-wdm-path-computation | +--ro min-central-frequency? frequency-thz | +--ro max-central-frequency? frequency-thz | +--ro transceiver-tunability? frequency-ghz - +--ro line-coding-bitrate? identityref - +--ro tx-channel-power? power-dbm-or-null + +--ro line-coding-bitrate* identityref + +--ro tx-channel-power? l0-types:power-dbm +--ro preferred-rx-channel-power? l0-types:power-dbm augment /te:tunnels-path-compute/te:output/te:path-compute-result /tepc:response/tepc:computed-paths-properties @@ -286,7 +286,7 @@ module: ietf-wdm-path-computation | +-- flexi-n? l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m x--:(super) - | +-- subcarrier-flexi-n* [flexi-n] + | x-- subcarrier-flexi-n* [flexi-n] | +-- flexi-n l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m +--:(multi) @@ -316,7 +316,7 @@ module: ietf-wdm-path-computation | +-- flexi-n? l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m x--:(super) - | +-- subcarrier-flexi-n* [flexi-n] + | x-- subcarrier-flexi-n* [flexi-n] | +-- flexi-n l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m +--:(multi) @@ -344,7 +344,7 @@ module: ietf-wdm-path-computation | +-- flexi-n? l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m x--:(super) - | +-- subcarrier-flexi-n* [flexi-n] + | x-- subcarrier-flexi-n* [flexi-n] | +-- flexi-n l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m +--:(multi) @@ -372,7 +372,7 @@ module: ietf-wdm-path-computation | +-- flexi-n? l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m x--:(super) - | +-- subcarrier-flexi-n* [flexi-n] + | x-- subcarrier-flexi-n* [flexi-n] | +-- flexi-n l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m +--:(multi) @@ -476,7 +476,7 @@ module: ietf-wdm-path-computation | +-- flexi-n? l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m x--:(super) - | +-- subcarrier-flexi-n* [flexi-n] + | x-- subcarrier-flexi-n* [flexi-n] | +-- flexi-n l0-types:flexi-n | +-- flexi-m? l0-types:flexi-m +--:(multi) @@ -505,7 +505,7 @@ module: ietf-wdm-path-computation | +--ro flexi-n? l0-types:flexi-n | +--ro flexi-m? l0-types:flexi-m x--:(super) - | +--ro subcarrier-flexi-n* [flexi-n] + | x--ro subcarrier-flexi-n* [flexi-n] | +--ro flexi-n l0-types:flexi-n | +--ro flexi-m? l0-types:flexi-m +--:(multi) diff --git a/ietf-wdm-path-computation.yang b/ietf-wdm-path-computation.yang index 5f90bdf..3af7a1f 100755 --- a/ietf-wdm-path-computation.yang +++ b/ietf-wdm-path-computation.yang @@ -104,7 +104,7 @@ module ietf-wdm-path-computation { description "Augment with transceiver configurations."; - uses wdm-tnl:path-transceiver-config-grp; + uses wdm-tnl:path-transceiver-config; } //??? @@ -137,7 +137,7 @@ module ietf-wdm-path-computation { description "Augment with transceiver configurations."; - uses wdm-tnl:path-transceiver-config-grp; + uses wdm-tnl:path-transceiver-config; } //??? @@ -168,7 +168,7 @@ module ietf-wdm-path-computation { description "Augment with transceiver configurations."; - uses wdm-tnl:path-transceiver-config-grp; + uses wdm-tnl:path-transceiver-config; } //??? @@ -196,7 +196,7 @@ module ietf-wdm-path-computation { description "Augment with transceiver configurations."; - uses wdm-tnl:path-transceiver-config-grp; + uses wdm-tnl:path-transceiver-config; } //??? @@ -223,7 +223,7 @@ module ietf-wdm-path-computation { description "Augment with transceiver configurations."; - uses wdm-tnl:path-transceiver-config-grp; + uses wdm-tnl:path-transceiver-config; } //??? @@ -268,7 +268,7 @@ module ietf-wdm-path-computation { description "Augment with transceiver configurations."; - uses wdm-tnl:path-transceiver-config-grp; + uses wdm-tnl:path-transceiver-config; } //???