From ed15c4834c3013a743f58fcfac775b12adaf8aff Mon Sep 17 00:00:00 2001 From: Balagangadhar Bathula Date: Thu, 4 Jun 2020 23:14:48 -0400 Subject: [PATCH] Release 7.1.0 --- model/Common/org-openroadm-alarm.yang | 8 +- ...penroadm-common-optical-channel-types.yang | 34 +- model/Common/org-openroadm-common-types.yang | 122 +++++ model/Common/org-openroadm-pm.yang | 8 +- .../Common/org-openroadm-probable-cause.yang | 11 + model/Common/org-openroadm-resource.yang | 6 +- model/Device/org-openroadm-database.yang | 6 +- model/Device/org-openroadm-de-operations.yang | 8 +- model/Device/org-openroadm-device.yang | 46 +- model/Device/org-openroadm-dhcp.yang | 6 +- .../org-openroadm-ethernet-interfaces.yang | 53 +- model/Device/org-openroadm-file-transfer.yang | 6 +- model/Device/org-openroadm-fwdl.yang | 6 +- .../Device/org-openroadm-gcc-interfaces.yang | 6 +- model/Device/org-openroadm-gnmi.yang | 8 +- model/Device/org-openroadm-ip.yang | 6 +- .../org-openroadm-ipv4-unicast-routing.yang | 8 +- .../org-openroadm-ipv6-unicast-routing.yang | 8 +- model/Device/org-openroadm-lldp.yang | 6 +- .../org-openroadm-maintenance-testsignal.yang | 6 +- ...rg-openroadm-media-channel-interfaces.yang | 8 +- ...oadm-network-media-channel-interfaces.yang | 8 +- ...-openroadm-optical-channel-interfaces.yang | 17 +- ...nroadm-optical-operational-interfaces.yang | 6 +- ...penroadm-optical-transport-interfaces.yang | 6 +- ...m-optical-tributary-signal-interfaces.yang | 38 +- model/Device/org-openroadm-ospf.yang | 8 +- .../org-openroadm-otn-odu-interfaces.yang | 10 +- .../org-openroadm-otn-otu-interfaces.yang | 57 +-- .../org-openroadm-otsi-group-interfaces.yang | 8 +- ...dm-pluggable-optics-holder-capability.yang | 8 +- .../Device/org-openroadm-port-capability.yang | 10 +- .../Device/org-openroadm-ppp-interfaces.yang | 6 +- .../org-openroadm-prot-otn-linear-aps.yang | 8 +- model/Device/org-openroadm-routing.yang | 6 +- model/Device/org-openroadm-rstp.yang | 6 +- model/Device/org-openroadm-security.yang | 8 +- model/Device/org-openroadm-swdl.yang | 6 +- model/Device/tree-view-device.txt | 270 +++++----- .../Network/org-openroadm-common-network.yang | 6 +- model/Network/org-openroadm-degree.yang | 6 +- .../org-openroadm-external-pluggable.yang | 6 +- model/Network/org-openroadm-link.yang | 6 +- .../org-openroadm-network-topology.yang | 18 +- .../Network/org-openroadm-network-types.yang | 6 +- model/Network/org-openroadm-network.yang | 14 +- .../org-openroadm-otn-network-topology.yang | 12 +- model/Network/org-openroadm-srg.yang | 6 +- model/Network/org-openroadm-xponder.yang | 10 +- model/Service/org-openroadm-ber-test.yang | 8 +- .../org-openroadm-common-ber-test.yang | 6 +- .../org-openroadm-common-service-types.yang | 42 +- ...rg-openroadm-controller-customization.yang | 8 +- .../org-openroadm-routing-constraints.yang | 16 + model/Service/org-openroadm-service.yang | 12 +- model/Service/org-openroadm-topology.yang | 6 +- model/Service/tree-view-service.txt | 474 +++++++++++------- 57 files changed, 1006 insertions(+), 518 deletions(-) diff --git a/model/Common/org-openroadm-alarm.yang b/model/Common/org-openroadm-alarm.yang index 4d5b04ec..57cdc61e 100644 --- a/model/Common/org-openroadm-alarm.yang +++ b/model/Common/org-openroadm-alarm.yang @@ -8,11 +8,11 @@ module org-openroadm-alarm { } import org-openroadm-resource { prefix org-openroadm-resource; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-probable-cause { prefix org-openroadm-probable-cause; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -48,6 +48,10 @@ module org-openroadm-alarm { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Common/org-openroadm-common-optical-channel-types.yang b/model/Common/org-openroadm-common-optical-channel-types.yang index e9055cc3..3fc027bb 100644 --- a/model/Common/org-openroadm-common-optical-channel-types.yang +++ b/model/Common/org-openroadm-common-optical-channel-types.yang @@ -35,6 +35,10 @@ module org-openroadm-common-optical-channel-types { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -64,39 +68,23 @@ module org-openroadm-common-optical-channel-types { "Version 3.0.0"; } + identity optical-rate-identity { + description + "base for otsi and och idenity"; + } + identity och-rate-identity { + base optical-rate-identity; description "A unique och rate identification"; } identity otsi-rate-identity { + base optical-rate-identity; description "A unique OTSi rate identification"; } - identity fec-identity { - description - "A unique FEC identification"; - } - - identity sc-fec { - base fec-identity; - description - "Staircase FEC identification"; - } - - identity rs-fec { - base fec-identity; - description - "Reed Solomon FEC identification"; - } - - identity o-fec { - base fec-identity; - description - "OpenROADM FEC identification"; - } - identity foic-identity { description "A unique FOICx.k identification (G.709.3 FlexO-LR and diff --git a/model/Common/org-openroadm-common-types.yang b/model/Common/org-openroadm-common-types.yang index a2832fe3..e35b4543 100644 --- a/model/Common/org-openroadm-common-types.yang +++ b/model/Common/org-openroadm-common-types.yang @@ -35,6 +35,10 @@ module org-openroadm-common-types { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -226,6 +230,11 @@ module org-openroadm-common-types { description "value for 7.0"; } + enum 7.1 { + value 16; + description + "value for 7.1"; + } } description "OpenROADM version enum type"; @@ -302,4 +311,117 @@ module org-openroadm-common-types { "TCM direction capability for the port"; } + + + + + + // + // Identities for FEC -- used for Device and Service models + // + + // Base Identity + identity fec-identity { + description + "A unique FEC identification"; + } + + // FEC Off (duplications for backwards compatibility) + identity off-fec { + status deprecated; + base fec-identity; + description + "FEC Off"; + } + identity off { + base fec-identity; + description + "FEC Off"; + } + + // Staircase FEC (duplications for backwards compatibility) + identity sc-fec { + status deprecated; + base fec-identity; + description + "Staircase FEC identification"; + } + identity scfec { + base fec-identity; + description + "Staircase FEC identification"; + } + + // Reed Solomon FEC (duplication for backwards compatibility) + identity rs-fec { + status deprecated; + base fec-identity; + description + "Reed Solomon FEC identification"; + } + identity rsfec { + base fec-identity; + description + "Reed Solomon FEC identification"; + } + + // OpenROADM FEC (duplication for backwards compatibility) + identity o-fec { + status deprecated; + base fec-identity; + description + "OpenROADM FEC identification"; + } + identity ofec { + base fec-identity; + description + "OpenROADM FEC identification"; + } + + // G.975.1 I.4 + identity efec { + base fec-identity; + description + "G.975.1 I.4"; + } + + // G.975.1 I.7 + identity ufec { + base fec-identity; + description + "G.975.1 I.7"; + } + + // Soft Decision FEC + identity sdfec { + base fec-identity; + description + "Soft Decision FEC"; + } + + // Clariphy SDFEC + identity sdfeca1 { + base fec-identity; + description + "Clariphy SDFEC"; + } + + // SDFEC with SCFED + identity sdfecb1 { + base fec-identity; + description + "SDFEC with SCFEC"; + } + + + grouping fec-grouping { + leaf fec { + type identityref { + base org-openroadm-common-types:fec-identity; + } + description + "FEC / Forward Error Correction"; + } + } + } diff --git a/model/Common/org-openroadm-pm.yang b/model/Common/org-openroadm-pm.yang index 54ae74aa..44b93282 100644 --- a/model/Common/org-openroadm-pm.yang +++ b/model/Common/org-openroadm-pm.yang @@ -8,7 +8,7 @@ module org-openroadm-pm { } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-alarm-pm-types { prefix org-openroadm-common-alarm-pm-types; @@ -16,7 +16,7 @@ module org-openroadm-pm { } import org-openroadm-resource { prefix org-openroadm-resource; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-resource-types { prefix org-openroadm-resource-types; @@ -60,6 +60,10 @@ module org-openroadm-pm { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Common/org-openroadm-probable-cause.yang b/model/Common/org-openroadm-probable-cause.yang index ff6b2428..b327742c 100644 --- a/model/Common/org-openroadm-probable-cause.yang +++ b/model/Common/org-openroadm-probable-cause.yang @@ -40,6 +40,10 @@ module org-openroadm-probable-cause { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -827,6 +831,13 @@ module org-openroadm-probable-cause { reference "IEEE 802.3-2018 Section 119"; } + enum farEndFaultIndication { + value 283; + description + "Far End Fault Indication"; + reference + "IEEE 802.3-2018 Section 24.3.2.1"; + } } description "probable cause group"; diff --git a/model/Common/org-openroadm-resource.yang b/model/Common/org-openroadm-resource.yang index fd544c4d..d8c2b424 100644 --- a/model/Common/org-openroadm-resource.yang +++ b/model/Common/org-openroadm-resource.yang @@ -12,7 +12,7 @@ module org-openroadm-resource { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-resource-types { prefix org-openroadm-resource-types; @@ -52,6 +52,10 @@ module org-openroadm-resource { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-database.yang b/model/Device/org-openroadm-database.yang index e8f4dd62..a58dbf05 100644 --- a/model/Device/org-openroadm-database.yang +++ b/model/Device/org-openroadm-database.yang @@ -4,7 +4,7 @@ module org-openroadm-database { import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -40,6 +40,10 @@ module org-openroadm-database { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-de-operations.yang b/model/Device/org-openroadm-de-operations.yang index 5d0c9d1f..a295ab0d 100644 --- a/model/Device/org-openroadm-de-operations.yang +++ b/model/Device/org-openroadm-de-operations.yang @@ -4,11 +4,11 @@ module org-openroadm-de-operations { import org-openroadm-resource { prefix org-openroadm-resource; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -44,6 +44,10 @@ module org-openroadm-de-operations { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-device.yang b/model/Device/org-openroadm-device.yang index e8c3c672..5e690f5a 100644 --- a/model/Device/org-openroadm-device.yang +++ b/model/Device/org-openroadm-device.yang @@ -16,7 +16,7 @@ module org-openroadm-device { } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-alarm-pm-types { prefix org-openroadm-common-alarm-pm-types; @@ -44,7 +44,7 @@ module org-openroadm-device { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-device-types { prefix org-openroadm-device-types; @@ -72,7 +72,7 @@ module org-openroadm-device { } import org-openroadm-swdl { prefix org-openroadm-swdl; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-equipment-states-types { prefix org-openroadm-equipment-states-types; @@ -84,7 +84,7 @@ module org-openroadm-device { } import org-openroadm-optical-operational-interfaces { prefix org-openroadm-optical-operational-interfaces; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-otn-common-types { prefix org-openroadm-otn-common-types; @@ -138,6 +138,10 @@ module org-openroadm-device { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -1291,7 +1295,7 @@ module org-openroadm-device { } mandatory true; description - "The supported circuit-pack. It will be empty if holder status is empty-not-prov, or installed-not-prov"; + "The supported circuit-pack."; } leaf-list port-list { type leafref { @@ -1455,14 +1459,6 @@ module org-openroadm-device { description "Operational state of a port"; } - leaf-list supported-interface-capability { - type identityref { - base org-openroadm-port-types:supported-if-capability; - } - config false; - description - "Interface types supported on this port"; - } leaf logical-connection-point { type string; description @@ -1569,14 +1565,13 @@ module org-openroadm-device { description "Port index identifier. Unique within the context of a circuit-pack."; } - leaf fec { - type identityref { - base org-openroadm-common-optical-channel-types:fec-identity; - } + + uses org-openroadm-common-types:fec-grouping { status deprecated; description - "Flexo FEC"; + "Flexo FEC / Forward Error Correction"; } + leaf otsi-rate { type identityref { base org-openroadm-common-optical-channel-types:otsi-rate-identity; @@ -1610,7 +1605,7 @@ module org-openroadm-device { "Otsigroup group capability"; leaf if-cap-type { type identityref { - base org-openroadm-port-types:if-OTUCn-ODUCn; + base org-openroadm-port-types:supported-if-capability; } description "Interface type/hierarchy/rate supported on this Otsi port. For example, if-n-otu4-n-odu4 and if-otucn-oducn"; @@ -1817,6 +1812,19 @@ module org-openroadm-device { description "ODTU type, part of the MSI (Multiplex Structure Identifier)"; } + leaf network-odu-rate { + type identityref { + base org-openroadm-otn-common-types:odu-rate-identity; + } + mandatory true; + description + "Network ODU rate"; + } + leaf network-oducn-n-rate { + type uint16; + description + "Network ODUCn rate, eg, network-oducn-n-rate=4 for ODUC4"; + } leaf network-ho-odu-trib-port-number { type uint16 { range "1 .. 80"; diff --git a/model/Device/org-openroadm-dhcp.yang b/model/Device/org-openroadm-dhcp.yang index 95f41b28..9562d123 100644 --- a/model/Device/org-openroadm-dhcp.yang +++ b/model/Device/org-openroadm-dhcp.yang @@ -4,7 +4,7 @@ module org-openroadm-dhcp { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import ietf-inet-types { prefix ietf-inet-types; @@ -45,6 +45,10 @@ module org-openroadm-dhcp { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-ethernet-interfaces.yang b/model/Device/org-openroadm-ethernet-interfaces.yang index 9cf9093d..6b56b92d 100644 --- a/model/Device/org-openroadm-ethernet-interfaces.yang +++ b/model/Device/org-openroadm-ethernet-interfaces.yang @@ -5,7 +5,7 @@ module org-openroadm-ethernet-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -13,11 +13,11 @@ module org-openroadm-ethernet-interfaces { } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-maintenance-testsignal { prefix org-openroadm-maint-testsignal; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-maintenance-loopback { prefix org-openroadm-maint-loopback; @@ -71,6 +71,10 @@ module org-openroadm-ethernet-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -129,16 +133,17 @@ module org-openroadm-ethernet-interfaces { type uint32; description "Set speed of the interface, unit mbps. - This is for ETH facility. "; + This is for ETH facility. + Applies to both management and transport Ethernet. + Optional, must be specified for transport Ethernet or when auto-negotiation is disabled."; } - leaf fec { - type enumeration { - enum off; - enum rsfec; - } + + uses org-openroadm-common-types:fec-grouping { description - "Forward Error Correction Choices. "; + "Forward Error Correction Choices. + Applies to transport Ethernet. Mandatory for transport Ethernet."; } + leaf duplex { type enumeration { enum half { @@ -154,7 +159,9 @@ module org-openroadm-ethernet-interfaces { } default "full"; description - "Set duplex selections."; + "Set duplex selections. + Applies to both management and transport Ethernet. + Optional, default “full”. Transport Ethernet only supports full."; } leaf auto-negotiation { type enumeration { @@ -171,46 +178,58 @@ module org-openroadm-ethernet-interfaces { } default "enabled"; description - "Set Auto Negotiation: Enabled/Disabled."; + "Set Auto Negotiation: Enabled/Disabled. + Applies to both management and transport Ethernet. + Optional, default “enabled”. Transport Ethernet only supports enabled."; } leaf curr-speed { type string; config false; description - "speed (UNKNOWN/AUTO/10/100/1000/10000) corresponding to the interface"; + "Speed (UNKNOWN/AUTO/10/100/1000/10000) corresponding to the interface. + Applies to both management and transport Ethernet."; } leaf curr-duplex { type string; config false; description - "duplex (HALF/FULL) corresponding to the interface"; + "Duplex (HALF/FULL) corresponding to the interface. + Applies to both management and transport Ethernet."; } leaf max-frame-size { type uint32; config false; description - "Maximum Frame Size."; + "Maximum Frame Size. Applies to management Ethernet."; } container subrate-eth-sla { presence "Explicit assignment of subrate ethernet allocation"; description - "SLA (Service Level Agreement) for subrate Ethernet"; + "SLA (Service Level Agreement) for subrate Ethernet. + Applies to transport Ethernet."; uses org-openroadm-common-types:eth-rate-and-burst-size; } + description + "Ethernet attributes grouping"; } grouping ethernet-container { container ethernet { description - "Ethernet Interfaces"; + "Ethernet Interfaces. + Maintenance test signal and loopback provisioning is supported for transport Ethernet."; uses eth-attributes; uses org-openroadm-maint-testsignal:maint-testsignal; uses org-openroadm-maint-loopback:maint-loopback; } + description + "Ethernet container grouping"; } augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" { when "org-openroadm-device:type = 'openROADM-if:ethernetCsmacd'"; uses ethernet-container; + description + "Augment for interface"; } } diff --git a/model/Device/org-openroadm-file-transfer.yang b/model/Device/org-openroadm-file-transfer.yang index 57dd7017..acb8a990 100644 --- a/model/Device/org-openroadm-file-transfer.yang +++ b/model/Device/org-openroadm-file-transfer.yang @@ -8,7 +8,7 @@ module org-openroadm-file-transfer { } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import ietf-yang-types { prefix ietf-yang-types; @@ -48,6 +48,10 @@ module org-openroadm-file-transfer { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-fwdl.yang b/model/Device/org-openroadm-fwdl.yang index 5317c296..b9b300f0 100644 --- a/model/Device/org-openroadm-fwdl.yang +++ b/model/Device/org-openroadm-fwdl.yang @@ -4,7 +4,7 @@ module org-openroadm-fwdl { import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -40,6 +40,10 @@ module org-openroadm-fwdl { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-gcc-interfaces.yang b/model/Device/org-openroadm-gcc-interfaces.yang index 0846c8cc..99a7420a 100644 --- a/model/Device/org-openroadm-gcc-interfaces.yang +++ b/model/Device/org-openroadm-gcc-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-gcc-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -58,6 +58,10 @@ module org-openroadm-gcc-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-gnmi.yang b/model/Device/org-openroadm-gnmi.yang index 0cb6cf16..874cfab9 100644 --- a/model/Device/org-openroadm-gnmi.yang +++ b/model/Device/org-openroadm-gnmi.yang @@ -5,11 +5,11 @@ module org-openroadm-gnmi { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-security { prefix org-openroadm-security; - revision-date 2020-03-27; + revision-date 2020-05-29; } import ietf-inet-types { prefix inet; @@ -49,6 +49,10 @@ module org-openroadm-gnmi { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-ip.yang b/model/Device/org-openroadm-ip.yang index ae8ac764..96ee2e7e 100644 --- a/model/Device/org-openroadm-ip.yang +++ b/model/Device/org-openroadm-ip.yang @@ -4,7 +4,7 @@ module org-openroadm-ip { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -43,6 +43,10 @@ module org-openroadm-ip { Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info)."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-ipv4-unicast-routing.yang b/model/Device/org-openroadm-ipv4-unicast-routing.yang index 1c90d366..48e30648 100644 --- a/model/Device/org-openroadm-ipv4-unicast-routing.yang +++ b/model/Device/org-openroadm-ipv4-unicast-routing.yang @@ -4,7 +4,7 @@ module org-openroadm-ipv4-unicast-routing { import org-openroadm-routing { prefix org-openroadm-routing; - revision-date 2020-03-27; + revision-date 2020-05-29; } import ietf-inet-types { prefix inet; @@ -12,7 +12,7 @@ module org-openroadm-ipv4-unicast-routing { } import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -39,6 +39,10 @@ module org-openroadm-ipv4-unicast-routing { Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info)."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-ipv6-unicast-routing.yang b/model/Device/org-openroadm-ipv6-unicast-routing.yang index e885858b..992f1cb7 100644 --- a/model/Device/org-openroadm-ipv6-unicast-routing.yang +++ b/model/Device/org-openroadm-ipv6-unicast-routing.yang @@ -4,7 +4,7 @@ module org-openroadm-ipv6-unicast-routing { import org-openroadm-routing { prefix org-openroadm-routing; - revision-date 2020-03-27; + revision-date 2020-05-29; } import ietf-inet-types { prefix inet; @@ -12,7 +12,7 @@ module org-openroadm-ipv6-unicast-routing { } import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -39,6 +39,10 @@ module org-openroadm-ipv6-unicast-routing { Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info)."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-lldp.yang b/model/Device/org-openroadm-lldp.yang index a294493a..a541eacd 100644 --- a/model/Device/org-openroadm-lldp.yang +++ b/model/Device/org-openroadm-lldp.yang @@ -8,7 +8,7 @@ module org-openroadm-lldp { } import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import iana-afn-safi { prefix ianaaf; @@ -56,6 +56,10 @@ module org-openroadm-lldp { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-maintenance-testsignal.yang b/model/Device/org-openroadm-maintenance-testsignal.yang index 8bf545c0..ce1b4863 100644 --- a/model/Device/org-openroadm-maintenance-testsignal.yang +++ b/model/Device/org-openroadm-maintenance-testsignal.yang @@ -5,7 +5,7 @@ module org-openroadm-maintenance-testsignal { import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -41,6 +41,10 @@ module org-openroadm-maintenance-testsignal { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-media-channel-interfaces.yang b/model/Device/org-openroadm-media-channel-interfaces.yang index 38bab26a..7b1e03ae 100644 --- a/model/Device/org-openroadm-media-channel-interfaces.yang +++ b/model/Device/org-openroadm-media-channel-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-media-channel-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -12,7 +12,7 @@ module org-openroadm-media-channel-interfaces { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -62,6 +62,10 @@ module org-openroadm-media-channel-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-network-media-channel-interfaces.yang b/model/Device/org-openroadm-network-media-channel-interfaces.yang index c76b6063..08d9f1b3 100644 --- a/model/Device/org-openroadm-network-media-channel-interfaces.yang +++ b/model/Device/org-openroadm-network-media-channel-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-network-media-channel-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -12,7 +12,7 @@ module org-openroadm-network-media-channel-interfaces { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -62,6 +62,10 @@ module org-openroadm-network-media-channel-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-optical-channel-interfaces.yang b/model/Device/org-openroadm-optical-channel-interfaces.yang index 92f6840b..357fcdd6 100644 --- a/model/Device/org-openroadm-optical-channel-interfaces.yang +++ b/model/Device/org-openroadm-optical-channel-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-optical-channel-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -16,11 +16,11 @@ module org-openroadm-optical-channel-interfaces { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-optical-operational-interfaces { prefix org-openroadm-optical-operational-interfaces; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -70,6 +70,10 @@ module org-openroadm-optical-channel-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -164,13 +168,6 @@ module org-openroadm-optical-channel-interfaces { description "The target transmit power for this channel. When set, the xponder will work to ensure that port-current-power reaches this level. Applicable only to channel on top of xpdr-network port"; } - leaf supported-group-if { - type leafref { - path "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface/org-openroadm-device:name"; - } - description - "OTSiG or FlexO-group interface name."; - } leaf optical-operational-mode { type string; description diff --git a/model/Device/org-openroadm-optical-operational-interfaces.yang b/model/Device/org-openroadm-optical-operational-interfaces.yang index 3bcff027..bcaff158 100644 --- a/model/Device/org-openroadm-optical-operational-interfaces.yang +++ b/model/Device/org-openroadm-optical-operational-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-optical-operational-interfaces { import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -54,6 +54,10 @@ module org-openroadm-optical-operational-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-optical-transport-interfaces.yang b/model/Device/org-openroadm-optical-transport-interfaces.yang index 968dc9b2..dd173a01 100644 --- a/model/Device/org-openroadm-optical-transport-interfaces.yang +++ b/model/Device/org-openroadm-optical-transport-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-optical-transport-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -63,6 +63,10 @@ module org-openroadm-optical-transport-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-optical-tributary-signal-interfaces.yang b/model/Device/org-openroadm-optical-tributary-signal-interfaces.yang index 6da6768a..514e7b7d 100644 --- a/model/Device/org-openroadm-optical-tributary-signal-interfaces.yang +++ b/model/Device/org-openroadm-optical-tributary-signal-interfaces.yang @@ -8,15 +8,19 @@ module org-openroadm-optical-tributary-signal-interfaces { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; + } + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2020-05-29; } import org-openroadm-optical-operational-interfaces { prefix org-openroadm-optical-operational-interfaces; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -70,6 +74,10 @@ module org-openroadm-optical-tributary-signal-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -149,15 +157,14 @@ module org-openroadm-optical-tributary-signal-interfaces { description "The target transmit power for this channel. When set, the xponder will work to ensure that port-current-power reaches this level. Applicable only to channel on top of xpdr-network port"; } - leaf fec { - when "../provision-mode = 'explicit'"; - type identityref { - base org-openroadm-common-optical-channel-types:fec-identity; - } + + uses org-openroadm-common-types:fec-grouping { + when "provision-mode = 'explicit'"; description - "FEC for OTSi"; + "OTSi FEC / Forward Error Correction"; } leaf optical-operational-mode { + when "../provision-mode = 'profile'"; type string; description "Optical-operational-mode sets the xponder settings based on one of the operational mode capabilities as published by the device. This attribute is mandatory when the provision-mode is set to profile."; @@ -190,11 +197,22 @@ module org-openroadm-optical-tributary-signal-interfaces { "Assigned flexo instance type"; } leaf-list iid { - type uint16; + type uint8; + min-elements 1; ordered-by user; description "A list of FlexO instance identification (G.709.1 clause 9.2.3)"; } + leaf-list accepted-group-id { + type uint32; + description + "AcGID[1]..AcGID[n] on a per FlexO instance basis (G.798 2019-12, Figure 15-10 FlexO-n/OTUCn_A_Sk processes)"; + } + leaf-list accepted-iid { + type uint8; + description + "AcIID[1]..AcIID[n] on a per FlexO instance basis (G.798 2019-12, Figure 15-10 FlexO-n/OTUCn_A_Sk processes)"; + } } } diff --git a/model/Device/org-openroadm-ospf.yang b/model/Device/org-openroadm-ospf.yang index f8da06ee..017f547e 100644 --- a/model/Device/org-openroadm-ospf.yang +++ b/model/Device/org-openroadm-ospf.yang @@ -12,11 +12,11 @@ module org-openroadm-ospf { } import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-routing { prefix org-openroadm-routing; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-key-chain { prefix org-openroadm-key-chain; @@ -47,6 +47,10 @@ module org-openroadm-ospf { Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info)."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-otn-odu-interfaces.yang b/model/Device/org-openroadm-otn-odu-interfaces.yang index ae6c9496..72ad065b 100644 --- a/model/Device/org-openroadm-otn-odu-interfaces.yang +++ b/model/Device/org-openroadm-otn-odu-interfaces.yang @@ -5,7 +5,7 @@ module org-openroadm-otn-odu-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -13,7 +13,7 @@ module org-openroadm-otn-odu-interfaces { } import org-openroadm-maintenance-testsignal { prefix org-openroadm-maint-testsignal; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-otn-common { prefix org-openroadm-otn-common; @@ -75,6 +75,10 @@ module org-openroadm-otn-odu-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -197,7 +201,7 @@ module org-openroadm-otn-odu-interfaces { } leaf oduflex-cbr-service { type identityref { - base org-openroadm-otn-common-types:odu-rate-identity; + base org-openroadm-otn-common-types:ODUflex-cbr-identity; } description "ODUflex for CBR client signals (G.709)"; diff --git a/model/Device/org-openroadm-otn-otu-interfaces.yang b/model/Device/org-openroadm-otn-otu-interfaces.yang index 511a7e8f..590d97e3 100644 --- a/model/Device/org-openroadm-otn-otu-interfaces.yang +++ b/model/Device/org-openroadm-otn-otu-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-otn-otu-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -26,6 +26,10 @@ module org-openroadm-otn-otu-interfaces { prefix org-openroadm-common-attributes; revision-date 2020-03-27; } + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2020-05-29; + } organization "Open ROADM MSA"; @@ -74,6 +78,10 @@ module org-openroadm-otn-otu-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -160,51 +168,10 @@ module org-openroadm-otn-otu-interfaces { "OTUCn subrate (OTUCn-M), value of M specifies the number of active 5 Gbit/s OPUCn tributary slots (G.709 Annex H)"; } - leaf fec { - type enumeration { - enum off { - value 0; - description - "fec off"; - } - enum rsfec { - value 1; - description - "rsfec"; - } - enum sdfeca1 { - value 2; - description - "Clariphy SDFEC"; - } - enum efec { - value 3; - description - "G.975.1 I.4"; - } - enum ufec { - value 4; - description - "G.975.1 I.7"; - } - enum sdfec { - value 5; - description - "Soft decision FEC"; - } - enum sdfecb1 { - value 6; - description - "SDFEC with SCFEC"; - } - enum scfec { - value 7; - description - "Stair case FEC"; - } - } + + uses org-openroadm-common-types:fec-grouping { description - "Forward Error Correction"; + "OTU FEC / Forward Error Correction"; } uses org-openroadm-otn-common:trail-trace; uses org-openroadm-common-attributes:deg-threshold; diff --git a/model/Device/org-openroadm-otsi-group-interfaces.yang b/model/Device/org-openroadm-otsi-group-interfaces.yang index 215deac1..56c558c0 100644 --- a/model/Device/org-openroadm-otsi-group-interfaces.yang +++ b/model/Device/org-openroadm-otsi-group-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-otsi-group-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -12,7 +12,7 @@ module org-openroadm-otsi-group-interfaces { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -62,6 +62,10 @@ module org-openroadm-otsi-group-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-pluggable-optics-holder-capability.yang b/model/Device/org-openroadm-pluggable-optics-holder-capability.yang index cccc26b6..2acb4aa5 100644 --- a/model/Device/org-openroadm-pluggable-optics-holder-capability.yang +++ b/model/Device/org-openroadm-pluggable-optics-holder-capability.yang @@ -4,11 +4,11 @@ module org-openroadm-pluggable-optics-holder-capability { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-port-capability { prefix org-openroadm-port-capability; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-port-types { prefix org-openroadm-port-types; @@ -62,6 +62,10 @@ module org-openroadm-pluggable-optics-holder-capability { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-port-capability.yang b/model/Device/org-openroadm-port-capability.yang index 5e16a70a..684b2f8b 100644 --- a/model/Device/org-openroadm-port-capability.yang +++ b/model/Device/org-openroadm-port-capability.yang @@ -4,7 +4,7 @@ module org-openroadm-port-capability { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-port-types { prefix org-openroadm-port-types; @@ -58,6 +58,10 @@ module org-openroadm-port-capability { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -189,7 +193,7 @@ module org-openroadm-port-capability { path "/org-openroadm-device:org-openroadm-device/org-openroadm-device:otn-capability-profile/org-openroadm-device:profile-name"; } } - container mpdr-client-restriction { + list mpdr-client-restriction { description "Restriction rules for how LO ODUs are multiplexed into HO ODU and the relation with mapped client ports."; @@ -205,7 +209,7 @@ module org-openroadm-port-capability { description "port identifier."; } - leaf muxp-profile-name { + leaf-list muxp-profile-name { type leafref { path "/org-openroadm-device:org-openroadm-device/org-openroadm-device:muxp-profile/org-openroadm-device:profile-name"; } diff --git a/model/Device/org-openroadm-ppp-interfaces.yang b/model/Device/org-openroadm-ppp-interfaces.yang index a2bf4315..b786cd08 100644 --- a/model/Device/org-openroadm-ppp-interfaces.yang +++ b/model/Device/org-openroadm-ppp-interfaces.yang @@ -4,7 +4,7 @@ module org-openroadm-ppp-interfaces { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-interfaces { prefix openROADM-if; @@ -58,6 +58,10 @@ module org-openroadm-ppp-interfaces { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-prot-otn-linear-aps.yang b/model/Device/org-openroadm-prot-otn-linear-aps.yang index 74c8352f..e6dcd2da 100644 --- a/model/Device/org-openroadm-prot-otn-linear-aps.yang +++ b/model/Device/org-openroadm-prot-otn-linear-aps.yang @@ -4,11 +4,11 @@ module org-openroadm-prot-otn-linear-aps { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -58,6 +58,10 @@ module org-openroadm-prot-otn-linear-aps { Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-routing.yang b/model/Device/org-openroadm-routing.yang index a886e278..ab1d9307 100644 --- a/model/Device/org-openroadm-routing.yang +++ b/model/Device/org-openroadm-routing.yang @@ -8,7 +8,7 @@ module org-openroadm-routing { } import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -35,6 +35,10 @@ module org-openroadm-routing { Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info)."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-rstp.yang b/model/Device/org-openroadm-rstp.yang index a42c6693..aa7a2e68 100644 --- a/model/Device/org-openroadm-rstp.yang +++ b/model/Device/org-openroadm-rstp.yang @@ -4,7 +4,7 @@ module org-openroadm-rstp { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-resource-types { prefix org-openroadm-resource-types; @@ -45,6 +45,10 @@ module org-openroadm-rstp { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-security.yang b/model/Device/org-openroadm-security.yang index 39162020..53bfec1a 100644 --- a/model/Device/org-openroadm-security.yang +++ b/model/Device/org-openroadm-security.yang @@ -5,11 +5,11 @@ module org-openroadm-security { import org-openroadm-device { prefix org-openroadm-device; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -45,6 +45,10 @@ module org-openroadm-security { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/org-openroadm-swdl.yang b/model/Device/org-openroadm-swdl.yang index 5ff341ef..dfdc8b3a 100644 --- a/model/Device/org-openroadm-swdl.yang +++ b/model/Device/org-openroadm-swdl.yang @@ -8,7 +8,7 @@ module org-openroadm-swdl { } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -44,6 +44,10 @@ module org-openroadm-swdl { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Device/tree-view-device.txt b/model/Device/tree-view-device.txt index e0d1c5bf..af3b148a 100644 --- a/model/Device/tree-view-device.txt +++ b/model/Device/tree-view-device.txt @@ -356,10 +356,10 @@ module: org-openroadm-device | | +--ro org-openroadm-pluggable-optics-holder-capability:optical-operational-mode-profile-name* -> /org-openroadm-device:org-openroadm-device/optical-operational-mode-profile/profile-name | | +--ro org-openroadm-pluggable-optics-holder-capability:otn-capability | | | +--ro org-openroadm-pluggable-optics-holder-capability:otn-capability-profile-name? -> /org-openroadm-device:org-openroadm-device/otn-capability-profile/profile-name - | | | +--ro org-openroadm-pluggable-optics-holder-capability:mpdr-client-restriction + | | | +--ro org-openroadm-pluggable-optics-holder-capability:mpdr-client-restriction* [] | | | | +--ro org-openroadm-pluggable-optics-holder-capability:network-ho-odu-circuit-pack-name string | | | | +--ro org-openroadm-pluggable-optics-holder-capability:network-ho-odu-port-name string - | | | | +--ro org-openroadm-pluggable-optics-holder-capability:muxp-profile-name? -> /org-openroadm-device:org-openroadm-device/muxp-profile/profile-name + | | | | +--ro org-openroadm-pluggable-optics-holder-capability:muxp-profile-name* -> /org-openroadm-device:org-openroadm-device/muxp-profile/profile-name | | | +--ro org-openroadm-pluggable-optics-holder-capability:otn-odu-mux-hierarchy-profile-name? -> /org-openroadm-device:org-openroadm-device/otn-odu-mux-hierarchy-profile/profile-name | | +--ro org-openroadm-pluggable-optics-holder-capability:logical-port | | +--ro org-openroadm-pluggable-optics-holder-capability:circuit-pack-name? string @@ -393,7 +393,6 @@ module: org-openroadm-device | +--rw lifecycle-state? org-openroadm-common-state-types:lifecycle-state | +--rw administrative-state? org-openroadm-equipment-states-types:admin-states | +--ro operational-state org-openroadm-common-state-types:state - | +--ro supported-interface-capability* identityref | +--rw logical-connection-point? string | +--ro partner-port | | +--ro circuit-pack-name? -> /org-openroadm-device/circuit-packs/circuit-pack-name @@ -430,10 +429,10 @@ module: org-openroadm-device | +--ro org-openroadm-port-capability:optical-operational-mode-profile-name* -> /org-openroadm-device:org-openroadm-device/optical-operational-mode-profile/profile-name | +--ro org-openroadm-port-capability:otn-capability | | +--ro org-openroadm-port-capability:otn-capability-profile-name? -> /org-openroadm-device:org-openroadm-device/otn-capability-profile/profile-name - | | +--ro org-openroadm-port-capability:mpdr-client-restriction + | | +--ro org-openroadm-port-capability:mpdr-client-restriction* [] | | | +--ro org-openroadm-port-capability:network-ho-odu-circuit-pack-name string | | | +--ro org-openroadm-port-capability:network-ho-odu-port-name string - | | | +--ro org-openroadm-port-capability:muxp-profile-name? -> /org-openroadm-device:org-openroadm-device/muxp-profile/profile-name + | | | +--ro org-openroadm-port-capability:muxp-profile-name* -> /org-openroadm-device:org-openroadm-device/muxp-profile/profile-name | | +--ro org-openroadm-port-capability:otn-odu-mux-hierarchy-profile-name? -> /org-openroadm-device:org-openroadm-device/otn-odu-mux-hierarchy-profile/profile-name | +--ro org-openroadm-port-capability:logical-port | +--ro org-openroadm-port-capability:circuit-pack-name? string @@ -449,6 +448,36 @@ module: org-openroadm-device | +--rw supporting-circuit-pack-name? -> /org-openroadm-device/circuit-packs/circuit-pack-name | +--rw supporting-port? -> /org-openroadm-device/circuit-packs[circuit-pack-name=current()/../supporting-circuit-pack-name]/ports/port-name | +--rw supporting-interface-list* -> /org-openroadm-device/interface/name + | +--rw org-openroadm-eth-interfaces:ethernet + | | +--rw org-openroadm-eth-interfaces:speed? uint32 + | | +--rw org-openroadm-eth-interfaces:fec? identityref + | | +--rw org-openroadm-eth-interfaces:duplex? enumeration + | | +--rw org-openroadm-eth-interfaces:auto-negotiation? enumeration + | | +--ro org-openroadm-eth-interfaces:curr-speed? string + | | +--ro org-openroadm-eth-interfaces:curr-duplex? string + | | +--ro org-openroadm-eth-interfaces:max-frame-size? uint32 + | | +--rw org-openroadm-eth-interfaces:subrate-eth-sla! + | | | +--rw org-openroadm-eth-interfaces:committed-info-rate uint32 + | | | +--rw org-openroadm-eth-interfaces:committed-burst-size uint16 + | | +--rw org-openroadm-eth-interfaces:maint-testsignal + | | | +---x org-openroadm-eth-interfaces:clear-diagnostics + | | | | +---w org-openroadm-eth-interfaces:input + | | | | | +---w org-openroadm-eth-interfaces:type? testsig-type + | | | | +--ro org-openroadm-eth-interfaces:output + | | | | +--ro org-openroadm-eth-interfaces:status org-openroadm-common-types:rpc-status + | | | | +--ro org-openroadm-eth-interfaces:status-message? string + | | | +--rw org-openroadm-eth-interfaces:enabled? boolean + | | | +--rw org-openroadm-eth-interfaces:testPattern enumeration + | | | +--rw org-openroadm-eth-interfaces:type? testsig-type + | | | +--ro org-openroadm-eth-interfaces:inSync? boolean + | | | +--ro org-openroadm-eth-interfaces:seconds uint32 + | | | +--ro org-openroadm-eth-interfaces:bitErrors? uint32 + | | | +--ro org-openroadm-eth-interfaces:bitErrorRate? decimal64 + | | +--rw org-openroadm-eth-interfaces:maint-loopback + | | +--rw org-openroadm-eth-interfaces:enabled? boolean + | | +--rw org-openroadm-eth-interfaces:type? enumeration + | +--rw org-openroadm-gcc-interfaces:gcc + | | +--rw org-openroadm-gcc-interfaces:gcc-channel-type? enumeration | +--rw org-openroadm-ip:ipv4! | | +--rw org-openroadm-ip:enabled? boolean | | +--rw org-openroadm-ip:forwarding? boolean @@ -470,6 +499,48 @@ module: org-openroadm-device | | +--rw org-openroadm-ip:address* [ip] | | +--rw org-openroadm-ip:ip inet:ipv6-address-no-zone | | +--rw org-openroadm-ip:prefix-length uint8 + | +--rw org-openroadm-media-channel-interfaces:mc-ttp + | | +--rw org-openroadm-media-channel-interfaces:min-freq? org-openroadm-common-optical-channel-types:frequency-THz + | | +--rw org-openroadm-media-channel-interfaces:max-freq? org-openroadm-common-optical-channel-types:frequency-THz + | | +--ro org-openroadm-media-channel-interfaces:center-freq? org-openroadm-common-optical-channel-types:frequency-THz + | | +--ro org-openroadm-media-channel-interfaces:slot-width? org-openroadm-common-optical-channel-types:frequency-GHz + | +--rw org-openroadm-network-media-channel-interfaces:nmc-ctp + | | +--rw org-openroadm-network-media-channel-interfaces:frequency? org-openroadm-common-optical-channel-types:frequency-THz + | | +--rw org-openroadm-network-media-channel-interfaces:width? org-openroadm-common-optical-channel-types:frequency-GHz + | +--rw org-openroadm-optical-channel-interfaces:och + | | +--rw org-openroadm-optical-channel-interfaces:provision-mode? org-openroadm-common-optical-channel-types:provision-mode-type + | | +--rw org-openroadm-optical-channel-interfaces:rate? identityref + | | +--rw org-openroadm-optical-channel-interfaces:frequency? org-openroadm-common-optical-channel-types:frequency-THz + | | +--ro org-openroadm-optical-channel-interfaces:width? org-openroadm-common-optical-channel-types:frequency-GHz + | | +--rw org-openroadm-optical-channel-interfaces:modulation-format? org-openroadm-common-optical-channel-types:modulation-format + | | +--rw org-openroadm-optical-channel-interfaces:transmit-power? org-openroadm-common-link-types:power-dBm + | | +--rw org-openroadm-optical-channel-interfaces:optical-operational-mode? string + | | +--ro org-openroadm-optical-channel-interfaces:operational-mode-params + | | +--ro org-openroadm-optical-channel-interfaces:spectral-width? org-openroadm-common-optical-channel-types:frequency-GHz + | +--rw org-openroadm-optical-transport-interfaces:ots + | | +--rw org-openroadm-optical-transport-interfaces:fiber-type? enumeration + | | +--rw org-openroadm-optical-transport-interfaces:span-loss-receive? org-openroadm-common-link-types:ratio-dB + | | +--rw org-openroadm-optical-transport-interfaces:span-loss-transmit? org-openroadm-common-link-types:ratio-dB + | | +--rw org-openroadm-optical-transport-interfaces:ingress-span-loss-aging-margin? org-openroadm-common-link-types:ratio-dB + | | +--rw org-openroadm-optical-transport-interfaces:eol-max-load-pIn? org-openroadm-common-link-types:power-dBm + | +--rw org-openroadm-optical-tributary-signal-interfaces:otsi + | | +--rw org-openroadm-optical-tributary-signal-interfaces:provision-mode? org-openroadm-common-optical-channel-types:provision-mode-type + | | +--rw org-openroadm-optical-tributary-signal-interfaces:otsi-rate? identityref + | | +--rw org-openroadm-optical-tributary-signal-interfaces:otsi-member-id? uint16 + | | +--rw org-openroadm-optical-tributary-signal-interfaces:frequency? org-openroadm-common-optical-channel-types:frequency-THz + | | +--ro org-openroadm-optical-tributary-signal-interfaces:width? org-openroadm-common-optical-channel-types:frequency-GHz + | | +--rw org-openroadm-optical-tributary-signal-interfaces:modulation-format? org-openroadm-common-optical-channel-types:modulation-format + | | +--rw org-openroadm-optical-tributary-signal-interfaces:transmit-power? org-openroadm-common-link-types:power-dBm + | | +--rw org-openroadm-optical-tributary-signal-interfaces:fec? identityref + | | +--rw org-openroadm-optical-tributary-signal-interfaces:optical-operational-mode? string + | | +--ro org-openroadm-optical-tributary-signal-interfaces:operational-mode-params + | | | +--ro org-openroadm-optical-tributary-signal-interfaces:spectral-width? org-openroadm-common-optical-channel-types:frequency-GHz + | | +--ro org-openroadm-optical-tributary-signal-interfaces:supported-group-if? -> /org-openroadm-device:org-openroadm-device/interface/name + | | +--rw org-openroadm-optical-tributary-signal-interfaces:flexo! + | | +--rw org-openroadm-optical-tributary-signal-interfaces:foic-type identityref + | | +--rw org-openroadm-optical-tributary-signal-interfaces:iid* uint8 + | | +--rw org-openroadm-optical-tributary-signal-interfaces:accepted-group-id* uint32 + | | +--rw org-openroadm-optical-tributary-signal-interfaces:accepted-iid* uint8 | +--rw org-openroadm-otn-odu-interfaces:odu! | | +--rw org-openroadm-otn-odu-interfaces:rate? identityref | | +--rw org-openroadm-otn-odu-interfaces:oducn-n-rate? uint16 @@ -566,16 +637,12 @@ module: org-openroadm-device | | +--ro org-openroadm-otn-odu-interfaces:seconds uint32 | | +--ro org-openroadm-otn-odu-interfaces:bitErrors? uint32 | | +--ro org-openroadm-otn-odu-interfaces:bitErrorRate? decimal64 - | +--rw org-openroadm-ppp-interfaces:ppp - | | +--rw org-openroadm-ppp-interfaces:magicNumber? boolean - | +--rw org-openroadm-gcc-interfaces:gcc - | | +--rw org-openroadm-gcc-interfaces:gcc-channel-type? enumeration | +--rw org-openroadm-otn-otu-interfaces:otu | | +--rw org-openroadm-otn-otu-interfaces:rate? identityref | | +--rw org-openroadm-otn-otu-interfaces:otu4-member-id? uint16 | | +--rw org-openroadm-otn-otu-interfaces:otucn-n-rate? uint16 | | +--rw org-openroadm-otn-otu-interfaces:otucn-M-subrate? uint16 - | | +--rw org-openroadm-otn-otu-interfaces:fec? enumeration + | | +--rw org-openroadm-otn-otu-interfaces:fec? identityref | | +--rw org-openroadm-otn-otu-interfaces:tx-sapi? string | | +--rw org-openroadm-otn-otu-interfaces:tx-dapi? string | | +--rw org-openroadm-otn-otu-interfaces:tx-operator? string @@ -591,78 +658,11 @@ module: org-openroadm-device | | +--rw org-openroadm-otn-otu-interfaces:maint-loopback | | +--rw org-openroadm-otn-otu-interfaces:enabled? boolean | | +--rw org-openroadm-otn-otu-interfaces:type? enumeration - | +--rw org-openroadm-optical-channel-interfaces:och - | | +--rw org-openroadm-optical-channel-interfaces:provision-mode? org-openroadm-common-optical-channel-types:provision-mode-type - | | +--rw org-openroadm-optical-channel-interfaces:rate? identityref - | | +--rw org-openroadm-optical-channel-interfaces:frequency? org-openroadm-common-optical-channel-types:frequency-THz - | | +--ro org-openroadm-optical-channel-interfaces:width? org-openroadm-common-optical-channel-types:frequency-GHz - | | +--rw org-openroadm-optical-channel-interfaces:modulation-format? org-openroadm-common-optical-channel-types:modulation-format - | | +--rw org-openroadm-optical-channel-interfaces:transmit-power? org-openroadm-common-link-types:power-dBm - | | +--rw org-openroadm-optical-channel-interfaces:supported-group-if? -> /org-openroadm-device:org-openroadm-device/interface/name - | | +--rw org-openroadm-optical-channel-interfaces:optical-operational-mode? string - | | +--ro org-openroadm-optical-channel-interfaces:operational-mode-params - | | +--ro org-openroadm-optical-channel-interfaces:spectral-width? org-openroadm-common-optical-channel-types:frequency-GHz - | +--rw org-openroadm-network-media-channel-interfaces:nmc-ctp - | | +--rw org-openroadm-network-media-channel-interfaces:frequency? org-openroadm-common-optical-channel-types:frequency-THz - | | +--rw org-openroadm-network-media-channel-interfaces:width? org-openroadm-common-optical-channel-types:frequency-GHz - | +--rw org-openroadm-optical-transport-interfaces:ots - | | +--rw org-openroadm-optical-transport-interfaces:fiber-type? enumeration - | | +--rw org-openroadm-optical-transport-interfaces:span-loss-receive? org-openroadm-common-link-types:ratio-dB - | | +--rw org-openroadm-optical-transport-interfaces:span-loss-transmit? org-openroadm-common-link-types:ratio-dB - | | +--rw org-openroadm-optical-transport-interfaces:ingress-span-loss-aging-margin? org-openroadm-common-link-types:ratio-dB - | | +--rw org-openroadm-optical-transport-interfaces:eol-max-load-pIn? org-openroadm-common-link-types:power-dBm - | +--rw org-openroadm-eth-interfaces:ethernet - | | +--rw org-openroadm-eth-interfaces:speed? uint32 - | | +--rw org-openroadm-eth-interfaces:fec? enumeration - | | +--rw org-openroadm-eth-interfaces:duplex? enumeration - | | +--rw org-openroadm-eth-interfaces:auto-negotiation? enumeration - | | +--ro org-openroadm-eth-interfaces:curr-speed? string - | | +--ro org-openroadm-eth-interfaces:curr-duplex? string - | | +--ro org-openroadm-eth-interfaces:max-frame-size? uint32 - | | +--rw org-openroadm-eth-interfaces:subrate-eth-sla! - | | | +--rw org-openroadm-eth-interfaces:committed-info-rate uint32 - | | | +--rw org-openroadm-eth-interfaces:committed-burst-size uint16 - | | +--rw org-openroadm-eth-interfaces:maint-testsignal - | | | +---x org-openroadm-eth-interfaces:clear-diagnostics - | | | | +---w org-openroadm-eth-interfaces:input - | | | | | +---w org-openroadm-eth-interfaces:type? testsig-type - | | | | +--ro org-openroadm-eth-interfaces:output - | | | | +--ro org-openroadm-eth-interfaces:status org-openroadm-common-types:rpc-status - | | | | +--ro org-openroadm-eth-interfaces:status-message? string - | | | +--rw org-openroadm-eth-interfaces:enabled? boolean - | | | +--rw org-openroadm-eth-interfaces:testPattern enumeration - | | | +--rw org-openroadm-eth-interfaces:type? testsig-type - | | | +--ro org-openroadm-eth-interfaces:inSync? boolean - | | | +--ro org-openroadm-eth-interfaces:seconds uint32 - | | | +--ro org-openroadm-eth-interfaces:bitErrors? uint32 - | | | +--ro org-openroadm-eth-interfaces:bitErrorRate? decimal64 - | | +--rw org-openroadm-eth-interfaces:maint-loopback - | | +--rw org-openroadm-eth-interfaces:enabled? boolean - | | +--rw org-openroadm-eth-interfaces:type? enumeration - | +--rw org-openroadm-media-channel-interfaces:mc-ttp - | | +--rw org-openroadm-media-channel-interfaces:min-freq? org-openroadm-common-optical-channel-types:frequency-THz - | | +--rw org-openroadm-media-channel-interfaces:max-freq? org-openroadm-common-optical-channel-types:frequency-THz - | | +--ro org-openroadm-media-channel-interfaces:center-freq? org-openroadm-common-optical-channel-types:frequency-THz - | | +--ro org-openroadm-media-channel-interfaces:slot-width? org-openroadm-common-optical-channel-types:frequency-GHz | +--rw org-openroadm-otsi-group-interfaces:otsi-group | | +--rw org-openroadm-otsi-group-interfaces:group-rate? identityref | | +--rw org-openroadm-otsi-group-interfaces:group-id? uint32 - | +--rw org-openroadm-optical-tributary-signal-interfaces:otsi - | +--rw org-openroadm-optical-tributary-signal-interfaces:provision-mode? org-openroadm-common-optical-channel-types:provision-mode-type - | +--rw org-openroadm-optical-tributary-signal-interfaces:otsi-rate? identityref - | +--rw org-openroadm-optical-tributary-signal-interfaces:otsi-member-id? uint16 - | +--rw org-openroadm-optical-tributary-signal-interfaces:frequency? org-openroadm-common-optical-channel-types:frequency-THz - | +--ro org-openroadm-optical-tributary-signal-interfaces:width? org-openroadm-common-optical-channel-types:frequency-GHz - | +--rw org-openroadm-optical-tributary-signal-interfaces:modulation-format? org-openroadm-common-optical-channel-types:modulation-format - | +--rw org-openroadm-optical-tributary-signal-interfaces:transmit-power? org-openroadm-common-link-types:power-dBm - | +--rw org-openroadm-optical-tributary-signal-interfaces:fec? identityref - | +--rw org-openroadm-optical-tributary-signal-interfaces:optical-operational-mode? string - | +--ro org-openroadm-optical-tributary-signal-interfaces:operational-mode-params - | | +--ro org-openroadm-optical-tributary-signal-interfaces:spectral-width? org-openroadm-common-optical-channel-types:frequency-GHz - | +--ro org-openroadm-optical-tributary-signal-interfaces:supported-group-if? -> /org-openroadm-device:org-openroadm-device/interface/name - | +--rw org-openroadm-optical-tributary-signal-interfaces:flexo! - | +--rw org-openroadm-optical-tributary-signal-interfaces:foic-type identityref - | +--rw org-openroadm-optical-tributary-signal-interfaces:iid* uint16 + | +--rw org-openroadm-ppp-interfaces:ppp + | +--rw org-openroadm-ppp-interfaces:magicNumber? boolean +--rw protection-grps | +--rw org-openroadm-prot-otn-linear-aps:odu-sncp-pg* [name] | +--rw org-openroadm-prot-otn-linear-aps:name string @@ -691,66 +691,66 @@ module: org-openroadm-device | | +--rw org-openroadm-dhcp:server-group-name string | | +--rw org-openroadm-dhcp:interface-name* -> /org-openroadm-device:org-openroadm-device/interface/name | | +--rw org-openroadm-dhcp:server-address* ietf-inet-types:ipv6-address - | +--rw org-openroadm-rstp:rstp - | | +--ro org-openroadm-rstp:max-bridge-instances? uint32 - | | +--rw org-openroadm-rstp:rstp-bridge-instance* [bridge-name] - | | +--rw org-openroadm-rstp:bridge-name string - | | +--rw org-openroadm-rstp:rstp-config - | | | +--rw org-openroadm-rstp:bridge-priority? uint32 - | | | +--rw org-openroadm-rstp:shutdown? empty - | | | +--rw org-openroadm-rstp:hold-time? uint32 - | | | +--rw org-openroadm-rstp:hello-time? uint32 - | | | +--rw org-openroadm-rstp:max-age? uint32 - | | | +--rw org-openroadm-rstp:forward-delay? uint32 - | | | +--rw org-openroadm-rstp:transmit-hold-count? uint32 - | | | +--rw org-openroadm-rstp:rstp-bridge-port-table* [ifname] - | | | +--rw org-openroadm-rstp:ifname -> /org-openroadm-device:org-openroadm-device/interface/name - | | | +--rw org-openroadm-rstp:cost? uint32 - | | | +--rw org-openroadm-rstp:priority? uint32 - | | +--ro org-openroadm-rstp:rstp-state - | | +--ro org-openroadm-rstp:rstp-bridge-attr - | | | +--ro org-openroadm-rstp:root-bridge-port? uint32 - | | | +--ro org-openroadm-rstp:root-path-cost? uint32 - | | | +--ro org-openroadm-rstp:root-bridge-priority? uint32 - | | | +--ro org-openroadm-rstp:root-bridge-id? bridge-id-type - | | | +--ro org-openroadm-rstp:root-hold-time? uint32 - | | | +--ro org-openroadm-rstp:root-hello-time? uint32 - | | | +--ro org-openroadm-rstp:root-max-age? uint32 - | | | +--ro org-openroadm-rstp:root-forward-delay? uint32 - | | | +--ro org-openroadm-rstp:bridge-id? bridge-id-type - | | | +--ro org-openroadm-rstp:topo-change-count? uint32 - | | | +--ro org-openroadm-rstp:time-since-topo-change? uint32 - | | +--ro org-openroadm-rstp:rstp-bridge-port-attr - | | +--ro org-openroadm-rstp:rstp-bridge-port-table* [ifname] - | | +--ro org-openroadm-rstp:ifname string - | | +--ro org-openroadm-rstp:bridge-port-state? enumeration - | | +--ro org-openroadm-rstp:bridge-port-role? enumeration - | | +--ro org-openroadm-rstp:bridge-port-id? uint32 - | | +--ro org-openroadm-rstp:oper-edge-bridge-port? empty - | | +--ro org-openroadm-rstp:designated-bridge-port? uint32 - | | +--ro org-openroadm-rstp:designated-bridgeid? bridge-id-type | +--rw org-openroadm-gnmi:gnmi | | +--rw org-openroadm-gnmi:enabled? boolean | | +--rw org-openroadm-gnmi:certificate-id? -> /org-openroadm-device:org-openroadm-device/org-openroadm-security:security/certificate/certificate-id | | +--rw org-openroadm-gnmi:port? inet:port-number | +--rw org-openroadm-lldp:lldp - | +--rw org-openroadm-lldp:global-config - | | +--rw org-openroadm-lldp:adminStatus? enumeration - | | +--rw org-openroadm-lldp:msgTxInterval? uint16 - | | +--rw org-openroadm-lldp:msgTxHoldMultiplier? uint8 - | +--rw org-openroadm-lldp:port-config* [ifName] - | | +--rw org-openroadm-lldp:ifName -> /org-openroadm-device:org-openroadm-device/interface/name - | | +--rw org-openroadm-lldp:adminStatus? enumeration - | +--ro org-openroadm-lldp:nbr-list - | +--ro org-openroadm-lldp:if-name* [ifName] - | +--ro org-openroadm-lldp:ifName string - | +--ro org-openroadm-lldp:remoteSysName? string - | +--ro org-openroadm-lldp:remoteMgmtAddressSubType? ianaaf:address-family - | +--ro org-openroadm-lldp:remoteMgmtAddress? inet:ip-address - | +--ro org-openroadm-lldp:remotePortIdSubType? enumeration - | +--ro org-openroadm-lldp:remotePortId? string - | +--ro org-openroadm-lldp:remoteChassisIdSubType? enumeration - | +--ro org-openroadm-lldp:remoteChassisId? string + | | +--rw org-openroadm-lldp:global-config + | | | +--rw org-openroadm-lldp:adminStatus? enumeration + | | | +--rw org-openroadm-lldp:msgTxInterval? uint16 + | | | +--rw org-openroadm-lldp:msgTxHoldMultiplier? uint8 + | | +--rw org-openroadm-lldp:port-config* [ifName] + | | | +--rw org-openroadm-lldp:ifName -> /org-openroadm-device:org-openroadm-device/interface/name + | | | +--rw org-openroadm-lldp:adminStatus? enumeration + | | +--ro org-openroadm-lldp:nbr-list + | | +--ro org-openroadm-lldp:if-name* [ifName] + | | +--ro org-openroadm-lldp:ifName string + | | +--ro org-openroadm-lldp:remoteSysName? string + | | +--ro org-openroadm-lldp:remoteMgmtAddressSubType? ianaaf:address-family + | | +--ro org-openroadm-lldp:remoteMgmtAddress? inet:ip-address + | | +--ro org-openroadm-lldp:remotePortIdSubType? enumeration + | | +--ro org-openroadm-lldp:remotePortId? string + | | +--ro org-openroadm-lldp:remoteChassisIdSubType? enumeration + | | +--ro org-openroadm-lldp:remoteChassisId? string + | +--rw org-openroadm-rstp:rstp + | +--ro org-openroadm-rstp:max-bridge-instances? uint32 + | +--rw org-openroadm-rstp:rstp-bridge-instance* [bridge-name] + | +--rw org-openroadm-rstp:bridge-name string + | +--rw org-openroadm-rstp:rstp-config + | | +--rw org-openroadm-rstp:bridge-priority? uint32 + | | +--rw org-openroadm-rstp:shutdown? empty + | | +--rw org-openroadm-rstp:hold-time? uint32 + | | +--rw org-openroadm-rstp:hello-time? uint32 + | | +--rw org-openroadm-rstp:max-age? uint32 + | | +--rw org-openroadm-rstp:forward-delay? uint32 + | | +--rw org-openroadm-rstp:transmit-hold-count? uint32 + | | +--rw org-openroadm-rstp:rstp-bridge-port-table* [ifname] + | | +--rw org-openroadm-rstp:ifname -> /org-openroadm-device:org-openroadm-device/interface/name + | | +--rw org-openroadm-rstp:cost? uint32 + | | +--rw org-openroadm-rstp:priority? uint32 + | +--ro org-openroadm-rstp:rstp-state + | +--ro org-openroadm-rstp:rstp-bridge-attr + | | +--ro org-openroadm-rstp:root-bridge-port? uint32 + | | +--ro org-openroadm-rstp:root-path-cost? uint32 + | | +--ro org-openroadm-rstp:root-bridge-priority? uint32 + | | +--ro org-openroadm-rstp:root-bridge-id? bridge-id-type + | | +--ro org-openroadm-rstp:root-hold-time? uint32 + | | +--ro org-openroadm-rstp:root-hello-time? uint32 + | | +--ro org-openroadm-rstp:root-max-age? uint32 + | | +--ro org-openroadm-rstp:root-forward-delay? uint32 + | | +--ro org-openroadm-rstp:bridge-id? bridge-id-type + | | +--ro org-openroadm-rstp:topo-change-count? uint32 + | | +--ro org-openroadm-rstp:time-since-topo-change? uint32 + | +--ro org-openroadm-rstp:rstp-bridge-port-attr + | +--ro org-openroadm-rstp:rstp-bridge-port-table* [ifname] + | +--ro org-openroadm-rstp:ifname string + | +--ro org-openroadm-rstp:bridge-port-state? enumeration + | +--ro org-openroadm-rstp:bridge-port-role? enumeration + | +--ro org-openroadm-rstp:bridge-port-id? uint32 + | +--ro org-openroadm-rstp:oper-edge-bridge-port? empty + | +--ro org-openroadm-rstp:designated-bridge-port? uint32 + | +--ro org-openroadm-rstp:designated-bridgeid? bridge-id-type +--ro internal-link* [internal-link-name] | +--ro internal-link-name string | +--ro source @@ -936,6 +936,8 @@ module: org-openroadm-device +--ro muxp-profile* [profile-name] | +--ro profile-name string | +--ro odtu-type identityref + | +--ro network-odu-rate identityref + | +--ro network-oducn-n-rate? uint16 | +--ro network-ho-odu-trib-port-number uint16 | +--ro network-ho-odu-trib-slots* uint16 | +--ro network-ho-odu-opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def diff --git a/model/Network/org-openroadm-common-network.yang b/model/Network/org-openroadm-common-network.yang index ace68d07..fbbab3ca 100644 --- a/model/Network/org-openroadm-common-network.yang +++ b/model/Network/org-openroadm-common-network.yang @@ -13,7 +13,7 @@ module org-openroadm-common-network { } import org-openroadm-network-types { prefix org-openroadm-network-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-state-types { prefix org-openroadm-common-state-types; @@ -55,6 +55,10 @@ module org-openroadm-common-network { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Network/org-openroadm-degree.yang b/model/Network/org-openroadm-degree.yang index 3a6daba3..c67cbfc5 100644 --- a/model/Network/org-openroadm-degree.yang +++ b/model/Network/org-openroadm-degree.yang @@ -9,7 +9,7 @@ module org-openroadm-degree { } import org-openroadm-network-types { prefix org-openroadm-network-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -46,6 +46,10 @@ module org-openroadm-degree { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Network/org-openroadm-external-pluggable.yang b/model/Network/org-openroadm-external-pluggable.yang index a64ba378..16ca977c 100644 --- a/model/Network/org-openroadm-external-pluggable.yang +++ b/model/Network/org-openroadm-external-pluggable.yang @@ -13,7 +13,7 @@ module org-openroadm-external-pluggable { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -50,6 +50,10 @@ module org-openroadm-external-pluggable { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Network/org-openroadm-link.yang b/model/Network/org-openroadm-link.yang index 68c8853a..2c20b215 100644 --- a/model/Network/org-openroadm-link.yang +++ b/model/Network/org-openroadm-link.yang @@ -21,7 +21,7 @@ module org-openroadm-link { } import org-openroadm-network-types { prefix org-openroadm-network-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -58,6 +58,10 @@ module org-openroadm-link { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Network/org-openroadm-network-topology.yang b/model/Network/org-openroadm-network-topology.yang index 4d2281f2..fcb11225 100644 --- a/model/Network/org-openroadm-network-topology.yang +++ b/model/Network/org-openroadm-network-topology.yang @@ -13,31 +13,31 @@ module org-openroadm-network-topology { } import org-openroadm-network-types { prefix org-openroadm-network-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-srg { prefix srg; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-degree { prefix dgr; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-xponder { prefix xpdr; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-external-pluggable { prefix plg; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-link { prefix link; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-network { prefix cnet; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -73,6 +73,10 @@ module org-openroadm-network-topology { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Network/org-openroadm-network-types.yang b/model/Network/org-openroadm-network-types.yang index f79bacd8..c4f93c2b 100644 --- a/model/Network/org-openroadm-network-types.yang +++ b/model/Network/org-openroadm-network-types.yang @@ -9,7 +9,7 @@ module org-openroadm-network-types { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-port-types { prefix org-openroadm-port-types; @@ -47,6 +47,10 @@ module org-openroadm-network-types { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Network/org-openroadm-network.yang b/model/Network/org-openroadm-network.yang index 04881d86..506c514b 100644 --- a/model/Network/org-openroadm-network.yang +++ b/model/Network/org-openroadm-network.yang @@ -9,7 +9,7 @@ module org-openroadm-network { } import org-openroadm-network-types { prefix nt; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-roadm { prefix roadm; @@ -17,11 +17,11 @@ module org-openroadm-network { } import org-openroadm-external-pluggable { prefix plg; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-xponder { prefix xpdr; - revision-date 2020-03-27; + revision-date 2020-05-29; } import ietf-inet-types { prefix inet; @@ -29,11 +29,11 @@ module org-openroadm-network { } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-network { prefix cnet; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -67,6 +67,10 @@ module org-openroadm-network { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Network/org-openroadm-otn-network-topology.yang b/model/Network/org-openroadm-otn-network-topology.yang index 7de323fd..28bbfa1b 100644 --- a/model/Network/org-openroadm-otn-network-topology.yang +++ b/model/Network/org-openroadm-otn-network-topology.yang @@ -13,7 +13,7 @@ module org-openroadm-otn-network-topology { } import org-openroadm-network-types { prefix org-openroadm-network-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-network-topology-types { prefix org-openroadm-network-topology-types; @@ -21,11 +21,11 @@ module org-openroadm-otn-network-topology { } import org-openroadm-xponder { prefix xpdr; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-network { prefix cnet; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -61,6 +61,10 @@ module org-openroadm-otn-network-topology { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -153,7 +157,7 @@ module org-openroadm-otn-network-topology { } augment "/nd:networks/nd:network/nd:node" { - when '../nd:network-types/cnet:openroadm-common-network/otn-topology'; + when '../nd:network-types/cnet:openroadm-common-network/otn-topo:otn-topology'; description "This augmentations adds the OTN Node type to the generic node definition and defines node-specific attributes for each node type diff --git a/model/Network/org-openroadm-srg.yang b/model/Network/org-openroadm-srg.yang index f675c518..ef47ba85 100644 --- a/model/Network/org-openroadm-srg.yang +++ b/model/Network/org-openroadm-srg.yang @@ -5,7 +5,7 @@ module org-openroadm-srg { import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -41,6 +41,10 @@ module org-openroadm-srg { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Network/org-openroadm-xponder.yang b/model/Network/org-openroadm-xponder.yang index 19dc9edb..27341902 100644 --- a/model/Network/org-openroadm-xponder.yang +++ b/model/Network/org-openroadm-xponder.yang @@ -5,7 +5,7 @@ module org-openroadm-xponder { import org-openroadm-network-types { prefix org-openroadm-network-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-equipment-types { prefix org-openroadm-common-equipment-types; @@ -17,7 +17,7 @@ module org-openroadm-xponder { } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-otn-common-types { prefix org-openroadm-otn-common-types; @@ -61,6 +61,10 @@ module org-openroadm-xponder { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -138,7 +142,7 @@ module org-openroadm-xponder { } leaf rate { type identityref { - base org-openroadm-common-optical-channel-types:och-rate-identity; + base org-openroadm-common-optical-channel-types:optical-rate-identity; } description "rate"; diff --git a/model/Service/org-openroadm-ber-test.yang b/model/Service/org-openroadm-ber-test.yang index 5a484e6b..09eea6b4 100644 --- a/model/Service/org-openroadm-ber-test.yang +++ b/model/Service/org-openroadm-ber-test.yang @@ -4,11 +4,11 @@ module org-openroadm-ber-test { import org-openroadm-common-service-types { prefix org-openroadm-common-service-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-ber-test { prefix org-openroadm-common-ber-test; - revision-date 2019-11-29; + revision-date 2020-05-29; } import ietf-yang-types { prefix yang; @@ -48,6 +48,10 @@ module org-openroadm-ber-test { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Service/org-openroadm-common-ber-test.yang b/model/Service/org-openroadm-common-ber-test.yang index e99f3c6e..dc927340 100644 --- a/model/Service/org-openroadm-common-ber-test.yang +++ b/model/Service/org-openroadm-common-ber-test.yang @@ -36,6 +36,10 @@ module org-openroadm-common-ber-test { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2019-11-29 { description "Version 6.1.0"; @@ -53,7 +57,7 @@ module org-openroadm-common-ber-test { container ber-options { leaf target-prefec-ber { type decimal64 { - fraction-digits 4; + fraction-digits 18; } } leaf duration { diff --git a/model/Service/org-openroadm-common-service-types.yang b/model/Service/org-openroadm-common-service-types.yang index 2b1dfeee..a16a71a2 100644 --- a/model/Service/org-openroadm-common-service-types.yang +++ b/model/Service/org-openroadm-common-service-types.yang @@ -12,11 +12,11 @@ module org-openroadm-common-service-types { } import org-openroadm-routing-constraints { prefix org-openroadm-routing-constraints; - revision-date 2019-11-29; + revision-date 2020-05-29; } import org-openroadm-topology { prefix org-openroadm-topology; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-equipment-types { prefix org-openroadm-common-equipment-types; @@ -40,7 +40,7 @@ module org-openroadm-common-service-types { } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-equipment-states-types { prefix org-openroadm-equipment-states-types; @@ -88,6 +88,10 @@ module org-openroadm-common-service-types { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; @@ -459,7 +463,15 @@ module org-openroadm-common-service-types { grouping otn-attributes-grp { container otn-attributes { + when "(../service-format='OTU' or ../service-format='ODU')" { + description + "For any OTN services (OTU and OTN)"; + } uses org-openroadm-common-attributes:parent-odu-allocation; + uses org-openroadm-common-types:fec-grouping { + description + "OTN FEC / Forward Error Correction"; + } uses org-openroadm-common-attributes:trail-trace-tx; uses org-openroadm-common-attributes:trail-trace-other; uses org-openroadm-common-attributes:deg-threshold; @@ -476,6 +488,20 @@ module org-openroadm-common-service-types { } } + grouping ethernet-subrate-attributes-grp { + container ethernet-attributes { + when "(../service-format='Ethernet')" { + description + "For any Ethernet services"; + } + uses org-openroadm-common-types:fec-grouping { + description + "ETH FEC / Forward Error Correction"; + } + uses org-openroadm-common-service-types:subrate-eth-sla; + } + } + grouping service-ends-container { container service-a-end { uses service-endpoint-summary; @@ -549,6 +575,7 @@ module org-openroadm-common-service-types { grouping subrate-eth-sla { container subrate-eth-sla { + presence "Explicit assignment of subrate ethernet allocation"; description "SLA (Service Level Agreement) for subrate Ethernet"; uses org-openroadm-common-types:eth-rate-and-burst-size; @@ -688,13 +715,8 @@ module org-openroadm-common-service-types { description "Label for service endpoint, defined by the user"; } - container subrate-eth-sla { - when "(../service-format='Ethernet')" { - description - "For any Ethernet services"; - } - uses org-openroadm-common-service-types:subrate-eth-sla; - } + + uses ethernet-subrate-attributes-grp; } grouping sdnc-request-header { diff --git a/model/Service/org-openroadm-controller-customization.yang b/model/Service/org-openroadm-controller-customization.yang index 7c18ea76..ac1c4fd0 100644 --- a/model/Service/org-openroadm-controller-customization.yang +++ b/model/Service/org-openroadm-controller-customization.yang @@ -8,11 +8,11 @@ module org-openroadm-controller-customization { } import org-openroadm-common-service-types { prefix org-openroadm-common-service-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-common-optical-channel-types { prefix org-openroadm-common-optical-channel-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -48,6 +48,10 @@ module org-openroadm-controller-customization { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Service/org-openroadm-routing-constraints.yang b/model/Service/org-openroadm-routing-constraints.yang index b16037da..b37a1718 100644 --- a/model/Service/org-openroadm-routing-constraints.yang +++ b/model/Service/org-openroadm-routing-constraints.yang @@ -44,6 +44,10 @@ module org-openroadm-routing-constraints { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2019-11-29 { description "Version 6.1.0"; @@ -214,6 +218,18 @@ module org-openroadm-routing-constraints { leaf link { type boolean; } + container equipment { + leaf roadm-srg { + type boolean; + description "ROADM shared-risk-group diversity"; + } + leaf xponder-srg { + type boolean; + description "xponder eqpt-srg-id diversity"; + } + description + "Equipment Diversity Contraints"; + } } } } diff --git a/model/Service/org-openroadm-service.yang b/model/Service/org-openroadm-service.yang index c5480ae8..34a9f667 100644 --- a/model/Service/org-openroadm-service.yang +++ b/model/Service/org-openroadm-service.yang @@ -8,11 +8,11 @@ module org-openroadm-service { } import org-openroadm-routing-constraints { prefix org-openroadm-routing-constraints; - revision-date 2019-11-29; + revision-date 2020-05-29; } import org-openroadm-common-types { prefix org-openroadm-common-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-resource-types { prefix org-openroadm-resource-types; @@ -20,11 +20,11 @@ module org-openroadm-service { } import org-openroadm-common-service-types { prefix org-openroadm-common-service-types; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-controller-customization { prefix org-openroadm-controller-customization; - revision-date 2020-03-27; + revision-date 2020-05-29; } organization @@ -60,6 +60,10 @@ module org-openroadm-service { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Service/org-openroadm-topology.yang b/model/Service/org-openroadm-topology.yang index 16322243..a2955817 100644 --- a/model/Service/org-openroadm-topology.yang +++ b/model/Service/org-openroadm-topology.yang @@ -4,7 +4,7 @@ module org-openroadm-topology { import org-openroadm-resource { prefix org-openroadm-resource; - revision-date 2020-03-27; + revision-date 2020-05-29; } import org-openroadm-network-resource { prefix org-openroadm-network-resource; @@ -44,6 +44,10 @@ module org-openroadm-topology { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2020-05-29 { + description + "Version 7.1.0"; + } revision 2020-03-27 { description "Version 7.0.0"; diff --git a/model/Service/tree-view-service.txt b/model/Service/tree-view-service.txt index 2c26ab75..030328cf 100644 --- a/model/Service/tree-view-service.txt +++ b/model/Service/tree-view-service.txt @@ -394,6 +394,7 @@ module: org-openroadm-service | | | | | +--rw trib-slots* uint16 | | | | +--:(opucn) | | | | +--rw opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--rw fec? identityref | | | +--rw tx-sapi? string | | | +--rw tx-dapi? string | | | +--rw tx-operator? string @@ -473,8 +474,9 @@ module: org-openroadm-service | | | +--rw ip-address? inet:ip-address | | | +--rw url? string | | +--rw user-label? string - | | +--rw subrate-eth-sla - | | | +--rw subrate-eth-sla + | | +--rw ethernet-attributes + | | | +--rw fec? identityref + | | | +--rw subrate-eth-sla! | | | +--rw committed-info-rate uint32 | | | +--rw committed-burst-size uint16 | | +--rw project-id? string @@ -495,6 +497,7 @@ module: org-openroadm-service | | | | | +--rw trib-slots* uint16 | | | | +--:(opucn) | | | | +--rw opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--rw fec? identityref | | | +--rw tx-sapi? string | | | +--rw tx-dapi? string | | | +--rw tx-operator? string @@ -574,8 +577,9 @@ module: org-openroadm-service | | | +--rw ip-address? inet:ip-address | | | +--rw url? string | | +--rw user-label? string - | | +--rw subrate-eth-sla - | | | +--rw subrate-eth-sla + | | +--rw ethernet-attributes + | | | +--rw fec? identityref + | | | +--rw subrate-eth-sla! | | | +--rw committed-info-rate uint32 | | | +--rw committed-burst-size uint16 | | +--rw project-id? string @@ -587,10 +591,13 @@ module: org-openroadm-service | | | +--rw diversity | | | | +--rw existing-service* string | | | | +--rw existing-service-applicability - | | | | +--rw site? boolean - | | | | +--rw node? boolean - | | | | +--rw srlg? boolean - | | | | +--rw link? boolean + | | | | +--rw site? boolean + | | | | +--rw node? boolean + | | | | +--rw srlg? boolean + | | | | +--rw link? boolean + | | | | +--rw equipment + | | | | +--rw roadm-srg? boolean + | | | | +--rw xponder-srg? boolean | | | +--rw exclude | | | | +--rw fiber-bundle* string | | | | +--rw srlg-id* uint32 @@ -629,10 +636,13 @@ module: org-openroadm-service | | | +--rw diversity | | | | +--rw existing-service* string | | | | +--rw existing-service-applicability - | | | | +--rw site? boolean - | | | | +--rw node? boolean - | | | | +--rw srlg? boolean - | | | | +--rw link? boolean + | | | | +--rw site? boolean + | | | | +--rw node? boolean + | | | | +--rw srlg? boolean + | | | | +--rw link? boolean + | | | | +--rw equipment + | | | | +--rw roadm-srg? boolean + | | | | +--rw xponder-srg? boolean | | | +--rw exclude | | | | +--rw fiber-bundle* string | | | | +--rw srlg-id* uint32 @@ -1084,6 +1094,7 @@ module: org-openroadm-service | | | | | +--rw trib-slots* uint16 | | | | +--:(opucn) | | | | +--rw opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--rw fec? identityref | | | +--rw tx-sapi? string | | | +--rw tx-dapi? string | | | +--rw tx-operator? string @@ -1163,8 +1174,9 @@ module: org-openroadm-service | | | +--rw ip-address? inet:ip-address | | | +--rw url? string | | +--rw user-label? string - | | +--rw subrate-eth-sla - | | | +--rw subrate-eth-sla + | | +--rw ethernet-attributes + | | | +--rw fec? identityref + | | | +--rw subrate-eth-sla! | | | +--rw committed-info-rate uint32 | | | +--rw committed-burst-size uint16 | | +--rw project-id? string @@ -1185,6 +1197,7 @@ module: org-openroadm-service | | | | | +--rw trib-slots* uint16 | | | | +--:(opucn) | | | | +--rw opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--rw fec? identityref | | | +--rw tx-sapi? string | | | +--rw tx-dapi? string | | | +--rw tx-operator? string @@ -1264,8 +1277,9 @@ module: org-openroadm-service | | | +--rw ip-address? inet:ip-address | | | +--rw url? string | | +--rw user-label? string - | | +--rw subrate-eth-sla - | | | +--rw subrate-eth-sla + | | +--rw ethernet-attributes + | | | +--rw fec? identityref + | | | +--rw subrate-eth-sla! | | | +--rw committed-info-rate uint32 | | | +--rw committed-burst-size uint16 | | +--rw project-id? string @@ -1277,10 +1291,13 @@ module: org-openroadm-service | | | +--rw diversity | | | | +--rw existing-service* string | | | | +--rw existing-service-applicability - | | | | +--rw site? boolean - | | | | +--rw node? boolean - | | | | +--rw srlg? boolean - | | | | +--rw link? boolean + | | | | +--rw site? boolean + | | | | +--rw node? boolean + | | | | +--rw srlg? boolean + | | | | +--rw link? boolean + | | | | +--rw equipment + | | | | +--rw roadm-srg? boolean + | | | | +--rw xponder-srg? boolean | | | +--rw exclude | | | | +--rw fiber-bundle* string | | | | +--rw srlg-id* uint32 @@ -1319,10 +1336,13 @@ module: org-openroadm-service | | | +--rw diversity | | | | +--rw existing-service* string | | | | +--rw existing-service-applicability - | | | | +--rw site? boolean - | | | | +--rw node? boolean - | | | | +--rw srlg? boolean - | | | | +--rw link? boolean + | | | | +--rw site? boolean + | | | | +--rw node? boolean + | | | | +--rw srlg? boolean + | | | | +--rw link? boolean + | | | | +--rw equipment + | | | | +--rw roadm-srg? boolean + | | | | +--rw xponder-srg? boolean | | | +--rw exclude | | | | +--rw fiber-bundle* string | | | | +--rw srlg-id* uint32 @@ -1773,6 +1793,7 @@ module: org-openroadm-service | | | | | +--rw trib-slots* uint16 | | | | +--:(opucn) | | | | +--rw opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--rw fec? identityref | | | +--rw tx-sapi? string | | | +--rw tx-dapi? string | | | +--rw tx-operator? string @@ -1852,8 +1873,9 @@ module: org-openroadm-service | | | +--rw ip-address? inet:ip-address | | | +--rw url? string | | +--rw user-label? string - | | +--rw subrate-eth-sla - | | | +--rw subrate-eth-sla + | | +--rw ethernet-attributes + | | | +--rw fec? identityref + | | | +--rw subrate-eth-sla! | | | +--rw committed-info-rate uint32 | | | +--rw committed-burst-size uint16 | | +--rw project-id? string @@ -1874,6 +1896,7 @@ module: org-openroadm-service | | | | | +--rw trib-slots* uint16 | | | | +--:(opucn) | | | | +--rw opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--rw fec? identityref | | | +--rw tx-sapi? string | | | +--rw tx-dapi? string | | | +--rw tx-operator? string @@ -1953,8 +1976,9 @@ module: org-openroadm-service | | | +--rw ip-address? inet:ip-address | | | +--rw url? string | | +--rw user-label? string - | | +--rw subrate-eth-sla - | | | +--rw subrate-eth-sla + | | +--rw ethernet-attributes + | | | +--rw fec? identityref + | | | +--rw subrate-eth-sla! | | | +--rw committed-info-rate uint32 | | | +--rw committed-burst-size uint16 | | +--rw project-id? string @@ -1966,10 +1990,13 @@ module: org-openroadm-service | | | +--rw diversity | | | | +--rw existing-service* string | | | | +--rw existing-service-applicability - | | | | +--rw site? boolean - | | | | +--rw node? boolean - | | | | +--rw srlg? boolean - | | | | +--rw link? boolean + | | | | +--rw site? boolean + | | | | +--rw node? boolean + | | | | +--rw srlg? boolean + | | | | +--rw link? boolean + | | | | +--rw equipment + | | | | +--rw roadm-srg? boolean + | | | | +--rw xponder-srg? boolean | | | +--rw exclude | | | | +--rw fiber-bundle* string | | | | +--rw srlg-id* uint32 @@ -2008,10 +2035,13 @@ module: org-openroadm-service | | | +--rw diversity | | | | +--rw existing-service* string | | | | +--rw existing-service-applicability - | | | | +--rw site? boolean - | | | | +--rw node? boolean - | | | | +--rw srlg? boolean - | | | | +--rw link? boolean + | | | | +--rw site? boolean + | | | | +--rw node? boolean + | | | | +--rw srlg? boolean + | | | | +--rw link? boolean + | | | | +--rw equipment + | | | | +--rw roadm-srg? boolean + | | | | +--rw xponder-srg? boolean | | | +--rw exclude | | | | +--rw fiber-bundle* string | | | | +--rw srlg-id* uint32 @@ -2513,6 +2543,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -2592,8 +2623,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | | +---w fec? identityref + | | | | +---w subrate-eth-sla! | | | | +---w committed-info-rate uint32 | | | | +---w committed-burst-size uint16 | | | +---w project-id? string @@ -2614,6 +2646,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -2693,8 +2726,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | | +---w fec? identityref + | | | | +---w subrate-eth-sla! | | | | +---w committed-info-rate uint32 | | | | +---w committed-burst-size uint16 | | | +---w project-id? string @@ -2706,10 +2740,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -2748,10 +2785,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -2824,10 +2864,13 @@ module: org-openroadm-service | | | +--ro diversity | | | | +--ro existing-service* string | | | | +--ro existing-service-applicability - | | | | +--ro site? boolean - | | | | +--ro node? boolean - | | | | +--ro srlg? boolean - | | | | +--ro link? boolean + | | | | +--ro site? boolean + | | | | +--ro node? boolean + | | | | +--ro srlg? boolean + | | | | +--ro link? boolean + | | | | +--ro equipment + | | | | +--ro roadm-srg? boolean + | | | | +--ro xponder-srg? boolean | | | +--ro exclude | | | | +--ro fiber-bundle* string | | | | +--ro srlg-id* uint32 @@ -2866,10 +2909,13 @@ module: org-openroadm-service | | +--ro diversity | | | +--ro existing-service* string | | | +--ro existing-service-applicability - | | | +--ro site? boolean - | | | +--ro node? boolean - | | | +--ro srlg? boolean - | | | +--ro link? boolean + | | | +--ro site? boolean + | | | +--ro node? boolean + | | | +--ro srlg? boolean + | | | +--ro link? boolean + | | | +--ro equipment + | | | +--ro roadm-srg? boolean + | | | +--ro xponder-srg? boolean | | +--ro exclude | | | +--ro fiber-bundle* string | | | +--ro srlg-id* uint32 @@ -3105,6 +3151,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -3184,8 +3231,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | +---w fec? identityref + | | | +---w subrate-eth-sla! | | | +---w committed-info-rate uint32 | | | +---w committed-burst-size uint16 | | +---w service-z-end @@ -3204,6 +3252,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -3283,8 +3332,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | +---w fec? identityref + | | | +---w subrate-eth-sla! | | | +---w committed-info-rate uint32 | | | +---w committed-burst-size uint16 | | +---w hard-constraints @@ -3294,10 +3344,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -3336,10 +3389,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -3435,10 +3491,13 @@ module: org-openroadm-service | | | | +--ro diversity | | | | | +--ro existing-service* string | | | | | +--ro existing-service-applicability - | | | | | +--ro site? boolean - | | | | | +--ro node? boolean - | | | | | +--ro srlg? boolean - | | | | | +--ro link? boolean + | | | | | +--ro site? boolean + | | | | | +--ro node? boolean + | | | | | +--ro srlg? boolean + | | | | | +--ro link? boolean + | | | | | +--ro equipment + | | | | | +--ro roadm-srg? boolean + | | | | | +--ro xponder-srg? boolean | | | | +--ro exclude | | | | | +--ro fiber-bundle* string | | | | | +--ro srlg-id* uint32 @@ -3477,10 +3536,13 @@ module: org-openroadm-service | | | +--ro diversity | | | | +--ro existing-service* string | | | | +--ro existing-service-applicability - | | | | +--ro site? boolean - | | | | +--ro node? boolean - | | | | +--ro srlg? boolean - | | | | +--ro link? boolean + | | | | +--ro site? boolean + | | | | +--ro node? boolean + | | | | +--ro srlg? boolean + | | | | +--ro link? boolean + | | | | +--ro equipment + | | | | +--ro roadm-srg? boolean + | | | | +--ro xponder-srg? boolean | | | +--ro exclude | | | | +--ro fiber-bundle* string | | | | +--ro srlg-id* uint32 @@ -3528,6 +3590,7 @@ module: org-openroadm-service | | | | | +--ro trib-slots* uint16 | | | | +--:(opucn) | | | | +--ro opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--ro fec? identityref | | | +--ro tx-sapi? string | | | +--ro tx-dapi? string | | | +--ro tx-operator? string @@ -3607,8 +3670,9 @@ module: org-openroadm-service | | | +--ro ip-address? inet:ip-address | | | +--ro url? string | | +--ro user-label? string - | | +--ro subrate-eth-sla - | | | +--ro subrate-eth-sla + | | +--ro ethernet-attributes + | | | +--ro fec? identityref + | | | +--ro subrate-eth-sla! | | | +--ro committed-info-rate uint32 | | | +--ro committed-burst-size uint16 | | +--ro equipment-required* [equipment-identifier] @@ -3632,6 +3696,7 @@ module: org-openroadm-service | | | | | +--ro trib-slots* uint16 | | | | +--:(opucn) | | | | +--ro opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--ro fec? identityref | | | +--ro tx-sapi? string | | | +--ro tx-dapi? string | | | +--ro tx-operator? string @@ -3711,8 +3776,9 @@ module: org-openroadm-service | | | +--ro ip-address? inet:ip-address | | | +--ro url? string | | +--ro user-label? string - | | +--ro subrate-eth-sla - | | | +--ro subrate-eth-sla + | | +--ro ethernet-attributes + | | | +--ro fec? identityref + | | | +--ro subrate-eth-sla! | | | +--ro committed-info-rate uint32 | | | +--ro committed-burst-size uint16 | | +--ro equipment-required* [equipment-identifier] @@ -3736,6 +3802,7 @@ module: org-openroadm-service | | | | +--ro trib-slots* uint16 | | | +--:(opucn) | | | +--ro opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | +--ro fec? identityref | | +--ro tx-sapi? string | | +--ro tx-dapi? string | | +--ro tx-operator? string @@ -3815,8 +3882,9 @@ module: org-openroadm-service | | +--ro ip-address? inet:ip-address | | +--ro url? string | +--ro user-label? string - | +--ro subrate-eth-sla - | | +--ro subrate-eth-sla + | +--ro ethernet-attributes + | | +--ro fec? identityref + | | +--ro subrate-eth-sla! | | +--ro committed-info-rate uint32 | | +--ro committed-burst-size uint16 | +--ro equipment-required* [equipment-identifier] @@ -3851,6 +3919,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -3930,8 +3999,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | +---w fec? identityref + | | | +---w subrate-eth-sla! | | | +---w committed-info-rate uint32 | | | +---w committed-burst-size uint16 | | +---w service-z-end @@ -3950,6 +4020,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -4029,8 +4100,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | +---w fec? identityref + | | | +---w subrate-eth-sla! | | | +---w committed-info-rate uint32 | | | +---w committed-burst-size uint16 | | +---w hard-constraints @@ -4040,10 +4112,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -4082,10 +4157,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -4182,10 +4260,13 @@ module: org-openroadm-service | | | | +--ro diversity | | | | | +--ro existing-service* string | | | | | +--ro existing-service-applicability - | | | | | +--ro site? boolean - | | | | | +--ro node? boolean - | | | | | +--ro srlg? boolean - | | | | | +--ro link? boolean + | | | | | +--ro site? boolean + | | | | | +--ro node? boolean + | | | | | +--ro srlg? boolean + | | | | | +--ro link? boolean + | | | | | +--ro equipment + | | | | | +--ro roadm-srg? boolean + | | | | | +--ro xponder-srg? boolean | | | | +--ro exclude | | | | | +--ro fiber-bundle* string | | | | | +--ro srlg-id* uint32 @@ -4224,10 +4305,13 @@ module: org-openroadm-service | | | +--ro diversity | | | | +--ro existing-service* string | | | | +--ro existing-service-applicability - | | | | +--ro site? boolean - | | | | +--ro node? boolean - | | | | +--ro srlg? boolean - | | | | +--ro link? boolean + | | | | +--ro site? boolean + | | | | +--ro node? boolean + | | | | +--ro srlg? boolean + | | | | +--ro link? boolean + | | | | +--ro equipment + | | | | +--ro roadm-srg? boolean + | | | | +--ro xponder-srg? boolean | | | +--ro exclude | | | | +--ro fiber-bundle* string | | | | +--ro srlg-id* uint32 @@ -4275,6 +4359,7 @@ module: org-openroadm-service | | | | | +--ro trib-slots* uint16 | | | | +--:(opucn) | | | | +--ro opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--ro fec? identityref | | | +--ro tx-sapi? string | | | +--ro tx-dapi? string | | | +--ro tx-operator? string @@ -4354,8 +4439,9 @@ module: org-openroadm-service | | | +--ro ip-address? inet:ip-address | | | +--ro url? string | | +--ro user-label? string - | | +--ro subrate-eth-sla - | | | +--ro subrate-eth-sla + | | +--ro ethernet-attributes + | | | +--ro fec? identityref + | | | +--ro subrate-eth-sla! | | | +--ro committed-info-rate uint32 | | | +--ro committed-burst-size uint16 | | +--ro equipment-required* [equipment-identifier] @@ -4379,6 +4465,7 @@ module: org-openroadm-service | | | | | +--ro trib-slots* uint16 | | | | +--:(opucn) | | | | +--ro opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--ro fec? identityref | | | +--ro tx-sapi? string | | | +--ro tx-dapi? string | | | +--ro tx-operator? string @@ -4458,8 +4545,9 @@ module: org-openroadm-service | | | +--ro ip-address? inet:ip-address | | | +--ro url? string | | +--ro user-label? string - | | +--ro subrate-eth-sla - | | | +--ro subrate-eth-sla + | | +--ro ethernet-attributes + | | | +--ro fec? identityref + | | | +--ro subrate-eth-sla! | | | +--ro committed-info-rate uint32 | | | +--ro committed-burst-size uint16 | | +--ro equipment-required* [equipment-identifier] @@ -4483,6 +4571,7 @@ module: org-openroadm-service | | | | +--ro trib-slots* uint16 | | | +--:(opucn) | | | +--ro opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | +--ro fec? identityref | | +--ro tx-sapi? string | | +--ro tx-dapi? string | | +--ro tx-operator? string @@ -4562,8 +4651,9 @@ module: org-openroadm-service | | +--ro ip-address? inet:ip-address | | +--ro url? string | +--ro user-label? string - | +--ro subrate-eth-sla - | | +--ro subrate-eth-sla + | +--ro ethernet-attributes + | | +--ro fec? identityref + | | +--ro subrate-eth-sla! | | +--ro committed-info-rate uint32 | | +--ro committed-burst-size uint16 | +--ro equipment-required* [equipment-identifier] @@ -4637,6 +4727,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -4716,8 +4807,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | | +---w fec? identityref + | | | | +---w subrate-eth-sla! | | | | +---w committed-info-rate uint32 | | | | +---w committed-burst-size uint16 | | | +---w project-id? string @@ -4738,6 +4830,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -4817,8 +4910,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | | +---w fec? identityref + | | | | +---w subrate-eth-sla! | | | | +---w committed-info-rate uint32 | | | | +---w committed-burst-size uint16 | | | +---w project-id? string @@ -4830,10 +4924,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -4872,10 +4969,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -4970,10 +5070,13 @@ module: org-openroadm-service | | | +--ro diversity | | | | +--ro existing-service* string | | | | +--ro existing-service-applicability - | | | | +--ro site? boolean - | | | | +--ro node? boolean - | | | | +--ro srlg? boolean - | | | | +--ro link? boolean + | | | | +--ro site? boolean + | | | | +--ro node? boolean + | | | | +--ro srlg? boolean + | | | | +--ro link? boolean + | | | | +--ro equipment + | | | | +--ro roadm-srg? boolean + | | | | +--ro xponder-srg? boolean | | | +--ro exclude | | | | +--ro fiber-bundle* string | | | | +--ro srlg-id* uint32 @@ -5012,10 +5115,13 @@ module: org-openroadm-service | | +--ro diversity | | | +--ro existing-service* string | | | +--ro existing-service-applicability - | | | +--ro site? boolean - | | | +--ro node? boolean - | | | +--ro srlg? boolean - | | | +--ro link? boolean + | | | +--ro site? boolean + | | | +--ro node? boolean + | | | +--ro srlg? boolean + | | | +--ro link? boolean + | | | +--ro equipment + | | | +--ro roadm-srg? boolean + | | | +--ro xponder-srg? boolean | | +--ro exclude | | | +--ro fiber-bundle* string | | | +--ro srlg-id* uint32 @@ -5098,6 +5204,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -5177,8 +5284,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | | +---w fec? identityref + | | | | +---w subrate-eth-sla! | | | | +---w committed-info-rate uint32 | | | | +---w committed-burst-size uint16 | | | +---w project-id? string @@ -5199,6 +5307,7 @@ module: org-openroadm-service | | | | | | +---w trib-slots* uint16 | | | | | +--:(opucn) | | | | | +---w opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | | +---w fec? identityref | | | | +---w tx-sapi? string | | | | +---w tx-dapi? string | | | | +---w tx-operator? string @@ -5278,8 +5387,9 @@ module: org-openroadm-service | | | | +---w ip-address? inet:ip-address | | | | +---w url? string | | | +---w user-label? string - | | | +---w subrate-eth-sla - | | | | +---w subrate-eth-sla + | | | +---w ethernet-attributes + | | | | +---w fec? identityref + | | | | +---w subrate-eth-sla! | | | | +---w committed-info-rate uint32 | | | | +---w committed-burst-size uint16 | | | +---w project-id? string @@ -5291,10 +5401,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -5333,10 +5446,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -5481,10 +5597,13 @@ module: org-openroadm-service | | | +--ro diversity | | | | +--ro existing-service* string | | | | +--ro existing-service-applicability - | | | | +--ro site? boolean - | | | | +--ro node? boolean - | | | | +--ro srlg? boolean - | | | | +--ro link? boolean + | | | | +--ro site? boolean + | | | | +--ro node? boolean + | | | | +--ro srlg? boolean + | | | | +--ro link? boolean + | | | | +--ro equipment + | | | | +--ro roadm-srg? boolean + | | | | +--ro xponder-srg? boolean | | | +--ro exclude | | | | +--ro fiber-bundle* string | | | | +--ro srlg-id* uint32 @@ -5523,10 +5642,13 @@ module: org-openroadm-service | | +--ro diversity | | | +--ro existing-service* string | | | +--ro existing-service-applicability - | | | +--ro site? boolean - | | | +--ro node? boolean - | | | +--ro srlg? boolean - | | | +--ro link? boolean + | | | +--ro site? boolean + | | | +--ro node? boolean + | | | +--ro srlg? boolean + | | | +--ro link? boolean + | | | +--ro equipment + | | | +--ro roadm-srg? boolean + | | | +--ro xponder-srg? boolean | | +--ro exclude | | | +--ro fiber-bundle* string | | | +--ro srlg-id* uint32 @@ -5568,10 +5690,13 @@ module: org-openroadm-service | | | | +---w diversity | | | | | +---w existing-service* string | | | | | +---w existing-service-applicability - | | | | | +---w site? boolean - | | | | | +---w node? boolean - | | | | | +---w srlg? boolean - | | | | | +---w link? boolean + | | | | | +---w site? boolean + | | | | | +---w node? boolean + | | | | | +---w srlg? boolean + | | | | | +---w link? boolean + | | | | | +---w equipment + | | | | | +---w roadm-srg? boolean + | | | | | +---w xponder-srg? boolean | | | | +---w exclude | | | | | +---w fiber-bundle* string | | | | | +---w srlg-id* uint32 @@ -5610,10 +5735,13 @@ module: org-openroadm-service | | | +---w diversity | | | | +---w existing-service* string | | | | +---w existing-service-applicability - | | | | +---w site? boolean - | | | | +---w node? boolean - | | | | +---w srlg? boolean - | | | | +---w link? boolean + | | | | +---w site? boolean + | | | | +---w node? boolean + | | | | +---w srlg? boolean + | | | | +---w link? boolean + | | | | +---w equipment + | | | | +---w roadm-srg? boolean + | | | | +---w xponder-srg? boolean | | | +---w exclude | | | | +---w fiber-bundle* string | | | | +---w srlg-id* uint32 @@ -5739,6 +5867,7 @@ module: org-openroadm-service | | | | | +--ro trib-slots* uint16 | | | | +--:(opucn) | | | | +--ro opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--ro fec? identityref | | | +--ro tx-sapi? string | | | +--ro tx-dapi? string | | | +--ro tx-operator? string @@ -5818,8 +5947,9 @@ module: org-openroadm-service | | | +--ro ip-address? inet:ip-address | | | +--ro url? string | | +--ro user-label? string - | | +--ro subrate-eth-sla - | | | +--ro subrate-eth-sla + | | +--ro ethernet-attributes + | | | +--ro fec? identityref + | | | +--ro subrate-eth-sla! | | | +--ro committed-info-rate uint32 | | | +--ro committed-burst-size uint16 | | +--ro project-id? string @@ -5840,6 +5970,7 @@ module: org-openroadm-service | | | | | +--ro trib-slots* uint16 | | | | +--:(opucn) | | | | +--ro opucn-trib-slots* org-openroadm-otn-common-types:opucn-trib-slot-def + | | | +--ro fec? identityref | | | +--ro tx-sapi? string | | | +--ro tx-dapi? string | | | +--ro tx-operator? string @@ -5919,8 +6050,9 @@ module: org-openroadm-service | | | +--ro ip-address? inet:ip-address | | | +--ro url? string | | +--ro user-label? string - | | +--ro subrate-eth-sla - | | | +--ro subrate-eth-sla + | | +--ro ethernet-attributes + | | | +--ro fec? identityref + | | | +--ro subrate-eth-sla! | | | +--ro committed-info-rate uint32 | | | +--ro committed-burst-size uint16 | | +--ro project-id? string @@ -5932,10 +6064,13 @@ module: org-openroadm-service | | | +--ro diversity | | | | +--ro existing-service* string | | | | +--ro existing-service-applicability - | | | | +--ro site? boolean - | | | | +--ro node? boolean - | | | | +--ro srlg? boolean - | | | | +--ro link? boolean + | | | | +--ro site? boolean + | | | | +--ro node? boolean + | | | | +--ro srlg? boolean + | | | | +--ro link? boolean + | | | | +--ro equipment + | | | | +--ro roadm-srg? boolean + | | | | +--ro xponder-srg? boolean | | | +--ro exclude | | | | +--ro fiber-bundle* string | | | | +--ro srlg-id* uint32 @@ -5974,10 +6109,13 @@ module: org-openroadm-service | | | +--ro diversity | | | | +--ro existing-service* string | | | | +--ro existing-service-applicability - | | | | +--ro site? boolean - | | | | +--ro node? boolean - | | | | +--ro srlg? boolean - | | | | +--ro link? boolean + | | | | +--ro site? boolean + | | | | +--ro node? boolean + | | | | +--ro srlg? boolean + | | | | +--ro link? boolean + | | | | +--ro equipment + | | | | +--ro roadm-srg? boolean + | | | | +--ro xponder-srg? boolean | | | +--ro exclude | | | | +--ro fiber-bundle* string | | | | +--ro srlg-id* uint32