diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..a5575458dcb1fcdb18d6d6c527181a31315272c6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "models/arista"]
+	path = models/arista
+	url = https://github.com/aristanetworks/yang.git
diff --git a/models/arista b/models/arista
new file mode 160000
index 0000000000000000000000000000000000000000..42aaddb9b62c18f6a4a50dce49df9fc2c4b84cb2
--- /dev/null
+++ b/models/arista
@@ -0,0 +1 @@
+Subproject commit 42aaddb9b62c18f6a4a50dce49df9fc2c4b84cb2
diff --git a/models/ciena-6500-adjacencies.yang b/models/ciena-6500-adjacencies.yang
deleted file mode 100644
index 92f68d4d0e18da3f176810ad1357576930c9edbb..0000000000000000000000000000000000000000
--- a/models/ciena-6500-adjacencies.yang
+++ /dev/null
@@ -1,1829 +0,0 @@
-module ciena-6500-adjacencies {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-adjacencies";
-  prefix adjacencies;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's adjacencies object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container adjacencies
-           list tx
-           - Added leaf: exp-res-time
-           - Added leaf: path-disp
-           - Added leaf: tx-pre-comp
-           - Added leaf: link-opt-mode
-           - Added leaf: tx-disp-mode
-           - Added leaf: disc-link-opt-mode
-           - Added leaf: disc-tx-disp-mode
-           - Added leaf: disc-tx-pre-comp
-           - Added leaf: disc-path-disp
-             leaf center-frequency
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-             leaf loopback-wavelength
-             - Changed config from true to false
-           list rx
-             leaf center-frequency
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         rpc adjacencies-show-adjacency
-           output
-             list output
-             - Added leaf: ops-fe-addr
-         container adjacencies
-           list adjacency
-           - Added leaf: ops-fe-addr";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: adjacencies-show-adjacency
-         rpc adjacencies-show-connval-status
-           input
-             leaf pass-entries
-             - Added default: NO 
-           output
-           - Removed leaf: aid
-           - Removed leaf: date
-           - Removed leaf: time
-           - Removed leaf: status
-           - Added list: output
-         container adjacencies
-           list adjacency
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list fiber
-             leaf adj
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list spli
-           - Removed leaf: commsuserovrd
-           - Added leaf: platform-type
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf fend-ip-addr
-             - Added mandatory: true 
-             leaf spli-id
-             - Added mandatory: true 
-             leaf keyformat
-             - Changed config from false to true
-               type enumeration
-               - Removed enum: TID
-               - Removed enum: TID_BAY
-               - Added enum: TID-SHELF
-               - Added enum: TID-BAY
-             leaf spli-status
-               type enumeration
-               - Added enum: UNVERIFIED
-           list line
-             leaf adjln
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list tx
-           - Removed leaf: routing-rule
-           - Added leaf: tx-ctrl
-           - Added leaf: trans-mode
-           - Added leaf: ctrl-freq-offset
-           - Added leaf: disc-tx-prov-pwr
-           - Added leaf: disc-trans-mode
-           - Added leaf: allo-spectral-width
-             leaf adjtx
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf bias
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -10.00..10.00 
-             leaf rate
-             - Added default: UNKNOWN 
-             leaf fec
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.00..20.00 
-             leaf min-pow
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -30.00..20.00 
-             leaf max-pow
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -30.00..20.00 
-             leaf cur-pow
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -30.00..20.00 
-             leaf paired-rx
-             - Added default: YES 
-             leaf active
-             - Added default: FALSE 
-             - Changed type from ciena-6500-enums:TRUE_FALSE_UNKNOWN to enumeration
-               type enumeration
-               - Added enum: TRUE
-               - Added enum: FALSE
-               - Added enum: UNKNOWN
-             leaf express-delete
-             - Added default: FALSE 
-             - Changed type from ciena-6500-enums:TRUE_FALSE_UNKNOWN to enumeration
-               type enumeration
-               - Added enum: TRUE
-               - Added enum: FALSE
-               - Added enum: UNKNOWN
-             leaf loopback-status
-             - Changed type from ciena-6500-enums:LPBKSTATUS to enumeration
-               type enumeration
-               - Added enum: UNKNOWN
-               - Added enum: PASS
-               - Added enum: FAIL
-               - Added enum: FAIL-CHOUTFL EXCEEDS 1 dB
-               - Added enum: FAIL-TTI Mismatch
-               - Added enum: FAIL-TTI Fail
-               - Added enum: FAIL-TXTUNING
-               - Added enum: FAIL-CHINLOS
-               - Added enum: FAIL-CHINFL EXCEEDS 1 dB
-               - Added enum: FAIL-CHOUTLOS
-               - Added enum: FAIL-NOTREADY
-               - Added enum: FAIL-RXLOS
-               - Added enum: FAIL-RXLOF
-               - Added enum: FAIL-RXLOCH
-               - Added enum: FAIL-RXLOC
-               - Added enum: FAIL-RXLOM
-               - Added enum: FAIL-RXSD
-               - Added enum: FAIL-PREFEC SF
-               - Added enum: FAIL-CMDCMNOUTHFL
-               - Added enum: FAIL-CMDCMNOUTLOS
-               - Added enum: FAIL-CMDCMNINHFL
-               - Added enum: FAIL-CMDCMNINLOS
-               - Added enum: FAIL-CMDOPMHFL
-               - Added enum: MANUAL-VALIDATION REQUIRED
-             leaf och-tx-blanking
-             - Added default: OFF 
-             leaf center-frequency
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf sig-bw-3dB
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 12.500..4800.000 
-             leaf sig-bw-10dB
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 12.500..4800.000 
-             leaf min-spectral-width
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 12.500..4800.000 
-             leaf min-freq-guard-band
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.000..4800.000 
-             leaf max-freq-guard-band
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.000..4800.000 
-             leaf freqresolution
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.001..1.000 
-             leaf laser-centering-range
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.000..2.500 
-             leaf laser-centering
-             - Changed type from ciena-6500-enums:BOOL_ON_OFF to ciena-6500-enums:lasercentering
-             leaf disc-type
-             - Changed type from ciena-6500-enums:TXRXTYPES to ciena-6500-types:STRING
-             leaf disc-laser-centering
-             - Changed type from ciena-6500-enums:OFF_ON_UNKNOWN to ciena-6500-enums:lasercentering
-           list rx
-             leaf adjrx
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf sensitivity-thresh
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -40.00..20.00 
-             leaf overload-thresh
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -40.00..20.00 
-             leaf nom-input
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -40.00..20.00 
-             leaf dtrans-pos
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -10.00..10.00 
-             leaf dtrans-neg
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -10.00..10.00 
-             leaf paired-tx
-             - Added default: YES 
-             leaf ignore-rx-faults
-             - Added default: FALSE 
-             leaf center-frequency
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf pre-fec-ber
-             - Added default: 9 
-               type ciena-6500-types:INT
-               - Added range: 5..9 
-             leaf disc-type
-             - Changed type from ciena-6500-enums:TXRXTYPES to ciena-6500-types:STRING
-             leaf cur-rx-corr-factor
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -10.00..10.00 
-           list txrx-profile
-           - Added leaf: ctrl-freq-offset
-           - Added leaf: transmode
-           - Added leaf: ctrl-type
-             leaf txrxprf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf bias
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -10.00..10.00 
-             leaf mod-class
-             - Added default: CUSTOM1 
-             leaf freq-res
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.001..1.000 
-             leaf min-freq-guard-band
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.000..4800.000 
-             leaf max-freq-guard-band
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.000..4800.000 ";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added rpc: adjacencies-show-connval-status
-         container adjacencies
-         - Added list: txrx-profile
-           list spli
-           - Removed leaf: splistatus
-           - Added leaf: spli-status
-           list tx
-           - Removed leaf: ckt-id
-           - Removed leaf: frequency
-           - Removed leaf: txsigbw3db
-           - Removed leaf: txsigbw10db
-           - Removed leaf: txminspectralwidth
-           - Removed leaf: provfepec
-           - Removed leaf: discfepec
-           - Removed leaf: discfrequency
-           - Removed leaf: targinpwr
-           - Removed leaf: discsplimgmt
-           - Added leaf: cktid
-           - Added leaf: center-frequency
-           - Added leaf: sig-bw-3dB
-           - Added leaf: sig-bw-10dB
-           - Added leaf: min-spectral-width
-           - Added leaf: prov-fe-pec
-           - Added leaf: min-freq-guard-band
-           - Added leaf: max-freq-guard-band
-           - Added leaf: freqresolution
-           - Added leaf: laser-centering-range
-           - Added leaf: laser-centering
-           - Added leaf: disc-fe-pec
-           - Added leaf: disc-center-frequency
-           - Added leaf: targ-in-pwr
-           - Added leaf: disc-spli-mgmt
-           - Added leaf: disc-laser-centering-range
-           - Added leaf: disc-laser-centering
-             leaf type
-             - Changed type from ciena-6500-enums:TXRXTYPES to ciena-6500-types:STRING
-           list rx
-           - Removed leaf: sens-thresh
-           - Removed leaf: frequency
-           - Removed leaf: provfepec
-           - Removed leaf: discfepec
-           - Removed leaf: discfrequency
-           - Added leaf: sensitivity-thresh
-           - Added leaf: center-frequency
-           - Added leaf: prov-fe-pec
-           - Added leaf: disc-fe-pec
-           - Added leaf: disc-center-frequency
-             leaf type
-             - Changed type from ciena-6500-enums:TXRXTYPES to ciena-6500-types:STRING";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Added rpc: adjacencies-delete-spli
-         container adjacencies
-         - Added list: spli
-           list adjacency
-           - Removed leaf: fe-addr-pattern
-             leaf aid
-             - Removed mandatory
-             - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTfac_bits to ciena-6500-enums:SSTfac
-           list fiber
-           - Changed key from aid to adj
-           - Removed leaf: aid
-           - Added leaf: adj
-           list line
-           - Changed key from aid to adjln
-           - Removed leaf: aid
-           - Added leaf: adjln
-           list tx
-           - Changed key from aid to adjtx
-           - Removed leaf: aid
-           - Added leaf: frequency
-           - Added leaf: txsigbw3db
-           - Added leaf: txsigbw10db
-           - Added leaf: txminspectralwidth
-           - Added leaf: provfepec
-           - Added leaf: adjtx
-           - Added leaf: discfepec
-           - Added leaf: discfrequency
-           - Added leaf: targinpwr
-           - Added leaf: discsplimgmt
-             leaf active
-             - Changed type from ciena-6500-enums:BOOL_TRUE_FALSE to ciena-6500-enums:TRUE_FALSE_UNKNOWN
-             leaf express-delete
-             - Changed type from ciena-6500-enums:BOOL_TRUE_FALSE to ciena-6500-enums:TRUE_FALSE_UNKNOWN
-             leaf disc-och-tx-blanking
-               type enumeration
-               - Removed enum: ON
-               - Added enum: ON_PROVISIONED
-               - Added enum: ON_CHANNEL_CONTENTION
-           list rx
-           - Changed key from aid to adjrx
-           - Removed leaf: aid
-           - Added leaf: frequency
-           - Added leaf: provfepec
-           - Added leaf: adjrx
-           - Added leaf: discfepec
-           - Added leaf: discfrequency";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: adjacencies";
-  }
-
-  rpc adjacencies-show-connval-status {
-    description
-      "Retrieve the Connection Validation status.";
-    input {
-      leaf adj {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf pass-entries {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        default "NO";
-        description
-          "Whether or not to display the successful CV tests";
-      }
-    }
-    output {
-      list output {
-        leaf adj {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "AID";
-        }
-        leaf date {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "Connection Validation Date Tag";
-        }
-        leaf time {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "Connection Validation Time Tag";
-        }
-        leaf fiber-loss {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "Measured Fiber Loss";
-        }
-        leaf status {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "CV status";
-        }
-      }
-    }
-  }
-  rpc adjacencies-delete-spli {
-    description
-      "Delete all UNRELIABLE entries or a particular entry. For a particular entry user must provide SHELF and INDEX, only entry with match 0 can be deleted.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf index {
-        type ciena-6500-types:INT;
-        description
-          "Index associated with the far-end shelf entry.";
-      }
-    }
-  }
-  rpc adjacencies-show-adjacency {
-    description
-      "Retrieve the Adjacency Application attributes.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format ADJ-shelf-slotSsubslot-portSsubport, ADJ-shelf-slotSsubslot-port, ADJ-shelf-slot-portSsubport, ADJ-shelf-slot-port, ADJPEER-shelf-slot-port-instance, ADJPEER-shelf-slot-portSsubport-instance, ADJ-shelf-slot-portPsubport, ADJ-shelf-ALL, ADJ-shelf-slot-ALL, ADJ-shelf-slotSsubslot-ALL, ADJPEER-shelf-slot-port-ALL, ADJPEER-shelf-slot-portSsubport-ALL, ADJPEER-shelf-slot-ALL, ADJPEER-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf fe-addr-pattern {
-        type ciena-6500-types:STRING;
-        description
-          "Search pattern for far end address.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf port-label {
-          type ciena-6500-types:STRING;
-          description
-            "Port Label";
-        }
-        leaf adj-type {
-          type ciena-6500-enums:adj_type;
-          description
-            "Adjacency Type.";
-        }
-        leaf prov-fe-addr {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned far end address.";
-        }
-        leaf prov-addr-form {
-          type ciena-6500-enums:addr_form;
-          description
-            "Provisioned far end address format.";
-        }
-        leaf disc-fe-addr {
-          type ciena-6500-types:STRING;
-          description
-            "Discovered far end address.";
-        }
-        leaf disc-addr-form {
-          type ciena-6500-enums:addr_form;
-          description
-            "Discovered far end address format.";
-        }
-        leaf adj-stat {
-          type enumeration {
-            enum "RELIABLE";
-            enum "UNRELIABLE";
-            enum "UNVERIFIED";
-            enum "DERIVED";
-            enum "UNUSED";
-          }
-          description
-            "Adjacency status.";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier. Customer provisionable label for the adjacency.";
-        }
-        leaf layer {
-          type ciena-6500-enums:AD_LAYER;
-          description
-            "Layer";
-        }
-        leaf ops-fe-addr {
-          type ciena-6500-types:STRING;
-          description
-            "Points to the trunk OPS adjacent to the card.";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  container adjacencies {
-    list adjacency {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format ADJ-shelf-slot-port, ADJ-shelf-slot-portSsubport, ADJ-shelf-slotSsubslot-port, ADJ-shelf-slotSsubslot-portSsubport, ADJ-shelf-slot-portPsubport, ADJPEER-shelf-slot-port-instance, ADJPEER-shelf-slot-portSsubport-instance, ADJ-shelf-ALL, ADJ-shelf-slot-ALL, ADJ-shelf-slotSsubslot-ALL, ADJPEER-shelf-slot-port-ALL, ADJPEER-shelf-slot-portSsubport-ALL, ADJPEER-shelf-slot-ALL, ADJPEER-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf prov-fe-addr {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned far end address.";
-        config true;
-      }
-      leaf prov-addr-form {
-        type ciena-6500-enums:addr_form;
-        description
-          "Provisioned far end address format.";
-        config true;
-      }
-      leaf adj-type {
-        type ciena-6500-enums:adj_type;
-        description
-          "Adjacency Type";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier. Customer provisionable label for the adjacency.";
-        config true;
-      }
-      leaf layer {
-        type ciena-6500-enums:AD_LAYER;
-        description
-          "Layer";
-        config true;
-      }
-      leaf ops-fe-addr {
-        type ciena-6500-types:STRING;
-        description
-          "Points to the trunk OPS adjacent to the card.";
-        config true;
-      }
-      leaf port-label {
-        type ciena-6500-types:STRING;
-        description
-          "Port Label";
-        config false;
-      }
-      leaf disc-fe-addr {
-        type ciena-6500-types:STRING;
-        description
-          "Discovered far end address.";
-        config false;
-      }
-      leaf disc-addr-form {
-        type ciena-6500-enums:addr_form;
-        description
-          "Discovered far end address format.";
-        config false;
-      }
-      leaf adj-stat {
-        type enumeration {
-          enum "RELIABLE";
-          enum "UNRELIABLE";
-          enum "UNVERIFIED";
-          enum "DERIVED";
-          enum "UNUSED";
-        }
-        description
-          "Adjacency status.";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary state";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:SSTfac;
-        description
-          "Identify the secondary state";
-        config false;
-      }
-    }
-    list fiber {
-      key "adj";
-      config true;
-      leaf adj {
-        mandatory true;
-        description
-          "AID in format ADJ-shelf-slotSsubslot-portSsubport, ADJ-shelf-slotSsubslot-port, ADJ-shelf-slot-portSsubport, ADJ-shelf-slot-port, ADJPEER-shelf-slot-port-instance, ADJPEER-shelf-slot-portSsubport-instance, ADJ-shelf-ALL, ADJ-shelf-slot-ALL, ADJ-shelf-slotSsubslot-ALL, ADJPEER-shelf-slot-port-ALL, ADJPEER-shelf-slot-portSsubport-ALL, ADJPEER-shelf-slot-ALL, ADJPEER-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf drift-thresh {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Drift Threshold";
-        config true;
-      }
-      leaf excess-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Excess Loss";
-        config true;
-      }
-      leaf pad-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Pad Loss";
-        config true;
-      }
-      leaf fiber-loss-minor-thresh {
-        type ciena-6500-types:STRING;
-        description
-          "Fiber Loss Minor Threshold";
-        config true;
-      }
-      leaf fiber-loss-major-thresh {
-        type ciena-6500-types:STRING;
-        description
-          "Fiber Loss Major Threshold";
-        config true;
-      }
-      leaf port-label {
-        type ciena-6500-types:STRING;
-        description
-          "Port Label";
-        config false;
-      }
-      leaf last-cv-runtime {
-        type ciena-6500-types:STRING;
-        description
-          "Last time CV test run";
-        config false;
-      }
-      leaf fiber-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Measured Fiber Loss";
-        config false;
-      }
-      leaf system-config-loss {
-        type ciena-6500-types:STRING;
-        description
-          "System Configuration Loss";
-        config false;
-      }
-    }
-    list spli {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf fend-ip-addr {
-        type string {
-          length "0..46";
-        }
-        mandatory true;
-        description
-          "IPv4 address of the far-end NE.";
-        config true;
-      }
-      leaf spli-id {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Key ID of the table entry. KEYFORMAT parameter defines its format.";
-        config true;
-      }
-      leaf keyformat {
-        type enumeration {
-          enum "TID-SHELF";
-          enum "TID-BAY";
-          enum "NODENAME";
-        }
-        description
-          "The format for the SPLI_ID.";
-        config true;
-      }
-      leaf commstype {
-        type enumeration {
-          enum "UDP" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "TCP";
-          enum "TCPSSH" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "LOCAL";
-        }
-        description
-          "Transport protocol for establishing the connection with the far-end NE.";
-        config true;
-      }
-      leaf platform-type {
-        type enumeration {
-          enum "NULL";
-          enum "6500" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "5400" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "8700" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "WAVESERVER" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-        }
-        description
-          "Platform Type of the far-end NE.";
-        config true;
-      }
-      leaf index {
-        type ciena-6500-types:INT;
-        description
-          "Index associated with the far-end shelf entry.(Mandatory for edit operations)";
-        config true;
-      }
-      leaf spli-status {
-        type enumeration {
-          enum "UNRELIABLE";
-          enum "RELIABLE";
-          enum "UNVERIFIED";
-        }
-        description
-          "Connnection and communication status.";
-        config false;
-      }
-      leaf numsplimatches {
-        type ciena-6500-types:INT;
-        description
-          "Number of matches to the far-end NE.";
-        config false;
-      }
-      leaf commsstate {
-        type enumeration {
-          enum "INIT";
-          enum "REQUESTED";
-          enum "1WAY";
-          enum "2WAY";
-          enum "ESTABLISHED";
-          enum "IN_USE";
-        }
-        description
-          "SPLI Connection State.";
-        config false;
-      }
-    }
-    list line {
-      key "adjln";
-      config true;
-      leaf adjln {
-        mandatory true;
-        description
-          "AID in format ADJ-shelf-slot-port, ADJ-shelf-ALL, ADJ-shelf-slot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf fiber-type {
-        type ciena-6500-enums:adj_fiber;
-        description
-          "Fibre type.";
-        config true;
-      }
-      leaf targ-span-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Target Span Loss in dB.";
-        config true;
-      }
-      leaf min-span-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Minimum Span Loss in dB.";
-        config true;
-      }
-      leaf span-loss-margin {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Span Loss Margin in dB.";
-        config true;
-      }
-      leaf bundle-id {
-        type ciena-6500-types:STRING;
-        description
-          "Bundle ID.";
-        config true;
-      }
-      leaf span-loss-source {
-        type ciena-6500-enums:adj_SpanLossSource;
-        description
-          "Span Loss Source.";
-        config false;
-      }
-      leaf osc-span-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "The Span Loss in dB.";
-        config false;
-      }
-      leaf line-in {
-        type ciena-6500-types:STRING;
-        description
-          "ADJ-shelf-slot-port";
-        config false;
-      }
-      leaf line-out {
-        type ciena-6500-types:STRING;
-        description
-          "ADJ-shelf-slot-port";
-        config false;
-      }
-      leaf crs-in {
-        type ciena-6500-types:STRING;
-        description
-          "ADJ-shelf-slot-port";
-        config false;
-      }
-      leaf crs-out {
-        type ciena-6500-types:STRING;
-        description
-          "ADJ-shelf-slot-port";
-        config false;
-      }
-      leaf cs-ind {
-        type ciena-6500-enums:MX_CONTROL_MODE;
-        description
-          "Coherent Select Indicator";
-        config false;
-      }
-    }
-    list tx {
-      key "adjtx";
-      config true;
-      leaf adjtx {
-        mandatory true;
-        description
-          "AID in format ADJ-shelf-slot-port, ADJ-shelf-slotSsubslot-port, ADJ-shelf-ALL, ADJ-shelf-slot-ALL, ADJ-shelf-slotSsubslot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf bias {
-        type decimal64 {
-          range "-10.00..10.00";
-          fraction-digits 2;
-        }
-        description
-          "OSNR bias in dB.";
-        config true;
-      }
-      leaf type {
-        type ciena-6500-types:STRING;
-        description
-          "Tx type.";
-        config true;
-      }
-      leaf cktid {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier. Customer provisionable label for the adjacency TX.";
-        config true;
-      }
-      leaf rate {
-        type ciena-6500-enums:adj_rate;
-        default "UNKNOWN";
-        description
-          "Line Rate.";
-        config true;
-      }
-      leaf fec {
-        type decimal64 {
-          range "0.00..20.00";
-          fraction-digits 2;
-        }
-        description
-          "FEC Gain in dB.";
-        config true;
-      }
-      leaf min-pow {
-        type decimal64 {
-          range "-30.00..20.00";
-          fraction-digits 2;
-        }
-        description
-          "Min launch power in dBm.";
-        config true;
-      }
-      leaf max-pow {
-        type decimal64 {
-          range "-30.00..20.00";
-          fraction-digits 2;
-        }
-        description
-          "Max launch power in dBm.";
-        config true;
-      }
-      leaf cur-pow {
-        type decimal64 {
-          range "-30.00..20.00";
-          fraction-digits 2;
-        }
-        description
-          "Current launch power in dBm.";
-        config true;
-      }
-      leaf paired-rx {
-        type enumeration {
-          enum "YES" {
-            description
-              "Paired Rx";
-          }
-          enum "NO" {
-            description
-              "Not paired";
-          }
-        }
-        default "YES";
-        description
-          "Paired Rx";
-        config true;
-      }
-      leaf syncprov {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "SPLI Auto-Tuning";
-        config true;
-      }
-      leaf active {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "FALSE" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "UNKNOWN";
-        }
-        default "FALSE";
-        description
-          "Ingress Active Status. Customer provisionable attribute for the adjacency TX. TRUE specifies Ingress is Active. FALSE specifies Ingress is NOT Active.";
-        config true;
-      }
-      leaf express-delete {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "FALSE" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "UNKNOWN";
-        }
-        default "FALSE";
-        description
-          "ExpressDelete . Customer provisionable attribute for the adjacency TX. TRUE specifies ExpressDelete is enabled. FALSE specifies ExpressDelete is NOT enabled.";
-        config true;
-      }
-      leaf mod-class {
-        type ciena-6500-enums:adjTxModClass;
-        description
-          "Modulation Class.";
-        config true;
-      }
-      leaf auto-disc {
-        type ciena-6500-enums:autoTxRxProv;
-        description
-          "Tx Auto Discovery can be Auto or Manual";
-        config true;
-      }
-      leaf loopback-status {
-        type enumeration {
-          enum "UNKNOWN" {
-            description
-              "Loopback test not run or currently running.";
-          }
-          enum "PASS" {
-            description
-              "Latest loopback test passed.";
-          }
-          enum "FAIL" {
-            description
-              "Latest loopback test failed.";
-          }
-          enum "FAIL-CHOUTFL EXCEEDS 1 dB" {
-            description
-              "Latest loopback test failed - CH OUT port Fiber Loss exceeds 1 dB.";
-          }
-          enum "FAIL-TTI Mismatch" {
-            description
-              "Latest loopback test failed - TTI Mismatch.";
-          }
-          enum "FAIL-TTI Fail" {
-            description
-              "Latest loopback test failed - TTI Fail.";
-          }
-          enum "FAIL-TXTUNING" {
-            description
-              "Latest loopback test failed - TX TUNING IN PROGRESS.";
-          }
-          enum "FAIL-CHINLOS" {
-            description
-              "Latest loopback test failed - CH IN LOS.";
-          }
-          enum "FAIL-CHINFL EXCEEDS 1 dB" {
-            description
-              "Latest loopback test failed - CH IN port Fiber Loss exceeds 1 dB.";
-          }
-          enum "FAIL-CHOUTLOS" {
-            description
-              "Latest loopback test failed - CH OUT LOS.";
-          }
-          enum "FAIL-NOTREADY" {
-            description
-              "Latest loopback test failed - EQUIPMENT NOT READY.";
-          }
-          enum "FAIL-RXLOS" {
-            description
-              "Latest loopback test failed - RX LOS.";
-          }
-          enum "FAIL-RXLOF" {
-            description
-              "Latest loopback test failed - RX LOF.";
-          }
-          enum "FAIL-RXLOCH" {
-            description
-              "Latest loopback test failed - RX LOCH.";
-          }
-          enum "FAIL-RXLOC" {
-            description
-              "Latest loopback test failed - RX LOC.";
-          }
-          enum "FAIL-RXLOM" {
-            description
-              "Latest loopback test failed - RX LOM.";
-          }
-          enum "FAIL-RXSD" {
-            description
-              "Latest loopback test failed - RX SD.";
-          }
-          enum "FAIL-PREFEC SF" {
-            description
-              "Latest loopback test failed - RX PREFEC SF.";
-          }
-          enum "FAIL-CMDCMNOUTHFL" {
-            description
-              "Latest loopback test failed - CMD Common Out HFL";
-          }
-          enum "FAIL-CMDCMNOUTLOS" {
-            description
-              "Latest loopback test failed - CMD Common Out Far End in LOS.";
-          }
-          enum "FAIL-CMDCMNINHFL" {
-            description
-              "Latest loopback test failed - CMD Common In Far End HFL";
-          }
-          enum "FAIL-CMDCMNINLOS" {
-            description
-              "Latest loopback test failed - CMD Common In LOS.";
-          }
-          enum "FAIL-CMDOPMHFL" {
-            description
-              "Latest loopback test failed - CMD OPM HFL.";
-          }
-          enum "MANUAL-VALIDATION REQUIRED" {
-            description
-              "Latest loopback test Manual: Validation Required.";
-          }
-        }
-        description
-          "Status of latest loopback test";
-        config true;
-      }
-      leaf och-tx-blanking {
-        type enumeration {
-          enum "OFF";
-          enum "ON";
-        }
-        default "OFF";
-        description
-          "Request(ON) or Release(OFF) blanking on the corresponding OCLD.";
-        config true;
-      }
-      leaf center-frequency {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Captures Tx frequency in THz.";
-        config true;
-      }
-      leaf sig-bw-3dB {
-        type decimal64 {
-          range "12.500..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Tx Signal Bandwidth in GHz measured at 3 dBm less than peak power.";
-        config true;
-      }
-      leaf sig-bw-10dB {
-        type decimal64 {
-          range "12.500..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Tx Signal Bandwidth in GHz measured at 10 dBm less than peak power.";
-        config true;
-      }
-      leaf min-spectral-width {
-        type decimal64 {
-          range "12.500..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Tx Network Media Channel Signal Bandwidth in GHz including majority of signal power, laser aging/drift, and laser control loop tolerance.";
-        config true;
-      }
-      leaf prov-fe-pec {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned FE PEC";
-        config true;
-      }
-      leaf min-freq-guard-band {
-        type decimal64 {
-          range "0.000..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Indicates the minimum required frequency spacing for the previous NMC.";
-        config true;
-      }
-      leaf max-freq-guard-band {
-        type decimal64 {
-          range "0.000..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Indicates the minimum required frequency spacing for the next NMC.";
-        config true;
-      }
-      leaf freqresolution {
-        type decimal64 {
-          range "0.001..1.000";
-          fraction-digits 3;
-        }
-        description
-          "Indicates the recurring frequency step that is allowed to be configured on the transponder.";
-        config true;
-      }
-      leaf laser-centering-range {
-        type decimal64 {
-          range "0.000..2.500";
-          fraction-digits 3;
-        }
-        description
-          "Laser Centering Range.";
-        config true;
-      }
-      leaf laser-centering {
-        type ciena-6500-enums:lasercentering;
-        description
-          "Laser Centering Loop Status.";
-        config true;
-      }
-      leaf tx-ctrl {
-        type ciena-6500-enums:txctrl;
-        default "YES";
-        description
-          "Tx Controller control flag";
-        config true;
-      }
-      leaf trans-mode {
-        type ciena-6500-types:STRING;
-        description
-          "Transponder Transmission Mode";
-        config true;
-      }
-      leaf ctrl-freq-offset {
-        type decimal64 {
-          range "-4800..4800";
-          fraction-digits 1;
-        }
-        description
-          "Control frequency offset in GHz.";
-        config true;
-      }
-      leaf exp-res-time {
-        type decimal64 {
-          range "1..100";
-          fraction-digits 1;
-        }
-        description
-          "Expected Restoration Time.";
-        config true;
-      }
-      leaf path-disp {
-        type decimal64 {
-          range "-999999999..999999999";
-          fraction-digits 1;
-        }
-        description
-          "Path Dispersion at a given frequency.";
-        config true;
-      }
-      leaf tx-pre-comp {
-        type decimal64 {
-          range "-999999999..999999999";
-          fraction-digits 1;
-        }
-        description
-          "Tx Dispersion Compensation Value.";
-        config true;
-      }
-      leaf link-opt-mode {
-        type ciena-6500-enums:linkOptMode;
-        default "UNKNOWN";
-        description
-          "Provisioned Link Optimization Mode Defining The Performance Metric For Which The Modem Is Optimized.";
-        config true;
-      }
-      leaf tx-disp-mode {
-        type ciena-6500-enums:txDispMode;
-        default "UNKNOWN";
-        description
-          "Determines how dispersion compensation for the transmitter is managed.";
-        config true;
-      }
-      leaf port-label {
-        type ciena-6500-types:STRING;
-        description
-          "Port Label";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Tx wavelength.";
-        config false;
-      }
-      leaf disc-wavelength {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Tx discovered wavelength.";
-        config false;
-      }
-      leaf doc-care {
-        type enumeration {
-          enum "TRUE";
-          enum "FALSE";
-        }
-        description
-          "DOC Care";
-        config false;
-      }
-      leaf ch-status {
-        type ciena-6500-enums:CHSTATUSVALUES;
-        description
-          "Channel Status";
-        config false;
-      }
-      leaf disc-type {
-        type ciena-6500-types:STRING;
-        description
-          "Discovered Tx Type.";
-        config false;
-      }
-      leaf loopback-wavelength {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Loopback wavelength.";
-        config false;
-      }
-      leaf actual-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Captures the total power at the Tx Output.";
-        config false;
-      }
-      leaf tx-tuned {
-        type enumeration {
-          enum "UNKNOWN";
-          enum "TRUE";
-          enum "FALSE";
-        }
-        description
-          "Flag indicates the Tx tuning state on the corresponding transponder.";
-        config false;
-      }
-      leaf matetx-info {
-        type ciena-6500-types:STRING;
-        description
-          "Mate info for ccmd at Regen site";
-        config false;
-      }
-      leaf disc-och-tx-blanking {
-        type enumeration {
-          enum "UNKNOWN";
-          enum "OFF";
-          enum "ON_PROVISIONED";
-          enum "ON_CHANNEL_CONTENTION";
-        }
-        description
-          "Discovered OTM OCH TX Blanking";
-        config false;
-      }
-      leaf och-line-type {
-        type ciena-6500-enums:linetype;
-        description
-          "OCH Line System Type";
-        config false;
-      }
-      leaf disc-fe-pec {
-        type ciena-6500-types:STRING;
-        description
-          "Discovered FE PEC seen by the Tx";
-        config false;
-      }
-      leaf disc-center-frequency {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Tx discovered frequency.";
-        config false;
-      }
-      leaf targ-in-pwr {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Captures target Tx CCMD in power.";
-        config false;
-      }
-      leaf disc-spli-mgmt {
-        type enumeration {
-          enum "UNKNOWN";
-          enum "TRUE";
-          enum "FALSE";
-        }
-        description
-          "Discovered SPLIMGMT seen by the Tx";
-        config false;
-      }
-      leaf disc-laser-centering-range {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Discovered Laser Centering Range.";
-        config false;
-      }
-      leaf disc-laser-centering {
-        type ciena-6500-enums:lasercentering;
-        description
-          "Discovered Laser Centering Loop Status.";
-        config false;
-      }
-      leaf disc-tx-prov-pwr {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Transponder Tx Provisioned Power in dBm.";
-        config false;
-      }
-      leaf disc-trans-mode {
-        type ciena-6500-types:STRING;
-        description
-          "Discovered Transmission Mode";
-        config false;
-      }
-      leaf allo-spectral-width {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Captures allocated Tx Network Media Channel Signal Bandwidth in GHz.";
-        config false;
-      }
-      leaf disc-link-opt-mode {
-        type ciena-6500-enums:linkOptMode;
-        description
-          "Discovered Link Optimization Mode";
-        config false;
-      }
-      leaf disc-tx-disp-mode {
-        type ciena-6500-enums:txDispMode;
-        description
-          "Discovered Dispersion Compensation Mode For The Transmitter";
-        config false;
-      }
-      leaf disc-tx-pre-comp {
-        type decimal64 {
-          range "-999999999..999999999";
-          fraction-digits 1;
-        }
-        description
-          "Discovered Tx Dispersion Compensation Value.";
-        config false;
-      }
-      leaf disc-path-disp {
-        type decimal64 {
-          range "-999999999..999999999";
-          fraction-digits 1;
-        }
-        description
-          "Discovered Path Disperstion at a given frequency.";
-        config false;
-      }
-    }
-    list rx {
-      key "adjrx";
-      config true;
-      leaf adjrx {
-        mandatory true;
-        description
-          "AID in format ADJ-shelf-slot-port, ADJ-shelf-slotSsubslot-port, ADJ-shelf-ALL, ADJ-shelf-slot-ALL, ADJ-shelf-slotSsubslot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf type {
-        type ciena-6500-types:STRING;
-        description
-          "Rx type.";
-        config true;
-      }
-      leaf sensitivity-thresh {
-        type decimal64 {
-          range "-40.00..20.00";
-          fraction-digits 2;
-        }
-        description
-          "Minimum per channel power the receiver can tolerate in dBm.";
-        config true;
-      }
-      leaf overload-thresh {
-        type decimal64 {
-          range "-40.00..20.00";
-          fraction-digits 2;
-        }
-        description
-          "Maximum per chanel power the receiver can tolerate in dBm.";
-        config true;
-      }
-      leaf nom-input {
-        type decimal64 {
-          range "-40.00..20.00";
-          fraction-digits 2;
-        }
-        description
-          "Typical per channel operational power recommended for the receiver in dBm.";
-        config true;
-      }
-      leaf dtrans-pos {
-        type decimal64 {
-          range "-10.00..10.00";
-          fraction-digits 2;
-        }
-        description
-          "Maximum positive transient in dB/s.";
-        config true;
-      }
-      leaf dtrans-neg {
-        type decimal64 {
-          range "-10.00..10.00";
-          fraction-digits 2;
-        }
-        description
-          "Maximum negative transient in dB/s.";
-        config true;
-      }
-      leaf paired-tx {
-        type enumeration {
-          enum "YES" {
-            description
-              "Paired Tx";
-          }
-          enum "NO" {
-            description
-              "Not paired";
-          }
-        }
-        default "YES";
-        description
-          "Paired Rx";
-        config true;
-      }
-      leaf ignore-rx-faults {
-        type enumeration {
-          enum "FALSE";
-          enum "TRUE";
-        }
-        default "FALSE";
-        description
-          "This flag blocks reporting receiver faults to OSRP.";
-        config true;
-      }
-      leaf sync-prov {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "SPLI Auto-Tuning";
-        config true;
-      }
-      leaf auto-disc {
-        type ciena-6500-enums:autoTxRxProv;
-        description
-          "Rx Auto Discovery can be Auto or Manual";
-        config true;
-      }
-      leaf center-frequency {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Captures Rx frequency in THz.";
-        config true;
-      }
-      leaf prov-fe-pec {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned FE PEC";
-        config true;
-      }
-      leaf port-label {
-        type ciena-6500-types:STRING;
-        description
-          "Port Label";
-        config false;
-      }
-      leaf pre-fec-ber {
-        default "9";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Pre-FEC BER.";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Rx wavelength.";
-        config false;
-      }
-      leaf disc-wavelength {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Rx discovered wavelength.";
-        config false;
-      }
-      leaf doc-care {
-        type enumeration {
-          enum "TRUE";
-          enum "FALSE";
-        }
-        description
-          "DOC Care";
-        config false;
-      }
-      leaf ch-status {
-        type ciena-6500-enums:CHSTATUSVALUES;
-        description
-          "Channel Status";
-        config false;
-      }
-      leaf rate {
-        type ciena-6500-enums:adj_rate;
-        description
-          "ADJTX Rate";
-        config false;
-      }
-      leaf disc-type {
-        type ciena-6500-types:STRING;
-        description
-          "Discovered Rx Type..";
-        config false;
-      }
-      leaf loopback-status {
-        type ciena-6500-types:STRING;
-        description
-          "Status of latest loopback test";
-        config false;
-      }
-      leaf act-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Captures the total power value as seen by the Rx";
-        config false;
-      }
-      leaf accum-rx-corr-factor {
-        type ciena-6500-types:STRING;
-        description
-          "Displays the per channel accumulated correction factor seen by the Rx";
-        config false;
-      }
-      leaf och-line-type {
-        type ciena-6500-enums:linetype;
-        description
-          "OCH Line System Type";
-        config false;
-      }
-      leaf disc-fe-pec {
-        type ciena-6500-types:STRING;
-        description
-          "Discovered FE PEC seen by the Rx";
-        config false;
-      }
-      leaf disc-center-frequency {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Rx discovered frequency.";
-        config false;
-      }
-      leaf cur-rx-corr-factor {
-        type decimal64 {
-          range "-10.00..10.00";
-          fraction-digits 2;
-        }
-        description
-          "Captures the per channel correction factor received from the Rx in dB.";
-        config true;
-      }
-    }
-    list txrx-profile {
-      key "txrxprf";
-      config true;
-      leaf txrxprf {
-        mandatory true;
-        description
-          "AID in format TXRXPRF-shelf-index, TXRXPRF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf type {
-        type ciena-6500-types:STRING;
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf bias {
-        type decimal64 {
-          range "-10.00..10.00";
-          fraction-digits 2;
-        }
-        description
-          "Bias in dB.";
-        config true;
-      }
-      leaf cur-pow {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Current launch power in dBm.";
-        config true;
-      }
-      leaf max-pow {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Max launch power in dBm.";
-        config true;
-      }
-      leaf min-pow {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Min launch power in dBm.";
-        config true;
-      }
-      leaf mod-class {
-        type ciena-6500-enums:txrxmodclass;
-        default "CUSTOM1";
-        description
-          "Modulation Class.";
-        config true;
-      }
-      leaf rate {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Line Rate in Gbps.";
-        config true;
-      }
-      leaf min-spectral-width {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Captures Tx Network Media Channel Signal Bandwidth in GHz including majority of signal power, laser aging or drift, and laser control loop tolerance.";
-        config true;
-      }
-      leaf sig-bw-10dB {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Captures Tx Signal Bandwidth in GHz measured at 10 dBm less than peak power.";
-        config true;
-      }
-      leaf sig-bw-3dB {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Captures Tx Signal Bandwidth in GHz measured at 3 dBm less than peak power.";
-        config true;
-      }
-      leaf freq-res {
-        type decimal64 {
-          range "0.001..1.000";
-          fraction-digits 3;
-        }
-        description
-          "Captures Tx frequency resolution of the signal.";
-        config true;
-      }
-      leaf nom-input {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Typical per channel operational power recommended for the receiver in dBm.";
-        config true;
-      }
-      leaf overload-thresh {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Maximum per chanel power the receiver can tolerate in dBm.";
-        config true;
-      }
-      leaf sensitivity-thresh {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Minimum per channel power the receiver can tolerate in dBm.";
-        config true;
-      }
-      leaf min-freq-guard-band {
-        type decimal64 {
-          range "0.000..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Used by SNCG to specify the maximum required frequency spacing for the previous NMC.";
-        config true;
-      }
-      leaf max-freq-guard-band {
-        type decimal64 {
-          range "0.000..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Used by SNCG to specify the maximum required frequency spacing for the previous NMC.";
-        config true;
-      }
-      leaf ctrl-freq-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Control Frequency Offset.";
-        config true;
-      }
-      leaf transmode {
-        type ciena-6500-types:STRING;
-        description
-          "User specified Transmission Mode";
-        config true;
-      }
-      leaf ctrl-type {
-        type ciena-6500-enums:ctrltype;
-        description
-          "TXRX indicates the profile is for TX/RX controller. SIGNAL indicates the profile is for signal controller.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-alarms.yang b/models/ciena-6500-alarms.yang
deleted file mode 100644
index 08b29086e326352b552a2f2d667c4a102e04c204..0000000000000000000000000000000000000000
--- a/models/ciena-6500-alarms.yang
+++ /dev/null
@@ -1,1167 +0,0 @@
-module ciena-6500-alarms {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-alarms";
-  prefix alarms;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's alarms object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Added rpc: alarms-show-attr-env
-         container alarms
-         - Added list: attr-env";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: alarms-show-alarm
-       - Added rpc: alarms-show-condition
-       - Added rpc: alarms-clear-security
-       - Added rpc: alarms-show-env
-       - Added rpc: alarms-operate-ext-cont
-       - Added rpc: alarms-release-ext-cont
-       - Added rpc: alarms-show-attr-cont
-       - Added rpc: alarms-show-ext-cont
-         container alarms
-         - Added list: env
-         - Added list: attr-cont
-         - Added list: ext-cont
-           list alarm
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf locn
-             - Changed type from ciena-6500-enums:LOCN to ciena-6500-enums:LOCN_WITH_DFLT
-             leaf year
-               type ciena-6500-types:INT
-               - Added range: 0..9999 
-             leaf bay-num
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf phys-shelf
-               type ciena-6500-types:INT
-               - Added range: 0..9 
-           list condition
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf locn
-             - Changed type from ciena-6500-enums:LOCN to ciena-6500-enums:LOCN_WITH_DFLT
-             leaf year
-               type ciena-6500-types:INT
-               - Added range: 0..9999 
-             leaf bay-num
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf phys-shelf
-               type ciena-6500-types:INT
-               - Added range: 0..9 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container alarms
-           list alarm
-           - Changed key from aid to dgn-type
-           - Removed leaf: state
-           - Removed leaf: severity
-             leaf aid
-             - Removed mandatory
-             - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT
-             leaf aidtype
-             - Changed type from ciena-6500-enums:ALMAIDTYPE to ciena-6500-enums:ALMPRVAIDTYPE
-           list condition
-           - Changed key from aid to dgn-type
-           - Removed leaf: state
-           - Removed leaf: severity
-             leaf aid
-             - Removed mandatory
-             - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT
-             leaf aidtype
-             - Changed type from ciena-6500-enums:ALMAIDTYPE to ciena-6500-enums:ALMPRVAIDTYPE
-         rpc alarms-operate-cutoff
-           input
-           - Changed leaf from aid to all
-             leaf all
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: alarms
-       - Added rpc: alarms-operate-cutoff";
-  }
-
-  rpc alarms-show-alarm {
-    description
-      "Retrieve Alarm All : this command retrieves all the current alarms from the specified network element.";
-    input {
-      leaf dgn-type {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf state {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-          enum "BOTH";
-        }
-        description
-          "Alarm status: Controls whether to retrieve only enabled alarms, only disabled alarms, or both enabled and disabled alarms.";
-      }
-      leaf severity {
-        type ciena-6500-enums:NTFCNCDE_ALL;
-        description
-          "Alarm severity. Controls whether to retrieve critical, major, minor or all enabled alarms";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:ALMPRVAIDTYPE;
-          description
-            "aidtype";
-        }
-        leaf ntfcncde {
-          type ciena-6500-enums:NTFCNCDE;
-          description
-            "The notification code for the message.";
-        }
-        leaf condtype {
-          type ciena-6500-types:STRING;
-          description
-            "The condition type for an alarm or a reported event. GR-833-CORE Appendix C stipulates 20 characters max.";
-        }
-        leaf srveff {
-          type ciena-6500-enums:SRVEFF;
-          description
-            "The effect on service caused by the standing or alarm condition.";
-        }
-        leaf ocrdat {
-          type ciena-6500-types:DATE;
-          description
-            "The date when the alarm occurred";
-        }
-        leaf ocrtm {
-          type ciena-6500-types:TIME;
-          description
-            "The time when the alarm occurred";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN_WITH_DFLT;
-          description
-            "The location associated with a particular command.";
-        }
-        leaf dirn {
-          type ciena-6500-enums:AlmDIRN;
-          description
-            "The direction of the alarm condition and is relative to the entity identified by the AID.";
-        }
-        leaf conddescr {
-          type ciena-6500-types:STRING;
-          description
-            "Condition description giving a textual outline of the event.";
-        }
-        leaf aiddet {
-          type ciena-6500-enums:MODE;
-          description
-            "Mode of port, if applicable";
-        }
-        leaf dgn-type {
-          type ciena-6500-types:STRING;
-          description
-            "An identifier which is used to provide the following definitions for Preside: 10 digit unique Alarm Id, 4 digit M3100 Probable Cause, 4 digit documentation index";
-        }
-        leaf year {
-          type ciena-6500-types:INT {
-            range "0..9999";
-          }
-          description
-            "A four character string used to represent the alarm occurrence year.";
-        }
-        leaf mode {
-          type ciena-6500-enums:MODE;
-          description
-            "Mode of port, if applicable";
-        }
-        leaf fic {
-          type ciena-6500-types:STRING;
-          description
-            "FIC";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Wavelength";
-        }
-        leaf bay-num {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Bay Number";
-        }
-        leaf phys-shelf {
-          type ciena-6500-types:INT {
-            range "0..9";
-          }
-          description
-            "Physical Shelf Number";
-        }
-        leaf subnet-name {
-          type ciena-6500-types:STRING;
-          description
-            "Subnet Name";
-        }
-        leaf additional-info {
-          type ciena-6500-types:STRING;
-          description
-            "Additional info";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf card-type {
-          type ciena-6500-types:STRING;
-          description
-            "Card Type";
-        }
-        leaf sig-layer {
-          type ciena-6500-types:STRING;
-          description
-            "Signal Layer";
-        }
-        leaf label {
-          type ciena-6500-types:STRING;
-          description
-            "Label";
-        }
-        leaf name {
-          type ciena-6500-types:STRING;
-          description
-            "Name";
-        }
-      }
-    }
-  }
-  rpc alarms-show-condition {
-    description
-      "Retrieve Conditions All : this command retrieves the current conditions (alarm or status) from the specified network element.";
-    input {
-      leaf dgn-type {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf state {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-          enum "BOTH";
-        }
-        description
-          "Alarm status: Controls whether to retrieve only enabled alarms, only disabled alarms, or both enabled and disabled alarms.";
-      }
-      leaf severity {
-        type ciena-6500-enums:NTFCNCDE_ALL;
-        description
-          "Alarm severity. Controls whether to retrieve critical, major, minor or all enabled alarms";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:ALMPRVAIDTYPE;
-          description
-            "aidtype";
-        }
-        leaf ntfcncde {
-          type ciena-6500-enums:NTFCNCDE_NA;
-          description
-            "Notification code for the message.";
-        }
-        leaf condtype {
-          type ciena-6500-types:STRING;
-          description
-            "Condition type for an alarm or a reported event. GR-833-CORE Appendix C stipulates 20 characters max.";
-        }
-        leaf srveff {
-          type ciena-6500-enums:SRVEFF_NAP;
-          description
-            "The effect on service caused by the standing or alarm condition.";
-        }
-        leaf ocrdat {
-          type ciena-6500-types:DATE;
-          description
-            "The date when the alarm occurred";
-        }
-        leaf ocrtm {
-          type ciena-6500-types:TIME;
-          description
-            "The time when the alarm occurred";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN_WITH_DFLT;
-          description
-            "The location associated with a particular command.";
-        }
-        leaf dirn {
-          type ciena-6500-enums:AlmDIRN;
-          description
-            "The direction of the alarm condition and is relative to the entity identified by the AID.";
-        }
-        leaf tmper {
-          type ciena-6500-types:STRING;
-          description
-            "Time Period";
-        }
-        leaf conddescr {
-          type ciena-6500-types:STRING;
-          description
-            "Condition description giving a textual outline of the event.";
-        }
-        leaf year {
-          type ciena-6500-types:INT {
-            range "0..9999";
-          }
-          description
-            "A four character string used to represent the alarm occurrence year.";
-        }
-        leaf dgn-type {
-          type ciena-6500-types:STRING;
-          description
-            "An identifier which is used to provide the following definitions for Preside: 10 digit unique Alarm Id, 4 digit M3100 Probable Cause, 4 digit documentation index";
-        }
-        leaf mode {
-          type ciena-6500-enums:MODE;
-          description
-            "Mode of port, if applicable";
-        }
-        leaf fic {
-          type ciena-6500-types:STRING;
-          description
-            "FIC";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Wavelength";
-        }
-        leaf bay-num {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Bay Number";
-        }
-        leaf phys-shelf {
-          type ciena-6500-types:INT {
-            range "0..9";
-          }
-          description
-            "Physical Shelf Number";
-        }
-        leaf subnet-name {
-          type ciena-6500-types:STRING;
-          description
-            "Subnet Name";
-        }
-        leaf additional-info {
-          type ciena-6500-types:STRING;
-          description
-            "Additional info";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf card-type {
-          type ciena-6500-types:STRING;
-          description
-            "Card Type";
-        }
-        leaf sig-layer {
-          type ciena-6500-types:STRING;
-          description
-            "Signal Layer";
-        }
-        leaf label {
-          type ciena-6500-types:STRING;
-          description
-            "Label";
-        }
-        leaf name {
-          type ciena-6500-types:STRING;
-          description
-            "Name";
-        }
-      }
-    }
-  }
-  rpc alarms-operate-cutoff {
-    description
-      "Operate Alarm Cut-Off Command: Instructs a network element to cut off the office audible alarm indications without changing the other alarm indications. The result of this command is identical to manually pressing the ACO button on the network element circuit pack.";
-    input {
-      leaf all {
-        mandatory true;
-        description
-          "AID in format ALL-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc alarms-clear-security {
-    description
-      "Manual Alarm Clear: this command is used to clear all present security alarms on the NE.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc alarms-show-env {
-    description
-      "Retrieve Environment Alarm: this command retrieves the current environmental alarms from the specified entity or entities.";
-    input {
-      leaf env {
-        mandatory true;
-        description
-          "AID in format ENV-shelf-number, ENV-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list notification-code {
-        type ciena-6500-enums:NTFCNCDE;
-        description
-          "The notification code for the environmental alarm.";
-      }
-      leaf-list alarm-type {
-        type ciena-6500-enums:EnvAlm;
-        description
-          "The alarm type for the environmental alarm.";
-      }
-    }
-    output {
-      list output {
-        leaf env {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf-list notification-code {
-          type ciena-6500-enums:NTFCNCDE;
-          description
-            "The notification code for the environmental alarm.";
-        }
-        leaf-list alarm-type {
-          type ciena-6500-enums:EnvAlm;
-          description
-            "The alarm type for the environmental alarm.";
-        }
-        leaf ocurred-date {
-          type ciena-6500-types:DATE;
-          description
-            "Occurrence Date for the particular alarm.";
-        }
-        leaf ocrtm {
-          type ciena-6500-types:TIME;
-          description
-            "Occurrence Time for the alarm";
-        }
-        leaf almmsg {
-          type ciena-6500-types:STRING;
-          description
-            "This is the text string (40 chars max) associated with the environmental input, assigned by the user with a SET-ATTR-ENV command.";
-        }
-        leaf year {
-          type ciena-6500-types:INT {
-            range "0..9999";
-          }
-          description
-            "A four character string used to represent the alarm occurrence year.";
-        }
-        leaf dgn-type {
-          type ciena-6500-types:STRING;
-          description
-            "An identifier which is used to provide the following definitions for Preside: 6 digit unique Alarm Id, 4 digit M3100 Probable Cause, 4 digit documentation index";
-        }
-        leaf mode {
-          type ciena-6500-enums:MODE;
-          description
-            "Mode of port, if applicable";
-        }
-      }
-    }
-  }
-  rpc alarms-show-attr-env {
-    description
-      "The Retrieve Environment Alarm Attributes command retrieves the attributes associated with environmental alarms. The response displays what each environmental alarm register has been programmed to represent. In the response, an alarm type field contains one of the 36 allowed types, followed by an alarm message preprogrammed by the customer to describe the precise details.";
-    input {
-      leaf env-aid {
-        mandatory true;
-        description
-          "AID in format ENV-shelf-number, ENV-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list notification-code {
-        type ciena-6500-enums:NTFCNCDE;
-        description
-          "The notification code for the environmental alarm.";
-      }
-      leaf-list alarm-type {
-        type ciena-6500-enums:EnvAlm;
-        description
-          "The alarm type for the environmental alarm.";
-      }
-    }
-    output {
-      list output {
-        leaf env-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf-list notification-code {
-          type ciena-6500-enums:NTFCNCDE;
-          description
-            "The notification code for the environmental alarm.";
-        }
-        leaf-list alarm-type {
-          type ciena-6500-enums:EnvAlm;
-          description
-            "The alarm type for the environmental alarm.";
-        }
-        leaf alarm-msg {
-          type ciena-6500-types:STRING;
-          description
-            "This is the text string (40 chars max) associated with the environmental input, assigned by the user with a SET-ATTR-ENV command.";
-        }
-      }
-    }
-  }
-  rpc alarms-operate-ext-cont {
-    description
-      "Operate External Controls: this command allows a surveillance operations system to instruct the target network element to operate the parallel relay outputs on the network element.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CONT-shelf-number, CONT-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf cont-type {
-        type ciena-6500-enums:EXTCONTROL;
-        description
-          "The type of control for which the control state is being set.";
-      }
-    }
-  }
-  rpc alarms-release-ext-cont {
-    description
-      "Release External Controls: this command allows a surveillance operations system to instruct the target network element to release the parallel relay outputs on the network element.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL, CONT-shelf-number, CONT-number-%HLINK-facility-hshelf-hslot-hport";
-        type ciena-6500-types:aid;
-      }
-      leaf-list cont-type {
-        type ciena-6500-enums:EXTCONTROL;
-        description
-          "The type of control for which the control state is being set.";
-      }
-    }
-  }
-  rpc alarms-show-attr-cont {
-    description
-      "The Retrieve External Control Attributes command retrieves the attributes associated with external controls. The attributes are the text strings assigned by the corresponding SET command, which identify the function of the control relay.";
-    input {
-      leaf cont {
-        mandatory true;
-        description
-          "AID in format CONT-shelf-number, CONT-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list control-type {
-        type ciena-6500-enums:EXTCONTROL;
-        description
-          "The type of control for which the control state is being set.";
-      }
-    }
-    output {
-      list output {
-        leaf cont {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf-list control-type {
-          type ciena-6500-enums:EXTCONTROL;
-          description
-            "The type of control for which the control state is being set.";
-        }
-      }
-    }
-  }
-  rpc alarms-show-ext-cont {
-    description
-      "Retrieve External Controls: this command allows a surveillance operations system to instruct the target network element to view the parallel relay outputs on the network element.";
-    input {
-      leaf cont {
-        mandatory true;
-        description
-          "AID in format CONT-shelf-number, CONT-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list cont-type {
-        type ciena-6500-enums:EXTCONTROL;
-        description
-          "The type of control for which the control state is being set.";
-      }
-    }
-    output {
-      list output {
-        leaf cont {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf-list cont-type {
-          type ciena-6500-enums:EXTCONTROL;
-          description
-            "The type of control for which the control state is being set.";
-        }
-        leaf conts {
-          type enumeration {
-            enum "CONTS" {
-              description
-                "Continuous";
-            }
-          }
-          description
-            "Duration is continuous, momentary is not supported.";
-        }
-        leaf contstate {
-          type enumeration {
-            enum "OPER" {
-              description
-                "Operated";
-            }
-            enum "RLS" {
-              description
-                "Released";
-            }
-          }
-          description
-            "Control state.";
-        }
-      }
-    }
-  }
-  container alarms {
-    list alarm {
-      key "dgn-type";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        description
-          "aidtype";
-        config false;
-      }
-      leaf ntfcncde {
-        type ciena-6500-enums:NTFCNCDE;
-        description
-          "The notification code for the message.";
-        config false;
-      }
-      leaf condtype {
-        type ciena-6500-types:STRING;
-        description
-          "The condition type for an alarm or a reported event. GR-833-CORE Appendix C stipulates 20 characters max.";
-        config false;
-      }
-      leaf srveff {
-        type ciena-6500-enums:SRVEFF;
-        description
-          "The effect on service caused by the standing or alarm condition.";
-        config false;
-      }
-      leaf ocrdat {
-        type ciena-6500-types:DATE;
-        description
-          "The date when the alarm occurred";
-        config false;
-      }
-      leaf ocrtm {
-        type ciena-6500-types:TIME;
-        description
-          "The time when the alarm occurred";
-        config false;
-      }
-      leaf locn {
-        type ciena-6500-enums:LOCN_WITH_DFLT;
-        description
-          "The location associated with a particular command.";
-        config false;
-      }
-      leaf dirn {
-        type ciena-6500-enums:AlmDIRN;
-        description
-          "The direction of the alarm condition and is relative to the entity identified by the AID.";
-        config false;
-      }
-      leaf conddescr {
-        type ciena-6500-types:STRING;
-        description
-          "Condition description giving a textual outline of the event.";
-        config false;
-      }
-      leaf aiddet {
-        type ciena-6500-enums:MODE;
-        description
-          "Mode of port, if applicable";
-        config false;
-      }
-      leaf dgn-type {
-        type ciena-6500-types:STRING;
-        description
-          "An identifier which is used to provide the following definitions for Preside: 10 digit unique Alarm Id, 4 digit M3100 Probable Cause, 4 digit documentation index";
-        config false;
-      }
-      leaf year {
-        type ciena-6500-types:INT {
-          range "0..9999";
-        }
-        description
-          "A four character string used to represent the alarm occurrence year.";
-        config false;
-      }
-      leaf mode {
-        type ciena-6500-enums:MODE;
-        description
-          "Mode of port, if applicable";
-        config false;
-      }
-      leaf fic {
-        type ciena-6500-types:STRING;
-        description
-          "FIC";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:STRING;
-        description
-          "Wavelength";
-        config false;
-      }
-      leaf bay-num {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "Bay Number";
-        config false;
-      }
-      leaf phys-shelf {
-        type ciena-6500-types:INT {
-          range "0..9";
-        }
-        description
-          "Physical Shelf Number";
-        config false;
-      }
-      leaf subnet-name {
-        type ciena-6500-types:STRING;
-        description
-          "Subnet Name";
-        config false;
-      }
-      leaf additional-info {
-        type ciena-6500-types:STRING;
-        description
-          "Additional info";
-        config false;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config false;
-      }
-      leaf card-type {
-        type ciena-6500-types:STRING;
-        description
-          "Card Type";
-        config false;
-      }
-      leaf sig-layer {
-        type ciena-6500-types:STRING;
-        description
-          "Signal Layer";
-        config false;
-      }
-      leaf label {
-        type ciena-6500-types:STRING;
-        description
-          "Label";
-        config false;
-      }
-      leaf name {
-        type ciena-6500-types:STRING;
-        description
-          "Name";
-        config false;
-      }
-    }
-    list condition {
-      key "dgn-type";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        description
-          "aidtype";
-        config false;
-      }
-      leaf ntfcncde {
-        type ciena-6500-enums:NTFCNCDE_NA;
-        description
-          "Notification code for the message.";
-        config false;
-      }
-      leaf condtype {
-        type ciena-6500-types:STRING;
-        description
-          "Condition type for an alarm or a reported event. GR-833-CORE Appendix C stipulates 20 characters max.";
-        config false;
-      }
-      leaf srveff {
-        type ciena-6500-enums:SRVEFF_NAP;
-        description
-          "The effect on service caused by the standing or alarm condition.";
-        config false;
-      }
-      leaf ocrdat {
-        type ciena-6500-types:DATE;
-        description
-          "The date when the alarm occurred";
-        config false;
-      }
-      leaf ocrtm {
-        type ciena-6500-types:TIME;
-        description
-          "The time when the alarm occurred";
-        config false;
-      }
-      leaf locn {
-        type ciena-6500-enums:LOCN_WITH_DFLT;
-        description
-          "The location associated with a particular command.";
-        config false;
-      }
-      leaf dirn {
-        type ciena-6500-enums:AlmDIRN;
-        description
-          "The direction of the alarm condition and is relative to the entity identified by the AID.";
-        config false;
-      }
-      leaf tmper {
-        type ciena-6500-types:STRING;
-        description
-          "Time Period";
-        config false;
-      }
-      leaf conddescr {
-        type ciena-6500-types:STRING;
-        description
-          "Condition description giving a textual outline of the event.";
-        config false;
-      }
-      leaf year {
-        type ciena-6500-types:INT {
-          range "0..9999";
-        }
-        description
-          "A four character string used to represent the alarm occurrence year.";
-        config false;
-      }
-      leaf dgn-type {
-        type ciena-6500-types:STRING;
-        description
-          "An identifier which is used to provide the following definitions for Preside: 10 digit unique Alarm Id, 4 digit M3100 Probable Cause, 4 digit documentation index";
-        config false;
-      }
-      leaf mode {
-        type ciena-6500-enums:MODE;
-        description
-          "Mode of port, if applicable";
-        config false;
-      }
-      leaf fic {
-        type ciena-6500-types:STRING;
-        description
-          "FIC";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:STRING;
-        description
-          "Wavelength";
-        config false;
-      }
-      leaf bay-num {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "Bay Number";
-        config false;
-      }
-      leaf phys-shelf {
-        type ciena-6500-types:INT {
-          range "0..9";
-        }
-        description
-          "Physical Shelf Number";
-        config false;
-      }
-      leaf subnet-name {
-        type ciena-6500-types:STRING;
-        description
-          "Subnet Name";
-        config false;
-      }
-      leaf additional-info {
-        type ciena-6500-types:STRING;
-        description
-          "Additional info";
-        config false;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config false;
-      }
-      leaf card-type {
-        type ciena-6500-types:STRING;
-        description
-          "Card Type";
-        config false;
-      }
-      leaf sig-layer {
-        type ciena-6500-types:STRING;
-        description
-          "Signal Layer";
-        config false;
-      }
-      leaf label {
-        type ciena-6500-types:STRING;
-        description
-          "Label";
-        config false;
-      }
-      leaf name {
-        type ciena-6500-types:STRING;
-        description
-          "Name";
-        config false;
-      }
-    }
-    list env {
-      key "env";
-      config false;
-      leaf env {
-        mandatory true;
-        description
-          "AID in format ENV-shelf-number, ENV-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list notification-code {
-        type ciena-6500-enums:NTFCNCDE;
-        description
-          "The notification code for the environmental alarm.";
-        config false;
-      }
-      leaf-list alarm-type {
-        type ciena-6500-enums:EnvAlm;
-        description
-          "The alarm type for the environmental alarm.";
-        config false;
-      }
-      leaf ocurred-date {
-        type ciena-6500-types:DATE;
-        description
-          "Occurrence Date for the particular alarm.";
-        config false;
-      }
-      leaf ocrtm {
-        type ciena-6500-types:TIME;
-        description
-          "Occurrence Time for the alarm";
-        config false;
-      }
-      leaf almmsg {
-        type ciena-6500-types:STRING;
-        description
-          "This is the text string (40 chars max) associated with the environmental input, assigned by the user with a SET-ATTR-ENV command.";
-        config false;
-      }
-      leaf year {
-        type ciena-6500-types:INT {
-          range "0..9999";
-        }
-        description
-          "A four character string used to represent the alarm occurrence year.";
-        config false;
-      }
-      leaf dgn-type {
-        type ciena-6500-types:STRING;
-        description
-          "An identifier which is used to provide the following definitions for Preside: 6 digit unique Alarm Id, 4 digit M3100 Probable Cause, 4 digit documentation index";
-        config false;
-      }
-      leaf mode {
-        type ciena-6500-enums:MODE;
-        description
-          "Mode of port, if applicable";
-        config false;
-      }
-    }
-    list attr-env {
-      key "env-aid";
-      config true;
-      leaf env-aid {
-        mandatory true;
-        description
-          "AID in format ENV-shelf-number, ENV-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list notification-code {
-        type ciena-6500-enums:NTFCNCDE;
-        description
-          "The notification code for the environmental alarm.";
-        config true;
-      }
-      leaf-list alarm-type {
-        type ciena-6500-enums:EnvAlm;
-        description
-          "The alarm type for the environmental alarm.";
-        config true;
-      }
-      leaf alarm-msg {
-        type ciena-6500-types:STRING;
-        description
-          "This is the text string (40 chars max) associated with the environmental input, assigned by the user with a SET-ATTR-ENV command.";
-        config true;
-      }
-    }
-    list attr-cont {
-      key "cont";
-      config true;
-      leaf cont {
-        mandatory true;
-        description
-          "AID in format CONT-shelf-number, CONT-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list control-type {
-        type ciena-6500-enums:EXTCONTROL;
-        description
-          "The type of control for which the control state is being set.";
-        config true;
-      }
-    }
-    list ext-cont {
-      key "cont";
-      config false;
-      leaf cont {
-        mandatory true;
-        description
-          "AID in format CONT-shelf-number, CONT-number-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list cont-type {
-        type ciena-6500-enums:EXTCONTROL;
-        description
-          "The type of control for which the control state is being set.";
-        config false;
-      }
-      leaf conts {
-        type enumeration {
-          enum "CONTS" {
-            description
-              "Continuous";
-          }
-        }
-        description
-          "Duration is continuous, momentary is not supported.";
-        config false;
-      }
-      leaf contstate {
-        type enumeration {
-          enum "OPER" {
-            description
-              "Operated";
-          }
-          enum "RLS" {
-            description
-              "Released";
-          }
-        }
-        description
-          "Control state.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-almprofile.yang b/models/ciena-6500-almprofile.yang
deleted file mode 100644
index 7c3915024eca0967554af394142810d8ee3799c6..0000000000000000000000000000000000000000
--- a/models/ciena-6500-almprofile.yang
+++ /dev/null
@@ -1,486 +0,0 @@
-module ciena-6500-almprofile {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-almprofile";
-  prefix almprofile;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's almprofile object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         rpc almprofile-show
-           input
-             leaf aidtype
-             - Added mandatory: true 
-           output
-           - Removed leaf: shelf
-           - Removed leaf: aidtype
-           - Removed leaf: prflid
-           - Removed leaf: prflname
-           - Removed leaf: conddescr
-           - Removed leaf: alm-id
-           - Removed leaf: state
-           - Removed leaf: hi-sev
-           - Removed leaf: lo-sev
-           - Added list: output
-         rpc almprofile-show-default
-           input
-             leaf aidtype
-             - Added mandatory: true 
-           output
-           - Removed leaf: shelf
-           - Removed leaf: aidtype
-           - Removed leaf: prflid
-           - Removed leaf: prflname
-           - Removed leaf: conddescr
-           - Removed leaf: alm-id
-           - Removed leaf: state
-           - Removed leaf: hi-sev
-           - Removed leaf: lo-sev
-           - Added list: output
-         rpc almprofile-show-active
-           input
-             leaf aidtype
-             - Added mandatory: true 
-           output
-           - Removed leaf: shelf
-           - Removed leaf: aidtype
-           - Removed leaf: prflid
-           - Removed leaf: prflname
-           - Added list: output
-         rpc almprofile-set-active
-           input
-             leaf aidtype
-             - Added mandatory: true 
-             leaf prflid
-             - Added mandatory: true 
-         rpc almprofile-set-default
-           input
-             leaf aidtype
-             - Added mandatory: true 
-             leaf prflid
-             - Added mandatory: true 
-         rpc almprofile-set-profile-attribute
-           input
-             leaf aidtype
-             - Added mandatory: true 
-             leaf prflid
-             - Added mandatory: true 
-             leaf almid
-             - Added mandatory: true 
-             leaf alrmstat
-             - Added default: ENABLED 
-         rpc almprofile-set-name
-           input
-             leaf aidtype
-             - Added mandatory: true 
-             leaf prflid
-             - Added mandatory: true 
-             leaf prflname
-             - Added mandatory: true ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         rpc almprofile-show
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf info
-             - Changed type from ciena-6500-types:BOOLEAN to ciena-6500-enums:BOOL_Y_N
-           output
-           - Added leaf: shelf
-         rpc almprofile-show-default
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf info
-             - Changed type from ciena-6500-types:BOOLEAN to ciena-6500-enums:BOOL_Y_N
-           output
-           - Added leaf: shelf
-         rpc almprofile-show-active
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-           output
-           - Added leaf: shelf
-         rpc almprofile-set-active
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc almprofile-set-default
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc almprofile-set-profile-attribute
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc almprofile-set-name
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added rpc: almprofile-show
-       - Added rpc: almprofile-show-default
-       - Added rpc: almprofile-show-active
-       - Added rpc: almprofile-set-active
-       - Added rpc: almprofile-set-default
-       - Added rpc: almprofile-set-profile-attribute
-       - Added rpc: almprofile-set-name";
-  }
-
-  rpc almprofile-show {
-    description
-      "Retrieve Alarm Profile: this command allows the user to retrieve the list of alarms and their associated profile status.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-      leaf prflid {
-        type ciena-6500-enums:AlmProfile;
-        description
-          "Profile id";
-      }
-      leaf info {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Display full profile info (default only displays profile name).";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:ALMPRVAIDTYPE;
-          mandatory true;
-          description
-            "Type of AID";
-        }
-        leaf prflid {
-          type ciena-6500-enums:AlmProfile;
-          mandatory true;
-          description
-            "Profile id";
-        }
-        leaf prflname {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "Profile name";
-        }
-        leaf conddescr {
-          type ciena-6500-types:STRING;
-          description
-            "Condition description giving a textual outline of the event.";
-        }
-        leaf alm-id {
-          type ciena-6500-types:INT;
-          description
-            "Alarm identifier";
-        }
-        leaf state {
-          type ciena-6500-enums:AlrmStat;
-          default "ENABLED";
-          description
-            "Indicates whether the alarm is enabled or disabled in this profile.";
-        }
-        leaf hi-sev {
-          type ciena-6500-enums:NTFCNCDE_NAP;
-          description
-            "Alarm High Severity";
-        }
-        leaf lo-sev {
-          type ciena-6500-enums:NTFCNCDE_NAP;
-          description
-            "Alarm Low Severity";
-        }
-      }
-    }
-  }
-  rpc almprofile-show-default {
-    description
-      "Retrieve Default Alarm Profile: this command will allow the user to retrieve the current default profile of an AIDTYPE.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-      leaf info {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Include Profile information in repsonse";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:ALMPRVAIDTYPE;
-          mandatory true;
-          description
-            "Type of AID";
-        }
-        leaf prflid {
-          type ciena-6500-enums:AlmProfile;
-          mandatory true;
-          description
-            "Profile id";
-        }
-        leaf prflname {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "Profile name";
-        }
-        leaf conddescr {
-          type ciena-6500-types:STRING;
-          description
-            "Condition description giving a textual outline of the event.";
-        }
-        leaf alm-id {
-          type ciena-6500-types:INT;
-          description
-            "Alarm identifier";
-        }
-        leaf state {
-          type ciena-6500-enums:AlrmStat;
-          default "ENABLED";
-          description
-            "Indicates whether the alarm is enabled or disabled in this profile.";
-        }
-        leaf hi-sev {
-          type ciena-6500-enums:NTFCNCDE_NAP;
-          description
-            "high severity.";
-        }
-        leaf lo-sev {
-          type ciena-6500-enums:NTFCNCDE_NAP;
-          description
-            "low severity.";
-        }
-      }
-    }
-  }
-  rpc almprofile-show-active {
-    description
-      "Retrieve Active Alarm Profile: this command allows the user to view the current alarm profile that is associated with a given equipment or facility object type.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-      leaf target-aid {
-        type ciena-6500-types:IDENT;
-        description
-          "A valid AID for the selected AIDTYPE. It is required for all AIDTYPE except COM and SECU.";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:ALMPRVAIDTYPE;
-          mandatory true;
-          description
-            "Type of AID";
-        }
-        leaf prflid {
-          type ciena-6500-enums:AlmProfile;
-          mandatory true;
-          description
-            "Profile id";
-        }
-        leaf prflname {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "Profile Name";
-        }
-      }
-    }
-  }
-  rpc almprofile-set-active {
-    description
-      "Set Active Alarm Profile: this command causes an alarm profile to become active on a specified facility or equipment entity.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-      leaf target-aid {
-        type ciena-6500-types:IDENT;
-        description
-          "AID of the facility or equipment to make the specified alarm profile active on it. It is required for all AIDTYPE except COM and SECU.";
-      }
-      leaf prflid {
-        type ciena-6500-enums:AlmProfile;
-        mandatory true;
-        description
-          "Profile id";
-      }
-    }
-  }
-  rpc almprofile-set-default {
-    description
-      "Set Default Alarm Profile: this command allows the user to change the default profile of an AIDTYPE (equipment or facility type). The profile will subsequently be used for all newly-created entities of that type.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-      leaf prflid {
-        type ciena-6500-enums:AlmProfile;
-        mandatory true;
-        description
-          "Profile name";
-      }
-    }
-  }
-  rpc almprofile-set-profile-attribute {
-    description
-      "Set Alarm Profile Attribute : this command is used to change the alarm provisioning status within a given profile and re-evaluates the standing alarms who are using this profile.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-      leaf prflid {
-        type ciena-6500-enums:EdAlmProfile;
-        mandatory true;
-        description
-          "Profile id";
-      }
-      leaf almid {
-        type ciena-6500-types:INT;
-        mandatory true;
-        description
-          "Alarm identifier";
-      }
-      leaf alrmstat {
-        type ciena-6500-enums:EdAlrmStat;
-        default "ENABLED";
-        description
-          "Alarm status";
-      }
-      leaf hisev {
-        type ciena-6500-enums:NTFCNCDE_NA;
-        description
-          "Alarm High Severity";
-      }
-      leaf losev {
-        type ciena-6500-enums:NTFCNCDE_NA;
-        description
-          "Alarm Low Severity";
-      }
-    }
-  }
-  rpc almprofile-set-name {
-    description
-      "Set Alarm Profile Name: this command allows the user to change the profile name.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:ALMPRVAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-      leaf prflid {
-        type ciena-6500-enums:EdAlmProfile;
-        mandatory true;
-        description
-          "Profile id";
-      }
-      leaf prflname {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Profile name";
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-ampmons.yang b/models/ciena-6500-ampmons.yang
deleted file mode 100644
index 336cb4412ac79ccd71f0121873b7b24afb1736d0..0000000000000000000000000000000000000000
--- a/models/ciena-6500-ampmons.yang
+++ /dev/null
@@ -1,117 +0,0 @@
-module ciena-6500-ampmons {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-ampmons";
-  prefix ampmons;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's ampmons object for the 6500 platform";
-
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container ampmons
-           list ampmon
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added container: ampmons";
-  }
-
-  container ampmons {
-    list ampmon {
-      key "ampmon";
-      config true;
-      leaf ampmon {
-        mandatory true;
-        description
-          "AID in format AMPMON-shelf-slot-port, AMPMON-shelf-ALL, AMPMON-shelf-slot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in edit operation)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in edit operation)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "AINS time left \"HH-MM\"";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary state";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-amps.yang b/models/ciena-6500-amps.yang
deleted file mode 100644
index 2c8e9e48cba0033b1af626b64d71f18c3e876447..0000000000000000000000000000000000000000
--- a/models/ciena-6500-amps.yang
+++ /dev/null
@@ -1,482 +0,0 @@
-module ciena-6500-amps {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-amps";
-  prefix amps;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's amps object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container amps
-           list amp
-           - Added leaf: flat-mode";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container amps
-           list amp
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         container amps
-           list amp
-             leaf amp
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf amp-mode
-             - Added default: GAIN 
-             leaf gain-mode
-             - Added default: HIGH 
-             leaf amp-peak-mode
-             - Added default: ENABLED 
-             leaf targ-gain
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0..30.00 
-             leaf targ-pow
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -40..40.00 
-             leaf targ-peak-pow
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -15..24.00 
-             leaf shutoff-thresh
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -60..10.00 
-             leaf output-loss
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0..100.00 
-             leaf forced-shutoff
-             - Added default: ENABLED 
-             leaf drop-targ-gain
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0..20.00 
-             leaf also-disabled
-             - Added default: FALSE 
-             - Changed type from ciena-6500-enums:BOOL_TRUE_FALSE to enumeration
-               type enumeration
-               - Added enum: TRUE
-               - Added enum: FALSE
-             leaf pst
-             - Changed type from ciena-6500-enums:PSTfac_RTRV to enumeration
-               type enumeration
-               - Added enum: IS
-               - Added enum: OOS-MA
-               - Added enum: IS-ANR
-               - Added enum: OOS-AU
-               - Added enum: OOS-AUMA
-               - Added enum: OOS-MAANR
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTfac to enumeration
-               type enumeration
-               - Added enum: AINS
-               - Added enum: AINS-DEA
-               - Added enum: BRIDGED
-               - Added enum: SWITCHED
-               - Added enum: ROLL
-               - Added enum: ACT
-               - Added enum: IDLE
-               - Added enum: STBYS
-               - Added enum: WRK
-               - Added enum: ERRANL
-               - Added enum: PSI
-               - Added enum: FLT
-               - Added enum: MEA
-               - Added enum: TSTF
-               - Added enum: UEQ
-               - Added enum: SGEO
-               - Added enum: DISCD
-               - Added enum: LPBK
-               - Added enum: TS
-               - Added enum: FAF
-               - Added enum: STBYH
-               - Added enum: WRKRX
-               - Added enum: WRKTX
-               - Added enum: PRTCL
-               - Added enum: UAS
-               - Added enum: NOSITE
-               - Added enum: NOAM
-               - Added enum: MON
-               - Added enum: MSC
-               - Added enum: PROTECTED
-               - Added enum: MT
-               - Added enum: DSBLD
-               - Added enum: INHIP
-               - Added enum: L2DSBLD
-               - Added enum: TSGEN
-               - Added enum: TSMON
-             leaf max-targ-pow
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf path-id
-               type ciena-6500-types:INT
-               - Added range: 1..254 ";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-         container amps
-           list amp
-           - Added leaf: ref-bw";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container amps
-           list amp
-           - Changed key from aid to amp
-           - Removed leaf: aid
-           - Removed leaf: mode
-           - Added leaf: amp-mode
-           - Added leaf: amp
-             leaf also-disabled
-             - Changed type from ciena-6500-enums:BOOL_TRUE_defaultFALSE to ciena-6500-enums:BOOL_TRUE_FALSE
-             leaf pst
-             - Changed type from ciena-6500-enums:PSTfac to ciena-6500-enums:PSTfac_RTRV
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTAINSMT_bits to ciena-6500-enums:SSTfac
-         rpc amps-disable-amp
-           input
-           - Added leaf: amp
-         rpc amps-enable-amp
-           input
-           - Added leaf: amp";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: amps
-       - Added rpc: amps-disable-amp
-       - Added rpc: amps-enable-amp";
-  }
-
-  rpc amps-disable-amp {
-    description
-      "Removes the AMP Optical Facility from service.";
-    input {
-      leaf amp {
-        mandatory true;
-        description
-          "AID in format AMP-shelf-slot-port, AMP-shelf-slot-portSsubport, AMP-shelf-slotSsubslot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Remove facility from Maintenance State";
-      }
-    }
-  }
-  rpc amps-enable-amp {
-    description
-      "Restores the AMP Optical Facility to service.";
-    input {
-      leaf amp {
-        mandatory true;
-        description
-          "AID in format AMP-shelf-slot-port, AMP-shelf-slot-portSsubport, AMP-shelf-slotSsubslot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container amps {
-    list amp {
-      key "amp";
-      config true;
-      leaf amp {
-        mandatory true;
-        description
-          "AID in format AMP-shelf-slot-port, AMP-shelf-slot-portSsubport, AMP-shelf-slotSsubslot-portSsubport, AMP-shelf-ALL, AMP-shelf-slot-ALL, AMP-shelf-slotSsubslot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf amp-mode {
-        type ciena-6500-enums:AMPMODE;
-        default "GAIN";
-        description
-          "Control Mode of the AMP.";
-        config true;
-      }
-      leaf gain-mode {
-        type ciena-6500-enums:GAINMODE;
-        default "HIGH";
-        description
-          "Gain Mode of the AMP.";
-        config true;
-      }
-      leaf amp-peak-mode {
-        type ciena-6500-enums:AMPPKMODE;
-        default "ENABLED";
-        description
-          "Peak Power Control State of the AMP. This is only applicable to the line AMPs.";
-        config true;
-      }
-      leaf targ-gain {
-        type decimal64 {
-          range "0..30.00";
-          fraction-digits 2;
-        }
-        description
-          "Target Gain in dB.";
-        config true;
-      }
-      leaf targ-pow {
-        type decimal64 {
-          range "-40..40.00";
-          fraction-digits 2;
-        }
-        description
-          "Target Total Power in dBm.";
-        config true;
-      }
-      leaf targ-peak-pow {
-        type decimal64 {
-          range "-15..24.00";
-          fraction-digits 2;
-        }
-        description
-          "Target peak Power in dBm. This is only applicable to the line AMPs.";
-        config true;
-      }
-      leaf targ-gain-tilt {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Gain tilt in dB.";
-        config true;
-      }
-      leaf shutoff-thresh {
-        type decimal64 {
-          range "-60..10.00";
-          fraction-digits 2;
-        }
-        description
-          "Shutoff Threshold in dBm.";
-        config true;
-      }
-      leaf input-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Input connector loss in dB. This is only applicable to the line AMPs.";
-        config true;
-      }
-      leaf output-loss {
-        type decimal64 {
-          range "0..100.00";
-          fraction-digits 2;
-        }
-        description
-          "Ouput connector loss in dB. This is only applicable to the line AMPs.";
-        config true;
-      }
-      leaf input-los-thres {
-        type ciena-6500-types:STRING;
-        description
-          "Input LOS Threshold";
-        config true;
-      }
-      leaf output-los-thres {
-        type ciena-6500-types:STRING;
-        description
-          "Output LOS Threshold";
-        config true;
-      }
-      leaf forced-shutoff {
-        type ciena-6500-enums:FORCEDSHUTOFF;
-        default "ENABLED";
-        description
-          "Forced EDFA Shutoff State";
-        config true;
-      }
-      leaf drop-targ-gain {
-        type decimal64 {
-          range "0..20.00";
-          fraction-digits 2;
-        }
-        description
-          "Drop Target Gain in dB.";
-        config true;
-      }
-      leaf top-offset {
-        type ciena-6500-types:STRING;
-        description
-          " Offset of the Total Output Power for the EDFA";
-        config true;
-      }
-      leaf also-disabled {
-        type enumeration {
-          enum "TRUE";
-          enum "FALSE";
-        }
-        default "FALSE";
-        description
-          "Disable EDFA Shutoff State";
-        config true;
-      }
-      leaf gain-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Gain Offset of the AMP";
-        config true;
-      }
-      leaf ref-bw {
-        type ciena-6500-enums:refBW;
-        description
-          "Reference Bandwidth which refers to the frame of reference for TARGPKPOW value.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf flat-mode {
-        type ciena-6500-enums:flatMode;
-        description
-          "Flat Mode";
-        config true;
-      }
-      leaf gain {
-        type ciena-6500-types:DECIMAL;
-        description
-          "The current gain of the amplifier.";
-        config false;
-      }
-      leaf max-targ-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Target Power in dBm.";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf path-id {
-        type ciena-6500-types:INT {
-          range "1..254";
-        }
-        description
-          "TX Path ID value";
-        config false;
-      }
-      leaf input-ovrld-thres {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Input Overload Threshold in dBm.";
-        config false;
-      }
-      leaf apr-thres {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Automatic Power Reduction in dB";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-application.yang b/models/ciena-6500-application.yang
deleted file mode 100644
index dcbb21986f0395b6e4bd1461642785ee7b99064b..0000000000000000000000000000000000000000
--- a/models/ciena-6500-application.yang
+++ /dev/null
@@ -1,52 +0,0 @@
-module ciena-6500-application {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-application";
-  prefix application;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's application object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Added container: application";
-  }
-
-  container application {
-    list application {
-      key "appl";
-      config false;
-      leaf appl {
-        mandatory true;
-        description
-          "AID in format APPL-shelf-id, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf name {
-        type ciena-6500-types:STRING;
-        description
-          "Application name";
-        config false;
-      }
-      leaf description {
-        type ciena-6500-types:STRING;
-        description
-          "Application description";
-        config false;
-      }
-      leaf expires {
-        type ciena-6500-types:TIME;
-        description
-          "Time that the application expires in format of \"yyyy-mm-dd-hh:mm:ss\"";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-channel-control.yang b/models/ciena-6500-channel-control.yang
deleted file mode 100644
index 71b66a1abb602395807f55e086ed660746b088d2..0000000000000000000000000000000000000000
--- a/models/ciena-6500-channel-control.yang
+++ /dev/null
@@ -1,1427 +0,0 @@
-module ciena-6500-channel-control {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-channel-control";
-  prefix channel-control;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's channel-control object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         container channel-control
-           list chc
-             leaf chc
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf min-freq
-             - Added mandatory: true 
-             leaf max-freq
-             - Added mandatory: true 
-             leaf min-freq-deadband
-             - Added default: 4 
-             leaf max-freq-deadband
-             - Added default: 4 
-             leaf opaque
-             - Added default: YES 
-             - Changed type from ciena-6500-enums:BOOL_YES_NO to enumeration
-               type enumeration
-               - Added enum: YES
-               - Added enum: NO
-             leaf sw-sel
-             - Added default: 3 
-               type enumeration
-               - Added enum: 21S2
-               - Added enum: 21S3
-               - Added enum: 21S4
-               - Added enum: 21S5
-               - Added enum: 21S6
-               - Added enum: 21S7
-               - Added enum: 21S8
-               - Added enum: 21S9
-               - Added enum: 21S10
-               - Added enum: 21S11
-               - Added enum: 22S2
-               - Added enum: 22S3
-               - Added enum: 22S4
-               - Added enum: 22S5
-               - Added enum: 22S6
-               - Added enum: 22S7
-               - Added enum: 22S8
-               - Added enum: 22S9
-               - Added enum: 22S10
-               - Added enum: 22S11
-               - Added enum: 23S2
-               - Added enum: 23S3
-               - Added enum: 23S4
-               - Added enum: 23S5
-               - Added enum: 23S6
-               - Added enum: 23S7
-               - Added enum: 23S8
-               - Added enum: 23S9
-               - Added enum: 23S10
-               - Added enum: 23S11
-               - Added enum: 24S2
-               - Added enum: 24S3
-               - Added enum: 24S4
-               - Added enum: 24S5
-               - Added enum: 24S6
-               - Added enum: 24S7
-               - Added enum: 24S8
-               - Added enum: 24S9
-               - Added enum: 24S10
-               - Added enum: 24S11
-               - Added enum: 6
-               - Added enum: 8
-               - Added enum: 10
-               - Added enum: 12
-               - Added enum: 14
-               - Added enum: 16
-               - Added enum: 18
-               - Added enum: 20
-             leaf targ-sw-sel
-               type enumeration
-               - Added enum: 21S2
-               - Added enum: 21S3
-               - Added enum: 21S4
-               - Added enum: 21S5
-               - Added enum: 21S6
-               - Added enum: 21S7
-               - Added enum: 21S8
-               - Added enum: 21S9
-               - Added enum: 21S10
-               - Added enum: 21S11
-               - Added enum: 22S2
-               - Added enum: 22S3
-               - Added enum: 22S4
-               - Added enum: 22S5
-               - Added enum: 22S6
-               - Added enum: 22S7
-               - Added enum: 22S8
-               - Added enum: 22S9
-               - Added enum: 22S10
-               - Added enum: 22S11
-               - Added enum: 23S2
-               - Added enum: 23S3
-               - Added enum: 23S4
-               - Added enum: 23S5
-               - Added enum: 23S6
-               - Added enum: 23S7
-               - Added enum: 23S8
-               - Added enum: 23S9
-               - Added enum: 23S10
-               - Added enum: 23S11
-               - Added enum: 24S2
-               - Added enum: 24S3
-               - Added enum: 24S4
-               - Added enum: 24S5
-               - Added enum: 24S6
-               - Added enum: 24S7
-               - Added enum: 24S8
-               - Added enum: 24S9
-               - Added enum: 24S10
-               - Added enum: 24S11
-           list ssc
-           - Added leaf: base-targ-pow
-           - Added leaf: ref-bw
-             leaf ssc
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list nmcc
-           - Removed leaf: base-targ-pow
-           - Added leaf: ctrl-freq-offset
-           - Added leaf: wss-ch-out-pow
-           - Added leaf: wss-ch-in-pow
-             leaf nmcc
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf targ-loss
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf ctrl-targ-pow
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf center-freq
-             - Added mandatory: true 
-             leaf spectral-width
-             - Added mandatory: true 
-             leaf expected-initial-pow
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf ctrl-ssc-atten
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf wss-out-pow
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf ctrl-out-pow
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf channel-pow
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf in-pow
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf in-pow-est-ref
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf loss
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added container: channel-control
-       - Added rpc: channel-control-disable-chc
-       - Added rpc: channel-control-enable-chc
-       - Added rpc: channel-control-init-power-profile-nmcc";
-  }
-
-  rpc channel-control-disable-chc {
-    description
-      "Puts the given channel control facility of a WSS card OOS";
-    input {
-      leaf chc {
-        mandatory true;
-        description
-          "AID in format CHC-shelf-slot-port-index, CHC-shelf-slot-portSsubport-index, CHC-shelf-slot-portSsubport-ALL, CHC-shelf-slot-port-ALL, CHC-shelf-slot-ALL, CHC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc channel-control-enable-chc {
-    description
-      "Puts the given channel control facility of a WSS card IS";
-    input {
-      leaf chc {
-        mandatory true;
-        description
-          "AID in format CHC-shelf-slot-port-index, CHC-shelf-slot-portSsubport-index, CHC-shelf-slot-portSsubport-ALL, CHC-shelf-slot-port-ALL, CHC-shelf-slot-ALL, CHC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc channel-control-init-power-profile-nmcc {
-    description
-      "Reset the power profile of the specified NMCC facilities";
-    input {
-      leaf nmcc {
-        mandatory true;
-        description
-          "AID in format NMCC-shelf-slot-port-chcIdx-index, NMCC-shelf-slot-portSsubport-chcIdx-index, NMCC-shelf-slot-port-chcIdx-ALL, NMCC-shelf-slot-portSsubport-chcIdx-ALL, NMCC-shelf-slot-port-ALL, NMCC-shelf-slot-portSsubport-ALL, NMCC-shelf-slot-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container channel-control {
-    list chc {
-      key "chc";
-      config true;
-      leaf chc {
-        mandatory true;
-        description
-          "AID in format CHC-shelf-slot-port-index, CHC-shelf-slot-portSsubport-index, CHC-shelf-slot-portSsubport-ALL, CHC-shelf-slot-port-ALL, CHC-shelf-slot-ALL, CHC-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf min-freq {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Minimum Channel Frequency";
-        config true;
-      }
-      leaf max-freq {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Maximum Channel Frequency";
-        config true;
-      }
-      leaf min-freq-limit {
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Channel Frequency Limit";
-        config true;
-      }
-      leaf max-freq-limit {
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Channel Frequency Limit";
-        config true;
-      }
-      leaf min-freq-deadband {
-        default "4";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Channel Frequency Deadband";
-        config true;
-      }
-      leaf max-freq-deadband {
-        default "4";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Channel Frequency Deadband";
-        config true;
-      }
-      leaf opaque {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "YES";
-        description
-          "Is Opaque. YES indicates the Channel is Blocked. NO indicates the Channel is Not Blocked.";
-        config true;
-      }
-      leaf sw-sel {
-        default "3";
-        type enumeration {
-          enum "3" {
-            description
-              "3(This value can be used in create and edit operations)";
-          }
-          enum "5" {
-            description
-              "5(This value can be used in create and edit operations)";
-          }
-          enum "7" {
-            description
-              "7(This value can be used in create and edit operations)";
-          }
-          enum "9" {
-            description
-              "9(This value can be used in create and edit operations)";
-          }
-          enum "11" {
-            description
-              "11(This value can be used in create and edit operations)";
-          }
-          enum "13" {
-            description
-              "13(This value can be used in create and edit operations)";
-          }
-          enum "15" {
-            description
-              "15(This value can be used in create and edit operations)";
-          }
-          enum "17" {
-            description
-              "17(This value can be used in create and edit operations)";
-          }
-          enum "19" {
-            description
-              "19(This value can be used in create and edit operations)";
-          }
-          enum "21" {
-            description
-              "21(This value can be used in create and edit operations)";
-          }
-          enum "23" {
-            description
-              "23(This value can be used in create and edit operations)";
-          }
-          enum "25" {
-            description
-              "25(This value can be used in create and edit operations)";
-          }
-          enum "26" {
-            description
-              "26 - Loopback(This value can be used in create and edit operations)";
-          }
-          enum "5S2" {
-            description
-              "5S2(This value can be used in create and edit operations)";
-          }
-          enum "5S3" {
-            description
-              "5S3(This value can be used in create and edit operations)";
-          }
-          enum "5S4" {
-            description
-              "5S4(This value can be used in create and edit operations)";
-          }
-          enum "5S5" {
-            description
-              "5S5(This value can be used in create and edit operations)";
-          }
-          enum "5S6" {
-            description
-              "5S6(This value can be used in create and edit operations)";
-          }
-          enum "5S7" {
-            description
-              "5S7(This value can be used in create and edit operations)";
-          }
-          enum "5S8" {
-            description
-              "5S8(This value can be used in create and edit operations)";
-          }
-          enum "5S9" {
-            description
-              "5S9(This value can be used in create and edit operations)";
-          }
-          enum "5S10" {
-            description
-              "5S10(This value can be used in create and edit operations)";
-          }
-          enum "5S11" {
-            description
-              "5S11(This value can be used in create and edit operations)";
-          }
-          enum "6S2" {
-            description
-              "6S2(This value can be used in create and edit operations)";
-          }
-          enum "6S3" {
-            description
-              "6S3(This value can be used in create and edit operations)";
-          }
-          enum "6S4" {
-            description
-              "6S4(This value can be used in create and edit operations)";
-          }
-          enum "6S5" {
-            description
-              "6S5(This value can be used in create and edit operations)";
-          }
-          enum "6S6" {
-            description
-              "6S6(This value can be used in create and edit operations)";
-          }
-          enum "6S7" {
-            description
-              "6S7(This value can be used in create and edit operations)";
-          }
-          enum "6S8" {
-            description
-              "6S8(This value can be used in create and edit operations)";
-          }
-          enum "6S9" {
-            description
-              "6S9(This value can be used in create and edit operations)";
-          }
-          enum "6S10" {
-            description
-              "6S10(This value can be used in create and edit operations)";
-          }
-          enum "6S11" {
-            description
-              "6S11(This value can be used in create and edit operations)";
-          }
-          enum "7S2" {
-            description
-              "7S2(This value can be used in create and edit operations)";
-          }
-          enum "7S3" {
-            description
-              "7S3(This value can be used in create and edit operations)";
-          }
-          enum "7S4" {
-            description
-              "7S4(This value can be used in create and edit operations)";
-          }
-          enum "7S5" {
-            description
-              "7S5(This value can be used in create and edit operations)";
-          }
-          enum "7S6" {
-            description
-              "7S6(This value can be used in create and edit operations)";
-          }
-          enum "7S7" {
-            description
-              "7S7(This value can be used in create and edit operations)";
-          }
-          enum "7S8" {
-            description
-              "7S8(This value can be used in create and edit operations)";
-          }
-          enum "7S9" {
-            description
-              "7S9(This value can be used in create and edit operations)";
-          }
-          enum "7S10" {
-            description
-              "7S10(This value can be used in create and edit operations)";
-          }
-          enum "7S11" {
-            description
-              "7S11(This value can be used in create and edit operations)";
-          }
-          enum "8S2" {
-            description
-              "8S2(This value can be used in create and edit operations)";
-          }
-          enum "8S3" {
-            description
-              "8S3(This value can be used in create and edit operations)";
-          }
-          enum "8S4" {
-            description
-              "8S4(This value can be used in create and edit operations)";
-          }
-          enum "8S5" {
-            description
-              "8S5(This value can be used in create and edit operations)";
-          }
-          enum "8S6" {
-            description
-              "8S6(This value can be used in create and edit operations)";
-          }
-          enum "8S7" {
-            description
-              "8S7(This value can be used in create and edit operations)";
-          }
-          enum "8S8" {
-            description
-              "8S8(This value can be used in create and edit operations)";
-          }
-          enum "8S9" {
-            description
-              "8S9(This value can be used in create and edit operations)";
-          }
-          enum "8S10" {
-            description
-              "8S10(This value can be used in create and edit operations)";
-          }
-          enum "8S11" {
-            description
-              "8S11(This value can be used in create and edit operations)";
-          }
-          enum "21S2" {
-            description
-              "21S2(This value can be used in create and edit operations)";
-          }
-          enum "21S3" {
-            description
-              "21S3(This value can be used in create and edit operations)";
-          }
-          enum "21S4" {
-            description
-              "21S4(This value can be used in create and edit operations)";
-          }
-          enum "21S5" {
-            description
-              "21S5(This value can be used in create and edit operations)";
-          }
-          enum "21S6" {
-            description
-              "21S6(This value can be used in create and edit operations)";
-          }
-          enum "21S7" {
-            description
-              "21S7(This value can be used in create and edit operations)";
-          }
-          enum "21S8" {
-            description
-              "21S8(This value can be used in create and edit operations)";
-          }
-          enum "21S9" {
-            description
-              "21S9(This value can be used in create and edit operations)";
-          }
-          enum "21S10" {
-            description
-              "21S10(This value can be used in create and edit operations)";
-          }
-          enum "21S11" {
-            description
-              "21S11(This value can be used in create and edit operations)";
-          }
-          enum "22S2" {
-            description
-              "22S2(This value can be used in create and edit operations)";
-          }
-          enum "22S3" {
-            description
-              "22S3(This value can be used in create and edit operations)";
-          }
-          enum "22S4" {
-            description
-              "22S4(This value can be used in create and edit operations)";
-          }
-          enum "22S5" {
-            description
-              "22S5(This value can be used in create and edit operations)";
-          }
-          enum "22S6" {
-            description
-              "22S6(This value can be used in create and edit operations)";
-          }
-          enum "22S7" {
-            description
-              "22S7(This value can be used in create and edit operations)";
-          }
-          enum "22S8" {
-            description
-              "22S8(This value can be used in create and edit operations)";
-          }
-          enum "22S9" {
-            description
-              "22S9(This value can be used in create and edit operations)";
-          }
-          enum "22S10" {
-            description
-              "22S10(This value can be used in create and edit operations)";
-          }
-          enum "22S11" {
-            description
-              "22S11(This value can be used in create and edit operations)";
-          }
-          enum "23S2" {
-            description
-              "23S2(This value can be used in create and edit operations)";
-          }
-          enum "23S3" {
-            description
-              "23S3(This value can be used in create and edit operations)";
-          }
-          enum "23S4" {
-            description
-              "23S4(This value can be used in create and edit operations)";
-          }
-          enum "23S5" {
-            description
-              "23S5(This value can be used in create and edit operations)";
-          }
-          enum "23S6" {
-            description
-              "23S6(This value can be used in create and edit operations)";
-          }
-          enum "23S7" {
-            description
-              "23S7(This value can be used in create and edit operations)";
-          }
-          enum "23S8" {
-            description
-              "23S8(This value can be used in create and edit operations)";
-          }
-          enum "23S9" {
-            description
-              "23S9(This value can be used in create and edit operations)";
-          }
-          enum "23S10" {
-            description
-              "23S10(This value can be used in create and edit operations)";
-          }
-          enum "23S11" {
-            description
-              "23S11(This value can be used in create and edit operations)";
-          }
-          enum "24S2" {
-            description
-              "24S2(This value can be used in create and edit operations)";
-          }
-          enum "24S3" {
-            description
-              "24S3(This value can be used in create and edit operations)";
-          }
-          enum "24S4" {
-            description
-              "24S4(This value can be used in create and edit operations)";
-          }
-          enum "24S5" {
-            description
-              "24S5(This value can be used in create and edit operations)";
-          }
-          enum "24S6" {
-            description
-              "24S6(This value can be used in create and edit operations)";
-          }
-          enum "24S7" {
-            description
-              "24S7(This value can be used in create and edit operations)";
-          }
-          enum "24S8" {
-            description
-              "24S8(This value can be used in create and edit operations)";
-          }
-          enum "24S9" {
-            description
-              "24S9(This value can be used in create and edit operations)";
-          }
-          enum "24S10" {
-            description
-              "24S10(This value can be used in create and edit operations)";
-          }
-          enum "24S11" {
-            description
-              "24S11(This value can be used in create and edit operations)";
-          }
-          enum "6" {
-            description
-              "6(This value can be used in edit operation)";
-          }
-          enum "8" {
-            description
-              "8(This value can be used in edit operation)";
-          }
-          enum "10" {
-            description
-              "10(This value can be used in edit operation)";
-          }
-          enum "12" {
-            description
-              "12(This value can be used in edit operation)";
-          }
-          enum "14" {
-            description
-              "14(This value can be used in edit operation)";
-          }
-          enum "16" {
-            description
-              "16(This value can be used in edit operation)";
-          }
-          enum "18" {
-            description
-              "18(This value can be used in edit operation)";
-          }
-          enum "20" {
-            description
-              "20(This value can be used in edit operation)";
-          }
-        }
-        description
-          "(OME) Switch Selector. WSS Port. Default of 1x20WSS Demux port is 5S6 and of 1x20WSS Mux port is 5S7; default of other WSS cards is 3.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf chc-mode {
-        type ciena-6500-enums:chcMode;
-        description
-          "CHC Mode. LOSS indicates Target Loss Control Mode. POWER indicates Target Power Control Mode. OPENLOOPLOSS indicates Target Loss Control Open Loop Mode.";
-        config true;
-      }
-      leaf targ-min-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Targeted Minimum Frequency set by the controlling application.";
-        config false;
-      }
-      leaf targ-max-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Targeted Maximum Frequency set by the controlling application.";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:STRING;
-        description
-          "Wavelength of center frequency";
-        config false;
-      }
-      leaf targ-sw-sel {
-        type enumeration {
-          enum "3" {
-            description
-              "3";
-          }
-          enum "5" {
-            description
-              "5";
-          }
-          enum "7" {
-            description
-              "7";
-          }
-          enum "9" {
-            description
-              "9";
-          }
-          enum "11" {
-            description
-              "11";
-          }
-          enum "13" {
-            description
-              "13";
-          }
-          enum "15" {
-            description
-              "15";
-          }
-          enum "17" {
-            description
-              "17";
-          }
-          enum "19" {
-            description
-              "19";
-          }
-          enum "5S2" {
-            description
-              "5S2";
-          }
-          enum "5S3" {
-            description
-              "5S3";
-          }
-          enum "5S4" {
-            description
-              "5S4";
-          }
-          enum "5S5" {
-            description
-              "5S5";
-          }
-          enum "5S6" {
-            description
-              "5S6";
-          }
-          enum "5S7" {
-            description
-              "5S7";
-          }
-          enum "5S8" {
-            description
-              "5S8";
-          }
-          enum "5S9" {
-            description
-              "5S9";
-          }
-          enum "5S10" {
-            description
-              "5S10";
-          }
-          enum "5S11" {
-            description
-              "5S11";
-          }
-          enum "6S2" {
-            description
-              "6S2";
-          }
-          enum "6S3" {
-            description
-              "6S3";
-          }
-          enum "6S4" {
-            description
-              "6S4";
-          }
-          enum "6S5" {
-            description
-              "6S5";
-          }
-          enum "6S6" {
-            description
-              "6S6";
-          }
-          enum "6S7" {
-            description
-              "6S7";
-          }
-          enum "6S8" {
-            description
-              "6S8";
-          }
-          enum "6S9" {
-            description
-              "6S9";
-          }
-          enum "6S10" {
-            description
-              "6S10";
-          }
-          enum "6S11" {
-            description
-              "6S11";
-          }
-          enum "7S2" {
-            description
-              "7S2";
-          }
-          enum "7S3" {
-            description
-              "7S3";
-          }
-          enum "7S4" {
-            description
-              "7S4";
-          }
-          enum "7S5" {
-            description
-              "7S5";
-          }
-          enum "7S6" {
-            description
-              "7S6";
-          }
-          enum "7S7" {
-            description
-              "7S7";
-          }
-          enum "7S8" {
-            description
-              "7S8";
-          }
-          enum "7S9" {
-            description
-              "7S9";
-          }
-          enum "7S10" {
-            description
-              "7S10";
-          }
-          enum "7S11" {
-            description
-              "7S11";
-          }
-          enum "8S2" {
-            description
-              "8S2";
-          }
-          enum "8S3" {
-            description
-              "8S3";
-          }
-          enum "8S4" {
-            description
-              "8S4";
-          }
-          enum "8S5" {
-            description
-              "8S5";
-          }
-          enum "8S6" {
-            description
-              "8S6";
-          }
-          enum "8S7" {
-            description
-              "8S7";
-          }
-          enum "8S8" {
-            description
-              "8S8";
-          }
-          enum "8S9" {
-            description
-              "8S9";
-          }
-          enum "8S10" {
-            description
-              "8S10";
-          }
-          enum "8S11" {
-            description
-              "8S11";
-          }
-          enum "21S2" {
-            description
-              "21S2";
-          }
-          enum "21S3" {
-            description
-              "21S3";
-          }
-          enum "21S4" {
-            description
-              "21S4";
-          }
-          enum "21S5" {
-            description
-              "21S5";
-          }
-          enum "21S6" {
-            description
-              "21S6";
-          }
-          enum "21S7" {
-            description
-              "21S7";
-          }
-          enum "21S8" {
-            description
-              "21S8";
-          }
-          enum "21S9" {
-            description
-              "21S9";
-          }
-          enum "21S10" {
-            description
-              "21S10";
-          }
-          enum "21S11" {
-            description
-              "21S11";
-          }
-          enum "22S2" {
-            description
-              "22S2";
-          }
-          enum "22S3" {
-            description
-              "22S3";
-          }
-          enum "22S4" {
-            description
-              "22S4";
-          }
-          enum "22S5" {
-            description
-              "22S5";
-          }
-          enum "22S6" {
-            description
-              "22S6";
-          }
-          enum "22S7" {
-            description
-              "22S7";
-          }
-          enum "22S8" {
-            description
-              "22S8";
-          }
-          enum "22S9" {
-            description
-              "22S9";
-          }
-          enum "22S10" {
-            description
-              "22S10";
-          }
-          enum "22S11" {
-            description
-              "22S11";
-          }
-          enum "23S2" {
-            description
-              "23S2";
-          }
-          enum "23S3" {
-            description
-              "23S3";
-          }
-          enum "23S4" {
-            description
-              "23S4";
-          }
-          enum "23S5" {
-            description
-              "23S5";
-          }
-          enum "23S6" {
-            description
-              "23S6";
-          }
-          enum "23S7" {
-            description
-              "23S7";
-          }
-          enum "23S8" {
-            description
-              "23S8";
-          }
-          enum "23S9" {
-            description
-              "23S9";
-          }
-          enum "23S10" {
-            description
-              "23S10";
-          }
-          enum "23S11" {
-            description
-              "23S11";
-          }
-          enum "24S2" {
-            description
-              "24S2";
-          }
-          enum "24S3" {
-            description
-              "24S3";
-          }
-          enum "24S4" {
-            description
-              "24S4";
-          }
-          enum "24S5" {
-            description
-              "24S5";
-          }
-          enum "24S6" {
-            description
-              "24S6";
-          }
-          enum "24S7" {
-            description
-              "24S7";
-          }
-          enum "24S8" {
-            description
-              "24S8";
-          }
-          enum "24S9" {
-            description
-              "24S9";
-          }
-          enum "24S10" {
-            description
-              "24S10";
-          }
-          enum "24S11" {
-            description
-              "24S11";
-          }
-        }
-        description
-          "(OME) Target Switch Selector. WSS Port.";
-        config false;
-      }
-      leaf loopback-ready {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Loopback Ready. TRUE indicates the CHC facility supports loopback state. FALSE indicates the CHC facility does not support loopback state.";
-        config false;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "ACT" {
-            description
-              "Active, carrying traffic";
-          }
-          enum "IDLE" {
-            description
-              "Idle, not carrying traffic";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "PSI" {
-            description
-              "Protection switch inhibited";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "MEA" {
-            description
-              "Mismatched equipment attributes";
-          }
-          enum "STBYH" {
-            description
-              "Hot standby";
-          }
-          enum "TS" {
-            description
-              "Test";
-          }
-          enum "UEQ" {
-            description
-              "Unequipped, circuit pack missing";
-          }
-          enum "WRK" {
-            description
-              "Working";
-          }
-          enum "FAF" {
-            description
-              "Facility failure";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-        }
-        description
-          "Identify the secondary state";
-        config false;
-      }
-    }
-    list ssc {
-      key "ssc";
-      config true;
-      leaf ssc {
-        mandatory true;
-        description
-          "AID in format SSC-shelf-slot-port-index, SSC-shelf-slot-portSsubport-index, SSC-shelf-slot-port-ALL, SSC-shelf-slot-portSsubport-ALL, SSC-shelf-slot-ALL, SSC-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf bias {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Provisioned Attenuation Bias of a Spectral Frequency Unit.";
-        config true;
-      }
-      leaf base-targ-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Base Target Power";
-        config true;
-      }
-      leaf ref-bw {
-        type ciena-6500-enums:refBW;
-        description
-          "Reference Bandwidth which refers to the frame of reference for local controller to use.Supported values: 12.5GHz (flexiblegrid card only), 50GHzITU.";
-        config true;
-      }
-      leaf min-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Spectral Frequency Unit";
-        config false;
-      }
-      leaf max-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Spectral Frequency Unit";
-        config false;
-      }
-      leaf parent-nmcc {
-        type ciena-6500-types:STRING;
-        description
-          "NMCC-shelf-slot-port-chcIdx-index";
-        config false;
-      }
-      leaf nmcc-relative-index {
-        type ciena-6500-types:STRING;
-        description
-          "NMCC Relative Index";
-        config false;
-      }
-      leaf atten {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Attenuation";
-        config false;
-      }
-    }
-    list nmcc {
-      key "nmcc";
-      config true;
-      leaf nmcc {
-        mandatory true;
-        description
-          "AID in format NMCC-shelf-slot-port-chcIdx-index, NMCC-shelf-slot-portSsubport-chcIdx-index, NMCC-shelf-slot-port-chcIdx-ALL, NMCC-shelf-slot-portSsubport-chcIdx-ALL, NMCC-shelf-slot-port-ALL, NMCC-shelf-slot-portSsubport-ALL, NMCC-shelf-slot-ALL, NMCC-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf targ-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Target attenuation value to be achieved for the NMCC.";
-        config true;
-      }
-      leaf ctrl-targ-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Target Power in the control bandwidth to be achieved by the controller for the NMCC in dBm.";
-        config true;
-      }
-      leaf ctrl-freq-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Control Frequency Offset.";
-        config true;
-      }
-      leaf ref-bw {
-        type ciena-6500-enums:refBW;
-        description
-          "Reference Bandwidth which refers to the frame of reference for local controller to use. Default is 12.5GHz for flexiblegrid card and 50GHzITU for fixedgrid card. Supported values: 12.5GHz (flexiblegrid card only), 50GHzITU.";
-        config true;
-      }
-      leaf inital-atten {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Initial Attenuation";
-        config true;
-      }
-      leaf center-freq {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Center Frequency";
-        config true;
-      }
-      leaf spectral-width {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Spectral Width";
-        config true;
-      }
-      leaf wavelength {
-        type ciena-6500-types:STRING;
-        description
-          "Wavelength of center frequency";
-        config false;
-      }
-      leaf min-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Channel Frequency";
-        config false;
-      }
-      leaf max-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Channel Frequency";
-        config false;
-      }
-      leaf ctrl-state {
-        type ciena-6500-types:STRING;
-        description
-          "Control State of the NMCC.";
-        config false;
-      }
-      leaf expected-initial-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Expected Initial Power that is used by the control application in OPENLOOPLOSS mode";
-        config false;
-      }
-      leaf ctrl-ssc {
-        type ciena-6500-types:STRING;
-        description
-          "SSC-shelf-slot-port-index1, SSC-shelf-slot-port-index2";
-        config false;
-      }
-      leaf ctrl-ssc-atten {
-        type ciena-6500-types:STRING;
-        description
-          "Attenuation that has been applied at the reference control SSC. Applicable to flexiblegrid card only.";
-        config false;
-      }
-      leaf wss-out-pow {
-        type ciena-6500-types:STRING;
-        description
-          "The measured power in the control bandwidth at the output of WSS.";
-        config false;
-      }
-      leaf wss-ch-out-pow {
-        type ciena-6500-types:STRING;
-        description
-          "The measured power in the control channel bandwidth at the output of WSS.";
-        config false;
-      }
-      leaf wss-ch-in-pow {
-        type ciena-6500-types:STRING;
-        description
-          "The measured power in the control channel bandwidth at the input of WSS.";
-        config false;
-      }
-      leaf ctrl-out-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Measured Power in the control bandwidth at the output of the control point.";
-        config false;
-      }
-      leaf channel-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated power across the NMCC spectral width.";
-        config false;
-      }
-      leaf opaque {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Opacity status of the parent CHC. YES indicates the Channel is Blocked. NO indicates the Channel is Not Blocked.";
-        config false;
-      }
-      leaf chc-mode {
-        type ciena-6500-enums:chcMode;
-        description
-          "CHC Mode of the parent CHC.";
-        config false;
-      }
-      leaf sw-sel {
-        type ciena-6500-types:STRING;
-        description
-          "Switch Selector. WSS Port for the parent CHC.";
-        config false;
-      }
-      leaf targ-sw-sel {
-        type ciena-6500-types:STRING;
-        description
-          "Target Switch Selector for the parent CHC.";
-        config false;
-      }
-      leaf in-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated Input Power at the WSS input port.";
-        config false;
-      }
-      leaf in-pow-est-ref {
-        type ciena-6500-types:STRING;
-        description
-          "The measured snapshot of the estimated Input Power at the WSS input port for a particular TCA baseline.";
-        config false;
-      }
-      leaf loss {
-        type ciena-6500-types:STRING;
-        description
-          "Calculated WSS Loss = output power - input power";
-        config false;
-      }
-      leaf in-pow-src {
-        type ciena-6500-types:STRING;
-        description
-          "The Input Power measurement Source. For passthrough channels, this point will reference the remote WSS output port. For local channels, this point will reference the local (S)CMD input port.";
-        config false;
-      }
-      leaf atten {
-        type ciena-6500-types:STRING;
-        description
-          "WSS Current Attenuation Request";
-        config false;
-      }
-      leaf cktid {
-        type ciena-6500-types:STRING;
-        description
-          "Optical Channel Circuit ID";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:NmccPst;
-        description
-          "Identify the primary state";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:NmccSst;
-        description
-          "Identify the secondary state";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-comms.yang b/models/ciena-6500-comms.yang
deleted file mode 100644
index 7cfde48f99ad7c7478dfdc9b88dfa7a78bb42b2f..0000000000000000000000000000000000000000
--- a/models/ciena-6500-comms.yang
+++ /dev/null
@@ -1,4809 +0,0 @@
-module ciena-6500-comms {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-comms";
-  prefix comms;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's comms object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Removed rpc: comms-show-arp-table
-       - Added rpc: comms-show-dhcp-rastats
-       - Added rpc: comms-show-ztpstats
-         container comms
-         - Added container: dhcp
-         - Added list: gne-portfilter
-         - Added list: ztpstats
-         - Added list: ztp
-           container arp
-           - Removed list: table
-           container ospf
-             list circuit
-               leaf cost
-                 type ciena-6500-types:INT
-                 - Changed range from 1..65534 to 0..65534
-           list llsdcc
-           - Added leaf: lan-port
-             leaf oper-carrier
-               type enumeration
-               - Added enum: GCC2
-               - Added enum: EXT
-           list wsc
-           - Removed leaf: mac-addr
-           - Added leaf: lan-port
-         rpc comms-show-llsdcc
-           output
-             list output
-             - Added leaf: lan-port
-               leaf oper-carrier
-                 type enumeration
-                 - Added enum: GCC2
-                 - Added enum: EXT";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: comms-show-arp-table
-       - Added rpc: comms-delete-iisis-circuit
-       - Added rpc: comms-show-iisis-circuit
-       - Added rpc: comms-delete-iisis-rdentry
-       - Added rpc: comms-show-ip
-       - Added rpc: comms-delete-ip-nat
-       - Added rpc: comms-show-ip-routing-table
-       - Added rpc: comms-delete-llsdcc
-       - Added rpc: comms-show-llsdcc
-       - Added rpc: comms-delete-ne-list
-       - Added rpc: comms-show-nodes
-       - Added rpc: comms-show-ospf-circuit
-       - Added rpc: comms-show-ppp
-       - Added rpc: comms-delete-ip-rpnat
-       - Added rpc: comms-show-osi-routing-info
-       - Added rpc: comms-show-osi-routing-table
-       - Added rpc: comms-show-tidmap
-       - Added rpc: comms-commit-ip-acl-list
-       - Added rpc: comms-delete-ndp-link
-       - Added rpc: comms-delete-sldd-list
-       - Added rpc: comms-delete-ospfv3-router
-       - Added rpc: comms-show-ip6-routing-table
-       - Added rpc: comms-delete-ospfv3-circuit
-       - Added rpc: comms-show-ip6-linklocal
-         rpc comms-delete-arp-proxy
-           input
-             leaf ip-addr
-             - Added mandatory: true 
-         rpc comms-delete-ip-filter
-           input
-             leaf location
-             - Added mandatory: true 
-             leaf action
-             - Added mandatory: true 
-             leaf proto
-             - Added mandatory: true 
-             leaf dest-start-port
-             - Added mandatory: true 
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf dest-end-port
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-         rpc comms-delete-ip-static-route
-           input
-             leaf ip-addr
-             - Added mandatory: true 
-             leaf netmask
-             - Added mandatory: true 
-         rpc comms-delete-ospf-rdentry
-           input
-             leaf ip-addr
-             - Added mandatory: true 
-             leaf netmask
-             - Added mandatory: true 
-             leaf leak-list-id
-             - Added mandatory: true 
-         rpc comms-delete-ip-acl-list
-           input
-             leaf priority
-             - Added mandatory: true 
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-         rpc comms-show-ip-acl-list
-           input
-             leaf list
-             - Added mandatory: true 
-           output
-           - Removed leaf: shelf
-           - Removed leaf-list: circuit
-           - Removed leaf: ip-addr
-           - Removed leaf: netmask
-           - Removed leaf: action
-           - Removed leaf: priority
-           - Added list: output
-         container comms
-         - Removed container: routing
-         - Removed list: acl
-         - Added container: iisis
-         - Added container: ip6
-         - Added container: ndp
-         - Added container: osi-routing
-         - Added container: ospfv3
-         - Added container: sldd
-         - Added container: tl1gw
-         - Added list: dbrs
-         - Added list: gre
-         - Added list: ip-nat
-         - Added list: llsdcc
-         - Added list: nat
-         - Added list: ne-list
-         - Added list: nodes
-         - Added list: ppp
-         - Added list: ip-rpnat
-         - Added list: serial
-         - Added list: tidmap
-         - Added list: ulsdcc
-         - Added list: wsc
-         - Added list: odbr
-         - Added list: ip-acl
-         - Added list: ip-address
-         - Added list: static-route
-         - Added list: config
-         - Added list: inband-comms
-           container arp
-             list proxy
-               leaf shelf
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf ip-addr
-               - Added mandatory: true 
-             list table
-             - Removed key
-             - Removed leaf: arp-tbl-entry
-               leaf shelf
-               - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT
-               leaf arp-tmout
-               - Added default: 3600 
-                 type ciena-6500-types:INT
-                 - Added range: 1..14400 
-           container ospf
-             list circuit
-               leaf circuitaid
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf net-area
-               - Added mandatory: true 
-               leaf cost
-                 type ciena-6500-types:INT
-                 - Added range: 1..65534 
-               leaf area-def-cost
-               - Added default: 1 
-                 type ciena-6500-types:INT
-                 - Added range: 1..16777215 
-               leaf dead-invl
-               - Added default: 40 
-                 type ciena-6500-types:INT
-                 - Added range: 1..65535 
-               leaf hello-invl
-               - Added default: 10 
-                 type ciena-6500-types:INT
-                 - Added range: 1..65535 
-               leaf retrans-invl
-               - Added default: 5 
-                 type ciena-6500-types:INT
-                 - Added range: 1..3600 
-               leaf trans-delay
-               - Added default: 1 
-                 type ciena-6500-types:INT
-                 - Added range: 1..3600 
-               leaf priority
-               - Added default: 1 
-                 type ciena-6500-types:INT
-                 - Added range: 0..255 
-               leaf area
-               - Added default: OFF 
-               leaf auth-type
-               - Added default: NULL 
-               leaf passive
-               - Added default: OFF 
-               leaf primary-area
-               - Added default: ON 
-               leaf id1
-               - Added default: 0 
-                 type ciena-6500-types:INT
-                 - Added range: 0..255 
-               leaf id2
-               - Added default: 1 
-                 type ciena-6500-types:INT
-                 - Added range: 0..255 
-             list rdentry
-               leaf shelf
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf ip-addr
-               - Added mandatory: true 
-               leaf netmask
-               - Added mandatory: true 
-               leaf metric
-               - Added mandatory: true 
-                 type ciena-6500-types:INT
-                 - Added range: 1..65535 
-               leaf metric-type
-               - Added mandatory: true 
-               leaf leak-list-id
-               - Added mandatory: true 
-             list router
-             - Added leaf: rfc1583-capable
-             - Added leaf: abr
-               leaf shelf
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf router-id
-               - Added mandatory: true 
-               leaf route-summarisation
-               - Added default: ON 
-               leaf asbr
-               - Added default: OFF 
-               leaf opaque-filter
-               - Added default: OFF 
-                 type enumeration
-                 - Removed enum: ON
-                 - Added enum: ALL
-                 - Added enum: LAN
-               leaf shelf-rd
-               - Added default: OFF 
-           list gne
-             leaf gneaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf config
-             - Added mandatory: true 
-             leaf access
-             - Added mandatory: true 
-             leaf gne-group
-               type ciena-6500-types:INT
-               - Added range: 1..255 
-             leaf user-ftp-port
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-           list ip
-             leaf ipcommsaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf ip-addr
-             - Added mandatory: true 
-             leaf netmask
-             - Added mandatory: true 
-             leaf def-ttl
-             - Added default: 90 
-               type ciena-6500-types:INT
-               - Added range: 1..255 
-             leaf host-only
-             - Added default: OFF 
-             leaf non-routing
-             - Added default: OFF 
-             leaf proxy-arp
-             - Added default: OFF 
-           list ip-filter
-             leaf lanports
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf location
-             - Added mandatory: true 
-             leaf action
-             - Added mandatory: true 
-             leaf proto
-             - Added mandatory: true 
-             leaf dest-start-port
-             - Added mandatory: true 
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf dest-end-port
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-           list ip-routing-table
-           - Removed key
-             leaf circuitaid
-             - Added mandatory: true 
-             leaf cost
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf ext-cost
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-           list ip-static-route
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf ip-addr
-             - Added mandatory: true 
-             leaf netmask
-             - Added mandatory: true 
-             leaf cost
-             - Added mandatory: true 
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-           list lan
-           - Added leaf: anctrl
-           - Added leaf: netdomain
-             leaf lanports
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf config
-             - Added default: AUTO 
-             leaf port
-             - Added default: ENABLED 
-           list ip-acl-list
-             leaf ip-addr
-             - Added mandatory: true 
-             leaf netmask
-             - Added mandatory: true 
-             leaf action
-             - Added mandatory: true 
-             leaf priority
-             - Added mandatory: true 
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-           list ip-acl-stats
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf total
-               type ciena-6500-types:INT
-               - Added range: 0..4294967295 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Added rpc: comms-delete-arp-proxy
-       - Added rpc: comms-delete-ip
-       - Added rpc: comms-delete-ip-filter
-       - Added rpc: comms-delete-ip-static-route
-       - Added rpc: comms-delete-ospf-circuit
-       - Added rpc: comms-delete-ospf-rdentry
-       - Added rpc: comms-delete-ip-acl-list
-         container comms
-           container arp
-             list proxy
-             - Changed key from aid to shelf
-             - Removed leaf: aid
-             - Removed leaf: start
-             - Added leaf: shelf
-               leaf ip-addr
-               - Changed config from false to true
-             list table
-             - Changed key from aid to shelf
-             - Removed leaf: aid
-             - Added leaf: shelf
-             - Added leaf: arp-tbl-entry
-           container ospf
-             list circuit
-             - Changed key from aid to circuitaid
-             - Removed leaf: aid
-             - Added leaf: primary-area
-             - Added leaf: circuitaid
-               leaf password
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 1..8 
-               leaf key1
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 1..16 
-               leaf key2
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 1..16 
-             list rdentry
-             - Changed key from aid to shelf
-             - Removed leaf: aid
-             - Added leaf: shelf
-             list router
-             - Changed key from aid to shelf
-             - Removed leaf: aid
-             - Added leaf: shelf
-           container routing
-             list info
-             - Changed key from aid to shelf
-             - Removed leaf: aid
-             - Removed leaf: neid
-             - Removed leaf: name
-             - Removed leaf: sysid
-               leaf shelf
-               - Removed config
-               leaf sitemgr
-               - Changed type from enumeration to ciena-6500-enums:BOOL_Y_N
-           list gne
-           - Changed key from aid to gneaid
-           - Removed leaf: aid
-           - Added leaf: gneaid
-           - Added leaf: user-ftp-port
-           list ip
-           - Changed key from aid to ipcommsaid
-           - Removed leaf: aid
-           - Added leaf: ipcommsaid
-           list ip-filter
-           - Changed key from aid to lanports
-           - Removed leaf: aid
-           - Added leaf: lanports
-           list ip-routing-table
-           - Changed key from aid to circuitaid
-           - Removed leaf: aid
-           - Added leaf: circuitaid
-             leaf tunnel
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..60 
-           list ip-static-route
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: ipcommsaid.SHELF
-           - Added leaf: shelf
-             leaf circuit
-             - Changed type from ciena-6500-enums:CIRCUITINTERFACE to ciena-6500-types:aid
-           list lan
-           - Changed key from aid to lanports
-           - Removed leaf: aid
-           - Added leaf: lanports
-             leaf config
-               type enumeration
-               - Added enum: FD1000BT
-             leaf oper-config
-               type enumeration
-               - Added enum: FD1000BT
-               - Added enum: HD1000BT
-             leaf mac-addr
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..17 
-           list ip-acl-list
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: list
-           - Added leaf: shelf
-             leaf-list circuit
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:aid
-           list ip-acl-stats
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-           list acl
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc comms-reset-ip-acl-list
-           input
-           - Changed leaf from aid to shelf
-             leaf shelf
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         rpc comms-show-ip-acl-list
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-           output
-           - Added leaf: shelf
-             leaf-list circuit
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:aid";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: comms
-       - Added rpc: comms-reset-ip-acl-list
-       - Added rpc: comms-show-ip-acl-list";
-  }
-
-  rpc comms-delete-arp-proxy {
-    description
-      "Delete Proxy ARP";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "IP address that NE will proxy arp for. If a range of IP addresses is required this is the first address in the range. ipaddr of 0.0.0.0 is not allowed(Format: n.n.n.n)";
-      }
-      leaf end {
-        type ciena-6500-types:IPADDR;
-        description
-          "Last, of a range of IP addresses that NE will 'proxy arp' for. ipaddr of 0.0.0.0 is not allowed(Format: n.n.n.n)";
-      }
-    }
-  }
-  rpc comms-delete-iisis-circuit {
-    description
-      "Delete an integrated IS-IS circuit.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, SHELF-shelf, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which overhead bytes are used to carry DCC (Section or Line). NOTE: Mandatory parameter with optical AIDs.";
-      }
-    }
-  }
-  rpc comms-show-iisis-circuit {
-    description
-      "View an integrated IS-IS circuit.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, SHELF-shelf, SHELF-shelf-ALL, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which overhead bytes are used to carry DCC (Section or Line). NOTE: Mandatory parameter with optical AIDs.";
-      }
-    }
-    output {
-      list output {
-        leaf ocn {
-          type ciena-6500-types:IDENT;
-          description
-            "circuit aid";
-        }
-        leaf ckt-default-metric {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..64";
-          }
-          description
-            "Circuit default metric";
-        }
-        leaf l2-only {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          description
-            "Level 2 Only";
-        }
-        leaf three-way-hs {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          description
-            "Three-Way Handshake";
-        }
-        leaf nps-override {
-          type enumeration {
-            enum "DUAL";
-            enum "IPONLY";
-            enum "OSIONLY";
-            enum "LAN_OSIONLY";
-            enum "OFF";
-          }
-          description
-            "Neighbour Protocols Supported Override";
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry DCC (Section or Line). NOTE: Mandatory parameter with optical AIDs.";
-        }
-      }
-    }
-  }
-  rpc comms-delete-iisis-rdentry {
-    description
-      "This command accepts an ISIS re-distributed route and remove it from the ISIS redistribution list.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "The IP address to be assigned(Format: n.n.n.n)";
-      }
-      leaf netmask {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Netmask for static route specified by aid.(Format: n.n.n.n)";
-      }
-      leaf leak-list-id {
-        type enumeration {
-          enum "OSPFRDLIST";
-          enum "STATICRDLIST";
-        }
-        mandatory true;
-        description
-          "Router list for distribution";
-      }
-    }
-  }
-  rpc comms-delete-ip {
-    description
-      "Used to delete the IP address and associated parameters assigned to the NE management interfaces.";
-    input {
-      leaf ipcommsaid {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, SHELF-shelf, CONTROL-shelf-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, IBC-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Overhead bytes that carry the DCC or G.709 GCC. NOTE: Mandatory parameter with optical AIDs.";
-      }
-    }
-  }
-  rpc comms-show-ip {
-    description
-      "Retrieve IP. Retrieves the IP address and associated parameters assigned to the NE management interfaces.";
-    input {
-      leaf ipcommsaid {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, SHELF-shelf, SHELF-shelf-ALL, CONTROL-shelf-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, IBC-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which overhead bytes are used to carry G709 GCC0 bytes. NOTE: Mandatory parameter with optical AIDs.";
-      }
-    }
-    output {
-      list output {
-        leaf ipcommsaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf ip-addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "IP address for interface specified by aid.(Format: n.n.n.n)";
-        }
-        leaf netmask {
-          type ciena-6500-types:IPADDR;
-          description
-            "Netmask for interface specified by aid.(Format: n.n.n.n)";
-        }
-        leaf bcast-addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "Broadcast address for interface specified by aid.(Format: n.n.n.n)";
-        }
-        leaf def-ttl {
-          default "90";
-          type ciena-6500-types:INT {
-            range "1..255";
-          }
-          description
-            "Default Time To Live (hops).";
-        }
-        leaf host-only {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          description
-            "Host only mode.";
-        }
-        leaf non-routing {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          description
-            "Non-routing mode.";
-        }
-        leaf proxy-arp {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          description
-            "Enable/disable Proxy ARP Default = OFF.";
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry G709 GCC0 bytes. NOTE: Mandatory parameter with optical AIDs.";
-        }
-        leaf net-domain {
-          type ciena-6500-enums:NETDOMAIN;
-          description
-            "Network Domain.";
-        }
-      }
-    }
-  }
-  rpc comms-delete-ip-filter {
-    description
-      "Delete a filter rule that was added using ENT-IPFILTER.";
-    input {
-      leaf lanports {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, IBC-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-      leaf location {
-        type enumeration {
-          enum "REMFORWARDOUT";
-          enum "INGRESS";
-        }
-        mandatory true;
-        description
-          "Specifies the location of the filter rule for the given aid.";
-      }
-      leaf action {
-        type enumeration {
-          enum "PERMIT";
-          enum "BLOCK";
-        }
-        mandatory true;
-        description
-          "Specifies the action to be taken when IP packets match the filter rule.";
-      }
-      leaf proto {
-        type enumeration {
-          enum "TCP";
-          enum "UDP";
-        }
-        mandatory true;
-        description
-          "Specifies which protocol, TCP or UDP, of the DESTPORT that is no longer to be permitted/blocked.";
-      }
-      leaf dest-start-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        mandatory true;
-        description
-          "Specifies start from which port is no longer to be permitted/blocked of the type PROTO.";
-      }
-      leaf dest-end-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Specifies end at which port is no longer to be permitted/blocked of the type PROTO.";
-      }
-    }
-  }
-  rpc comms-delete-ip-nat {
-    description
-      "Delete IPNAT";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf dcn-ip {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Must be in the standard dot notation, n.n.n.n(Format: n.n.n.n)";
-      }
-      leaf rne-ip {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Must be in the standard dot notation, n.n.n.n(Format: n.n.n.n)";
-      }
-    }
-  }
-  rpc comms-show-ip-routing-table {
-    description
-      "Retrieve IP Routing Table: Command returns a report listing all the network entities on the network.";
-    input {
-      leaf circuitaid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf circuitaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf ip-addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "The IP address(Format: n.n.n.n)";
-        }
-        leaf netmask {
-          type ciena-6500-types:IPADDR;
-          description
-            "The IP subnet mask(Format: n.n.n.n)";
-        }
-        leaf next-hop {
-          type ciena-6500-types:IPADDR;
-          description
-            "Next Hop(Format: n.n.n.n)";
-        }
-        leaf owner {
-          type enumeration {
-            enum "LOCAL";
-            enum "STATIC";
-            enum "OSPF";
-            enum "ISIS";
-          }
-          description
-            "Owner";
-        }
-        leaf tunnel {
-          type string {
-            length "0..60";
-          }
-          description
-            "GRE-shelf-type-tunnel referring to the AID of the manually provisioned tunnel. For auto tunnel the reference is the endpoint (eg MACADDR).";
-        }
-        leaf cost {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Cost";
-        }
-        leaf ext-cost {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "Forward Metric";
-        }
-        leaf circuit {
-          type ciena-6500-types:IDENT;
-          description
-            "Circuit";
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry DCC (Section or Line), GCC (GCC0 or GCC1).";
-        }
-      }
-    }
-  }
-  rpc comms-delete-ip-static-route {
-    description
-      "Delete IP static route";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "The IP address to be assigned(Format: n.n.n.n)";
-      }
-      leaf netmask {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Netmask for static route specified by aid.(Format: n.n.n.n)";
-      }
-      leaf next-hop {
-        type ciena-6500-types:IPADDR;
-        description
-          "ipaddress of the possible Next hop(Format: n.n.n.n)";
-      }
-      leaf circuit {
-        type ciena-6500-types:aid;
-        description
-          "Interface to NEXTHOP";
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Overhead bytes that carry the DCC or GCC.";
-      }
-    }
-  }
-  rpc comms-delete-llsdcc {
-    description
-      "Delete Lower Layer DCC. Deletes a section data communications channel (SDCC), line data communications channel, or G.709 GCC based on the specified AID.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, FTTP-shelf-slot-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        mandatory true;
-        description
-          "Choose which overhead bytes are used to carry DCC (Section, Line, GCC0, GCC1, GCC2 or EXT).";
-      }
-    }
-  }
-  rpc comms-show-llsdcc {
-    description
-      "Retrieve Lower Layer DCC. Retrieves information associated with a given section data communications channel (SDCC), line data communications channel (LDCC), or G.709 GCC based on the specified AID. The information includes the state of the layer 2 (LAPD or PPP) link and the current settings of editable layer 2 parameters.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, SHELF-shelf-ALL, FTTP-shelf-slot-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which overhead bytes are used to carry DCC (Section, Line, GCC0, GCC1, GCC2 or EXT).";
-      }
-      leaf protocol {
-        type enumeration {
-          enum "LAPD";
-          enum "PPP";
-          enum "NDP";
-          enum "TRANSP";
-        }
-        description
-          "Protocol";
-      }
-    }
-    output {
-      list output {
-        leaf ocn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry DCC (Section, Line, GCC0, GCC1, GCC2 or EXT).";
-        }
-        leaf oper-carrier {
-          type enumeration {
-            enum "SECTION";
-            enum "LINE";
-            enum "DISCONNECTED";
-            enum "GCC0";
-            enum "GCC1";
-            enum "GCC2";
-            enum "EXT";
-          }
-          description
-            "Display which overhead bytes are used to carry DCC (Section, Line, DISCONNECTED, GCC0, GCC1, GCC2 or EXT).";
-        }
-        leaf protocol {
-          type enumeration {
-            enum "LAPD";
-            enum "PPP";
-            enum "NDP";
-            enum "TRANSP";
-          }
-          description
-            "Protocol";
-        }
-        leaf net-domain {
-          type ciena-6500-enums:NETDOMAIN;
-          description
-            "Network Domain.";
-        }
-        leaf l2-info {
-          type ciena-6500-types:INT {
-            range "512..1492";
-          }
-          description
-            "LAPD Frame Size";
-        }
-        leaf l2-side {
-          type enumeration {
-            enum "USER";
-            enum "NETWORK";
-            enum "AUTO";
-          }
-          description
-            "LAPD: the role of the local node, network or user. The default value is Auto. The local node attempts to establish a connection with the far end by toggling its role between network and user in a random pattern. Setting this parameter to auto simplifies the setup of the link since the nodes decide which node is user and which is network. It does not matter which node has which role, as long as the two connecting nodes have opposite roles.";
-        }
-        leaf oper-l2side {
-          type enumeration {
-            enum "USER";
-            enum "NETWORK";
-            enum "DISCONNECTED";
-          }
-          description
-            "LAPD: the role of the local node, network or user.";
-        }
-        leaf transparent-connect {
-          type ciena-6500-types:IDENT;
-          description
-            "TRANSP: transparency connection mate AID";
-        }
-        leaf fcs-mode {
-          type enumeration {
-            enum "16BIT";
-            enum "32BIT";
-          }
-          description
-            "HDLC FCS MODE. ";
-        }
-        leaf lan-port {
-          type ciena-6500-types:aid;
-          description
-            "LAN Port";
-        }
-      }
-    }
-  }
-  rpc comms-delete-ne-list {
-    description
-      "Remove an NE from a table.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf rne-tid {
-        type string {
-          length "1..20";
-        }
-        mandatory true;
-        description
-          "The Remote NE Target IDentifier is the node name / system identifier (SID) of a remote Network Element. The name can include any combination of upper and lower case letters, numbers, or special characters (lowercase and special characters must be quoted). If unquoted, the name must start with a letter. If unquoted, the only permitted special character is a hyphen. The name cannot include the following characters: backslash, space, double-quote, colon, semicolon, ampersand, greater than, less than, or comma.";
-      }
-    }
-  }
-  rpc comms-show-nodes {
-    description
-      "Displays a complete list of OSPF addressable nodes.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf tid {
-          type ciena-6500-types:STRING;
-          description
-            "TID";
-        }
-        leaf remote-shelf {
-          type ciena-6500-types:STRING;
-          description
-            "shelfnumber";
-        }
-        leaf ip-addr {
-          type ciena-6500-types:STRING;
-          description
-            "The IP address";
-        }
-        leaf ip-addr-2 {
-          type ciena-6500-types:STRING;
-          description
-            "The IP address";
-        }
-        leaf ne-type {
-          type ciena-6500-types:STRING;
-          description
-            "Eight hexadecimal digits. Digits 1+2: 00 - Known Ciena Equipment, 01 - Unknown Ciena Equipment, 11 - Other Vendor. Digits 3+4: 00 - OPC, 01 - anything other than OPC; Digits 5+6: for OPC: status (active/inactive, primary/backup), otherwise: type (16 for 6500, 17 for CPL,1B for 5410, 1C for 5430); Digits 7+8: 00 - SP, 01 - NP (Express only).";
-        }
-        leaf mac-addr {
-          type ciena-6500-types:STRING;
-          description
-            "MAC Address";
-        }
-        leaf member {
-          type ciena-6500-types:STRING;
-          description
-            "True if member of a consolidated NE";
-        }
-        leaf siteid {
-          type ciena-6500-types:STRING;
-          description
-            "Site Id value";
-        }
-      }
-    }
-  }
-  rpc comms-delete-ospf-circuit {
-    description
-      "Delete an OSPF circuit.";
-    input {
-      leaf circuitaid {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, OSC-shelf-slot-port, SHELF-shelf, CONTROL-shelf-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, IBC-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which overhead bytes are used to carry G709 GCC0 bytes. NOTE: Mandatory parameter with optical AIDs. Carrier is unsupported for CPL.";
-      }
-    }
-  }
-  rpc comms-show-ospf-circuit {
-    description
-      "View an OSPF circuit.";
-    input {
-      leaf circuitaid {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, OSC-shelf-slot-port, SHELF-shelf, SHELF-shelf-ALL, CONTROL-shelf-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, IBC-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which overhead bytes are used to carry G709 GCC0 bytes. NOTE: Mandatory parameter with optical AIDs. Carrier is unsupported for CPL.";
-      }
-    }
-    output {
-      list output {
-        leaf circuitaid {
-          type ciena-6500-types:IDENT;
-          description
-            "circuit aid";
-        }
-        leaf net-area {
-          type ciena-6500-types:IPADDR;
-          description
-            "OSPF Network Area(Format: n.n.n.n)";
-        }
-        leaf cost {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "The cost of the OSPF circuit: [1, 65535]";
-        }
-        leaf auth-type {
-          type enumeration {
-            enum "NULL";
-            enum "SIMPLE";
-            enum "MD5";
-          }
-          description
-            "This field indicates the authentication type of the OSPF. NULL means no authentication. SIMPLE means simple authentication. MD5 means MD5 authentication.";
-        }
-        leaf area-def-cost {
-          type ciena-6500-types:INT {
-            range "1..16777215";
-          }
-          description
-            "Area Default Cost";
-        }
-        leaf dead-invl {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Dead interval";
-        }
-        leaf hello-invl {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Hello interval";
-        }
-        leaf retrans-invl {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Retransmit interval";
-        }
-        leaf trans-delay {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Transmit Delay";
-        }
-        leaf priority {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Priority";
-        }
-        leaf area {
-          type enumeration {
-            enum "OFF";
-            enum "NSSA";
-            enum "STUB";
-          }
-          description
-            "Area";
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry G709 GCC0 bytes. NOTE: Mandatory parameter with optical AIDs. Carrier is unsupported for CPL.";
-        }
-        leaf opaque {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Support for transmission/reception of OSPF opaque LSAs on a given interface.";
-        }
-        leaf passive {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "PASSIVE ON/OFF disables/enables the ability to raise the OSPF Adjacency Loss alarm against the circuit.";
-        }
-        leaf primary-area {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Primary area is OFF can have multi netarea provision on the same AID";
-        }
-        leaf password {
-          type string {
-            length "1..8";
-          }
-          description
-            "A character string from 1-8 characters to be used for OSPF simple password authentication on this circuit. Any combination of upper, lower, numbers or special characters may be used.";
-        }
-        leaf status {
-          type enumeration {
-            enum "NULL";
-            enum "ACCEPTING";
-            enum "REJECTING";
-          }
-          description
-            "The status of the simple password. Null if the authentication is not provisioned. Accepting if the authentication key is valid. Rejecting if otherwise.";
-        }
-        leaf id1 {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "An integer key ID from 0 to 255 to be used for OSPF MD5 password authentication on this circuit.";
-        }
-        leaf key1 {
-          type string {
-            length "1..16";
-          }
-          description
-            "A character string from 1-16 characters to be used for OSPF MD5 password authentication on this circuit. Any combination of upper, lower, numbers or special characters may be used.";
-        }
-        leaf status1 {
-          type enumeration {
-            enum "NULL";
-            enum "ACCEPTING";
-            enum "REJECTING";
-          }
-          description
-            "The status of the first MD5 authentication key. Null if the authentication is not provisioned. Accepting if the authentication key is valid. Rejecting if otherwise.";
-        }
-        leaf id2 {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "An integer key ID from 0 to 255 to be used for OSPF MD5 password authentication on this circuit.";
-        }
-        leaf key2 {
-          type string {
-            length "1..16";
-          }
-          description
-            "A character string from 1-16 characters to be used for OSPF MD5 password authentication on this circuit. Any combination of upper, lower, numbers or special characters may be used.";
-        }
-        leaf status2 {
-          type enumeration {
-            enum "NULL";
-            enum "ACCEPTING";
-            enum "REJECTING";
-          }
-          description
-            "The status of the second MD5 authentication key. Null if the authentication is not provisioned. Accepting if the authentication key is valid. Rejecting if otherwise.";
-        }
-      }
-    }
-  }
-  rpc comms-delete-ospf-rdentry {
-    description
-      "This command accepts an OSPF re-distributed route and remove it from the OSPF redistribution list.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "The IP address to be assigned(Format: n.n.n.n)";
-      }
-      leaf netmask {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Netmask for static route specified by aid.(Format: n.n.n.n)";
-      }
-      leaf leak-list-id {
-        type enumeration {
-          enum "ISISRDLIST";
-          enum "STATICRDLIST";
-        }
-        mandatory true;
-        description
-          "Leak list id.";
-      }
-    }
-  }
-  rpc comms-show-ppp {
-    description
-      "Retrieve PPP";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, SHELF-shelf-ALL, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which overhead bytes are used to carry G709 GCC bytes. NOTE: Mandatory parameter with optical AIDs.";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf max-receive-unit {
-          type ciena-6500-types:INT {
-            range "64..4470";
-          }
-          description
-            "PPP Frame Size";
-        }
-        leaf oper-mru {
-          type ciena-6500-types:INT {
-            range "64..4470";
-          }
-          description
-            "Negotiated PPP Frame Size";
-        }
-        leaf security {
-          type enumeration {
-            enum "CHAP";
-            enum "PAP";
-            enum "OFF";
-          }
-          description
-            "PPP Security";
-        }
-        leaf local-secret {
-          type string {
-            length "0..253";
-          }
-          description
-            "PPP Local Secret";
-        }
-        leaf remote-secret {
-          type string {
-            length "0..253";
-          }
-          description
-            "PPP Remote Secret";
-        }
-        leaf preferred-frame-checksum {
-          type enumeration {
-            enum "32BIT";
-            enum "16BIT";
-            enum "OFF";
-          }
-          description
-            "PPP Preferred Frame Checksum";
-        }
-        leaf magic-num {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          description
-            "PPP Magic Number Support";
-        }
-        leaf ip-hdr-compression {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          description
-            "IP Header Compression";
-        }
-        leaf heartbeat {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          description
-            "PPP Heartbeat";
-        }
-        leaf peer-ip {
-          type ciena-6500-types:IPADDR;
-          description
-            "IP addresses to assign to remote end.(Format: n.n.n.n)";
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry G709 GCC bytes. NOTE: Mandatory parameter with optical AIDs.";
-        }
-      }
-    }
-  }
-  rpc comms-delete-ip-rpnat {
-    description
-      "Delete a single Reverse Port NAT mapping entry.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf proto {
-        type enumeration {
-          enum "TCP";
-          enum "UDP";
-        }
-        mandatory true;
-        description
-          "Indicates the protocol to be translated from public to private.";
-      }
-      leaf dcn-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        mandatory true;
-        description
-          "Indicates the public protocol port that is mapped to a specific RNEIP and RNEPORT.";
-      }
-    }
-  }
-  rpc comms-show-osi-routing-info {
-    description
-      "Retrieve Routing Info. Displays a complete list of ISIS addressable nodes. The report lists the ID (empty for Express), Target ID , System ID, Type, and Site Mgr Support (Y/N). ";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf neid {
-        type ciena-6500-types:IDENT;
-        description
-          "NE ID";
-      }
-      leaf name {
-        type ciena-6500-types:STRING;
-        description
-          "NE Name (TID)";
-      }
-      leaf sysid {
-        type ciena-6500-types:IDENT;
-        description
-          "NE System ID";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "shelf aid";
-        }
-        leaf id {
-          type ciena-6500-types:INT;
-          description
-            "ID. Empty for Express.";
-        }
-        leaf tid {
-          type ciena-6500-types:STRING;
-          description
-            "NE TID (presented as an inner string i.e. \\\"tid\\\")";
-        }
-        leaf systemid {
-          type ciena-6500-types:IDENT;
-          description
-            "System ID";
-        }
-        leaf type {
-          type ciena-6500-types:IDENT;
-          description
-            "Eight hexadecimal digits. Digits 1+2: 00 - Known Ciena Equipment, 01 - Unknown Ciena Equipment, 11 - Other Vendor. Digits 3+4: 00 - OPC, 01 - anything other than OPC; Digits 5+6: for OPC: status (active/inactive, primary/backup), otherwise: type (16 for 6500, 17 for CPL, 1B for 5410, 1C for 5430); Digits 7+8: 00 - SP, 01 - NP (Express only).";
-        }
-        leaf sitemgr {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Site Manager Support (Y or N). Always Y for 6500. N for CPL.";
-        }
-      }
-    }
-  }
-  rpc comms-show-osi-routing-table {
-    description
-      "Retrieve Routing Table. Displays a complete list of ISIS addressable nodes. The report lists the OSI address of the Destination, of the Adjacency (ies), and the OSI Cost.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc comms-show-tidmap {
-    description
-      "Retrieve the TIDMAP Data Cache and display the list of RNEs that have been self discovered via the 6500's supported address resolution protocols (NNS, AR and TARP).";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf sid {
-          type string {
-            length "1..20";
-          }
-          description
-            "System Identifier";
-        }
-        leaf protocol {
-          type enumeration {
-            enum "ISO";
-            enum "INET";
-          }
-          description
-            "Protocol Used";
-        }
-        leaf iso-addr {
-          type ciena-6500-types:IDENT;
-          description
-            "ISO address";
-        }
-        leaf inetaddr {
-          type ciena-6500-types:IPADDR;
-          description
-            "INET address(Format: n.n.n.n)";
-        }
-        leaf ne-type {
-          type ciena-6500-types:STRING;
-          description
-            "Eight hexadecimal digits. Digits 1+2: 00 - Known Ciena Equipment, 01 - Unknown Ciena Equipment, 11 - Other Vendor. Digits 3+4: 00 - OPC, 01 - anything other than OPC; Digits 5+6: for OPC: status (active/inactive, primary/backup), otherwise: type (16 for 6500, 17 for CPL, 18 for 565, 19 for 5100, 1A for 5200, 1B for 5410, 1C for 5430); Digits 7+8: 00 - SP, 01 - NP (Express only).";
-        }
-      }
-    }
-  }
-  rpc comms-delete-ip-acl-list {
-    description
-      "Used to delete an IP ACL entry";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf priority {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        mandatory true;
-        description
-          "Priority. Can be 0 to 255.";
-      }
-    }
-  }
-  rpc comms-reset-ip-acl-list {
-    description
-      "Used to delete all IP ACL entries";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc comms-show-ip-acl-list {
-    description
-      "Retrieve IP ACL entries from specified list (edit list or commit list)";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf list {
-        type enumeration {
-          enum "EDIT" {
-            description
-              "ACL edit list";
-          }
-          enum "COMMIT" {
-            description
-              "ACL commit list";
-          }
-        }
-        mandatory true;
-        description
-          "Type of the list";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf-list circuit {
-          type ciena-6500-types:aid;
-          description
-            "The interface to which the rule applies.";
-        }
-        leaf ip-addr {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "The IP address(Format: n.n.n.n)";
-        }
-        leaf netmask {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "The IP mask(Format: n.n.n.n)";
-        }
-        leaf action {
-          type enumeration {
-            enum "DENY" {
-              description
-                "Action to be denied";
-            }
-            enum "ALLOW" {
-              description
-                "Action to be allowed";
-            }
-          }
-          mandatory true;
-          description
-            "The action of the rule.";
-        }
-        leaf priority {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          mandatory true;
-          description
-            "Priority.";
-        }
-      }
-    }
-  }
-  rpc comms-commit-ip-acl-list {
-    description
-      "Used to install ACL rules";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc comms-delete-ndp-link {
-    description
-      "Used to delete an NDP link from an interface";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which carrier to delete.";
-      }
-    }
-  }
-  rpc comms-delete-sldd-list {
-    description
-      "Used to delete an an interface from the Site Level Data Distribution interface list.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf circuit {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "An interface to provision for SLDD. Supported interfaces (COLAN, ILAN).";
-      }
-    }
-  }
-  rpc comms-delete-ospfv3-router {
-    description
-      "Disable the OSPFv3 router";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc comms-show-ip6-routing-table {
-    description
-      "Retrieve IPv6 Routing Table";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf ip6addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "IPv6 Address(Format: n.n.n.n)";
-        }
-        leaf prefix {
-          type ciena-6500-types:INT {
-            range "0..128";
-          }
-          description
-            "IPv6 network prefix";
-        }
-        leaf ip-addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "IPv6 Address of the Next Hop(Format: n.n.n.n)";
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          description
-            "Interface to NEXTHOP";
-        }
-        leaf cost {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Cost of route, range=1-65535";
-        }
-        leaf ext-cost {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "Forward Metric";
-        }
-        leaf owner {
-          type ciena-6500-enums:IPRTG_OWNER;
-          description
-            "Owner of the route";
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Overhead bytes that carry the DCC or GCC (for DCC/GCC only).";
-        }
-      }
-    }
-  }
-  rpc comms-delete-ospfv3-circuit {
-    description
-      "Delete an OSPFv3 circuit";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format OSPFV3-shelf-index";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc comms-show-ip6-linklocal {
-    description
-      "Retrieve the IPV6 LinkLocal addresses for all interfaces.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf ip-addr {
-          type string {
-            length "0..46";
-          }
-          description
-            "IPV6 address of the interface.";
-        }
-        leaf prefix {
-          type ciena-6500-types:INT {
-            range "0..128";
-          }
-          description
-            "IPV6 prefix for the address.";
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          description
-            "Circuit";
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Overhead bytes that carry the DCC or G.709 GCC.";
-        }
-      }
-    }
-  }
-  rpc comms-show-dhcp-rastats {
-    description
-      "Retrieve STATS for the DHCP Relay Agent";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf stats-line {
-          type string {
-            length "0..250";
-          }
-          description
-            "RASTATS output line.";
-        }
-      }
-    }
-  }
-  rpc comms-show-ztpstats {
-    description
-      "Retrieve STATS for the ZTP Client";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf stats-line {
-          type string {
-            length "0..110";
-          }
-          description
-            "ZTP STATS output line.";
-        }
-      }
-    }
-  }
-  container comms {
-    container arp {
-      list proxy {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf ip-addr {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "IP address that NE will proxy arp for. If a range of IP addresses is required this is the first address in the range. ipaddr of 0.0.0.0 is not allowed(Format: n.n.n.n)";
-          config true;
-        }
-        leaf end {
-          type ciena-6500-types:IPADDR;
-          description
-            "Last, of a range of IP addresses that NE will 'proxy arp' for. ipaddr of 0.0.0.0 is not allowed(Format: n.n.n.n)";
-          config true;
-        }
-      }
-    }
-    container dhcp {
-      list relay {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf mode {
-          type enumeration {
-            enum "AUTO";
-            enum "MANUAL";
-            enum "OFF";
-          }
-          description
-            "Enable or disable the DHCP RA (default is OFF).(Mandatory for edit operations)";
-          config true;
-        }
-      }
-      list raif {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format DHCPRA-shelf-index, DHCPRA-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          mandatory true;
-          description
-            "Circuit";
-          config true;
-        }
-        leaf plainra {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "OFF";
-          description
-            "Act as Plain RA or insert Prov CLI in DHCP options for Client. Must be OFF for unnumbered i/f";
-          config true;
-        }
-      }
-      list rasrvrinfo {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format DHCPRASRVR-shelf-index, DHCPRASRVR-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf srvrip {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "The IP address to be assigned(Format: n.n.n.n)";
-          config true;
-        }
-      }
-      list rastats {
-        config false;
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid in format SHELF-shelf";
-        }
-        leaf stats-line {
-          type string {
-            length "0..250";
-          }
-          description
-            "RASTATS output line.";
-          config false;
-        }
-      }
-    }
-    container iisis {
-      list circuit {
-        key "ocn";
-        config true;
-        leaf ocn {
-          mandatory true;
-          description
-            "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, SHELF-shelf, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf ckt-default-metric {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          description
-            "Circuit default metric";
-          config true;
-        }
-        leaf l2-only {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          default "OFF";
-          description
-            "Level 2 Only";
-          config true;
-        }
-        leaf three-way-hs {
-          type enumeration {
-            enum "OFF";
-            enum "ON";
-          }
-          default "OFF";
-          description
-            "Three-Way Handshake";
-          config true;
-        }
-        leaf nps-override {
-          type enumeration {
-            enum "DUAL";
-            enum "IPONLY";
-            enum "OSIONLY";
-            enum "LAN_OSIONLY";
-            enum "OFF";
-          }
-          default "OFF";
-          description
-            "Neighbour Protocols Supported Override";
-          config true;
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry DCC (Section or Line). NOTE: Mandatory parameter with optical AIDs.";
-          config true;
-        }
-      }
-      list rdentry {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf ip-addr {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "IP address for distribution specified by aid. (Format: n.n.n.n)";
-          config true;
-        }
-        leaf netmask {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "Netmask for distribution specified by aid.(Format: n.n.n.n)";
-          config true;
-        }
-        leaf metric {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          mandatory true;
-          description
-            "Metric for the distributed route";
-          config true;
-        }
-        leaf metric-type {
-          type enumeration {
-            enum "EXTERNAL";
-            enum "INTERNAL";
-          }
-          mandatory true;
-          description
-            "Metric type which associate the metric value of the distributed route";
-          config true;
-        }
-        leaf leak-list-id {
-          type enumeration {
-            enum "OSPFRDLIST";
-            enum "STATICRDLIST";
-          }
-          mandatory true;
-          description
-            "Router list for distribution";
-          config true;
-        }
-      }
-      list router {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf router-level {
-          type enumeration {
-            enum "LEVEL1";
-            enum "LEVEL2";
-          }
-          default "LEVEL1";
-          description
-            "Router level. Default=LEVEL1.";
-          config true;
-        }
-        leaf l1-priority {
-          default "64";
-          type ciena-6500-types:INT {
-            range "1..127";
-          }
-          description
-            "LEVEL1 router priority. Default=64.";
-          config true;
-        }
-        leaf l2-priority {
-          default "64";
-          type ciena-6500-types:INT {
-            range "1..127";
-          }
-          description
-            "LEVEL2 router priority. Default=64.";
-          config true;
-        }
-        leaf route-summarisation {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "ON";
-          description
-            "Whether routes or route summaries are redistributed. Default=ON.";
-          config true;
-        }
-      }
-    }
-    container ip6 {
-      list ndp-proxy {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format NDPROXY-shelf-index, NDPROXY-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf ip-addr {
-          type string {
-            length "0..46";
-          }
-          mandatory true;
-          description
-            "IPv6 address, must be quoted";
-          config true;
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          description
-            "Circuit on which IPADDR is PROXYed";
-          config true;
-        }
-      }
-      list routing-table {
-        config false;
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid in format SHELF-shelf";
-        }
-        leaf ip6addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "IPv6 Address(Format: n.n.n.n)";
-          config false;
-        }
-        leaf prefix {
-          type ciena-6500-types:INT {
-            range "0..128";
-          }
-          description
-            "IPv6 network prefix";
-          config false;
-        }
-        leaf ip-addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "IPv6 Address of the Next Hop(Format: n.n.n.n)";
-          config false;
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          description
-            "Interface to NEXTHOP";
-          config false;
-        }
-        leaf cost {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Cost of route, range=1-65535";
-          config false;
-        }
-        leaf ext-cost {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "Forward Metric";
-          config false;
-        }
-        leaf owner {
-          type ciena-6500-enums:IPRTG_OWNER;
-          description
-            "Owner of the route";
-          config false;
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Overhead bytes that carry the DCC or GCC (for DCC/GCC only).";
-          config false;
-        }
-      }
-      list ndp-table {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf ip6addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "IPv6 Address(Format: n.n.n.n)";
-          config false;
-        }
-        leaf mac-addr {
-          type ciena-6500-types:STRING;
-          description
-            "MAC Address";
-          config false;
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          description
-            "Interface for this NDP entry";
-          config false;
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Overhead bytes that carry the DCC or GCC (for DCC/GCC only).";
-          config false;
-        }
-      }
-      list linklocal {
-        config false;
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid in format SHELF-shelf";
-        }
-        leaf ip-addr {
-          type string {
-            length "0..46";
-          }
-          description
-            "IPV6 address of the interface.";
-          config false;
-        }
-        leaf prefix {
-          type ciena-6500-types:INT {
-            range "0..128";
-          }
-          description
-            "IPV6 prefix for the address.";
-          config false;
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          description
-            "Circuit";
-          config false;
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Overhead bytes that carry the DCC or G.709 GCC.";
-          config false;
-        }
-      }
-      list gne {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf config {
-          type enumeration {
-            enum "REDUNDANT";
-            enum "STANDALONE";
-          }
-          mandatory true;
-          description
-            "Defines the GNE configuration";
-          config true;
-        }
-        leaf access {
-          type enumeration {
-            enum "NDPROXY";
-            enum "OSPFV3";
-            enum "STATIC";
-          }
-          mandatory true;
-          description
-            "Defines the DCN access mechanism to be used";
-          config true;
-        }
-      }
-    }
-    container ndp {
-      list config {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf admin-state {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Turn the feature off at a shelf level";
-            }
-            enum "ON" {
-              description
-                "Turn the feature on at a shelf level";
-            }
-          }
-          description
-            "The admin state of the feature.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf ip-addr {
-          type string {
-            length "0..15";
-          }
-          description
-            "The NODEID (an IP V4 address).";
-          config true;
-        }
-        leaf ndpversion {
-          type ciena-6500-types:INT {
-            range "1..256";
-          }
-          description
-            "The NDP version.";
-          config false;
-        }
-      }
-      list link {
-        key "ocn";
-        config true;
-        leaf ocn {
-          mandatory true;
-          description
-            "AID in format OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport";
-          type ciena-6500-types:aid;
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry G.709 GCC. NOTE: GCC0 is the only supported carrier for NDP.";
-          config true;
-        }
-      }
-    }
-    container osi-routing {
-      list info {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf id {
-          type ciena-6500-types:INT;
-          description
-            "ID. Empty for Express.";
-          config false;
-        }
-        leaf tid {
-          type ciena-6500-types:STRING;
-          description
-            "NE TID (presented as an inner string i.e. \\\"tid\\\")";
-          config false;
-        }
-        leaf systemid {
-          type ciena-6500-types:IDENT;
-          description
-            "System ID";
-          config false;
-        }
-        leaf type {
-          type ciena-6500-types:IDENT;
-          description
-            "Eight hexadecimal digits. Digits 1+2: 00 - Known Ciena Equipment, 01 - Unknown Ciena Equipment, 11 - Other Vendor. Digits 3+4: 00 - OPC, 01 - anything other than OPC; Digits 5+6: for OPC: status (active/inactive, primary/backup), otherwise: type (16 for 6500, 17 for CPL, 1B for 5410, 1C for 5430); Digits 7+8: 00 - SP, 01 - NP (Express only).";
-          config false;
-        }
-        leaf sitemgr {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Site Manager Support (Y or N). Always Y for 6500. N for CPL.";
-          config false;
-        }
-      }
-      list table {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-      }
-    }
-    container ospf {
-      list circuit {
-        key "circuitaid";
-        config true;
-        leaf circuitaid {
-          mandatory true;
-          description
-            "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, OSC-shelf-slot-port, SHELF-shelf, CONTROL-shelf-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, IBC-shelf-instance, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf net-area {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "OSPF Network Area(Format: n.n.n.n)";
-          config true;
-        }
-        leaf cost {
-          type ciena-6500-types:INT {
-            range "0..65534";
-          }
-          description
-            "The OSPF circuit cost.";
-          config true;
-        }
-        leaf area-def-cost {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..16777215";
-          }
-          description
-            "Area Default Cost.";
-          config true;
-        }
-        leaf dead-invl {
-          default "40";
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Dead interval.";
-          config true;
-        }
-        leaf hello-invl {
-          default "10";
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Hello interval.";
-          config true;
-        }
-        leaf retrans-invl {
-          default "5";
-          type ciena-6500-types:INT {
-            range "1..3600";
-          }
-          description
-            "Retransmit interval.";
-          config true;
-        }
-        leaf trans-delay {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..3600";
-          }
-          description
-            "Transmit Delay.";
-          config true;
-        }
-        leaf priority {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Priority.";
-          config true;
-        }
-        leaf area {
-          type enumeration {
-            enum "OFF";
-            enum "NSSA";
-            enum "STUB";
-          }
-          default "OFF";
-          description
-            "Area. Default=OFF.";
-          config true;
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Choose which overhead bytes are used to carry DCC (Section or Line). NOTE: Mandatory parameter with optical AIDs. Carrier is unsupported for CPL";
-          config true;
-        }
-        leaf auth-type {
-          type enumeration {
-            enum "NULL";
-            enum "SIMPLE";
-            enum "MD5";
-          }
-          default "NULL";
-          description
-            "This field indicates the authentication type of the OSPF. NULL means no authentication. SIMPLE means simple authentication. MD5 means MD5 authentication.";
-          config true;
-        }
-        leaf password {
-          type string {
-            length "1..8";
-          }
-          description
-            "A character string from 1-8 characters to be used for OSPF simple password authentication on this circuit. Any combination of upper, lower, numbers or special characters may be used.";
-          config true;
-        }
-        leaf opaque {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Support for transmission/reception of OSPF opaque LSAs on a given interface.";
-          config true;
-        }
-        leaf passive {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "OFF";
-          description
-            "PASSIVE ON/OFF disables/enables the ability to raise the OSPF Adjacency Loss alarm against the circuit.";
-          config true;
-        }
-        leaf primary-area {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "ON";
-          description
-            "Primary area is OFF can have multi netarea provision on the same AID";
-          config true;
-        }
-        leaf id1 {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "An integer key ID from 0 to 255 to be used for OSPF MD5 password authentication on this circuit.";
-          config true;
-        }
-        leaf key1 {
-          type string {
-            length "1..16";
-          }
-          description
-            "A character string from 1-16 characters to be used for OSPF MD5 password authentication on this circuit. Any combination of upper, lower, numbers or special characters may be used.";
-          config true;
-        }
-        leaf id2 {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "An integer key ID from 0 to 255 to be used for OSPF MD5 password authentication on this circuit.";
-          config true;
-        }
-        leaf key2 {
-          type string {
-            length "1..16";
-          }
-          description
-            "A character string from 1-16 characters to be used for OSPF MD5 password authentication on this circuit. Any combination of upper, lower, numbers or special characters may be used.";
-          config true;
-        }
-        leaf status {
-          type enumeration {
-            enum "NULL";
-            enum "ACCEPTING";
-            enum "REJECTING";
-          }
-          description
-            "The status of the simple password. Null if the authentication is not provisioned. Accepting if the authentication key is valid. Rejecting if otherwise.";
-          config false;
-        }
-        leaf status1 {
-          type enumeration {
-            enum "NULL";
-            enum "ACCEPTING";
-            enum "REJECTING";
-          }
-          description
-            "The status of the first MD5 authentication key. Null if the authentication is not provisioned. Accepting if the authentication key is valid. Rejecting if otherwise.";
-          config false;
-        }
-        leaf status2 {
-          type enumeration {
-            enum "NULL";
-            enum "ACCEPTING";
-            enum "REJECTING";
-          }
-          description
-            "The status of the second MD5 authentication key. Null if the authentication is not provisioned. Accepting if the authentication key is valid. Rejecting if otherwise.";
-          config false;
-        }
-      }
-      list rdentry {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf ip-addr {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "The IP address to be assigned(Format: n.n.n.n)";
-          config true;
-        }
-        leaf netmask {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "Netmask for static route specified by aid.(Format: n.n.n.n)";
-          config true;
-        }
-        leaf metric {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          mandatory true;
-          description
-            "Metric for the distributed route";
-          config true;
-        }
-        leaf metric-type {
-          type enumeration {
-            enum "INTERNAL";
-            enum "EXTERNAL";
-          }
-          mandatory true;
-          description
-            "Metric type which associate the metric value of the distributed route. Default=Internal";
-          config true;
-        }
-        leaf leak-list-id {
-          type enumeration {
-            enum "ISISRDLIST";
-            enum "STATICRDLIST";
-          }
-          mandatory true;
-          description
-            "Router list for distribution.";
-          config true;
-        }
-      }
-      list router {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf router-id {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "Router ID, in the format of IPv4 address: a.b.c.d [0,255], except 0.0.0.0(Format: n.n.n.n)";
-          config true;
-        }
-        leaf route-summarisation {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "ON";
-          description
-            "Whether routes or route summaries are redistributed. Default=ON.";
-          config true;
-        }
-        leaf asbr {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "OFF";
-          description
-            "Used to configure NE as Autonomous System Border Router. Default=OFF.";
-          config true;
-        }
-        leaf opaque-filter {
-          type enumeration {
-            enum "ALL";
-            enum "LAN";
-            enum "OFF";
-          }
-          default "OFF";
-          description
-            "Used to configure NE with Opaque LSA Flooding Control. Default=OFF.";
-          config true;
-        }
-        leaf shelf-rd {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "OFF";
-          description
-            "Used to configure NE with Shelf IP Re-distribution. Default=OFF.";
-          config true;
-        }
-        leaf rfc1583-capable {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "ON";
-          description
-            "Used to configure RFC1583 compatibility. Default=ON.";
-          config true;
-        }
-        leaf abr {
-          type enumeration {
-            enum "RFC3509";
-            enum "RFC2328COMPATIBLE";
-          }
-          default "RFC3509";
-          description
-            "Used to configure ABR.";
-          config true;
-        }
-      }
-    }
-    container ospfv3 {
-      list router {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf router-id {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "Router ID, in the format of IPv4 address: a.b.c.d [0,255], except 0.0.0.0(Format: n.n.n.n)";
-          config true;
-        }
-        leaf abr {
-          type enumeration {
-            enum "RFC3509";
-            enum "RFC2328";
-          }
-          default "RFC3509";
-          description
-            "Used to configure ABR.";
-          config true;
-        }
-      }
-      list circuit {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format OSPFV3-shelf-index, OSPFV3-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf net-area {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "OSPFv3 network area, in the format of IPv4 address: a.b.c.d [0,255](Format: n.n.n.n)";
-          config true;
-        }
-        leaf instance-id {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Instance ID: [0, 255]";
-          config true;
-        }
-        leaf cost {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "The OSPF circuit cost.";
-          config true;
-        }
-        leaf dead-interval {
-          default "40";
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Dead interval: [1, 65535]";
-          config true;
-        }
-        leaf hello-interval {
-          default "10";
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Hello interval: [1, 65535]";
-          config true;
-        }
-        leaf retransmit-interval {
-          default "5";
-          type ciena-6500-types:INT {
-            range "1..1800";
-          }
-          description
-            "Retransmit interval: [1, 1800]";
-          config true;
-        }
-        leaf trans-delay {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..1800";
-          }
-          description
-            "Transmit delay: [1, 1800]";
-          config true;
-        }
-        leaf priority {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Priority: [0, 255]";
-          config true;
-        }
-        leaf passive {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "OFF";
-          description
-            "PASSIVE ON/OFF disables/enables the ability to raise the OSPF Adjacency Loss alarm against the circuit";
-          config true;
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          mandatory true;
-          description
-            "Interface";
-          config true;
-        }
-        leaf primary-area {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          default "ON";
-          description
-            "PRIMARY AREA ON/OFF enables/disables Interface participating to OSPFv3 Primary Area";
-          config true;
-        }
-        leaf carrier {
-          type ciena-6500-enums:CARRIER;
-          description
-            "Overhead bytes that carry the DCC or G.709 GCC. NOTE: Mandatory parameter with optical AIDs.";
-          config true;
-        }
-      }
-    }
-    container sldd {
-      list config {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf admin-state {
-          type enumeration {
-            enum "ON" {
-              description
-                "Enable the feature at a shelf level";
-            }
-            enum "OFF" {
-              description
-                "Disable the feature at a shelf level";
-            }
-          }
-          description
-            "The admin state of the feature.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf config {
-          type enumeration {
-            enum "AUTO" {
-              description
-                "Automatically re-provision the SCOPEID.";
-            }
-            enum "MANUAL" {
-              description
-                "Manualy provision the SCOPEID to one fixed value.";
-            }
-          }
-          default "AUTO";
-          description
-            "The configuration mode of the SCOPEID.";
-          config true;
-        }
-        leaf scopeid {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "Specifies the scope of the AR/TR records.";
-          config true;
-        }
-      }
-      list list {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf circuit {
-          type ciena-6500-types:aid;
-          mandatory true;
-          description
-            "An interface to provision for SLDD. Supported interfaces (COLAN, ILAN).";
-          config true;
-        }
-        leaf operational-state {
-          type ciena-6500-enums:SLDD_SST;
-          description
-            "The operational state";
-          config false;
-        }
-      }
-    }
-    container tl1gw {
-      list connections {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf sid {
-          type string {
-            length "1..20";
-          }
-          description
-            "System Identifier";
-          config false;
-        }
-        leaf protocol {
-          type enumeration {
-            enum "ISO";
-            enum "INET";
-          }
-          description
-            "Protocol Used";
-          config false;
-        }
-        leaf session {
-          type ciena-6500-types:INT {
-            range "1..999999";
-          }
-          description
-            "The session ID in NE";
-          config false;
-        }
-        leaf status {
-          type enumeration {
-            enum "UP";
-            enum "DOWN";
-          }
-          description
-            "Status";
-          config false;
-        }
-        leaf local {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Local";
-          config false;
-        }
-      }
-      list config {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf gne {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "Indication of TL1 gateway GNE function as enabled or disabled.";
-          config true;
-        }
-        leaf rne {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "Indication of TL1 gateway RNE function as enabled or disabled.";
-          config true;
-        }
-      }
-    }
-    list dbrs {
-      key "lan-port";
-      config true;
-      leaf lan-port {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf dbrs-ar {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "New status of DBRS for AR on the given NE(Mandatory for edit operations)";
-        config true;
-      }
-      leaf dbrs-tr {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "New status of DBRS for TR on the given NE(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    list gne {
-      key "gneaid";
-      config true;
-      leaf gneaid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf config {
-        type enumeration {
-          enum "REDUNDANT";
-          enum "STANDALONE";
-        }
-        mandatory true;
-        description
-          "Defines the GNE configuration";
-        config true;
-      }
-      leaf access {
-        type enumeration {
-          enum "ARP";
-          enum "NAT";
-          enum "OSPF";
-          enum "STATIC";
-          enum "PRIVATEIP";
-        }
-        mandatory true;
-        description
-          "Defined the DCN access mechanism to be used";
-        config true;
-      }
-      leaf gne-group {
-        type ciena-6500-types:INT {
-          range "1..255";
-        }
-        description
-          "Specifies the redundancy group that the GNE belongs to for master/backup negotiation";
-        config true;
-      }
-      leaf primary {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Defines the GNE as being the preferred MASTER.";
-        config true;
-      }
-      leaf subnet-name {
-        type ciena-6500-types:STRING;
-        description
-          "Subnet name, range up to 36 alphanumeric and special characters";
-        config true;
-      }
-      leaf user-ftp-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "User provisioned FTP port for NAT configuration";
-        config true;
-      }
-    }
-    list gre {
-      key "gre";
-      config true;
-      leaf gre {
-        mandatory true;
-        description
-          "AID in format GRE-shelf-type-tunnel, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf destaddr {
-        type ciena-6500-types:IDENT;
-        description
-          "Destination address";
-        config true;
-      }
-      leaf ip-dest-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "IP Destination address(Format: n.n.n.n)";
-        config true;
-      }
-      leaf ip-src-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "IP Source address(Format: n.n.n.n)";
-        config true;
-      }
-    }
-    list ip {
-      key "ipcommsaid";
-      config true;
-      leaf ipcommsaid {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, GRE-shelf-type-tunnel, OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, SHELF-shelf, CONTROL-shelf-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, IBC-shelf-instance, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "The IP address to be assigned(Format: n.n.n.n)";
-        config true;
-      }
-      leaf netmask {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Set the IP subnet mask for the port(Format: n.n.n.n)";
-        config true;
-      }
-      leaf def-ttl {
-        default "90";
-        type ciena-6500-types:INT {
-          range "1..255";
-        }
-        description
-          "Default Time To Live (hops).";
-        config true;
-      }
-      leaf host-only {
-        type enumeration {
-          enum "OFF";
-          enum "ON";
-        }
-        default "OFF";
-        description
-          "Host only mode.";
-        config true;
-      }
-      leaf non-routing {
-        type enumeration {
-          enum "OFF";
-          enum "ON";
-        }
-        default "OFF";
-        description
-          "Non-routing mode.";
-        config true;
-      }
-      leaf proxy-arp {
-        type enumeration {
-          enum "OFF";
-          enum "ON";
-        }
-        default "OFF";
-        description
-          "Not possible to be enabled on the OTM facility.";
-        config true;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Overhead bytes that carry the DCC or G.709 GCC. NOTE: Mandatory parameter with optical AIDs.";
-        config true;
-      }
-      leaf bcast-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "Broadcast address for interface specified by aid.(Format: n.n.n.n)";
-        config false;
-      }
-      leaf net-domain {
-        type ciena-6500-enums:NETDOMAIN;
-        description
-          "Network Domain.";
-        config false;
-      }
-    }
-    list ip-filter {
-      key "lanports";
-      config true;
-      leaf lanports {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, IBC-shelf-instance, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf location {
-        type enumeration {
-          enum "REMFORWARDOUT";
-          enum "INGRESS";
-        }
-        mandatory true;
-        description
-          "Specifies the location of the filter rule for the given aid.";
-        config true;
-      }
-      leaf action {
-        type enumeration {
-          enum "PERMIT";
-          enum "BLOCK";
-        }
-        mandatory true;
-        description
-          "Specifies the action to be taken when IP packets match the filter rule.";
-        config true;
-      }
-      leaf proto {
-        type enumeration {
-          enum "TCP";
-          enum "UDP";
-        }
-        mandatory true;
-        description
-          "Specifies which protocol, TCP or UDP, the DESTPORT to be permitted/blocked is applicable to.";
-        config true;
-      }
-      leaf dest-start-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        mandatory true;
-        description
-          "Specifies start from which port is permitted/blocked of the type PROTO.";
-        config true;
-      }
-      leaf dest-end-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Specifies end at which port is permitted/blocked of the type PROTO.";
-        config true;
-      }
-    }
-    list ip-nat {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf dcn-ip {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Must be in the standard dot notation, n.n.n.n(Format: n.n.n.n)";
-        config true;
-      }
-      leaf rne-ip {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Must be in the standard dot notation, n.n.n.n(Format: n.n.n.n)";
-        config true;
-      }
-      leaf prime {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "YES";
-        description
-          "Indicates whether RNEIP is the IP address to be used for mapping of incoming packets (should generally be the circuitless IP)";
-        config true;
-      }
-    }
-    list ip-routing-table {
-      config false;
-      leaf circuitaid {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "aid in format SHELF-shelf";
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "The IP address(Format: n.n.n.n)";
-        config false;
-      }
-      leaf netmask {
-        type ciena-6500-types:IPADDR;
-        description
-          "The IP subnet mask(Format: n.n.n.n)";
-        config false;
-      }
-      leaf next-hop {
-        type ciena-6500-types:IPADDR;
-        description
-          "Next Hop(Format: n.n.n.n)";
-        config false;
-      }
-      leaf owner {
-        type enumeration {
-          enum "LOCAL";
-          enum "STATIC";
-          enum "OSPF";
-          enum "ISIS";
-        }
-        description
-          "Owner";
-        config false;
-      }
-      leaf tunnel {
-        type string {
-          length "0..60";
-        }
-        description
-          "GRE-shelf-type-tunnel referring to the AID of the manually provisioned tunnel. For auto tunnel the reference is the endpoint (eg MACADDR).";
-        config false;
-      }
-      leaf cost {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Cost";
-        config false;
-      }
-      leaf ext-cost {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Forward Metric";
-        config false;
-      }
-      leaf circuit {
-        type ciena-6500-types:IDENT;
-        description
-          "Circuit";
-        config false;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Choose which overhead bytes are used to carry DCC (Section or Line), GCC (GCC0 or GCC1).";
-        config false;
-      }
-    }
-    list ip-static-route {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "The IP address to be assigned(Format: n.n.n.n)";
-        config true;
-      }
-      leaf netmask {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Netmask for static route specified by aid.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf circuit {
-        type ciena-6500-types:aid;
-        description
-          "Interface to NEXTHOP. It is mandatory for OME 6500 S-series and CPL.";
-        config true;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Overhead bytes that carry the DCC or GCC.";
-        config true;
-      }
-      leaf next-hop {
-        type ciena-6500-types:IPADDR;
-        description
-          "ipaddress of the possible Next hop. It is mandatory for OME 6500 S-series and CPL.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf cost {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        mandatory true;
-        description
-          "Static Route cost.";
-        config true;
-      }
-      leaf description {
-        type ciena-6500-types:STRING;
-        description
-          "A character string from 1-64 characters used to label the IP Static Route";
-        config true;
-      }
-      leaf status {
-        type enumeration {
-          enum "FORWARDING";
-          enum "PENDING";
-          enum "REJECTED";
-        }
-        description
-          "The status of the route. The possible values are: FWD, PEND, REJ. FWD means the route is active in the routing table. PEND means the route is standby and it is not in the routing table. REJ means there is an issue with the route. It may have a link failure or it may have an unreachable NEXTHOP.";
-        config false;
-      }
-    }
-    list lan {
-      key "lanports";
-      config true;
-      leaf lanports {
-        mandatory true;
-        description
-          "AID in format COLAN-shelf-port, ILAN-shelf-port, LAN-shelf-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf config {
-        type enumeration {
-          enum "HD10BT";
-          enum "HD100BT";
-          enum "FD10BT";
-          enum "FD100BT";
-          enum "FD1000BT";
-          enum "AUTO";
-        }
-        default "AUTO";
-        description
-          "Port Duplex and Speed";
-        config true;
-      }
-      leaf anctrl {
-        type ciena-6500-enums:ANCTRL;
-        default "AUTO";
-        description
-          "Auto Neg Control(Param is applicable only on T-Series shelf.)";
-        config true;
-      }
-      leaf netdomain {
-        type ciena-6500-enums:LAN_NETDOMAIN;
-        default "MCN";
-        description
-          "Network Domain(Param is applicable only on T-Series shelf.)";
-        config true;
-      }
-      leaf port {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "ENABLED";
-        description
-          "Enable or disable the LAN port (default is ENABLED).";
-        config true;
-      }
-      leaf oper-config {
-        type enumeration {
-          enum "HD10BT";
-          enum "HD100BT";
-          enum "FD10BT";
-          enum "FD100BT";
-          enum "FD1000BT";
-          enum "HD1000BT";
-          enum "DISCONNECTED";
-        }
-        description
-          "Negotiated Port Duplex and Speed";
-        config false;
-      }
-      leaf mac-addr {
-        type string {
-          length "0..17";
-        }
-        description
-          "MAC Address assigned to the LAN port.";
-        config false;
-      }
-    }
-    list llsdcc {
-      key "ocn";
-      config true;
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, FTTP-shelf-slot-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        mandatory true;
-        description
-          "Choose which overhead bytes are used to carry DCC (Section, Line, GCC0, GCC1, GCC2 or EXT).(Mandatory for edit operations)";
-        config true;
-      }
-      leaf net-domain {
-        type ciena-6500-enums:NETDOMAIN;
-        description
-          "Network Domain.";
-        config true;
-      }
-      leaf protocol {
-        type enumeration {
-          enum "LAPD";
-          enum "PPP";
-          enum "NDP";
-          enum "TRANSP";
-        }
-        default "PPP";
-        description
-          "Protocol (TRANSP with SECTION or LINE carriers only)";
-        config true;
-      }
-      leaf l2-info {
-        default "1304";
-        type ciena-6500-types:INT {
-          range "512..1492";
-        }
-        description
-          "LAPD Frame Size";
-        config true;
-      }
-      leaf l2-side {
-        type enumeration {
-          enum "USER";
-          enum "NETWORK";
-          enum "AUTO";
-        }
-        default "AUTO";
-        description
-          "LAPD: the role of the local node, network or user. The default value is Auto. The local node attempts to establish a connection with the far end by toggling its role between network and user in a random pattern. Setting this parameter to auto simplifies the setup of the link since the nodes decide which node is user and which is network. It does not matter which node has which role, as long as the two connecting nodes have opposite roles.";
-        config true;
-      }
-      leaf transparent-connect {
-        type ciena-6500-types:IDENT;
-        description
-          "TRANSP: transparency connection mate AID.";
-        config true;
-      }
-      leaf fcs-mode {
-        type enumeration {
-          enum "16BIT";
-          enum "32BIT";
-        }
-        default "16BIT";
-        description
-          "HDLC FCS mode. Can be set when PROTOCOL=TRANSP. Can also be set for PROTOCOL=PPP when CARRIER=SECTION/LINE.";
-        config true;
-      }
-      leaf lan-port {
-        type ciena-6500-types:aid;
-        description
-          "LAN Port";
-        config true;
-      }
-      leaf oper-carrier {
-        type enumeration {
-          enum "SECTION";
-          enum "LINE";
-          enum "DISCONNECTED";
-          enum "GCC0";
-          enum "GCC1";
-          enum "GCC2";
-          enum "EXT";
-        }
-        description
-          "Display which overhead bytes are used to carry DCC (Section, Line, DISCONNECTED, GCC0, GCC1, GCC2 or EXT).";
-        config false;
-      }
-      leaf oper-l2side {
-        type enumeration {
-          enum "USER";
-          enum "NETWORK";
-          enum "DISCONNECTED";
-        }
-        description
-          "LAPD: the role of the local node, network or user.";
-        config false;
-      }
-    }
-    list nat {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf nat-base-port {
-        type ciena-6500-types:INT {
-          range "1024..65279";
-        }
-        description
-          "Specifies the base UDP/TCP port value dynamically allocated for connections flows managed by NAT services. NATBASEPORT to NATBASEPORT+NATNUMPORT defines the range that NAT uses.";
-        config true;
-      }
-      leaf nat-num-port {
-        type ciena-6500-types:INT {
-          range "256..1024";
-        }
-        description
-          "Specifies the number of UDP/TCP ports dynamically allocated for connections flows managed by NAT services. NATBASEPORT to NATBASEPORT+NATNUMPORT defines the range that NAT uses.";
-        config true;
-      }
-    }
-    list ne-list {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf gne {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Indicates whether this Network Element entry is a GNE (Gateway Network) or not.";
-        config true;
-      }
-      leaf gne-ip-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "The IP address of the GNE of this Network Element entry(Format: n.n.n.n)";
-        config true;
-      }
-      leaf sid {
-        type string {
-          length "1..20";
-        }
-        description
-          "System Identifier";
-        config false;
-      }
-      leaf ne-name {
-        type ciena-6500-types:STRING;
-        description
-          "Network Element Name";
-        config false;
-      }
-      leaf inetaddr {
-        type ciena-6500-types:IPADDR;
-        description
-          "The IP address of this Network Element entry(Format: n.n.n.n)";
-        config false;
-      }
-      leaf cost {
-        type string {
-          length "0..21";
-        }
-        description
-          "Cost to reach this Network Element";
-        config false;
-      }
-      leaf ne-type {
-        type ciena-6500-types:STRING;
-        description
-          "Eight hexadecimal digits. Digits 1+2: 00 - Known Ciena Equipment, 01 - Unknown Ciena Equipment, 11 - Other Vendor. Digits 3+4: 00 - OPC, 01 - anything other than OPC; Digits 5+6: for OPC: status (active/inactive, primary/backup), otherwise: type (16 for 6500, 17 for CPL, 18 for 565, 19 for 5100, 1A for 5200, 1B for 5410, 1C for 5430); Digits 7+8: 00 - SP, 01 - NP (Express only).";
-        config false;
-      }
-      leaf rne-tid {
-        type string {
-          length "1..20";
-        }
-        mandatory true;
-        description
-          "The Remote NE Target IDentifier is the node name / system identifier (SID) of a remote Network Element. The name can include any combination of upper and lower case letters, numbers, or special characters (lowercase and special characters must be quoted). If unquoted, the name must start with a letter. If unquoted, the only permitted special character is a hyphen. The name cannot include the following characters: backslash, space, double-quote, colon, semicolon, ampersand, greater than, less than, or comma.";
-        config true;
-      }
-    }
-    list nodes {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "aid in format SHELF-shelf";
-      }
-      leaf tid {
-        type ciena-6500-types:STRING;
-        description
-          "TID";
-        config false;
-      }
-      leaf remote-shelf {
-        type ciena-6500-types:STRING;
-        description
-          "shelfnumber";
-        config false;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:STRING;
-        description
-          "The IP address";
-        config false;
-      }
-      leaf ip-addr-2 {
-        type ciena-6500-types:STRING;
-        description
-          "The IP address";
-        config false;
-      }
-      leaf ne-type {
-        type ciena-6500-types:STRING;
-        description
-          "Eight hexadecimal digits. Digits 1+2: 00 - Known Ciena Equipment, 01 - Unknown Ciena Equipment, 11 - Other Vendor. Digits 3+4: 00 - OPC, 01 - anything other than OPC; Digits 5+6: for OPC: status (active/inactive, primary/backup), otherwise: type (16 for 6500, 17 for CPL,1B for 5410, 1C for 5430); Digits 7+8: 00 - SP, 01 - NP (Express only).";
-        config false;
-      }
-      leaf mac-addr {
-        type ciena-6500-types:STRING;
-        description
-          "MAC Address";
-        config false;
-      }
-      leaf member {
-        type ciena-6500-types:STRING;
-        description
-          "True if member of a consolidated NE";
-        config false;
-      }
-      leaf siteid {
-        type ciena-6500-types:STRING;
-        description
-          "Site Id value";
-        config false;
-      }
-    }
-    list ppp {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, OTM1-shelf-slot-port, OTM2-shelf-slot-port, OTM3-shelf-slot-port, OTM4-shelf-slot-port, OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf magic-num {
-        type enumeration {
-          enum "OFF";
-          enum "ON";
-        }
-        default "OFF";
-        description
-          "PPP Magic Number Support. Default=OFF. NOTE: Mandatory parameter with optical AIDs.";
-        config true;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Overhead bytes that carry the DCC or G.709 GCC. NOTE: Mandatory parameter with optical AIDs.";
-        config true;
-      }
-      leaf max-receive-unit {
-        type ciena-6500-types:INT {
-          range "64..4470";
-        }
-        description
-          "PPP Frame Size";
-        config false;
-      }
-      leaf oper-mru {
-        type ciena-6500-types:INT {
-          range "64..4470";
-        }
-        description
-          "Negotiated PPP Frame Size";
-        config false;
-      }
-      leaf security {
-        type enumeration {
-          enum "CHAP";
-          enum "PAP";
-          enum "OFF";
-        }
-        description
-          "PPP Security";
-        config false;
-      }
-      leaf local-secret {
-        type string {
-          length "0..253";
-        }
-        description
-          "PPP Local Secret";
-        config false;
-      }
-      leaf remote-secret {
-        type string {
-          length "0..253";
-        }
-        description
-          "PPP Remote Secret";
-        config false;
-      }
-      leaf preferred-frame-checksum {
-        type enumeration {
-          enum "32BIT";
-          enum "16BIT";
-          enum "OFF";
-        }
-        description
-          "PPP Preferred Frame Checksum";
-        config false;
-      }
-      leaf ip-hdr-compression {
-        type enumeration {
-          enum "OFF";
-          enum "ON";
-        }
-        description
-          "IP Header Compression";
-        config false;
-      }
-      leaf heartbeat {
-        type enumeration {
-          enum "OFF";
-          enum "ON";
-        }
-        description
-          "PPP Heartbeat";
-        config false;
-      }
-      leaf peer-ip {
-        type ciena-6500-types:IPADDR;
-        description
-          "IP addresses to assign to remote end.(Format: n.n.n.n)";
-        config false;
-      }
-    }
-    list ip-rpnat {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf proto {
-        type enumeration {
-          enum "TCP";
-          enum "UDP";
-        }
-        mandatory true;
-        description
-          "Indicates the protocol to be translated from public to private.";
-        config true;
-      }
-      leaf dcn-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        mandatory true;
-        description
-          "Indicates the public protocol port that is mapped to a specific RNEIP and RNEPORT.";
-        config true;
-      }
-      leaf rne-ip {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "This indicates what IP address the public protocol port is mapped to.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf rne-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        mandatory true;
-        description
-          "The private protocol port that DCNPORT is to be mapped to. ";
-        config true;
-      }
-      leaf dcn-ip {
-        type ciena-6500-types:IPADDR;
-        description
-          "Public IP address (COLAN-X or COLAN-A interface address) that is being translated to private IP address of RNEIP.(Format: n.n.n.n)";
-        config false;
-      }
-    }
-    list serial {
-      key "serial";
-      config false;
-      leaf serial {
-        mandatory true;
-        description
-          "AID in format SERIAL-shelf-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf protocol-timeout {
-        type ciena-6500-types:INT {
-          range "60..3600";
-        }
-        description
-          "Serial Port protocol timeout (seconds)";
-        config false;
-      }
-      leaf protocol {
-        type enumeration {
-          enum "VT100";
-          enum "PPP";
-          enum "AUTO";
-        }
-        description
-          "Serial Port protocol. Default=AUTO.";
-        config false;
-      }
-      leaf oper-protocol {
-        type enumeration {
-          enum "VT100";
-          enum "PPP";
-          enum "DISCONNECTED";
-        }
-        description
-          "Negotiated Serial Port protocol";
-        config false;
-      }
-      leaf baud {
-        type enumeration {
-          enum "9600";
-          enum "19200";
-          enum "38400";
-          enum "57600";
-          enum "115200";
-          enum "AUTO";
-        }
-        description
-          "Serial Port baud rate. Default=AUTO.";
-        config false;
-      }
-      leaf oper-baud {
-        type enumeration {
-          enum "9600";
-          enum "19200";
-          enum "38400";
-          enum "57600";
-          enum "115200";
-          enum "DISCONNECTED";
-          enum "CONNECTED";
-        }
-        description
-          "Negotiated Serial Port baud rate";
-        config false;
-      }
-      leaf databits {
-        type enumeration {
-          enum "7";
-          enum "8";
-        }
-        description
-          "Serial Port data bits. Default=8.";
-        config false;
-      }
-      leaf parity {
-        type enumeration {
-          enum "NONE";
-          enum "EVEN";
-        }
-        description
-          "Serial Port parity. Default=NONE.";
-        config false;
-      }
-      leaf stop-bits {
-        type enumeration {
-          enum "1";
-          enum "1.5";
-          enum "2";
-        }
-        description
-          "Serial Port stop bits. Default=1.";
-        config false;
-      }
-      leaf hwflow {
-        type enumeration {
-          enum "OFF";
-          enum "ON";
-        }
-        description
-          "Serial port hardware flow control. Default=OFF.";
-        config false;
-      }
-    }
-    list tidmap {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "aid in format SHELF-shelf";
-      }
-      leaf sid {
-        type string {
-          length "1..20";
-        }
-        description
-          "System Identifier";
-        config false;
-      }
-      leaf protocol {
-        type enumeration {
-          enum "ISO";
-          enum "INET";
-        }
-        description
-          "Protocol Used";
-        config false;
-      }
-      leaf iso-addr {
-        type ciena-6500-types:IDENT;
-        description
-          "ISO address";
-        config false;
-      }
-      leaf inetaddr {
-        type ciena-6500-types:IPADDR;
-        description
-          "INET address(Format: n.n.n.n)";
-        config false;
-      }
-      leaf ne-type {
-        type ciena-6500-types:STRING;
-        description
-          "Eight hexadecimal digits. Digits 1+2: 00 - Known Ciena Equipment, 01 - Unknown Ciena Equipment, 11 - Other Vendor. Digits 3+4: 00 - OPC, 01 - anything other than OPC; Digits 5+6: for OPC: status (active/inactive, primary/backup), otherwise: type (16 for 6500, 17 for CPL, 18 for 565, 19 for 5100, 1A for 5200, 1B for 5410, 1C for 5430); Digits 7+8: 00 - SP, 01 - NP (Express only).";
-        config false;
-      }
-    }
-    list ulsdcc {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf man-area-1 {
-        type string {
-          length "0..30";
-        }
-        description
-          "Network Layer area address 1. Default=490000.";
-        config true;
-      }
-      leaf man-area-2 {
-        type string {
-          length "0..30";
-        }
-        description
-          "Network Layer area address 2";
-        config true;
-      }
-      leaf man-area-3 {
-        type string {
-          length "0..30";
-        }
-        description
-          "Network Layer area address 3";
-        config true;
-      }
-      leaf calc-area-1 {
-        type string {
-          length "0..30";
-        }
-        description
-          "Calculated Network Layer area address 1";
-        config false;
-      }
-      leaf calc-area-2 {
-        type string {
-          length "0..30";
-        }
-        description
-          "Calculated Network Layer area address 2";
-        config false;
-      }
-      leaf calc-area-3 {
-        type string {
-          length "0..30";
-        }
-        description
-          "Calculated Network Layer area address 3";
-        config false;
-      }
-    }
-    list wsc {
-      key "wsc-port";
-      config true;
-      leaf wsc-port {
-        mandatory true;
-        description
-          "AID in format WSC-shelf-slot-port, COLAN-shelf-port, ILAN-shelf-port, WSC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf config {
-        type enumeration {
-          enum "HD10BT";
-          enum "HD100BT";
-          enum "FD10BT";
-          enum "FD100BT";
-          enum "AUTO";
-        }
-        description
-          "Port Duplex and Speed(Mandatory for edit operations)";
-        config true;
-      }
-      leaf lan-port {
-        type ciena-6500-types:IDENT;
-        description
-          "aid";
-        config false;
-      }
-      leaf oper-config {
-        type enumeration {
-          enum "HD10BT";
-          enum "HD100BT";
-          enum "FD10BT";
-          enum "FD100BT";
-          enum "DISCONNECTED";
-        }
-        description
-          "Negotiated Port Duplex and Speed";
-        config false;
-      }
-    }
-    list odbr {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf status {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "Specifies the status of ODBR.";
-        config true;
-      }
-      leaf areaid1 {
-        type ciena-6500-types:IPADDR;
-        description
-          "Specifies the first ODBR area id.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf areaid2 {
-        type ciena-6500-types:IPADDR;
-        description
-          "Specifies the second ODBR area id.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf areaid3 {
-        type ciena-6500-types:IPADDR;
-        description
-          "Specifies the third ODBR area id.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf areaid4 {
-        type ciena-6500-types:IPADDR;
-        description
-          "Specifies the fourth ODBR area id.(Format: n.n.n.n)";
-        config true;
-      }
-    }
-    list ip-acl-list {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list circuit {
-        type ciena-6500-types:aid;
-        description
-          "The interface to which the rule applies. COLAN-Shelf-X, COLAN-Shelf-A, ILAN-Shelf-IN, ILAN-Shelf-OUT. Group format example is COLAN-Shelf-A&ILAN-Shelf-IN&ILAN-Shelf-OUT";
-        config true;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Set the IP address. Must be in the standard dot notation, n.n.n.n.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf netmask {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "Set the IP mask. Must be in the standard dot notation, n.n.n.n.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf action {
-        type enumeration {
-          enum "DENY" {
-            description
-              "Action to be denied";
-          }
-          enum "ALLOW" {
-            description
-              "Action to be allowed";
-          }
-        }
-        mandatory true;
-        description
-          "Set the action of the rule.";
-        config true;
-      }
-      leaf priority {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        mandatory true;
-        description
-          "Priority, 0 to 255 where 0 is the highest priority.";
-        config true;
-      }
-    }
-    list ip-acl-stats {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf status {
-        type enumeration {
-          enum "OOS" {
-            description
-              "ACL is out-of-service";
-          }
-          enum "IS" {
-            description
-              "ACL is in-service";
-          }
-        }
-        description
-          "The status of the ACL.";
-        config false;
-      }
-      leaf total {
-        type ciena-6500-types:INT {
-          range "0..4294967295";
-        }
-        description
-          "Total number of packets dropped since the rules are installed";
-        config false;
-      }
-    }
-    list ip-acl {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf server {
-        type enumeration {
-          enum "DISABLE" {
-            description
-              "ACL is disabled";
-          }
-          enum "ENABLE" {
-            description
-              "ACL is enabled";
-          }
-        }
-        description
-          "The status of the ACL.(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    list ip-address {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format IPADDR-shelf-index, IPADDR-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type string {
-          length "0..46";
-        }
-        mandatory true;
-        description
-          "IP address. IPv6 address MUST be quoted. ";
-        config true;
-      }
-      leaf prefix {
-        type ciena-6500-types:INT {
-          range "0..128";
-        }
-        mandatory true;
-        description
-          "Set the IP network prefix";
-        config true;
-      }
-      leaf circuit {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "Circuit";
-        config true;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Overhead bytes that carry the DCC or G.709 GCC. NOTE: Mandatory parameter with optical AIDs.";
-        config true;
-      }
-    }
-    list static-route {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format STATICRT-shelf-index, STATICRT-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type string {
-          length "0..46";
-        }
-        mandatory true;
-        description
-          "IP Address, IPv6 address must be quoted";
-        config true;
-      }
-      leaf prefix {
-        type ciena-6500-types:INT {
-          range "0..128";
-        }
-        mandatory true;
-        description
-          "IP network prefix";
-        config true;
-      }
-      leaf next-hop {
-        type string {
-          length "0..46";
-        }
-        description
-          "IP Address, IPv6 address must be quoted ";
-        config true;
-      }
-      leaf circuit {
-        type ciena-6500-types:aid;
-        description
-          "Interface to NEXTHOP";
-        config true;
-      }
-      leaf cost {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        mandatory true;
-        description
-          "Cost : [1-65535]";
-        config true;
-      }
-      leaf carrier {
-        type ciena-6500-enums:CARRIER;
-        description
-          "Overhead bytes that carry the DCC or GCC.";
-        config true;
-      }
-      leaf redistribut {
-        type ciena-6500-enums:REDISTRIBUT;
-        description
-          "Add to OSPFv3 re-distribution list";
-        config true;
-      }
-      leaf distributed-route-metric-type {
-        type ciena-6500-enums:RDTYPE;
-        default "INTERNAL";
-        description
-          "Metric type which associate the metric value of the distributed route";
-        config true;
-      }
-      leaf description {
-        type ciena-6500-types:STRING;
-        description
-          "0..64 chars to identify the Static Route";
-        config true;
-      }
-      leaf gw-status {
-        type ciena-6500-enums:GWSTATUS;
-        description
-          "The status of the route. The possible values are: FWD, PEND, REJ. FWD means the route is active in the routing table. PEND means the route is standby and it is not in the routing table. REJ means there is an issue with the route. It may have a link failure or it may have an unreachable NEXTHOP.";
-        config false;
-      }
-    }
-    list config {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ipv4 {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "IPV4 functionality is enabled or disabled.";
-        config true;
-      }
-      leaf ipv6 {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "IPV6 functionality is enabled or disabled.";
-        config true;
-      }
-      leaf ipv6-hop-limit {
-        default "90";
-        type ciena-6500-types:INT {
-          range "1..255";
-        }
-        description
-          "IPV6HOPLIMIT (Time To Live). Default=90";
-        config true;
-      }
-      leaf ipv6-capable {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "This NE type supports IPV6 (YES or NO)";
-        config false;
-      }
-    }
-    list inband-comms {
-      key "ibc";
-      config false;
-      leaf ibc {
-        mandatory true;
-        description
-          "AID in format IBC-shelf-instance, IBC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mac-addr {
-        type string {
-          length "0..17";
-        }
-        description
-          "The local MAC address used as source in Ethernet packets originating from this 6500 node over the specified IBC channel.";
-        config false;
-      }
-      leaf status {
-        type enumeration {
-          enum "UNDEFINED";
-          enum "CONFIGURED";
-        }
-        description
-          "Provisioning Status of the IBC channel";
-        config false;
-      }
-    }
-    list gne-portfilter {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format PORTFILTER-shelf-index, PORTFILTER-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf proto {
-        type enumeration {
-          enum "TCP";
-          enum "UDP";
-        }
-        mandatory true;
-        description
-          "Specifies which protocol (TCP or UDP) the filter is applicable to.";
-        config true;
-      }
-      leaf dropport {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        mandatory true;
-        description
-          "Specifies the destination port for which packets will be dropped (0-65535)";
-        config true;
-      }
-      leaf accesscolanx {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "Specify the GNE access interface for COLAN-X.";
-        config true;
-      }
-      leaf accesscolana {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Specify the GNE access interface for COLAN-A.";
-        config true;
-      }
-    }
-    list ztpstats {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "aid in format SHELF-shelf";
-      }
-      leaf stats-line {
-        type string {
-          length "0..110";
-        }
-        description
-          "ZTP STATS output line.";
-        config false;
-      }
-    }
-    list ztp {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf admin-state {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Turn the feature off";
-          }
-          enum "ON" {
-            description
-              "Turn the feature on";
-          }
-          enum "AUTO" {
-            description
-              "Use card default setting";
-          }
-        }
-        description
-          "The admin state of the feature.(Mandatory for edit operations)";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-cpu.yang b/models/ciena-6500-cpu.yang
deleted file mode 100644
index 5103ea493eca8ef7d59e49c986e144fa453d54db..0000000000000000000000000000000000000000
--- a/models/ciena-6500-cpu.yang
+++ /dev/null
@@ -1,78 +0,0 @@
-module ciena-6500-cpu {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-cpu";
-  prefix cpu;
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's CPU usage and heapstat object for the 6500 platform";
-
-  revision 2017-01-01 {
-    description
-      "Initial revision";
-  }
-
-  typedef percent {
-    type decimal64 {
-      fraction-digits 2;
-      range "0 .. 100";
-    }
-    units "percent";
-  }
-
-  typedef kilobytes {
-    type uint32;
-    units "kB";
-  }
-
-  container cpu {
-    config false;
-    container usage {
-      config false;
-      leaf total {
-        type percent;
-        description
-          "Total CPU usage for all cores";
-      }
-      list process {
-        key "id";
-        leaf id {
-          type uint32;
-          description
-            "Unique ID for this task or process.";
-        }
-        leaf name {
-          type string;
-          description
-            "Name for this task or process.  Not required to be unique.";
-        }
-        leaf usage {
-          type percent;
-          description
-            "CPU usage for this task or process over the monitoring period.";
-        }
-      }
-    }
-    container memory {
-      description
-        "Memory usage for this processor";
-      leaf free {
-        type kilobytes;
-        description
-          "Total free memory available.";
-      }
-      leaf used {
-        type kilobytes;
-        description
-          "Total memory used.";
-      }
-      leaf total {
-        type kilobytes;
-        description
-          "Total memory available.";
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-debuglog.yang b/models/ciena-6500-debuglog.yang
deleted file mode 100644
index 65a0c5374c843b0446f5fee7f85fac02ba2f6a94..0000000000000000000000000000000000000000
--- a/models/ciena-6500-debuglog.yang
+++ /dev/null
@@ -1,383 +0,0 @@
-module ciena-6500-debuglog {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-debuglog";
-  prefix debuglog;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's debuglog object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         rpc debuglog-collect
-           input
-           - Added leaf: parallel
-             leaf timeout
-             - Changed default from 40 to 20";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         rpc debuglog-collect
-           input
-             leaf collectcore
-             - Added default: NO 
-             leaf clean
-             - Added default: NO 
-             leaf timeout
-             - Added default: 40 
-               type ciena-6500-types:INT
-               - Added range: 1..300 
-             leaf copyback
-             - Added default: NO 
-             leaf security
-             - Added default: NO 
-         rpc debuglog-download
-           input
-             leaf url
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 18..300 
-             leaf keep
-             - Added default: NO 
-             leaf auto-log
-             - Added default: NO 
-         rpc debuglog-cancel
-           input
-           - Changed leaf from shelfall to shelf
-             leaf shelf
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         container debuglog
-           list collect-status
-           - Added leaf: log-progress
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list download-status
-           - Added leaf: log-progress
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf save-result
-               type enumeration
-               - Removed enum: INV_DEST
-               - Removed enum: TRANSFER_FAIL
-               - Added enum: INVALID_DEST
-               - Added enum: TRANSFER_FAILED";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container debuglog
-         - Removed list: status
-         - Added list: collect-status
-         - Added list: download-status
-         rpc debuglog-collect
-           input
-           - Removed leaf: aid
-           - Added leaf: slot
-         rpc debuglog-download
-           input
-           - Removed leaf: aid
-           - Added leaf: slot
-         rpc debuglog-cancel
-           input
-           - Changed leaf from aid to shelfall
-             leaf shelfall
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: debuglog
-       - Added rpc: debuglog-collect
-       - Added rpc: debuglog-download
-       - Added rpc: debuglog-cancel";
-  }
-
-  rpc debuglog-collect {
-    description
-      "Retrieve Log : Collect debug logs from the specified shelf/slots.";
-    input {
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf include {
-        type ciena-6500-types:STRING;
-        description
-          "Only retrieve logs from specified list of slots in the shelf.";
-      }
-      leaf exclude {
-        type ciena-6500-types:STRING;
-        description
-          "Retrieve logs from all slots in the shelf EXCEPT those specified in this list.";
-      }
-      leaf collectcore {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        default "NO";
-        description
-          "Request coredump collection.";
-      }
-      leaf clean {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        default "NO";
-        description
-          "Clean up existing log collection. Required to overwrite unsaved log files.";
-      }
-      leaf timeout {
-        default "20";
-        type ciena-6500-types:INT {
-          range "1..300";
-        }
-        description
-          "Set timeout for log collection from a single slot. This parameter is not supported when collecting from multiple slots. Default for Active SP is 40 minutes, default for all other cards is 20 min.";
-      }
-      leaf copyback {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        default "NO";
-        description
-          "Copy logs from a single slot back to source slot.";
-      }
-      leaf security {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        default "NO";
-        description
-          "Retrieve security related data from SP.";
-      }
-      leaf parallel {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        default "NO";
-        description
-          "Attempt to collect from multiple slots in parallel.";
-      }
-    }
-  }
-  rpc debuglog-download {
-    description
-      "Save Log : (S)FTP collected debug logs off the network element.";
-    input {
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "18..300";
-        }
-        mandatory true;
-        description
-          "Full URL to remote directory inside quotes. The format of url is: [s]ftp://user:password@host[:port]/directory-path. Maximum path length is 128. The password cannot contain the character '@'. If host is an IPv6 address, it must be enclosed in square brackets.";
-      }
-      leaf keep {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        default "NO";
-        description
-          "Keep collected logs on the NE after they've been transferred.";
-      }
-      leaf auto-log {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        default "NO";
-        description
-          "Collect all autonomous logs generated by cards in shelf.";
-      }
-    }
-  }
-  rpc debuglog-cancel {
-    description
-      "Cancel Log : Cancel log collection.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container debuglog {
-    list collect-status {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf log-progress {
-        type ciena-6500-types:STRING;
-        description
-          "Log collection Progress";
-        config false;
-      }
-      leaf log-state {
-        type enumeration {
-          enum "IDLE" {
-            description
-              "No collection being performed on this AID.";
-          }
-          enum "INPROGRESS" {
-            description
-              "Currently collecting logs from this AID.";
-          }
-          enum "COMPLETE" {
-            description
-              "Log collection from AID has completed.";
-          }
-          enum "QUEUED" {
-            description
-              "AID is queued up for log collection.";
-          }
-        }
-        description
-          "Log collection State";
-        config false;
-      }
-      leaf collect-result {
-        type enumeration {
-          enum "PASS" {
-            description
-              "Log collection was successful.";
-          }
-          enum "DISK_FULL" {
-            description
-              "Log collection failed because disk is full.";
-          }
-          enum "INCOMPLETE" {
-            description
-              "Log file is incomplete because it took too long to collect.";
-          }
-          enum "FAIL" {
-            description
-              "Generic log collection failure.";
-          }
-          enum "REMOTE_TRANSFER_FAILED" {
-            description
-              "Log collection failed because commands file could not be sent to target slot.";
-          }
-          enum "COPYBACK_FAILED" {
-            description
-              "Failed to copy log back to target slot.";
-          }
-          enum "LINEUP_INCOMPLETE" {
-            description
-              "Commands file missing from load.";
-          }
-          enum "CONNECTION_FAILED" {
-            description
-              "Unable to connect to target slot.";
-          }
-        }
-        description
-          "Log collection Result";
-        config false;
-      }
-    }
-    list download-status {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf log-progress {
-        type ciena-6500-types:STRING;
-        description
-          "Log save Progress";
-        config false;
-      }
-      leaf log-state {
-        type enumeration {
-          enum "IDLE" {
-            description
-              "No log files are currently being or have been saved for this AID.";
-          }
-          enum "INPROGRESS" {
-            description
-              "Currently saving logs from this AID.";
-          }
-          enum "COMPLETE" {
-            description
-              "Logs saved for this AID.";
-          }
-        }
-        description
-          "Log save State";
-        config false;
-      }
-      leaf save-result {
-        type enumeration {
-          enum "PASS" {
-            description
-              "Saving of logs was successful.";
-          }
-          enum "CONN_FAIL" {
-            description
-              "Connection failed for URL";
-          }
-          enum "INVALID_DEST" {
-            description
-              "Invalid destination.";
-          }
-          enum "TRANSFER_FAILED" {
-            description
-              "Log file transfer failed.";
-          }
-          enum "FTP_ACCESS_DENIED" {
-            description
-              "FTP access denied.";
-          }
-          enum "SFTP_ACCESS_DENIED" {
-            description
-              "SFTP access denied.";
-          }
-          enum "DISK_FULL" {
-            description
-              "Could not fetch logs or core file from target slot because SP disk is full.";
-          }
-        }
-        description
-          "Log save Result";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-diagnostic.yang b/models/ciena-6500-diagnostic.yang
deleted file mode 100644
index 9196b5c7180065c00b53b2b107bf3828e6a2c668..0000000000000000000000000000000000000000
--- a/models/ciena-6500-diagnostic.yang
+++ /dev/null
@@ -1,141 +0,0 @@
-module ciena-6500-diagnostic {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-diagnostic";
-  prefix diagnostic;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's diagnostic object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: diagnostic-operate-lamp-test
-       - Added rpc: diagnostic-diagnose-equipment
-       - Added rpc: diagnostic-operate-lamp-flash
-       - Added rpc: diagnostic-operate-dbfrz
-       - Added container: diagnostic";
-  }
-
-  rpc diagnostic-operate-lamp-test {
-    description
-      "Test Lamp. Tests the LEDs on the shelf associated with the specified AID.";
-    input {
-      leaf slotall {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SLOT-slot-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc diagnostic-diagnose-equipment {
-    description
-      "Diagnose Equipment: Instructs a Network Element to initiate a diagnostic routine on one or more equipment units in the Network Element.";
-    input {
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format 10G-shelf-slot, 10G-shelf-ALL, 2G5-shelf-slot, 2G5-shelf-ALL, 155622M-shelf-slot, 155622M-shelf-ALL, GE-shelf-slot, GE-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, XC-shelf-slot, XC-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, SMUX-shelf-slot, SMUX-shelf-ALL, MRO-shelf-slot, MRO-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, PCXM-shelf-slot-port, WSSOPM-shelf-slot, OPM-shelf-slot, SMD-shelf-slot, TCC-shelf-slot, SLIC-shelf-slot, LIM-shelf-slot, ESAM-shelf-slot, SAM-shelf-slot, SRA-shelf-slot, XLA-shelf-slot, RLA-shelf-slot, FGA-shelf-slot, CMD4-shelf-slot, CCMD12-shelf-slot, CCMD8X16-shelf-slot, CCMD16X12-shelf-slot, CCMD8X4-shelf-slotSsubslot, MFC-shelf-slot, AMP4-shelf-slotSsubslot, OPS-shelf-slot, OPS-shelf-ALL, FE-shelf-slot, FE-shelf-ALL, SPOTNFMOTR-shelf-slot, SPOTNFMOTR-shelf-ALL, SP-shelf-slot, SP-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, OTNFMOTR-shelf-slot, OTNFMOTR-shelf-ALL, XGE-shelf-slot, XGE-shelf-ALL, L2RPR-shelf-slot, L2RPR-shelf-ALL, MXC-shelf-slot, MXC-shelf-ALL, 10GWT-shelf-slot, 10GWT-shelf-ALL, 10GELWT-shelf-slot, 10GELWT-shelf-ALL, 10GOTNWT-shelf-slot, 10GOTNWT-shelf-ALL, 2G5MOTR-shelf-slot, 2G5MOTR-shelf-ALL, 10GOTR-shelf-slot, 10GOTR-shelf-ALL, 10GOTSC-shelf-slot, 10GOTSC-shelf-ALL, OSIC-shelf-slot, OSIC-shelf-ALL, ISS-shelf-slot, ISS-shelf-ALL, 40GOCLD-shelf-slot, 40GOCLD-shelf-ALL, 40GUOCLD-shelf-slot, 40GUOCLD-shelf-ALL, 40GOCI-shelf-slot, 40GOCI-shelf-ALL, 40GMUX-shelf-slot, 40GMUX-shelf-ALL, 40GXCIF-shelf-slot, 40GXCIF-shelf-ALL, 100GOCLD-shelf-slot, 100GOCLD-shelf-ALL, 100GMUX-shelf-slot, 100GMUX-shelf-ALL, 100GOCI-shelf-slot, 100GOCI-shelf-ALL, OTR-shelf-slot, OTR-shelf-ALL, MOTR-shelf-slot, MOTR-shelf-ALL, OCI-shelf-slot, OCI-shelf-ALL, OTSC-shelf-slot, OTSC-shelf-ALL, TRM-shelf-slot, TRM-shelf-ALL, PKTOTNXCIF-shelf-slot, PKTOTNXCIF-shelf-ALL, CTM-shelf-slot, CTM-shelf-ALL, SM-shelf-slot, SM-shelf-ALL, PKTOTN-shelf-slot, PKTOTN-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf dgn-id {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "dgn_id";
-        }
-        leaf rslt {
-          type enumeration {
-            enum "PASS";
-            enum "FAIL";
-          }
-          mandatory true;
-          description
-            "The condition of the entity";
-        }
-      }
-    }
-  }
-  rpc diagnostic-operate-lamp-flash {
-    description
-      "Flash Lamps. Flash the LEDs on the shelf associated with the specified AID.";
-    input {
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SLOT-slot-%HLINK-facility-hshelf-hslot-hport, SLOT-shelf-slot-port, SLOT-shelf-slotSsubslot, SLOT-shelf-slotSsubslot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf state {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "State To Set Lamp";
-      }
-    }
-  }
-  rpc diagnostic-operate-dbfrz {
-    description
-      "Operate Database Freeze: This command is used to block all the provisioning request";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container diagnostic {
-    list led {
-      key "led";
-      config false;
-      leaf led {
-        mandatory true;
-        description
-          "AID in format LED-shelf-slot-ALL, LEDFAN-shelf-slot-ALL, LEDAP-shelf-slot-ALL, LED-shelf-slotSsubslot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf name {
-        type ciena-6500-types:STRING;
-        description
-          "LED Name";
-        config false;
-      }
-      leaf port {
-        type ciena-6500-types:INT;
-        description
-          "Optional LED port";
-        config false;
-      }
-      leaf module-subslot {
-        type ciena-6500-types:INT;
-        description
-          "Optional LED module subslot";
-        config false;
-      }
-      leaf state {
-        type ciena-6500-enums:LED_STATES;
-        description
-          "LED State";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-disps.yang b/models/ciena-6500-disps.yang
deleted file mode 100644
index 362311b336752144853d9477b888fd5b4be3a62c..0000000000000000000000000000000000000000
--- a/models/ciena-6500-disps.yang
+++ /dev/null
@@ -1,121 +0,0 @@
-module ciena-6500-disps {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-disps";
-  prefix disps;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's disps object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added container: disps";
-  }
-
-  container disps {
-    list disp {
-      key "disp";
-      config true;
-      leaf disp {
-        mandatory true;
-        description
-          "AID in format DISP-shelf-slot-port, DISP-shelf-ALL, DISP-shelf-slot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf inst {
-        type ciena-6500-types:INT {
-          range "1 | 2";
-        }
-        description
-          "DSCM Instance Number.";
-        config true;
-      }
-      leaf lim-slot {
-        type ciena-6500-types:INT {
-          range "1..14";
-        }
-        description
-          "LIM Slot Number.";
-        config true;
-      }
-      leaf lim-port {
-        type ciena-6500-types:INT {
-          range "5..8";
-        }
-        description
-          "LIM Port Number.";
-        config true;
-      }
-      leaf mod {
-        type ciena-6500-enums:DSCM_Mods;
-        description
-          "Module Number.";
-        config true;
-      }
-      leaf type {
-        type ciena-6500-enums:DSCM_Types;
-        description
-          "DSCM Type.";
-        config true;
-      }
-      leaf input-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Input loss to the DSCM.";
-        config true;
-      }
-      leaf output-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ouput loss after the DSCM.";
-        config true;
-      }
-      leaf wdl-slope {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Wavelength Dependent Loss Slope.";
-        config true;
-      }
-      leaf cr {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Raman Gain Peak at wavelength 1455 nm.";
-        config true;
-      }
-      leaf avg-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Attenuation Co-efficient.";
-        config true;
-      }
-      leaf length {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Length.";
-        config true;
-      }
-      leaf wdl-max {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Wavelength Dependent Loss Maximum at 1530nm.";
-        config true;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary state";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-encryption.yang b/models/ciena-6500-encryption.yang
deleted file mode 100644
index b24f269773dd4cb4c56ebf2559467b80b44a8dbb..0000000000000000000000000000000000000000
--- a/models/ciena-6500-encryption.yang
+++ /dev/null
@@ -1,98 +0,0 @@
-module ciena-6500-encryption {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-encryption";
-  prefix encryption;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's encryption object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added container: encryption";
-  }
-
-  container encryption {
-    list ip-encryp {
-      key "eqpt";
-      config true;
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format OTSC-shelf-slot, 100GOCLD-shelf-slot, 100GOCLD-shelf-ALL, OTSC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type string {
-          length "0..46";
-        }
-        mandatory true;
-        description
-          "IP Address.";
-        config true;
-      }
-      leaf prefix {
-        type ciena-6500-types:INT {
-          range "1..128";
-        }
-        mandatory true;
-        description
-          "IP network prefix";
-        config true;
-      }
-      leaf gateway {
-        type string {
-          length "0..46";
-        }
-        mandatory true;
-        description
-          "IP Address.";
-        config true;
-      }
-    }
-    list access-encryp {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Disable Encryption Access";
-          }
-          enum "SEG" {
-            description
-              "Segregated Solution for Encryption Access";
-          }
-          enum "NONSEG" {
-            description
-              "Non-segregated Solution for Encryption Access";
-          }
-        }
-        mandatory true;
-        description
-          "Encryption access mode";
-        config true;
-      }
-      leaf lan-port {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "Dedicated LAN port for the segregated solution in Encryption Access";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-enums.yang b/models/ciena-6500-enums.yang
deleted file mode 100644
index 4e8f16aa1da23cf265a14f37d9f9fd8633fd7afb..0000000000000000000000000000000000000000
--- a/models/ciena-6500-enums.yang
+++ /dev/null
@@ -1,21117 +0,0 @@
-module ciena-6500-enums {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-enums";
-  prefix ciena-6500-enums;
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's enumerated types for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Removed typedef: ALMAIDTYPE
-       - Removed typedef: ETH10G_TH_MONTYPE_resp
-       - Removed typedef: ETHN_SET_MONTYPE
-       - Added typedef: linkOptMode
-       - Added typedef: txDispMode
-       - Added typedef: grpc_encoding
-       - Added typedef: flatMode
-       - Added typedef: CbrTtpProtocol
-       - Added typedef: AUTO_NEGOTIATION
-       - Added typedef: CbrMapping
-       - Added typedef: CbrFECFrmt
-       - Added typedef: CbrTtpCondType
-       - Added typedef: CBRTTP_OMTYPE
-       - Added typedef: CapacityChangeMode
-       - Added typedef: ETHN_TH_MONTYPE
-       - Added typedef: CBRTTP_MONTYPE
-       - Added typedef: CBRTTP_MONTYPE_resp
-       - Added typedef: CBRTTP_TH_MONTYPE
-         typedef addr_form
-           type enumeration
-           - Added enum: TID-SH-SL-PRTLBL
-           - Added enum: TID-SH-SL-PRT-INSTANCE
-         typedef AD_LAYER
-           type enumeration
-           - Added enum: PTP
-           - Added enum: PEER
-         typedef linetype
-           type enumeration
-           - Added enum: UNKNOWN
-         typedef ALMPRVAIDTYPE
-           type enumeration
-           - Added enum: CBRTTP
-           - Added enum: ADJPEER
-         typedef CARRIER
-           type enumeration
-           - Added enum: EXT
-         typedef NETDOMAIN
-           type enumeration
-           - Added enum: WSC
-         typedef EQPTPROFILE1
-           type enumeration
-           - Added enum: 100GSERVICE
-           - Added enum: MULTISERVICE
-         typedef ochCarrierCenteringMode
-           type enumeration
-           - Added enum: UNKNOWN
-         typedef ccda
-           type enumeration
-           - Added enum: UNKNOWN
-         typedef txb
-           type enumeration
-           - Added enum: UNKNOWN
-         typedef TxMode
-           type enumeration
-           - Added enum: UNKNOWN
-           - Added enum: SEARCH
-         typedef ochTxWvlngthSpacing
-           type enumeration
-           - Added enum: UNKNOWN
-         typedef ptpReachClass
-           type enumeration
-           - Added enum: TER1P5
-         typedef ptpLnkOptMode
-           type enumeration
-           - Added enum: UNKNOWN
-           - Added enum: 35GBAUD_test
-         typedef ALL_MONTYPE
-           type enumeration
-           - Added enum: UNCFECBLK-OTU
-           - Added enum: PSD-ODU
-           - Added enum: PSCP-ODU
-           - Added enum: PSCW-ODU
-           - Added enum: FC-TCM
-           - Added enum: PSD-TCM
-           - Added enum: PSCW-TCM
-           - Added enum: PSCP-TCM
-           - Added enum: OPR-OTSI
-           - Added enum: OPT-OTSI
-           - Added enum: OPRN-OTSI
-           - Added enum: OPTN-OTSI
-           - Added enum: OPRAVG-OTSI
-           - Added enum: OPRMIN-OTSI
-           - Added enum: OPRMAX-OTSI
-           - Added enum: OPTAVG-OTSI
-           - Added enum: OPTMIN-OTSI
-           - Added enum: OPTMAX-OTSI
-           - Added enum: DGDAVG-OTSI
-           - Added enum: DGDMAX-OTSI
-           - Added enum: PDLAVG-OTSI
-           - Added enum: PDLMAX-OTSI
-           - Added enum: HCCS-OTSI
-           - Added enum: FEC-OTSI
-           - Added enum: PRFBER-OTSI
-           - Added enum: PRFBERMAX-OTSI
-           - Added enum: QMIN-OTSI
-           - Added enum: QMAX-OTSI
-           - Added enum: QAVG-OTSI
-           - Added enum: QSTDEV-OTSI
-           - Added enum: UNCFECBLK-OTSI
-           - Added enum: OSNRMIN-OTSI
-           - Added enum: OSNRMAX-OTSI
-           - Added enum: OSNRAVG-OTSI
-           - Added enum: ESNRMIN-OTSI
-           - Added enum: ESNRMAX-OTSI
-           - Added enum: ESNRAVG-OTSI
-           - Added enum: CDMIN-OTSI
-           - Added enum: CDMAX-OTSI
-           - Added enum: CDAVG-OTSI
-           - Added enum: FEC-PCS
-           - Added enum: FECCCW-PCS
-           - Added enum: FECUNCCW-PCS
-           - Added enum: HCCS-PCS
-           - Added enum: PRFBER-PCS
-           - Added enum: PRFBERMAX-PCS
-         typedef PMAIDTYPE
-           type enumeration
-           - Removed enum: OTM0
-           - Removed enum: OTM1
-           - Removed enum: OTMFLEX
-           - Added enum: VOA
-           - Added enum: E3
-           - Added enum: OC1
-           - Added enum: ETH100
-           - Added enum: ODU
-           - Added enum: FLEX
-           - Added enum: PTP
-           - Added enum: OTUTTP
-           - Added enum: ETTP
-           - Added enum: CBRTTP
-           - Added enum: STTP
-           - Added enum: ODUTTP
-           - Added enum: ODUCTP
-           - Added enum: TCM
-         typedef ALL_MONTYPE_resp
-           type enumeration
-           - Added enum: QMIN-OTU
-           - Added enum: QMAX-OTU
-           - Added enum: QAVG-OTU
-           - Added enum: QSTDEV-OTU
-           - Added enum: UNCFECBLK-OTU
-           - Added enum: PSD-ODU
-           - Added enum: PSCP-ODU
-           - Added enum: PSCW-ODU
-           - Added enum: FC-TCM
-           - Added enum: PSD-TCM
-           - Added enum: PSCW-TCM
-           - Added enum: PSCP-TCM
-           - Added enum: OPR-OTSI
-           - Added enum: OPT-OTSI
-           - Added enum: OPRN-OTSI
-           - Added enum: OPTN-OTSI
-           - Added enum: OPRAVG-OTSI
-           - Added enum: OPRMIN-OTSI
-           - Added enum: OPRMAX-OTSI
-           - Added enum: OPTAVG-OTSI
-           - Added enum: OPTMIN-OTSI
-           - Added enum: OPTMAX-OTSI
-           - Added enum: DGDAVG-OTSI
-           - Added enum: DGDMAX-OTSI
-           - Added enum: PDLAVG-OTSI
-           - Added enum: PDLMAX-OTSI
-           - Added enum: HCCS-OTSI
-           - Added enum: FEC-OTSI
-           - Added enum: PRFBER-OTSI
-           - Added enum: PRFBERMAX-OTSI
-           - Added enum: QMIN-OTSI
-           - Added enum: QMAX-OTSI
-           - Added enum: QAVG-OTSI
-           - Added enum: QSTDEV-OTSI
-           - Added enum: UNCFECBLK-OTSI
-           - Added enum: OSNRMIN-OTSI
-           - Added enum: OSNRMAX-OTSI
-           - Added enum: OSNRAVG-OTSI
-           - Added enum: ESNRMIN-OTSI
-           - Added enum: ESNRMAX-OTSI
-           - Added enum: ESNRAVG-OTSI
-           - Added enum: CDMIN-OTSI
-           - Added enum: CDMAX-OTSI
-           - Added enum: CDAVG-OTSI
-           - Added enum: FEC-PCS
-           - Added enum: FECCCW-PCS
-           - Added enum: FECUNCCW-PCS
-           - Added enum: HCCS-PCS
-           - Added enum: PRFBER-PCS
-           - Added enum: PRFBERMAX-PCS
-         typedef ALL_TH_MONTYPE_resp
-           type enumeration
-           - Removed enum: FEC-OTU
-           - Removed enum: CV-PCS
-           - Added enum: CV-P
-           - Added enum: BBE-P
-           - Added enum: ES-P
-           - Added enum: SES-P
-           - Added enum: SAS-P
-           - Added enum: SEFS-P
-           - Added enum: CSS-P
-           - Added enum: UAS-P
-           - Added enum: CVC-P
-           - Added enum: ESC-P
-           - Added enum: SESC-P
-           - Added enum: UASC-P
-           - Added enum: CV-V
-           - Added enum: ES-V
-           - Added enum: SES-V
-           - Added enum: UAS-V
-           - Added enum: BBE-PPI
-           - Added enum: ES-PPI
-           - Added enum: SES-PPI
-           - Added enum: OPT-OTS
-           - Added enum: MAXEVLSH-OTS
-           - Added enum: MAXEVLLG-OTS
-           - Added enum: MAXEVRSH-OTS
-           - Added enum: MAXEVRLG-OTS
-           - Added enum: CUMEVLSH-OTS
-           - Added enum: CUMEVLLG-OTS
-           - Added enum: CUMEVRSH-OTS
-           - Added enum: CUMEVRLG-OTS
-           - Added enum: QMIN-OTU
-           - Added enum: QMAX-OTU
-           - Added enum: QAVG-OTU
-           - Added enum: QSTDEV-OTU
-           - Added enum: UNCFECBLK-OTU
-           - Added enum: HCCS-PMA
-           - Added enum: PRFBER-PMA
-           - Added enum: PRFBERMAX-PMA
-           - Added enum: UTLMIN-E
-           - Added enum: UTLMAX-E
-           - Added enum: UTLAVG-E
-           - Added enum: UTL-W
-           - Added enum: UTLMX-W
-           - Added enum: OPR-OTSI
-           - Added enum: OPT-OTSI
-           - Added enum: OPRN-OTSI
-           - Added enum: DGDAVG-OTSI
-           - Added enum: DGDMAX-OTSI
-           - Added enum: PDLAVG-OTSI
-           - Added enum: PDLMAX-OTSI
-           - Added enum: HCCS-OTSI
-           - Added enum: PRFBER-OTSI
-           - Added enum: PRFBERMAX-OTSI
-           - Added enum: QMIN-OTSI
-           - Added enum: QMAX-OTSI
-           - Added enum: QAVG-OTSI
-           - Added enum: QSTDEV-OTSI
-           - Added enum: UNCFECBLK-OTSI
-           - Added enum: OSNRMIN-OTSI
-           - Added enum: OSNRMAX-OTSI
-           - Added enum: OSNRAVG-OTSI
-           - Added enum: ESNRMIN-OTSI
-           - Added enum: ESNRMAX-OTSI
-           - Added enum: ESNRAVG-OTSI
-           - Added enum: CDMIN-OTSI
-           - Added enum: CDMAX-OTSI
-           - Added enum: CDAVG-OTSI
-           - Added enum: HCCS-PCS
-           - Added enum: PRFBER-PCS
-           - Added enum: PRFBERMAX-PCS
-         typedef ETH10G_MONTYPE
-           type enumeration
-           - Added enum: UTLMIN-E
-           - Added enum: UTLMAX-E
-           - Added enum: UTLAVG-E
-         typedef ETHN_MONTYPE
-           type enumeration
-           - Added enum: UTLMIN-E
-           - Added enum: UTLMAX-E
-           - Added enum: UTLAVG-E
-         typedef ETH10G_MONTYPE_resp
-           type enumeration
-           - Added enum: UTLMIN-E
-           - Added enum: UTLMAX-E
-           - Added enum: UTLAVG-E
-         typedef ETHN_MONTYPE_resp
-           type enumeration
-           - Added enum: UTLMIN-E
-           - Added enum: UTLMAX-E
-           - Added enum: UTLAVG-E
-         typedef ETH10G_TH_MONTYPE
-           type enumeration
-           - Added enum: UTLMIN-E
-           - Added enum: UTLMAX-E
-           - Added enum: UTLAVG-E
-         typedef AIDTYPE
-           type enumeration
-           - Added enum: ADJPEER
-         typedef PTP_MONTYPE
-           type enumeration
-           - Added enum: OSNRMIN-OTSI
-           - Added enum: OSNRMAX-OTSI
-           - Added enum: OSNRAVG-OTSI
-           - Added enum: ESNRMIN-OTSI
-           - Added enum: ESNRMAX-OTSI
-           - Added enum: ESNRAVG-OTSI
-           - Added enum: CDMIN-OTSI
-           - Added enum: CDMAX-OTSI
-           - Added enum: CDAVG-OTSI
-           - Added enum: PSCW-OTS
-           - Added enum: PSCP-OTS
-           - Added enum: PSD-OTS
-         typedef PTP_MONTYPE_resp
-           type enumeration
-           - Added enum: OSNRMIN-OTSI
-           - Added enum: OSNRMAX-OTSI
-           - Added enum: OSNRAVG-OTSI
-           - Added enum: ESNRMIN-OTSI
-           - Added enum: ESNRMAX-OTSI
-           - Added enum: ESNRAVG-OTSI
-           - Added enum: CDMIN-OTSI
-           - Added enum: CDMAX-OTSI
-           - Added enum: CDAVG-OTSI
-           - Added enum: PSCW-OTS
-           - Added enum: PSCP-OTS
-           - Added enum: PSD-OTS
-         typedef PTP_TH_MONTYPE
-           type enumeration
-           - Added enum: OSNRMIN-OTSI
-           - Added enum: OSNRMAX-OTSI
-           - Added enum: OSNRAVG-OTSI
-           - Added enum: ESNRMIN-OTSI
-           - Added enum: ESNRMAX-OTSI
-           - Added enum: ESNRAVG-OTSI
-           - Added enum: CDMIN-OTSI
-           - Added enum: CDMAX-OTSI
-           - Added enum: CDAVG-OTSI
-         typedef ETTP_TH_MONTYPE
-           type enumeration
-           - Removed enum: CV-PCS
-         typedef SwitchReasonPG
-           type enumeration
-           - Added enum: TRFLT
-         typedef TSTSIG_Pattern
-           type enumeration
-           - Added enum: 10GETESTPATTERN4
-           - Added enum: O150PRBS11
-           - Added enum: O150INVPRBS11
-           - Added enum: O151PRBS15
-           - Added enum: O151INVPRBS15
-           - Added enum: O153PRBS20
-           - Added enum: O153INVPRBS20
-           - Added enum: O151PRBS20
-           - Added enum: O151INVPRBS20
-           - Added enum: O151PRBS23
-           - Added enum: O151INVPRBS23
-           - Added enum: O150PRBS31
-           - Added enum: O150INVPRBS31
-           - Added enum: PTTRN1
-           - Added enum: PTTRN2
-           - Added enum: PTTRN3
-           - Added enum: PTTRN4
-           - Added enum: PTTRN5
-           - Added enum: PTTRN6
-           - Added enum: PTTRN7
-           - Added enum: ETHPACKETPTTRN1
-           - Added enum: ETHPACKETPTTRN2
-           - Added enum: ETHPACKETPTTRN3
-           - Added enum: 16GFICONTESTPATTERN
-           - Added enum: 16GFCTESTPATTERN
-           - Added enum: 32GFCTESTPATTERN
-           - Added enum: 32GFICONTESTPATTERN";
-  }
-  revision 2018-02-23 {
-    description
-      "6500 Release 12.25 DF
-       - Added typedef: OFF_ON_UNKNOWN
-         typedef adj_fiber
-           type enumeration
-           - Added enum: TEWAVULL
-           - Added enum: EX2000";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-       - Added typedef: RecircOper
-         typedef adj_type
-           type enumeration
-           - Added enum: UCS
-         typedef SSTfac
-           type enumeration
-           - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Removed typedef: ROUTINGRULE
-       - Removed typedef: TRUE_FALSE_UNKNOWN
-       - Removed typedef: TXRXTYPES
-       - Removed typedef: OFF_ON_UNKNOWN
-       - Removed typedef: DIRN
-       - Removed typedef: PG_PS
-       - Removed typedef: WTR_OPS
-       - Removed typedef: TDG
-       - Removed typedef: PG_RVRTV
-       - Removed typedef: SwitchCommandPG
-       - Removed typedef: TDG_OTM
-       - Added typedef: lasercentering
-       - Added typedef: txctrl
-       - Added typedef: TRUE_FALSE_UNKNOWN_defaultFALSE
-       - Added typedef: LOCN_WITH_DFLT
-       - Added typedef: ANCTRL
-       - Added typedef: LAN_NETDOMAIN
-       - Added typedef: REDISTRIBUT
-       - Added typedef: RDTYPE
-       - Added typedef: GWSTATUS
-       - Added typedef: SLDD_SST
-       - Added typedef: IPRTG_OWNER
-       - Added typedef: CCT_default2WAY
-       - Added typedef: CRS_RATE
-       - Added typedef: CCT_OTM2
-       - Added typedef: CCT_ODU
-       - Added typedef: CTPTYPE
-       - Added typedef: LED_STATES
-       - Added typedef: EnvAlm
-       - Added typedef: EXTCONTROL
-       - Added typedef: DSCM_Mods
-       - Added typedef: DSCM_Types
-       - Added typedef: SSTTAAINS
-       - Added typedef: SSTTAAINSMT
-       - Added typedef: Conditioning_T12
-       - Added typedef: Service
-       - Added typedef: SSBITMDE
-       - Added typedef: FEC
-       - Added typedef: BOOL_ON_OFF_defaultOFF
-       - Added typedef: RTRV_STSn_INCSGLBL_parm
-       - Added typedef: ODUTTI
-       - Added typedef: FTraceType
-       - Added typedef: ptpServiceType
-       - Added typedef: PtpRole
-       - Added typedef: TxMode
-       - Added typedef: ochenm
-       - Added typedef: ochTxWvlngthSpacing
-       - Added typedef: rotation
-       - Added typedef: ptpTransMode
-       - Added typedef: ptpModemClass
-       - Added typedef: ptpReachClass
-       - Added typedef: ptpLnkOptMode
-       - Added typedef: ptpReachType
-       - Added typedef: ptpLnkCustom1
-       - Added typedef: ptpLnkCustom2
-       - Added typedef: ptpLaserOffMode
-       - Added typedef: PtpMod
-       - Added typedef: StatsInfoDefYes
-       - Added typedef: DispScanInfo
-       - Added typedef: PtpRate
-       - Added typedef: ptpBaud
-       - Added typedef: ScanState
-       - Added typedef: OTU_FECFrmt
-       - Added typedef: TIMEN
-       - Added typedef: OtuRate
-       - Added typedef: EncrByte
-       - Added typedef: OtuActRate
-       - Added typedef: SttpMapping
-       - Added typedef: SttpRate
-       - Added typedef: STTPportmode
-       - Added typedef: EttpMapping_WLAI
-       - Added typedef: EttpCondType
-       - Added typedef: EthRate
-       - Added typedef: EttpMapping
-       - Added typedef: OduTtpRate
-       - Added typedef: OduCtpCondType
-       - Added typedef: rxtsMode
-       - Added typedef: clientTypeTtp
-       - Added typedef: baseHO
-       - Added typedef: TsProv
-       - Added typedef: flexType
-       - Added typedef: OduCtpRate
-       - Added typedef: clientTypeCtp
-       - Added typedef: mcpomode
-       - Added typedef: locctrlmode
-       - Added typedef: OTDRTRACESTATUS
-       - Added typedef: trace_type
-       - Added typedef: ctrltype
-       - Added typedef: BWPRF_CIR_EIR_UNITS
-       - Added typedef: BWPRF_POLICER
-       - Added typedef: CLASS_OF_SERVICE_DOMAIN
-       - Added typedef: CLASS_OF_SERVICE
-       - Added typedef: LCASAIDTYPE
-       - Added typedef: AD_RELIABILITY
-       - Added typedef: AD_MECHANISM
-       - Added typedef: EnumOSRPLINK_State
-       - Added typedef: todrprfen
-       - Added typedef: todrmultiday
-       - Added typedef: todrsunen
-       - Added typedef: todrmonen
-       - Added typedef: todrtueen
-       - Added typedef: todrweden
-       - Added typedef: todrthuen
-       - Added typedef: todrfrien
-       - Added typedef: todrsaten
-       - Added typedef: todrassign
-       - Added typedef: WLRULES
-       - Added typedef: ETH_OMTYPE
-       - Added typedef: LAG_OMTYPE
-       - Added typedef: COS_OMTYPE
-       - Added typedef: ETH100_OMTYPE
-       - Added typedef: ETHN_OMTYPE
-       - Added typedef: RPR_OMTYPE
-       - Added typedef: RLE_OMTYPE
-       - Added typedef: MEP_OMTYPE_RTRV
-       - Added typedef: MIP_OMTYPE_RTRV
-       - Added typedef: ETTP_OMTYPE
-       - Added typedef: DIRN_INPUT_PHT
-       - Added typedef: DIRN_RESP_PHT
-       - Added typedef: PORTMODE
-       - Added typedef: RAMAN_PM_MONTYPE
-       - Added typedef: TMPER_TH_PHT
-       - Added typedef: VOA_PM_MONTYPE_rtrv
-       - Added typedef: VOA_PM_MONTYPE_rtrv_resp
-       - Added typedef: VOA_PM_MONTYPE
-       - Added typedef: VOA_TH_MONTYPE_set
-       - Added typedef: VOA_TH_MONTYPE_resp
-       - Added typedef: ALL_MONTYPE
-       - Added typedef: PMAIDTYPE
-       - Added typedef: ALL_MONTYPE_resp
-       - Added typedef: ALMAIDTYPE
-       - Added typedef: ALL_TH_MONTYPE_resp
-       - Added typedef: OSC_MONTYPE_ALL
-       - Added typedef: DIRN_INPUT
-       - Added typedef: ETH_MONTYPE
-       - Added typedef: ETH100_MONTYPE
-       - Added typedef: FC_MONTYPE
-       - Added typedef: OSC_MONTYPE_resp_ALL
-       - Added typedef: DIRN_RESP
-       - Added typedef: ETH100_MONTYPE_resp
-       - Added typedef: ETH_MONTYPE_resp
-       - Added typedef: FC_MONTYPE_resp
-       - Added typedef: OSC_TH_MONTYPE
-       - Added typedef: ETH_SET_MONTYPE
-       - Added typedef: FC_TH_MONTYPE_resp
-       - Added typedef: FLEX_TH_MONTYPE_resp
-       - Added typedef: FC_TH_MONTYPE
-       - Added typedef: FLEX_TH_MONTYPE
-       - Added typedef: COS_MONTYPE
-       - Added typedef: CHMON_PM_MONTYPE_rtrv
-       - Added typedef: CHMON_PM_MONTYPE_rtrv_resp
-       - Added typedef: CHMON_MONTYPE
-       - Added typedef: CHMON_TH_MONTYPE_set
-       - Added typedef: AIDTYPE
-       - Added typedef: CHMON_TH_MONTYPE_resp
-       - Added typedef: OTDRCFG_PM_MONTYPE
-       - Added typedef: OTDRCFG_PM_MONTYPE_rtrv_resp
-       - Added typedef: OTDRCFG_TH_MONTYPE_set
-       - Added typedef: OTDRCFG_TH_MONTYPE_resp
-       - Added typedef: NMCMON_PM_MONTYPE
-       - Added typedef: NMCMON_PM_MONTYPE_resp
-       - Added typedef: NMCMON_TH_MONTYPE_set
-       - Added typedef: NMCMON_TH_MONTYPE_resp
-       - Added typedef: PTP_MONTYPE
-       - Added typedef: PTP_MONTYPE_resp
-       - Added typedef: PTP_TH_MONTYPE
-       - Added typedef: OTUTTP_MONTYPE
-       - Added typedef: OTUTTP_MONTYPE_resp
-       - Added typedef: OTUTTP_TH_MONTYPE
-       - Added typedef: STTP_MONTYPE
-       - Added typedef: STTP_MONTYPE_resp
-       - Added typedef: STTP_TH_MONTYPE
-       - Added typedef: ETTP_MONTYPE
-       - Added typedef: ETTP_MONTYPE_resp
-       - Added typedef: ETTP_TH_MONTYPE
-       - Added typedef: ODUTTP_MONTYPE
-       - Added typedef: ODUTTP_MONTYPE_resp
-       - Added typedef: ODU_TH_MONTYPE
-       - Added typedef: ODUTTP_TH_MONTYPE
-       - Added typedef: ODUCTP_MONTYPE
-       - Added typedef: ODUCTP_MONTYPE_resp
-       - Added typedef: ODUCTP_TH_MONTYPE
-       - Added typedef: ExResult
-       - Added typedef: ExInvl
-       - Added typedef: EqptProtScheme
-       - Added typedef: EqptProtPrio
-       - Added typedef: WTR_default_5MIN
-       - Added typedef: SWMODE
-       - Added typedef: SwitchReason_EQPT
-       - Added typedef: WTR_ETH_default_5MIN
-       - Added typedef: BOOL_Y_N_defaultN
-       - Added typedef: STDBYTX
-       - Added typedef: SWCR
-       - Added typedef: SwitchCommandOC
-       - Added typedef: SwitchStatusBLSR
-       - Added typedef: SwitchReason_OCn
-       - Added typedef: SwitchStatusRPR
-       - Added typedef: SwitchReasonRPR
-       - Added typedef: WTR_OTMn_default_5MIN
-       - Added typedef: TDG_OTM_default_0SEC
-       - Added typedef: TRG_OTM_default_0MSEC
-       - Added typedef: SwitchStatusOTMn
-       - Added typedef: SwitchReasonOTMn
-       - Added typedef: SwitchCommandOTMn
-       - Added typedef: SWMODE_LAG
-       - Added typedef: SwitchReasonLAG
-       - Added typedef: PG_PSDIRN_defaultUNI
-       - Added typedef: PG_RVRTV_defaultN
-       - Added typedef: PG_SIGTYPE
-       - Added typedef: PG_WTR_default_5MIN
-       - Added typedef: PG_PS_default1PLUS1
-       - Added typedef: PG_PS_RTRV
-       - Added typedef: PG_SST
-       - Added typedef: SwitchCommandPG_defaultMAN
-       - Added typedef: SwitchEndPG
-       - Added typedef: SwitchReasonPG
-       - Added typedef: WTR_OPS_default_5MIN
-       - Added typedef: TDG_default_0SEC
-       - Added typedef: ODU_SIGTYPE
-       - Added typedef: Direction
-       - Added typedef: DevType
-       - Added typedef: DfltSetting
-       - Added typedef: AlternateSecurityDomains
-       - Added typedef: BLOCKED_UNBLOCKED
-       - Added typedef: WTR_Sync
-       - Added typedef: ETHLoopBack
-       - Added typedef: FLEXLoopBack
-       - Added typedef: LoopBack_NGM
-       - Added typedef: LoopBack
-       - Added typedef: TACC_Mode_1
-       - Added typedef: TACC_Mode
-       - Added typedef: TSTSIG_Pattern
-       - Added typedef: EnumVCPTYPE
-         typedef adj_type
-           type enumeration
-           - Removed enum: GMD
-           - Added enum: OTDR
-         typedef adjTxModClass
-           type enumeration
-           - Added enum: 35GBAUD_100G
-           - Added enum: 35GBAUD_150G
-           - Added enum: 35GBAUD_200G
-           - Added enum: 35GBAUD_250G
-           - Added enum: 56GBAUD_100G
-           - Added enum: 56GBAUD_150G
-           - Added enum: 56GBAUD_200G
-           - Added enum: 56GBAUD_250G
-           - Added enum: 56GBAUD_300G
-           - Added enum: 56GBAUD_350G
-           - Added enum: 56GBAUD_400G
-           - Added enum: SLIC
-         typedef LPBKSTATUS
-           type enumeration
-           - Added enum: MANUAL-VALIDATION REQUIRED
-         typedef ALMPRVAIDTYPE
-           type enumeration
-           - Added enum: OTDRCFG
-         typedef refBW
-           type enumeration
-           - Removed enum: 12.5GHz
-           - Removed enum: 50GHzITU
-           - Added enum: N/A
-           - Added enum: 12.5GHZ
-           - Added enum: 50GHZITU
-           - Added enum: PORTBW
-         typedef PROTOCOL
-           type enumeration
-           - Added enum: OSC
-           - Added enum: CPRI6
-           - Added enum: CPRI8
-         typedef FLEX_MAPPING
-           type enumeration
-           - Added enum: TTTBMP
-           - Added enum: TCODEGFPTSTD
-         typedef NmccSst
-           type enumeration
-           - Added enum: FAF
-         typedef loctype
-           type enumeration
-           - Added enum: LOCNIL
-           - Added enum: LOCADD
-           - Added enum: LOCDROP
-           - Added enum: WSSMUX
-           - Added enum: WSSDEMUX
-         typedef OTSsubtype_RTRV
-           type enumeration
-           - Removed enum: DGE
-           - Removed enum: GOADM
-         typedef OTSsubtype_ENT
-           type enumeration
-           - Removed enum: GOADM
-         typedef txClass
-           type enumeration
-           - Added enum: 7
-           - Added enum: SLIC
-         typedef RAMAN_PM_MONTYPE_rtrv
-           type enumeration
-           - Removed enum: ORL-OTS
-           - Removed enum: ORLMIN-OTS
-           - Removed enum: ORLMAX-OTS
-           - Removed enum: ORLAVG-OTS
-         typedef RAMAN_PM_MONTYPE_rtrv_resp
-           type enumeration
-           - Removed enum: ORL-OTS
-           - Removed enum: ORLMIN-OTS
-           - Removed enum: ORLMAX-OTS
-           - Removed enum: ORLAVG-OTS
-         typedef RAMAN_TH_MONTYPE_set
-           type enumeration
-           - Removed enum: ORL-OTS
-           - Removed enum: OPROSC-OTS
-         typedef RAMAN_TH_MONTYPE_resp
-           type enumeration
-           - Removed enum: ORL-OTS
-           - Removed enum: OPROSC-OTS
-         typedef OPTMON_PM_MONTYPE_rtrv
-           type enumeration
-           - Removed enum: GRPOPT-OTS
-           - Removed enum: GRPOPTMIN-OTS
-           - Removed enum: GRPOPTMAX-OTS
-           - Removed enum: GRPOPTAVG-OTS
-         typedef OPTMON_PM_MONTYPE_rtrv_resp
-           type enumeration
-           - Removed enum: GRPOPT-OTS
-           - Removed enum: GRPOPTMIN-OTS
-           - Removed enum: GRPOPTMAX-OTS
-           - Removed enum: GRPOPTAVG-OTS
-         typedef OPTMON_TH_MONTYPE_set
-           type enumeration
-           - Removed enum: GRPOPT-OTS
-         typedef AMP_PM_MONTYPE
-           type enumeration
-           - Removed enum: ORL-OTS
-           - Removed enum: ORLMIN-OTS
-           - Removed enum: ORLMAX-OTS
-           - Removed enum: ORLAVG-OTS
-           - Removed enum: OPIN-OTS
-           - Removed enum: OPINMIN-OTS
-           - Removed enum: OPINMAX-OTS
-           - Removed enum: OPINAVG-OTS
-           - Removed enum: OPOUT-OTS
-           - Removed enum: OPOUTMIN-OTS
-           - Removed enum: OPOUTMAX-OTS
-           - Removed enum: OPOUTAVG-OTS
-           - Removed enum: GRPGAIN-OTS
-           - Removed enum: GRPGAINMIN-OTS
-           - Removed enum: GRPGAINMAX-OTS
-           - Removed enum: GRPGAINAVG-OTS
-           - Removed enum: GRPOPIN-OTS
-           - Removed enum: GRPOPINMIN-OTS
-           - Removed enum: GRPOPINMAX-OTS
-           - Removed enum: GRPOPINAVG-OTS
-           - Removed enum: GRPOPOUT-OTS
-           - Removed enum: GRPOPOUTMIN-OTS
-           - Removed enum: GRPOPOUTMAX-OTS
-           - Removed enum: GRPOPOUTAVG-OTS
-           - Removed enum: DROPGAIN-OTS
-           - Removed enum: DROPGAINMIN-OTS
-           - Removed enum: DROPGAINMAX-OTS
-           - Removed enum: DROPGAINAVG-OTS
-         typedef OCn_MONTYPE_ALL
-           type enumeration
-           - Added enum: OPRMIN-OCH
-           - Added enum: OPRMAX-OCH
-           - Added enum: OPRAVG-OCH
-           - Added enum: OPTAVG-OCH
-           - Added enum: OPTMIN-OCH
-           - Added enum: OPTMAX-OCH
-         typedef OTM_MONTYPE
-           type enumeration
-           - Added enum: UNCFECBLK-OTU
-         typedef OCn_MONTYPE_resp_ALL
-           type enumeration
-           - Added enum: OPRMIN-OCH
-           - Added enum: OPRMAX-OCH
-           - Added enum: OPRAVG-OCH
-           - Added enum: OPTAVG-OCH
-           - Added enum: OPTMIN-OCH
-           - Added enum: OPTMAX-OCH
-         typedef OCn_TH_MONTYPE
-           type enumeration
-           - Removed enum: SPANLOSS-OCH
-         typedef NMCMON_MONTYPE
-           type enumeration
-           - Removed enum: OPT-OCH
-         typedef TRAPIF
-           type enumeration
-           - Removed enum: COLAN-1
-         typedef provcurrentinfo
-           type enumeration
-           - Removed enum: 3x40
-           - Removed enum: 3x50
-           - Removed enum: 3x60
-           - Removed enum: 2x40
-           - Removed enum: 2x50
-           - Removed enum: 2x60
-           - Removed enum: 2x80
-           - Removed enum: 2x100
-           - Removed enum: 4x40
-           - Removed enum: 4x50
-           - Removed enum: 4x60
-           - Removed enum: 2x120
-           - Removed enum: 3x80
-           - Removed enum: 3x100
-           - Removed enum: 3x120
-           - Removed enum: 6x40
-           - Removed enum: 6x50
-           - Removed enum: 6x60
-           - Added enum: 3X40
-           - Added enum: 3X50
-           - Added enum: 3X60
-           - Added enum: 2X40
-           - Added enum: 2X50
-           - Added enum: 2X60
-           - Added enum: 2X80
-           - Added enum: 2X100
-           - Added enum: 4X40
-           - Added enum: 4X50
-           - Added enum: 4X60
-           - Added enum: 2X120
-           - Added enum: 3X80
-           - Added enum: 3X100
-           - Added enum: 3X120
-           - Added enum: 6X40
-           - Added enum: 6X50
-           - Added enum: 6X60
-           - Added enum: 3X125
-           - Added enum: 3X150
-           - Added enum: 3X160
-           - Added enum: 6X70
-           - Added enum: 6X80";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added typedef: BOOL_YES_NO_defaultNO
-       - Added typedef: OFF_ON_UNKNOWN
-       - Added typedef: COMPLETE_INCOMPLETE
-       - Added typedef: refBW
-       - Added typedef: chcMode
-       - Added typedef: NmccPst
-       - Added typedef: NmccSst
-       - Added typedef: loctype
-       - Added typedef: LocPst
-       - Added typedef: LocSst
-       - Added typedef: txrxmodclass
-       - Added typedef: bwthrmode
-       - Added typedef: EnumRVRTT
-       - Added typedef: PSTfac_NOANR
-       - Added typedef: EnumCostCriteria
-       - Added typedef: EnumDTLEXCL_SNC
-       - Added typedef: EnumENDPTSIZE_SNC
-       - Added typedef: EnumPRTT_SNC
-       - Added typedef: EnumRMTEPTYPE_SNC
-       - Added typedef: osrp_rmtttpmux
-       - Added typedef: EnumRMTPATHPROTECTION
-       - Added typedef: BOOL_YES_NO_defaultYES
-       - Added typedef: EnumSNCTYPE
-       - Added typedef: EnumRMTINTEROP
-       - Added typedef: EnumCostCriteriaSetting
-       - Added typedef: EnumHPPREEMPT
-       - Added typedef: EnumRTEOPR
-       - Added typedef: EnumPRIORITY
-       - Added typedef: rvrtState
-       - Added typedef: divtype
-       - Added typedef: EnumDTLEXCL_SNCG
-       - Added typedef: EnumPRTT_SNCG
-       - Added typedef: PST_SNCG
-       - Added typedef: EnumDTLEXCL_CRSNC
-       - Added typedef: EnumPRTT_CRSNC
-       - Added typedef: EnumENDPTSIZE_CRSNC
-       - Added typedef: EnumRMTEPTYPE_CRSNC
-       - Added typedef: controlMode
-       - Added typedef: controlCpbl
-       - Added typedef: txClass
-       - Added typedef: RAMAN_PM_MONTYPE_rtrv
-       - Added typedef: RAMAN_PM_MONTYPE_rtrv_resp
-       - Added typedef: RAMAN_TH_MONTYPE_set
-       - Added typedef: RAMAN_TH_MONTYPE_resp
-       - Added typedef: SDMON_MONTYPE
-       - Added typedef: NMCMON_MONTYPE
-         typedef adj_rate
-           type enumeration
-           - Added enum: 250.0G
-           - Added enum: 300.0G
-           - Added enum: 350.0G
-           - Added enum: 400.0G
-         typedef LPBKSTATUS
-           type enumeration
-           - Added enum: FAIL-CMDCMNINHFL
-           - Added enum: FAIL-CMDOPMHFL
-         typedef TXRXTYPES
-           type enumeration
-           - Added enum: WL435G100GCLS
-           - Added enum: WL435G150GCLS
-           - Added enum: WL435G200GCLS
-           - Added enum: WL435G250GCLS
-           - Added enum: WL456G100GCLS
-           - Added enum: WL456G150GCLS
-           - Added enum: WL456G200GCLS
-           - Added enum: WL456G250GCLS
-           - Added enum: WL456G300GCLS
-           - Added enum: WL456G350GCLS
-           - Added enum: WL456G400GCLS
-           - Added enum: WL435G100GCS
-           - Added enum: WL435G150GCS
-           - Added enum: WL435G200GCS
-           - Added enum: WL435G250GCS
-           - Added enum: WL456G100GCS
-           - Added enum: WL456G150GCS
-           - Added enum: WL456G200GCS
-           - Added enum: WL456G250GCS
-           - Added enum: WL456G300GCS
-           - Added enum: WL456G350GCS
-           - Added enum: WL456G400GCS
-         typedef ALMPRVAIDTYPE
-           type enumeration
-           - Added enum: NMCC
-           - Added enum: SNCG";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Removed typedef: ALMAIDTYPE
-       - Removed typedef: CIRCUITINTERFACE
-       - Removed typedef: fixcfgtype
-       - Removed typedef: OTSsubtype
-       - Removed typedef: SSTfac_bits
-       - Removed typedef: SSTAINSMT_bits
-       - Removed typedef: BOOL_TRUE_FALSE_bits
-       - Removed typedef: OPTMON_PM_MONTYPE_rtrv_bits
-       - Removed typedef: TMPER_ALL_bits
-       - Removed typedef: INDEX_bits
-       - Removed typedef: BOOL_Y_N_bits
-       - Removed typedef: RTRVPMProfile_bits
-       - Removed typedef: AMP_PM_MONTYPE_rtrv_bits
-       - Removed typedef: OCn_MONTYPE_ALL_bits
-       - Removed typedef: OCn_TH_MONTYPE_bits
-       - Removed typedef: TMPR_bits
-       - Removed typedef: PathRDIAISInsert_bits
-       - Removed typedef: ALARMINFO_bits
-       - Added typedef: SSTfac
-       - Added typedef: CCT_CRSODU
-       - Added typedef: SSTAINSMT
-       - Added typedef: PDHTYPE_LIST
-       - Added typedef: Conditioning
-       - Added typedef: MTU
-       - Added typedef: FLOWCTRL
-       - Added typedef: SSMTRANSMIT
-       - Added typedef: spliMgmt
-       - Added typedef: spliManaged
-       - Added typedef: PROTOCOL
-       - Added typedef: FLEX_MAPPING
-       - Added typedef: tfMode
-       - Added typedef: OTM_CONDTYPE
-       - Added typedef: optimizeMode
-       - Added typedef: ochCarrierCenteringMode
-       - Added typedef: ccda
-       - Added typedef: SecureOH
-       - Added typedef: txb
-       - Added typedef: StatsInfoDefNo
-       - Added typedef: otntfMode
-       - Added typedef: Owner
-       - Added typedef: SSTODU
-       - Added typedef: OTSsubtype_RTRV
-       - Added typedef: OTScfgtype
-       - Added typedef: OTSsubtype_ENT
-       - Added typedef: FLEX_OMTYPE
-       - Added typedef: WAN_OMTYPE
-       - Added typedef: OMTYPE
-       - Added typedef: OPTMON_PM_MONTYPE_rtrv
-       - Added typedef: AMP_PM_MONTYPE_rtrv
-       - Added typedef: OCn_MONTYPE_ALL
-       - Added typedef: OTM2_MONTYPE
-       - Added typedef: OTM3_MONTYPE
-       - Added typedef: OTM_MONTYPE
-       - Added typedef: ETH10G_MONTYPE
-       - Added typedef: ETHN_MONTYPE
-       - Added typedef: WAN_MONTYPE
-       - Added typedef: OTM2_MONTYPE_resp
-       - Added typedef: OTM3_MONTYPE_resp
-       - Added typedef: OTM_MONTYPE_resp
-       - Added typedef: ETH10G_MONTYPE_resp
-       - Added typedef: ETHN_MONTYPE_resp
-       - Added typedef: FLEX_MONTYPE
-       - Added typedef: FLEX_MONTYPE_resp
-       - Added typedef: WAN_MONTYPE_resp
-       - Added typedef: OTM2_TH_MONTYPE_resp
-       - Added typedef: OTM3_TH_MONTYPE_resp
-       - Added typedef: OTM_TH_MONTYPE_resp
-       - Added typedef: ETH10G_TH_MONTYPE_resp
-       - Added typedef: ETHN_SET_MONTYPE
-       - Added typedef: TMPR
-       - Added typedef: OTM2_TH_MONTYPE
-       - Added typedef: OTM3_SET_MONTYPE
-       - Added typedef: OTM_SET_MONTYPE
-       - Added typedef: ETH10G_TH_MONTYPE
-       - Added typedef: WAN_SET_MONTYPE
-       - Added typedef: ODU_MONTYPE
-       - Added typedef: ODU_MONTYPE_resp
-       - Added typedef: TCM_MONTYPE
-       - Added typedef: TCM_MONTYPE_resp
-       - Added typedef: TCM_TH_MONTYPE
-       - Added typedef: PathRDIAISInsert
-       - Added typedef: TDG_OTM
-       - Added typedef: ALARMINFO
-         typedef addr_form
-           type enumeration
-           - Added enum: TID-SH-SL-SBSL-PRT-SBPRT
-           - Added enum: NODENAME-SL-PRT
-           - Added enum: SHNAME-SL-PRT
-         typedef adj_type
-           type enumeration
-           - Added enum: AMP
-         typedef AD_LAYER
-           type enumeration
-           - Added enum: L2MON
-         typedef TXRXTYPES
-           type enumeration
-           - Removed enum: WL3EMDMQPSKCNTLS6A
-           - Removed enum: OMEEDC40GOCLDEPMD
-           - Removed enum: OMEEDC40GOCLD
-           - Removed enum: OMEEDC40GOCLDR
-           - Removed enum: OMEEDC40GOCLDM
-           - Removed enum: WL3NMDM4ASKCLD1
-           - Removed enum: WL3NMDM4ASKCLD2
-           - Removed enum: WL3NMDM4ASKCLS1
-           - Removed enum: WL3NMDM4ASKCLS2
-           - Removed enum: WL3NMDM4ASKCNTLS1
-           - Removed enum: WL3NMDM4ASKCNTLS2
-           - Removed enum: WL3NMDMQPSKCLD3
-           - Removed enum: WL3NMDMQPSKCLS3
-           - Removed enum: WL3NMDMQPSKCNTLS3
-           - Removed enum: OMEEDC40GOCLDSUB
-           - Removed enum: OMEEDC40GOCLDHSRX
-           - Removed enum: OMEEDC100GOCLD
-           - Removed enum: OMEEDC100GOCLDEPMD
-           - Removed enum: OMEEDC100GOCLDR
-           - Removed enum: OMEEDC100GOCLDM
-           - Removed enum: OMEEDC100GOCLDSUB
-           - Removed enum: OMEEDC40GOCLDULH
-           - Removed enum: OMEEDC40GOCLDULHSUB
-           - Removed enum: EDC40GWVSELOCLDEPMDCLD
-           - Removed enum: EDC40GWVSELOCLDCLD
-           - Removed enum: EDC40GWVSELOCLDRCLD
-           - Removed enum: EDC40GWVSELOCLDMCLD
-           - Removed enum: EDC40GWVSELOCLDSUBCLD
-           - Removed enum: WL3EMDMQPSKCLD6A
-           - Removed enum: WL3EMDMQPSKCLS6A
-           - Removed enum: WL3EMDMBPSKCLD6
-           - Removed enum: WL3EMDMBPSKCLS6
-           - Removed enum: WL3EMDM16QAMCLD6
-           - Removed enum: WL3EMDM16QAMCLS6
-           - Removed enum: EDC40GWVSELOCLDEPMDCLS
-           - Removed enum: EDC40GWVSELOCLDCLS
-           - Removed enum: EDC40GWVSELOCLDRCLS
-           - Removed enum: EDC40GWVSELOCLDMCLS
-           - Removed enum: EDC40GWVSELOCLDSUBCLS
-           - Removed enum: EDC100GWL3OCLDLHCLD
-           - Removed enum: EDC100GWL3OCLDRCLD
-           - Removed enum: EDC100GWL3OCLDMCLD
-           - Removed enum: EDC100GWL3OCLDSUBCLD
-           - Removed enum: EDC100GWL3OCLDPCLD
-           - Removed enum: EDC100GWL3OCLDRNGCLD
-           - Removed enum: EDC100GWL3OCLDLHCLS
-           - Removed enum: EDC100GWL3OCLDRCLS
-           - Removed enum: EDC100GWL3OCLDMCLS
-           - Removed enum: EDC100GWL3OCLDSUBCLS
-           - Removed enum: EDC100GWL3OCLDPCLS
-           - Removed enum: EDC100GWL3OCLDRNGCLS
-           - Removed enum: EDC100GOCLDER
-           - Removed enum: EDC100GOCLDEPMDER
-           - Removed enum: EDC100GOCLDMER
-           - Removed enum: EDC100GOCLDRER
-           - Removed enum: EDC100GOCLDSUBER
-           - Removed enum: EDC100GWL3OCLDECLD
-           - Removed enum: EDC100GWL3OCLDECLS
-           - Removed enum: FLEX2WL3OCLDLHQPSKCLD
-           - Removed enum: FLEX2WL3OCLDLHBPSKCLD
-           - Removed enum: FLEX2WL3OCLDLHQPSKCLS
-           - Removed enum: FLEX2WL3OCLDLHBPSKCLS
-           - Removed enum: FLEX2WL3OCLDPRMQPSKCLD
-           - Removed enum: FLEX2WL3OCLDPRMBPSKCLD
-           - Removed enum: FLEX2WL3OCLDPRMQPSKCLS
-           - Removed enum: FLEX2WL3OCLDPRMBPSKCLS
-           - Removed enum: FLEX2WL3OCLDSUBQPSKCLD
-           - Removed enum: FLEX2WL3OCLDSUBBPSKCLD
-           - Removed enum: FLEX2WL3OCLDSUBQPSKCLS
-           - Removed enum: FLEX2WL3OCLDSUBBPSKCLS
-           - Removed enum: LBAND10G
-           - Removed enum: WL3EMDMQPSKCLD1A
-           - Removed enum: WL3EMDMQPSKCLD2A
-           - Removed enum: WL3EMDMQPSKCLD3A
-           - Removed enum: WL3EMDMQPSKCLD4A
-           - Removed enum: WL3EMDMQPSKCLD5A
-           - Removed enum: WL3EMDMQPSKCLS1A
-           - Removed enum: WL3EMDMQPSKCLS2A
-           - Removed enum: WL3EMDMQPSKCLS3A
-           - Removed enum: WL3EMDMQPSKCLS4A
-           - Removed enum: WL3EMDMQPSKCLS5A
-           - Removed enum: WL3EMDMBPSKCLD1
-           - Removed enum: WL3EMDMBPSKCLD2
-           - Removed enum: WL3EMDMQPSKCLD8A
-           - Removed enum: WL3EMDMBPSKCLD8
-           - Removed enum: WL3EMDMBPSKCLD5
-           - Removed enum: WL3EMDMBPSKCLS1
-           - Removed enum: WL3EMDMBPSKCLS2
-           - Removed enum: WL3EMDMQPSKCLS8A
-           - Removed enum: WL3EMDMBPSKCLS8
-           - Removed enum: WL3EMDMBPSKCLS5
-           - Removed enum: WL3EMDM16QAMCLD1
-           - Removed enum: WL3EMDM16QAMCLD2
-           - Removed enum: WL3EMDM16QAMCLD3
-           - Removed enum: WL3EMDM16QAMCLD4
-           - Removed enum: WL3EMDM16QAMCLD5
-           - Removed enum: WL3EMDM16QAMCLS1
-           - Removed enum: WL3EMDM16QAMCLS2
-           - Removed enum: WL3EMDM16QAMCLS3
-           - Removed enum: WL3EMDM16QAMCLS4
-           - Removed enum: WL3EMDM16QAMCLS5
-           - Removed enum: WL3EMDMQPSKCLD1B
-           - Removed enum: WL3EMDMQPSKCLD2B
-           - Removed enum: WL3EMDMQPSKCLD3B
-           - Removed enum: WL3EMDMQPSKCLD4B
-           - Removed enum: WL3EMDMQPSKCLD5B
-           - Removed enum: WL3EMDMQPSKCLS1B
-           - Removed enum: WL3EMDMQPSKCLS2B
-           - Removed enum: WL3EMDMQPSKCLS3B
-           - Removed enum: WL3EMDMQPSKCLS4B
-           - Removed enum: WL3EMDMQPSKCLS5B
-           - Removed enum: EDC40GWVSELMDMCNTLS1
-           - Removed enum: EDC40GWVSELMDMCNTLS2
-           - Removed enum: EDC40GWVSELMDMCNTLS3
-           - Removed enum: EDC40GWVSELMDMCNTLS4
-           - Removed enum: EDC40GWVSELMDMCNTLS5
-           - Removed enum: EDC100GWL3MDMCNTLS1
-           - Removed enum: EDC100GWL3MDMCNTLS2
-           - Removed enum: EDC100GWL3MDMCNTLS3
-           - Removed enum: EDC100GWL3MDMCNTLS4
-           - Removed enum: EDC100GWL3MDMCNTLS5
-           - Removed enum: EDC100GWL3MDMCNTLS6
-           - Removed enum: EDC100GWL3MDMCNTLS7
-           - Removed enum: FLEX2WL3MDMQPSKCNTLS1
-           - Removed enum: FLEX2WL3MDMQPSKCNTLS2
-           - Removed enum: FLEX2WL3MDMQPSKCNTLS3
-           - Removed enum: WL3EMDMQPSKCNTLS8A
-           - Removed enum: WL3EMDMQPSKCNTLS1A
-           - Removed enum: WL3EMDMQPSKCNTLS2A
-           - Removed enum: WL3EMDMQPSKCNTLS3A
-           - Removed enum: WL3EMDMQPSKCNTLS4A
-           - Removed enum: WL3EMDMQPSKCNTLS5A
-           - Removed enum: WL3EMDMQPSKCNTLS1B
-           - Removed enum: WL3EMDMQPSKCNTLS2B
-           - Removed enum: WL3EMDMQPSKCNTLS3B
-           - Removed enum: WL3EMDMQPSKCNTLS4B
-           - Removed enum: WL3EMDMQPSKCNTLS5B
-           - Removed enum: WL3EMDM16QAMCNTLS1
-           - Removed enum: WL3EMDM16QAMCNTLS2
-           - Removed enum: WL3EMDM16QAMCNTLS3
-           - Removed enum: WL3EMDM16QAMCNTLS4
-           - Removed enum: WL3EMDM16QAMCNTLS5
-           - Removed enum: WL3EMDM16QAMCNTLS6
-           - Removed enum: EDC100GWL3MDMCS1
-           - Removed enum: EDC100GWL3MDMCS2
-           - Removed enum: EDC100GWL3MDMCS3
-           - Removed enum: EDC100GWL3MDMCS4
-           - Removed enum: EDC100GWL3MDMCS5
-           - Removed enum: EDC100GWL3MDMCS6
-           - Removed enum: EDC100GWL3MDMCS7
-           - Removed enum: WL3EMDMQPSKCS7
-           - Removed enum: WL3EMDMQPSKCS1
-           - Removed enum: WL3EMDMQPSKCS2
-           - Removed enum: WL3EMDMQPSKCS3
-           - Removed enum: WL3EMDMQPSKCS4
-           - Removed enum: WL3EMDMQPSKCS5
-           - Removed enum: WL3EMDMQPSKCS6
-           - Removed enum: WL3EMDMBPSKCS1
-           - Removed enum: WL3EMDMBPSKCS2
-           - Removed enum: WL3EMDMBPSKCS5
-           - Removed enum: WL3EMDMBPSKCS6
-           - Removed enum: WL3EMDM16QAMCS1
-           - Removed enum: WL3EMDM16QAMCS2
-           - Removed enum: WL3EMDM16QAMCS3
-           - Removed enum: WL3EMDM16QAMCS4
-           - Removed enum: WL3EMDM16QAMCS5
-           - Removed enum: WL3EMDM16QAMCS6
-           - Removed enum: WL3EMDMQPSKCS1B
-           - Removed enum: WL3EMDMQPSKCS2B
-           - Removed enum: WL3EMDMQPSKCS3B
-           - Removed enum: WL3EMDMQPSKCS4B
-           - Removed enum: WL3EMDMQPSKCS5B
-           - Removed enum: WL3NMDM4ASKCS1
-           - Removed enum: WL3NMDM4ASKCS2
-           - Removed enum: WL3NMDMQPSKCS3
-           - Removed enum: WL3EMDMQPSKCLD7A
-           - Removed enum: WL3EMDMQPSKCLS7A
-           - Removed enum: WL3EMDMQPSKCNTLS7A
-           - Removed enum: WL3EMDMQPSKCLD9A
-           - Removed enum: WL3EMDMQPSKCLD10A
-           - Removed enum: WL3EMDMQPSKCLD11A
-           - Removed enum: WL3EMDMQPSKCLD12A
-           - Removed enum: WL3EMDMQPSKCLS9A
-           - Removed enum: WL3EMDMQPSKCLS10A
-           - Removed enum: WL3EMDMQPSKCLS11A
-           - Removed enum: WL3EMDMQPSKCLS12A
-           - Removed enum: WL3EMDMQPSKCNTLS9A
-           - Removed enum: WL3EMDMQPSKCNTLS10A
-           - Removed enum: WL3EMDMQPSKCNTLS11A
-           - Removed enum: WL3EMDMQPSKCNTLS12A
-           - Removed enum: WL3EMDMQPSKCS9
-           - Removed enum: WL3EMDMQPSKCS10
-           - Removed enum: WL3EMDMQPSKCS11
-           - Removed enum: WL3EMDMQPSKCS12
-           - Added enum: FOREIGNCOHERENT
-           - Added enum: SFPP_1609201900
-           - Added enum: XFPDWDM_NTK589_LBAND
-           - Added enum: EDC40GULHMDM
-           - Added enum: EDC40GULHMDMSUB
-           - Added enum: EDC100GWL2MDM
-           - Added enum: EDC100GWL2MDMER
-           - Added enum: FLEX2WL3MDMQPSKCLD
-           - Added enum: FLEX2WL3MDMBPSKCLD
-           - Added enum: FLEX2WL3MDMQPSKCLS
-           - Added enum: FLEX2WL3MDMBPSKCLS
-           - Added enum: FLEX2WL3MDMQPSKCNTLS
-           - Added enum: WL3EMDMQPSKCLD
-           - Added enum: WL3EMDMQPSKCLS
-           - Added enum: WL3EMDMQPSKCNTLS
-           - Added enum: WL3EMDMQPSKCS
-           - Added enum: WL3EMDMBPSKCLD
-           - Added enum: WL3EMDMBPSKCLS
-           - Added enum: WL3EMDMBPSKCS
-           - Added enum: WL3EMDM16QAMCLD
-           - Added enum: WL3EMDM16QAMCLS
-           - Added enum: WL3EMDM16QAMCNTLS
-           - Added enum: WL3EMDM16QAMCS
-           - Added enum: WL3NMDM4ASKCLD
-           - Added enum: WL3NMDM4ASKCLS
-           - Added enum: WL3NMDM4ASKCNTLS
-           - Added enum: WL3NMDMQPSKCLD
-           - Added enum: WL3NMDMQPSKCLS
-           - Added enum: WL3NMDMQPSKCNTLS
-           - Added enum: WL3NMDM4ASKCS
-           - Added enum: WL3NMDMQPSKCS
-           - Added enum: WL3NMDMAMP4ASKCLD
-           - Added enum: WL3NMDMAMP4ASKCLS
-           - Added enum: WL3NMDMAMP4ASKCNTLS
-           - Added enum: WL3NMDMAMP4ASKCS
-           - Added enum: UNDEFINED
-           - Added enum: WL3EMDM8QAMCLD
-           - Added enum: WL3EMDM8QAMCLS
-           - Added enum: WL3EMDM8QAMCNTLS
-           - Added enum: WL3EMDM8QAMCS
-           - Added enum: WL3EMDMUNAMPQPSKCLD
-           - Added enum: WL3EMDMUNAMPQPSKCLS
-           - Added enum: WL3EMDMUNAMPQPSKCNTLS
-           - Added enum: WL3EMDMUNAMPQPSKCS
-           - Added enum: WL3EMDMUNAMP8QAMCLD
-           - Added enum: WL3EMDMUNAMP8QAMCLS
-           - Added enum: WL3EMDMUNAMP8QAMCNTLS
-           - Added enum: WL3EMDMUNAMP8QAMCS
-           - Added enum: WLCFP2ACOAQPSKCLD
-           - Added enum: WLCFP2ACOAQPSKCLS
-           - Added enum: WLCFP2ACOAQPSKCNTLS
-           - Added enum: WLCFP2ACOBQPSKCLD
-           - Added enum: WLCFP2ACOBQPSKCLS
-           - Added enum: WLCFP2ACOBQPSKCNTLS
-           - Added enum: WLCFP2ACOCQPSKCLD
-           - Added enum: WLCFP2ACOCQPSKCLS
-           - Added enum: WLCFP2ACOCQPSKCNTLS
-         typedef adj_rate
-           type enumeration
-           - Added enum: 150.0G
-         typedef adjTxModClass
-           type enumeration
-           - Added enum: 100GWL38QAM
-         typedef LPBKSTATUS
-           type enumeration
-           - Removed enum: FAIL_RXHFL
-           - Removed enum: FAIL_TTIMISMATCH
-           - Removed enum: FAIL_TTIFAIL
-           - Added enum: FAIL-CHOUTFL EXCEEDS 1 dB
-           - Added enum: FAIL-TTI Mismatch
-           - Added enum: FAIL-TTI Fail
-           - Added enum: FAIL-TXTUNING
-           - Added enum: FAIL-CHINLOS
-           - Added enum: FAIL-CHINFL EXCEEDS 1 dB
-           - Added enum: FAIL-CHOUTLOS
-           - Added enum: FAIL-NOTREADY
-           - Added enum: FAIL-RXLOS
-           - Added enum: FAIL-RXLOF
-           - Added enum: FAIL-RXLOCH
-           - Added enum: FAIL-RXLOC
-           - Added enum: FAIL-RXLOM
-           - Added enum: FAIL-RXSD
-           - Added enum: FAIL-PREFEC SF
-           - Added enum: FAIL-CMDCMNOUTHFL
-           - Added enum: FAIL-CMDCMNOUTLOS
-           - Added enum: FAIL-CMDCMNINLOS
-         typedef ALMPRVAIDTYPE
-           type enumeration
-           - Added enum: ALL
-         typedef EQPTPROFILE1
-           type enumeration
-           - Added enum: 4ASK100G
-           - Added enum: 2X8QAM300G
-         typedef OPTMON_PM_MONTYPE
-           type enumeration
-           - Added enum: OPR-OTS
-           - Added enum: OPRMIN-OTS
-           - Added enum: OPRMAX-OTS
-           - Added enum: OPRAVG-OTS
-           - Added enum: OPT-OTS
-           - Added enum: OPTMIN-OTS
-           - Added enum: OPTMAX-OTS
-           - Added enum: OPTAVG-OTS
-           - Added enum: PSD-OTS
-           - Added enum: PSCW-OTS
-           - Added enum: PSCP-OTS
-         typedef AMP_PM_MONTYPE
-           type enumeration
-           - Added enum: ORL-OTS
-           - Added enum: ORLMIN-OTS
-           - Added enum: ORLMAX-OTS
-           - Added enum: ORLAVG-OTS
-           - Added enum: OPIN-OTS
-           - Added enum: OPINMIN-OTS
-           - Added enum: OPINMAX-OTS
-           - Added enum: OPINAVG-OTS
-           - Added enum: OPOUT-OTS
-           - Added enum: OPOUTMIN-OTS
-           - Added enum: OPOUTMAX-OTS
-           - Added enum: OPOUTAVG-OTS
-           - Added enum: GRPGAIN-OTS
-           - Added enum: GRPGAINMIN-OTS
-           - Added enum: GRPGAINMAX-OTS
-           - Added enum: GRPGAINAVG-OTS
-           - Added enum: GRPOPIN-OTS
-           - Added enum: GRPOPINMIN-OTS
-           - Added enum: GRPOPINMAX-OTS
-           - Added enum: GRPOPINAVG-OTS
-           - Added enum: GRPOPOUT-OTS
-           - Added enum: GRPOPOUTMIN-OTS
-           - Added enum: GRPOPOUTMAX-OTS
-           - Added enum: GRPOPOUTAVG-OTS
-           - Added enum: DROPGAIN-OTS
-           - Added enum: DROPGAINMIN-OTS
-           - Added enum: DROPGAINMAX-OTS
-           - Added enum: DROPGAINAVG-OTS
-         typedef SwitchStatusPG
-           type enumeration
-           - Added enum: TTOPS
-         typedef SwitchReasonOPS
-           type enumeration
-           - Added enum: TRFLT
-         typedef provcurrentinfo
-           type enumeration
-           - Added enum: 2x120
-           - Added enum: 3x80
-           - Added enum: 3x100
-           - Added enum: 3x120
-           - Added enum: 6x40
-           - Added enum: 6x50
-           - Added enum: 6x60";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added typedef: addr_form
-       - Added typedef: adj_type
-       - Added typedef: AD_LAYER
-       - Added typedef: PSTfac_RTRV
-       - Added typedef: adj_fiber
-       - Added typedef: adj_SpanLossSource
-       - Added typedef: MX_CONTROL_MODE
-       - Added typedef: TXRXTYPES
-       - Added typedef: adj_rate
-       - Added typedef: BOOL_TRUE_FALSE
-       - Added typedef: adjTxModClass
-       - Added typedef: autoTxRxProv
-       - Added typedef: LPBKSTATUS
-       - Added typedef: ROUTINGRULE
-       - Added typedef: CHSTATUSVALUES
-       - Added typedef: TRUE_FALSE_UNKNOWN
-       - Added typedef: linetype
-       - Added typedef: ALMPRVAIDTYPE
-       - Added typedef: AlmProfile
-       - Added typedef: BOOL_Y_N
-       - Added typedef: AlrmStat
-       - Added typedef: NTFCNCDE_NAP
-       - Added typedef: EdAlmProfile
-       - Added typedef: EdAlrmStat
-       - Added typedef: NTFCNCDE_NA
-       - Added typedef: NTFCNCDE_ALL
-       - Added typedef: ALMAIDTYPE
-       - Added typedef: NTFCNCDE
-       - Added typedef: SRVEFF
-       - Added typedef: LOCN
-       - Added typedef: AlmDIRN
-       - Added typedef: MODE
-       - Added typedef: SRVEFF_NAP
-       - Added typedef: BOOL_YES_NO
-       - Added typedef: CARRIER
-       - Added typedef: NETDOMAIN
-       - Added typedef: CIRCUITINTERFACE
-       - Added typedef: CCT
-       - Added typedef: MAPMODE
-       - Added typedef: WANCONFIG
-       - Added typedef: IOCARRIER
-       - Added typedef: EQPTPROFILE1
-       - Added typedef: EQPTPROFILE2
-       - Added typedef: SSTAINS
-       - Added typedef: fixcfgtype
-       - Added typedef: DB_SYNC_STATE
-       - Added typedef: AMPMODE
-       - Added typedef: GAINMODE
-       - Added typedef: AMPPKMODE
-       - Added typedef: FORCEDSHUTOFF
-       - Added typedef: BOOL_TRUE_defaultFALSE
-       - Added typedef: PSTfac
-       - Added typedef: RMVSSTMT
-       - Added typedef: OTSsubtype
-       - Added typedef: DISABLE_ENABLE
-       - Added typedef: slotcfgmode
-       - Added typedef: MONLEV
-       - Added typedef: LOCN_ALL
-       - Added typedef: DIRN
-       - Added typedef: TREXFRMT
-       - Added typedef: OPTMON_PM_MONTYPE_rtrv_resp
-       - Added typedef: VLDTY
-       - Added typedef: TMPER_ALL
-       - Added typedef: INDEX
-       - Added typedef: OPTMON_PM_MONTYPE
-       - Added typedef: OPTMON_TH_MONTYPE_set
-       - Added typedef: PMProfile
-       - Added typedef: EdPMProfile
-       - Added typedef: OPTMON_TH_MONTYPE_resp
-       - Added typedef: TMPER_MIN
-       - Added typedef: RTRVPMProfile
-       - Added typedef: AMP_PM_MONTYPE_rtrv_resp
-       - Added typedef: AMP_PM_MONTYPE
-       - Added typedef: AMP_TH_MONTYPE_set
-       - Added typedef: AMP_TH_MONTYPE_resp
-       - Added typedef: OCn_MONTYPE_resp_ALL
-       - Added typedef: TMPER
-       - Added typedef: OCn_TH_MONTYPE
-       - Added typedef: PG_PS
-       - Added typedef: WTR_OPS
-       - Added typedef: TDG
-       - Added typedef: PG_RVRTV
-       - Added typedef: ProtStandardOTMn
-       - Added typedef: SwitchCommandPG
-       - Added typedef: SwitchStatusPG
-       - Added typedef: SwitchReasonOPS
-       - Added typedef: TRAPIF
-       - Added typedef: UPC
-       - Added typedef: BOOL_ON_OFF
-       - Added typedef: ENABLE_DISABLE
-       - Added typedef: CSA_QUERYMODE
-       - Added typedef: ENABLED_DISABLED
-       - Added typedef: intersectingSlotseqStatus
-       - Added typedef: VALIDATION_OFF_ON
-       - Added typedef: provcurrentinfo
-       - Added typedef: Laserofffarendfail
-       - Added typedef: OSCMODE
-       - Added typedef: ALMCORR
-       - Added typedef: ENABLED_defaultDISABLED
-       - Added typedef: ConditioningOverride
-       - Added typedef: EnumRVRTTYPE
-       - Added typedef: SSTfac_bits
-       - Added typedef: SSTAINSMT_bits
-       - Added typedef: BOOL_TRUE_FALSE_bits
-       - Added typedef: OPTMON_PM_MONTYPE_rtrv_bits
-       - Added typedef: TMPER_ALL_bits
-       - Added typedef: INDEX_bits
-       - Added typedef: BOOL_Y_N_bits
-       - Added typedef: RTRVPMProfile_bits
-       - Added typedef: AMP_PM_MONTYPE_rtrv_bits
-       - Added typedef: OCn_MONTYPE_ALL_bits
-       - Added typedef: OCn_TH_MONTYPE_bits
-       - Added typedef: TMPR_bits
-       - Added typedef: PathRDIAISInsert_bits
-       - Added typedef: ALARMINFO_bits";
-  }
-
-  typedef addr_form {
-    type enumeration {
-      enum "NULL";
-      enum "TID-PRT" {
-        description
-          "TID Port";
-      }
-      enum "TID-SL-PRT" {
-        description
-          "TID Slot Port";
-      }
-      enum "TID-SL-SBSL-PRT" {
-        description
-          "TID Slot SubSlot Port";
-      }
-      enum "TID-SH-PRT" {
-        description
-          "TID Shelf Port";
-      }
-      enum "TID-SH-SBSH-PRT" {
-        description
-          "TID Shelf SubShelf Port";
-      }
-      enum "TID-SH-SL-PRT" {
-        description
-          "TID Shelf SlotPort";
-      }
-      enum "TID-SH-SL-SBSL-PRT" {
-        description
-          "TID Shelf Slot Subslot Port";
-      }
-      enum "TID-SH-SBSH-SL-PRT" {
-        description
-          "TID Shelf SubShelf SlotPort";
-      }
-      enum "TID-SH-SBSH-SL-SBSL-PRT" {
-        description
-          "TID Shelf SubShelf Slot SubSlot Port";
-      }
-      enum "TID-BAY-SHL-SL-PRT" {
-        description
-          "TID Bay ShelfLabel Slot Port";
-      }
-      enum "TID-SH-SL-PRT-SBPRT" {
-        description
-          "TID Shelf Slot Port SubPort";
-      }
-      enum "TID-SH-SL-SBSL-PRT-SBPRT" {
-        description
-          "TID Shelf Slot SubSlot Port SubPort";
-      }
-      enum "NODENAME-SL-PRT" {
-        description
-          "NODENAME Slot Port";
-      }
-      enum "SHNAME-SL-PRT" {
-        description
-          "ShelfName Slot Port";
-      }
-      enum "TID-SH-SL-PRTLBL" {
-        description
-          "TID Shelf Slot Port(label)";
-      }
-      enum "TID-SH-SL-PRT-INSTANCE" {
-        description
-          "TID Shelf Slot Port PeerInstance";
-      }
-    }
-  }
-
-  typedef adj_type {
-    type enumeration {
-      enum "LINE" {
-        description
-          "Line Adjacency";
-      }
-      enum "TX" {
-        description
-          "Tx Adjacency";
-      }
-      enum "RX" {
-        description
-          "Rx Adjacency";
-      }
-      enum "CMD" {
-        description
-          "CMD Adjacency";
-      }
-      enum "LIM" {
-        description
-          "LIM Adjacency";
-      }
-      enum "WSS" {
-        description
-          "WSS Adjacency";
-      }
-      enum "OPM" {
-        description
-          "OPM Adjacency";
-      }
-      enum "OSC" {
-        description
-          "OSC Adjacency";
-      }
-      enum "BMD" {
-        description
-          "BMD Adjacency";
-      }
-      enum "DSCM" {
-        description
-          "DSCM Adjacency";
-      }
-      enum "DRA" {
-        description
-          "DRA Adjacency";
-      }
-      enum "TXRX" {
-        description
-          "TXRX Adjacency";
-      }
-      enum "SMD" {
-        description
-          "SMD Adjacency";
-      }
-      enum "OMD" {
-        description
-          "OMD Adjacency";
-      }
-      enum "OMX" {
-        description
-          "OMX Adjacency";
-      }
-      enum "TCC" {
-        description
-          "TCC Adjacency";
-      }
-      enum "VOA" {
-        description
-          "VOA Adjacency";
-      }
-      enum "BYPASS" {
-        description
-          "Adjacency Bypass";
-      }
-      enum "BS" {
-        description
-          "BS Adjacency";
-      }
-      enum "OSCF" {
-        description
-          "OSCF Adjacency";
-      }
-      enum "FGA" {
-        description
-          "FGA Adjacency";
-      }
-      enum "OMDF" {
-        description
-          "OMDF Adjacency";
-      }
-      enum "OPS" {
-        description
-          "OPS Adjacency";
-      }
-      enum "ISS" {
-        description
-          "ISS Adjacency";
-      }
-      enum "FIM" {
-        description
-          "FIM Adjacency";
-      }
-      enum "AMP" {
-        description
-          "AMP Adjacency";
-      }
-      enum "OTDR" {
-        description
-          "OTDR Adjacency";
-      }
-      enum "OBB" {
-        description
-          "OBB Adjacency";
-      }
-      enum "UCS" {
-        description
-          "UCS Adjacency";
-      }
-      enum "UNKNOWN" {
-        description
-          "Unknown";
-      }
-    }
-  }
-
-  typedef AD_LAYER {
-    type enumeration {
-      enum "LINE" {
-        description
-          "SONET Line Layer";
-      }
-      enum "SECT" {
-        description
-          "SONET Section Layer";
-      }
-      enum "PHYS" {
-        description
-          "Physical Layer";
-      }
-      enum "L1OTN" {
-        description
-          "Layer 1 OTN layer";
-      }
-      enum "L2PHYS" {
-        description
-          "Layer 2 physical layer";
-      }
-      enum "L2MON" {
-        description
-          "Layer 2 monitoring layer";
-      }
-      enum "OTU" {
-        description
-          "OTU layer";
-      }
-      enum "SUBPORT" {
-        description
-          "Subport Layer";
-      }
-      enum "PTP" {
-        description
-          "PhysicalTermination Point Layer";
-      }
-      enum "PEER" {
-        description
-          "Virtual Peer for Point to Multi-Point Configurations";
-      }
-    }
-  }
-
-  typedef BOOL_YES_NO_defaultNO {
-    type enumeration {
-      enum "YES";
-      enum "NO" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef PSTfac_RTRV {
-    type enumeration {
-      enum "IS" {
-        description
-          "In Service";
-      }
-      enum "IS-ANR" {
-        description
-          "In Service - Abnormal";
-      }
-      enum "OOS-MA" {
-        description
-          "Out-of-service maintenance for provisioning memory administration";
-      }
-      enum "OOS-AU" {
-        description
-          "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-      }
-      enum "OOS-AUMA" {
-        description
-          "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-      }
-      enum "OOS-MAANR" {
-        description
-          "Out-of-service maintenance - abnormal.";
-      }
-    }
-  }
-
-  typedef SSTfac {
-    type enumeration {
-      enum "AINS" {
-        description
-          "Auto-In-Service";
-      }
-      enum "AINS-DEA" {
-        description
-          "Auto-In-Service Deactivate";
-      }
-      enum "BRIDGED" {
-        description
-          "Transition from switched to bridged";
-      }
-      enum "SWITCHED" {
-        description
-          "Transition from bridged to switched";
-      }
-      enum "ROLL";
-      enum "ACT";
-      enum "IDLE";
-      enum "STBYS";
-      enum "WRK";
-      enum "ERRANL";
-      enum "PSI";
-      enum "FLT";
-      enum "MEA";
-      enum "TSTF";
-      enum "UEQ";
-      enum "SGEO";
-      enum "DISCD";
-      enum "LPBK";
-      enum "TS";
-      enum "FAF";
-      enum "STBYH";
-      enum "WRKRX";
-      enum "WRKTX";
-      enum "PRTCL";
-      enum "UAS";
-      enum "NOSITE";
-      enum "NOAM";
-      enum "MON";
-      enum "MSC";
-      enum "PROTECTED";
-      enum "MT" {
-        description
-          "Maintenance";
-      }
-      enum "DSBLD";
-      enum "INHIP";
-      enum "L2DSBLD";
-      enum "TSGEN";
-      enum "TSMON";
-      enum "TSRECIRC";
-    }
-  }
-
-  typedef adj_fiber {
-    type enumeration {
-      enum "UNKNOWN" {
-        description
-          "Unknown fiber type";
-      }
-      enum "NDSF" {
-        description
-          "Non-Dispersion Shifted Fiber";
-      }
-      enum "TWC" {
-        description
-          "TrueWave Classic";
-      }
-      enum "LS" {
-        description
-          "Lambda Shifted Single Mode Fiber";
-      }
-      enum "DSF" {
-        description
-          "Dispersion Shifted Single Mode Fiber";
-      }
-      enum "TWRS" {
-        description
-          "TrueWave Reduced Slope";
-      }
-      enum "TWP" {
-        description
-          "TrueWave Plus";
-      }
-      enum "LEAF" {
-        description
-          "Large Effective Area Fiber";
-      }
-      enum "ELEAF" {
-        description
-          "Enhanced Effective Area Fiber";
-      }
-      enum "FL" {
-        description
-          "Freelight";
-      }
-      enum "AW" {
-        description
-          "Allwave";
-      }
-      enum "TWREACH" {
-        description
-          "Truewave Reach";
-      }
-      enum "TERALIGHT" {
-        description
-          "Teralight";
-      }
-      enum "PSC" {
-        description
-          "Pure Silica Core";
-      }
-      enum "OTHER" {
-        description
-          "other";
-      }
-      enum "NDSFLWP" {
-        description
-          "Non-Dispersion Shifted Fiber Low Water Peak";
-      }
-      enum "TEWAVULL" {
-        description
-          "TeraWave ULL";
-      }
-      enum "EX2000" {
-        description
-          "EX2000";
-      }
-    }
-  }
-
-  typedef adj_SpanLossSource {
-    type enumeration {
-      enum "UNKNOWN" {
-        description
-          "Unknown Span Loss Source";
-      }
-      enum "OSC" {
-        description
-          "OSC source";
-      }
-      enum "TG" {
-        description
-          "Telemetry Gain source";
-      }
-    }
-  }
-
-  typedef MX_CONTROL_MODE {
-    type enumeration {
-      enum "N" {
-        description
-          "Not a Coherent Select OTS. (Default) ";
-      }
-      enum "Y" {
-        description
-          "OTS in Coherent Select mode.";
-      }
-    }
-  }
-
-  typedef adj_rate {
-    type enumeration {
-      enum "UNKNOWN" {
-        description
-          "Unknown (Default) ";
-      }
-      enum "2.5G" {
-        description
-          "2.5G";
-      }
-      enum "10.0G" {
-        description
-          "10.0G";
-      }
-      enum "10.7G" {
-        description
-          "10.7G";
-      }
-      enum "11.1G" {
-        description
-          "11.1G";
-      }
-      enum "11.3G" {
-        description
-          "11.3G";
-      }
-      enum "4.0G" {
-        description
-          "4.0G";
-      }
-      enum "40.0G" {
-        description
-          "40.0G";
-      }
-      enum "100.0G" {
-        description
-          "100.0G";
-      }
-      enum "50.0G" {
-        description
-          "50.0G";
-      }
-      enum "200.0G" {
-        description
-          "200.0G";
-      }
-      enum "150.0G" {
-        description
-          "150.0G";
-      }
-      enum "250.0G" {
-        description
-          "250.0G";
-      }
-      enum "300.0G" {
-        description
-          "300.0G";
-      }
-      enum "350.0G" {
-        description
-          "350.0G";
-      }
-      enum "400.0G" {
-        description
-          "400.0G";
-      }
-    }
-  }
-
-  typedef BOOL_TRUE_FALSE {
-    type enumeration {
-      enum "TRUE";
-      enum "FALSE";
-    }
-  }
-
-  typedef BOOL_TRUE_defaultFALSE {
-    type enumeration {
-      enum "TRUE";
-      enum "FALSE" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef adjTxModClass {
-    type enumeration {
-      enum "UNKNOWN" {
-        description
-          "Unknown";
-      }
-      enum "UNDEFINED" {
-        description
-          "Undefined";
-      }
-      enum "2G5" {
-        description
-          "2.5G";
-      }
-      enum "10G" {
-        description
-          "10G";
-      }
-      enum "10GNGM" {
-        description
-          "10G NGM";
-      }
-      enum "40G" {
-        description
-          "40G";
-      }
-      enum "CUSTOM1" {
-        description
-          "Custom1";
-      }
-      enum "CUSTOM2" {
-        description
-          "Custom2";
-      }
-      enum "CUSTOM3" {
-        description
-          "Custom3";
-      }
-      enum "CUSTOM4" {
-        description
-          "Custom4";
-      }
-      enum "CUSTOM5" {
-        description
-          "Custom5";
-      }
-      enum "CUSTOM6" {
-        description
-          "Custom6";
-      }
-      enum "100G" {
-        description
-          "100G";
-      }
-      enum "40GULH" {
-        description
-          "40GULH";
-      }
-      enum "100GWL3" {
-        description
-          "100GWL3";
-      }
-      enum "100GWL3BPSK" {
-        description
-          "100GWL3BPSK";
-      }
-      enum "100GWL38QAM" {
-        description
-          "100GWL38QAM";
-      }
-      enum "100GWL316QAM" {
-        description
-          "100GWL316QAM";
-      }
-      enum "100GWL34ASK" {
-        description
-          "100GWL34ASK";
-      }
-      enum "35GBAUD_100G" {
-        description
-          "35GBAUD_100G";
-      }
-      enum "35GBAUD_150G" {
-        description
-          "35GBAUD_150G";
-      }
-      enum "35GBAUD_200G" {
-        description
-          "35GBAUD_200G";
-      }
-      enum "35GBAUD_250G" {
-        description
-          "35GBAUD_250G";
-      }
-      enum "56GBAUD_100G" {
-        description
-          "56GBAUD_100G";
-      }
-      enum "56GBAUD_150G" {
-        description
-          "56GBAUD_150G";
-      }
-      enum "56GBAUD_200G" {
-        description
-          "56GBAUD_200G";
-      }
-      enum "56GBAUD_250G" {
-        description
-          "56GBAUD_250G";
-      }
-      enum "56GBAUD_300G" {
-        description
-          "56GBAUD_300G";
-      }
-      enum "56GBAUD_350G" {
-        description
-          "56GBAUD_350G";
-      }
-      enum "56GBAUD_400G" {
-        description
-          "56GBAUD_400G";
-      }
-      enum "SLIC" {
-        description
-          "SLIC";
-      }
-    }
-  }
-
-  typedef autoTxRxProv {
-    type enumeration {
-      enum "AUTO" {
-        description
-          "Auto Provisioning of Type Enabled";
-      }
-      enum "MANUAL" {
-        description
-          "Auto Provisioning of Type Disabled";
-      }
-    }
-  }
-
-  typedef LPBKSTATUS {
-    type enumeration {
-      enum "UNKNOWN" {
-        description
-          "Loopback test not run or currently running.";
-      }
-      enum "PASS" {
-        description
-          "Latest loopback test passed.";
-      }
-      enum "FAIL" {
-        description
-          "Latest loopback test failed.";
-      }
-      enum "FAIL-CHOUTFL EXCEEDS 1 dB" {
-        description
-          "Latest loopback test failed - CH OUT port Fiber Loss exceeds 1 dB.";
-      }
-      enum "FAIL-TTI Mismatch" {
-        description
-          "Latest loopback test failed - TTI Mismatch.";
-      }
-      enum "FAIL-TTI Fail" {
-        description
-          "Latest loopback test failed - TTI Fail.";
-      }
-      enum "FAIL-TXTUNING" {
-        description
-          "Latest loopback test failed - TX TUNING IN PROGRESS.";
-      }
-      enum "FAIL-CHINLOS" {
-        description
-          "Latest loopback test failed - CH IN LOS.";
-      }
-      enum "FAIL-CHINFL EXCEEDS 1 dB" {
-        description
-          "Latest loopback test failed - CH IN port Fiber Loss exceeds 1 dB.";
-      }
-      enum "FAIL-CHOUTLOS" {
-        description
-          "Latest loopback test failed - CH OUT LOS.";
-      }
-      enum "FAIL-NOTREADY" {
-        description
-          "Latest loopback test failed - EQUIPMENT NOT READY.";
-      }
-      enum "FAIL-RXLOS" {
-        description
-          "Latest loopback test failed - RX LOS.";
-      }
-      enum "FAIL-RXLOF" {
-        description
-          "Latest loopback test failed - RX LOF.";
-      }
-      enum "FAIL-RXLOCH" {
-        description
-          "Latest loopback test failed - RX LOCH.";
-      }
-      enum "FAIL-RXLOC" {
-        description
-          "Latest loopback test failed - RX LOC.";
-      }
-      enum "FAIL-RXLOM" {
-        description
-          "Latest loopback test failed - RX LOM.";
-      }
-      enum "FAIL-RXSD" {
-        description
-          "Latest loopback test failed - RX SD.";
-      }
-      enum "FAIL-PREFEC SF" {
-        description
-          "Latest loopback test failed - RX PREFEC SF.";
-      }
-      enum "FAIL-CMDCMNOUTHFL" {
-        description
-          "Latest loopback test failed - CMD Common Out HFL";
-      }
-      enum "FAIL-CMDCMNOUTLOS" {
-        description
-          "Latest loopback test failed - CMD Common Out Far End in LOS.";
-      }
-      enum "FAIL-CMDCMNINHFL" {
-        description
-          "Latest loopback test failed - CMD Common In Far End HFL";
-      }
-      enum "FAIL-CMDCMNINLOS" {
-        description
-          "Latest loopback test failed - CMD Common In LOS.";
-      }
-      enum "FAIL-CMDOPMHFL" {
-        description
-          "Latest loopback test failed - CMD OPM HFL.";
-      }
-      enum "MANUAL-VALIDATION REQUIRED" {
-        description
-          "Latest loopback test Manual: Validation Required.";
-      }
-    }
-  }
-
-  typedef lasercentering {
-    type enumeration {
-      enum "OFF";
-      enum "ON";
-      enum "STANDBY";
-      enum "UNKNOWN";
-    }
-  }
-
-  typedef txctrl {
-    type enumeration {
-      enum "NO";
-      enum "YES" {
-        description
-          " (Default) ";
-      }
-      enum "UNKNOWN";
-    }
-  }
-
-  typedef linkOptMode {
-    type enumeration {
-      enum "LNKSTDMODE" {
-        description
-          "Standard";
-      }
-      enum "LNKSNRMODE" {
-        description
-          "SNR-Tolerance";
-      }
-      enum "LNKTRACKINGMODE" {
-        description
-          "Fast-Tracking";
-      }
-      enum "LNKSPECTRALMODE" {
-        description
-          "Spectral-Efficiency";
-      }
-      enum "LNKLATENCYMODE" {
-        description
-          "Latency";
-      }
-      enum "LNKNRBWCHMODE" {
-        description
-          "Narrow";
-      }
-      enum "LNKNONLCHMODE" {
-        description
-          "Non-linear";
-      }
-      enum "LNKFLINEMODE" {
-        description
-          "Foreign";
-      }
-      enum "LNKRSVMODE1" {
-        description
-          "Reserved-1";
-      }
-      enum "LNKRSVMODE2" {
-        description
-          "Reserved-2";
-      }
-      enum "LNKRSVMODE3" {
-        description
-          "Reserved-3";
-      }
-      enum "CUSTOM" {
-        description
-          "Custom";
-      }
-      enum "UNKNOWN" {
-        description
-          "Unknown (Default) ";
-      }
-    }
-  }
-
-  typedef txDispMode {
-    type enumeration {
-      enum "AUTOMATIC" {
-        description
-          "Automatic";
-      }
-      enum "FIXEDTX" {
-        description
-          "Fixed";
-      }
-      enum "UNKNOWN" {
-        description
-          "Unknown (Default) ";
-      }
-    }
-  }
-
-  typedef CHSTATUSVALUES {
-    type enumeration {
-      enum "NOT_AVAILABLE" {
-        description
-          "DOC has not specified a status for this wavelength.";
-      }
-      enum "UNMANAGED" {
-        description
-          "DOC is not managing this wavelength.";
-      }
-      enum "ADDING" {
-        description
-          "DOC is adding this wavelength.";
-      }
-      enum "DELETING" {
-        description
-          "DOC is deleting this wavelength.";
-      }
-      enum "MANAGED" {
-        description
-          "DOC is managing this wavelength.";
-      }
-      enum "FAILED" {
-        description
-          "The last DOC action for this wavelength failed.";
-      }
-      enum "NOT_APPLICABLE" {
-        description
-          "Channel status is not applicable to this site.";
-      }
-    }
-  }
-
-  typedef TRUE_FALSE_UNKNOWN_defaultFALSE {
-    type enumeration {
-      enum "TRUE";
-      enum "FALSE" {
-        description
-          " (Default) ";
-      }
-      enum "UNKNOWN";
-    }
-  }
-
-  typedef linetype {
-    type enumeration {
-      enum "COLOURED" {
-        description
-          "Coloured";
-      }
-      enum "COLOURLESS" {
-        description
-          "Colourless";
-      }
-      enum "CONTENTIONLESS" {
-        description
-          "Contentionless";
-      }
-      enum "CSCOLOURED" {
-        description
-          "Coherent Select Coloured";
-      }
-      enum "CSCOLOURLESS" {
-        description
-          "Coherent Select Colourless";
-      }
-      enum "UNKNOWN" {
-        description
-          "UNKNOWN";
-      }
-    }
-  }
-
-  typedef ALMPRVAIDTYPE {
-    type enumeration {
-      enum "OPTMON" {
-        description
-          "Optical Monitoring";
-      }
-      enum "VOA" {
-        description
-          "VOA facility";
-      }
-      enum "AMP" {
-        description
-          "AMP facility";
-      }
-      enum "DOC" {
-        description
-          "DOC facility";
-      }
-      enum "RAMAN" {
-        description
-          "RAMAN facility";
-      }
-      enum "ADJ" {
-        description
-          "Adjacency";
-      }
-      enum "OSC" {
-        description
-          "OSC facility";
-      }
-      enum "SECU" {
-        description
-          "Security related";
-      }
-      enum "EQPT" {
-        description
-          "Equipment";
-      }
-      enum "COM" {
-        description
-          "Common to Shelf or SP";
-      }
-      enum "OC3" {
-        description
-          "OC3 facility";
-      }
-      enum "OC12" {
-        description
-          "OC12 facility";
-      }
-      enum "OC48" {
-        description
-          "OC48 facility";
-      }
-      enum "OC192" {
-        description
-          "OC192 facility";
-      }
-      enum "OC768" {
-        description
-          "OC768 facility";
-      }
-      enum "STS1" {
-        description
-          "STS1 facility";
-      }
-      enum "STS3C" {
-        description
-          "STS3C facility";
-      }
-      enum "STS12C" {
-        description
-          "STS12C facility";
-      }
-      enum "STS24C" {
-        description
-          "STS24C facility";
-      }
-      enum "STS48C" {
-        description
-          "STS48C facility";
-      }
-      enum "STS192C" {
-        description
-          "STS192C facility";
-      }
-      enum "VT1" {
-        description
-          "VT1 facility";
-      }
-      enum "VT2" {
-        description
-          "VT2 facility";
-      }
-      enum "ETH" {
-        description
-          "Ethernet client facility";
-      }
-      enum "WAN" {
-        description
-          "WAN client facility";
-      }
-      enum "E1" {
-        description
-          "E1 Facility";
-      }
-      enum "T1" {
-        description
-          "T1/DS1 facility";
-      }
-      enum "STM1E" {
-        description
-          "STM1E facility";
-      }
-      enum "DSM" {
-        description
-          "DSM entities";
-      }
-      enum "OTM" {
-        description
-          "OTM facility";
-      }
-      enum "OTM2" {
-        description
-          "OTM2 facility";
-      }
-      enum "OTM3" {
-        description
-          "OTM3 facility";
-      }
-      enum "LAG" {
-        description
-          "LAG facility";
-      }
-      enum "E3" {
-        description
-          "E3 facility";
-      }
-      enum "RPR" {
-        description
-          "RPR facility";
-      }
-      enum "ETH10G" {
-        description
-          "ETH10G facility AID";
-      }
-      enum "ETH100" {
-        description
-          "ETH100 facility AID";
-      }
-      enum "ETHN" {
-        description
-          "GENERIC ETH facility AID";
-      }
-      enum "FC" {
-        description
-          "FC facility AID";
-      }
-      enum "PTP" {
-        description
-          "PTP facility AID";
-      }
-      enum "OTUTTP" {
-        description
-          "OTUTTP facility AID";
-      }
-      enum "ETTP" {
-        description
-          "ETTP facility AID";
-      }
-      enum "STTP" {
-        description
-          "STTP facility AID";
-      }
-      enum "ODUTTP" {
-        description
-          "ODUTTP facility AID";
-      }
-      enum "ODUCTP" {
-        description
-          "ODUCTP facility AID";
-      }
-      enum "TCM" {
-        description
-          "TCM facility AID";
-      }
-      enum "SNC" {
-        description
-          "Sub network connection AID";
-      }
-      enum "OSRPNODE" {
-        description
-          "OSRPNODE AID";
-      }
-      enum "OSRPLINK" {
-        description
-          "OSRPLINK AID";
-      }
-      enum "OSRPLINE" {
-        description
-          "OSRPLINE AID";
-      }
-      enum "RLS" {
-        description
-          "E-SPRing Ringlet AID";
-      }
-      enum "MA" {
-        description
-          "Maintenance Association AID";
-      }
-      enum "IDLER" {
-        description
-          "Idler facility AID";
-      }
-      enum "TELEMETRY" {
-        description
-          "Telemetry facility AID";
-      }
-      enum "CRSNC" {
-        description
-          "CRSNC facility AID";
-      }
-      enum "SLOTSEQ" {
-        description
-          "SLOTSEQ facility AID";
-      }
-      enum "TIDSLOTSEQ" {
-        description
-          "TIDSLOTSEQ facility AID";
-      }
-      enum "AMPMON" {
-        description
-          "AMPMON facility";
-      }
-      enum "VT6" {
-        description
-          "VT6 facility";
-      }
-      enum "OTS" {
-        description
-          "OTS facility";
-      }
-      enum "FLEX" {
-        description
-          "FLEX facility";
-      }
-      enum "OTC" {
-        description
-          "OTC facility";
-      }
-      enum "PROTGRP" {
-        description
-          "PROTGRP facility";
-      }
-      enum "OC1" {
-        description
-          "OC1 facility";
-      }
-      enum "ODU" {
-        description
-          "ODU facility";
-      }
-      enum "CHC" {
-        description
-          "CHC facility";
-      }
-      enum "NMCC" {
-        description
-          "NMCC facility";
-      }
-      enum "OTDRCFG" {
-        description
-          "OTDRCFG facility";
-      }
-      enum "SNCG" {
-        description
-          "SNCG facility";
-      }
-      enum "CBRTTP" {
-        description
-          "CBRTTP facility AID";
-      }
-      enum "ADJPEER" {
-        description
-          "Adjacency Peer";
-      }
-      enum "ALL" {
-        description
-          "ALL facilities";
-      }
-      enum "T3" {
-        description
-          "T3/DS3 facility";
-      }
-      enum "EC1" {
-        description
-          "EC1 facility";
-      }
-    }
-  }
-
-  typedef AlmProfile {
-    type enumeration {
-      enum "PROFILE0" {
-        description
-          "FACTORY DFLT";
-      }
-      enum "PROFILE1" {
-        description
-          "ALL ENABLED";
-      }
-      enum "PROFILE2" {
-        description
-          "ALL DISABLED";
-      }
-      enum "PROFILE3" {
-        description
-          "USER EDITABLE";
-      }
-      enum "PROFILE4" {
-        description
-          "USER EDITABLE";
-      }
-      enum "PROFILE5" {
-        description
-          "USER EDITABLE";
-      }
-    }
-  }
-
-  typedef BOOL_Y_N {
-    type enumeration {
-      enum "Y";
-      enum "N";
-    }
-  }
-
-  typedef AlrmStat {
-    type enumeration {
-      enum "ENABLED" {
-        description
-          " (Default) ";
-      }
-      enum "DISABLED";
-      enum "NOTMONITORED";
-    }
-  }
-
-  typedef NTFCNCDE_NAP {
-    type enumeration {
-      enum "CR" {
-        description
-          "Critical";
-      }
-      enum "MJ" {
-        description
-          "Major";
-      }
-      enum "MN" {
-        description
-          "Minor";
-      }
-      enum "NA" {
-        description
-          "Not Alarmed";
-      }
-      enum "NAP" {
-        description
-          "Not Applicable";
-      }
-    }
-  }
-
-  typedef EdAlmProfile {
-    type enumeration {
-      enum "PROFILE3" {
-        description
-          "USER EDITABLE";
-      }
-      enum "PROFILE4" {
-        description
-          "USER EDITABLE";
-      }
-      enum "PROFILE5" {
-        description
-          "USER EDITABLE";
-      }
-    }
-  }
-
-  typedef EdAlrmStat {
-    type enumeration {
-      enum "ENABLED" {
-        description
-          " (Default) ";
-      }
-      enum "DISABLED";
-    }
-  }
-
-  typedef NTFCNCDE_NA {
-    type enumeration {
-      enum "CR" {
-        description
-          "Critical";
-      }
-      enum "MJ" {
-        description
-          "Major";
-      }
-      enum "MN" {
-        description
-          "Minor";
-      }
-      enum "NA" {
-        description
-          "Not Alarmed";
-      }
-    }
-  }
-
-  typedef NTFCNCDE_ALL {
-    type enumeration {
-      enum "CR" {
-        description
-          "Critical";
-      }
-      enum "MJ" {
-        description
-          "Major";
-      }
-      enum "MN" {
-        description
-          "Minor";
-      }
-      enum "ALL" {
-        description
-          "ALL (Default) ";
-      }
-    }
-  }
-
-  typedef NTFCNCDE {
-    type enumeration {
-      enum "CR" {
-        description
-          "Critical";
-      }
-      enum "MJ" {
-        description
-          "Major";
-      }
-      enum "MN" {
-        description
-          "Minor";
-      }
-    }
-  }
-
-  typedef SRVEFF {
-    type enumeration {
-      enum "SA" {
-        description
-          "Service Affecting";
-      }
-      enum "NSA" {
-        description
-          "Not Service Affecting";
-      }
-    }
-  }
-
-  typedef LOCN_WITH_DFLT {
-    type enumeration {
-      enum "NEND" {
-        description
-          "Near End (Default) ";
-      }
-      enum "FEND" {
-        description
-          "Far End";
-      }
-    }
-  }
-
-  typedef AlmDIRN {
-    type enumeration {
-      enum "RCV" {
-        description
-          "Receive direction only";
-      }
-      enum "TRMT" {
-        description
-          "Transmit direction only";
-      }
-      enum "NA" {
-        description
-          "Not Applicable";
-      }
-    }
-  }
-
-  typedef MODE {
-    type enumeration {
-      enum "SONET";
-      enum "SDH";
-      enum "NONE";
-      enum "SDHJ";
-    }
-  }
-
-  typedef SRVEFF_NAP {
-    type enumeration {
-      enum "SA" {
-        description
-          "Service Affecting";
-      }
-      enum "NSA" {
-        description
-          "Not Service Affecting";
-      }
-    }
-  }
-
-  typedef BOOL_YES_NO {
-    type enumeration {
-      enum "YES";
-      enum "NO";
-    }
-  }
-
-  typedef grpc_encoding {
-    type enumeration {
-      enum "ASCII" {
-        description
-          "ASCII Encoding type (Default) ";
-      }
-      enum "PROTO" {
-        description
-          "PROTO Encoding type";
-      }
-      enum "JSON" {
-        description
-          "JSON Encoding type";
-      }
-    }
-  }
-
-  typedef CARRIER {
-    type enumeration {
-      enum "SECTION" {
-        description
-          "Section";
-      }
-      enum "LINE" {
-        description
-          "Line";
-      }
-      enum "GCC0" {
-        description
-          "General Communication Channel 0";
-      }
-      enum "GCC1" {
-        description
-          "General Communication Channel 1";
-      }
-      enum "GCC2" {
-        description
-          "General Communication Channel 2";
-      }
-      enum "EXT" {
-        description
-          "Extended Communication Channel";
-      }
-    }
-  }
-
-  typedef NETDOMAIN {
-    type enumeration {
-      enum "MCN" {
-        description
-          "Management Communications Network";
-      }
-      enum "SONETCP" {
-        description
-          "Signaling Communications Network for SONET Control Plane";
-      }
-      enum "OTNCP" {
-        description
-          "Signaling Communications Network for OTN Control Plane";
-      }
-      enum "ENCRYP" {
-        description
-          "Encryption Communications Network";
-      }
-      enum "WSC" {
-        description
-          "LAN Wayside Channel";
-      }
-    }
-  }
-
-  typedef ANCTRL {
-    type enumeration {
-      enum "AUTO" {
-        description
-          "Auto Negotiation with auto control (Default) ";
-      }
-      enum "MASTER" {
-        description
-          "Auto Negotiation with master control";
-      }
-      enum "SLAVE" {
-        description
-          "Auto Negotiation with slave control";
-      }
-    }
-  }
-
-  typedef LAN_NETDOMAIN {
-    type enumeration {
-      enum "MCN" {
-        description
-          "Management Communications Network (Default) ";
-      }
-      enum "PKTN" {
-        description
-          "Packet Network Provider Domain";
-      }
-    }
-  }
-
-  typedef REDISTRIBUT {
-    type enumeration {
-      enum "OFF" {
-        description
-          "Set static route Re-distribution to OFF";
-      }
-      enum "OSPFV3" {
-        description
-          "Re-distribute static route to OSPFv3";
-      }
-    }
-  }
-
-  typedef RDTYPE {
-    type enumeration {
-      enum "INTERNAL" {
-        description
-          "Re-distribute the static route as an internal route (Default) ";
-      }
-      enum "EXTERNAL" {
-        description
-          "Re-distribute the static route as an external route";
-      }
-    }
-  }
-
-  typedef GWSTATUS {
-    type enumeration {
-      enum "FORWARDING";
-      enum "PENDING";
-      enum "REJECTED";
-    }
-  }
-
-  typedef SLDD_SST {
-    type enumeration {
-      enum "ACT" {
-        description
-          "Active - interface UP";
-      }
-      enum "ADJDN" {
-        description
-          "Fault detected - adjacency DOWN";
-      }
-      enum "LNKDN" {
-        description
-          "Fault detected - interface DOWN";
-      }
-      enum "UNPROV" {
-        description
-          "Un-provisioned - interface DOWN";
-      }
-    }
-  }
-
-  typedef IPRTG_OWNER {
-    type enumeration {
-      enum "LOCAL" {
-        description
-          "Route owned by LOCAL";
-      }
-      enum "STATIC" {
-        description
-          "Route owned by STATIC";
-      }
-      enum "OSPF" {
-        description
-          "Route owned by OSPF";
-      }
-      enum "IISIS" {
-        description
-          "Route owned by IISIS";
-      }
-      enum "BGP" {
-        description
-          "Route owned by BGP";
-      }
-    }
-  }
-
-  typedef CCT_default2WAY {
-    type enumeration {
-      enum "1WAY" {
-        description
-          "Unidirectional Connection";
-      }
-      enum "1WAYPR" {
-        description
-          "Unidirectional Path Ring Connection";
-      }
-      enum "2WAY" {
-        description
-          "Bidirectional Connection (Default) ";
-      }
-      enum "2WAYPR" {
-        description
-          "Bidirectional Path Ring Connection";
-      }
-      enum "2WAYDPR" {
-        description
-          "Bidirectional Single Homed Path Ring Connection";
-      }
-    }
-  }
-
-  typedef CRS_RATE {
-    type enumeration {
-      enum "VT1";
-      enum "VT2";
-      enum "STS1";
-      enum "STS3C";
-      enum "STS12C";
-      enum "STS24C";
-      enum "STS48C";
-      enum "STS192C";
-      enum "ALL";
-    }
-  }
-
-  typedef CCT_OTM2 {
-    type enumeration {
-      enum "1WAY" {
-        description
-          "Unidirectional Connection";
-      }
-      enum "2WAY" {
-        description
-          "Bidirectional Connection (Default) ";
-      }
-    }
-  }
-
-  typedef CCT_CRSODU {
-    type enumeration {
-      enum "2WAY" {
-        description
-          "Bidirectional Connection (Default) ";
-      }
-      enum "2WAYPR" {
-        description
-          "Bidirectional Path Ring Connection";
-      }
-    }
-  }
-
-  typedef CCT_ODU {
-    type enumeration {
-      enum "2WAY" {
-        description
-          "Bidirectional Connection (Default) ";
-      }
-    }
-  }
-
-  typedef CTPTYPE {
-    type enumeration {
-      enum "UNKNOWN";
-      enum "OTM2";
-      enum "ODU0";
-      enum "ODU1";
-      enum "ODUFLEX";
-      enum "ODU2";
-      enum "ODU3";
-      enum "ODU4";
-      enum "OC192";
-      enum "ETH10G";
-      enum "FLEX";
-      enum "STS192C";
-      enum "SDH64";
-    }
-  }
-
-  typedef LED_STATES {
-    type enumeration {
-      enum "LED_OFF";
-      enum "LED_RED";
-      enum "LED_YELLOW";
-      enum "LED_GREEN";
-      enum "LED_BLUE";
-      enum "LED_WHITE";
-      enum "LED_RED_FLASH";
-      enum "LED_YELLOW_FLASH";
-      enum "LED_GREEN_FLASH";
-      enum "LED_BLUE_FLASH";
-      enum "LED_UNKNOWN";
-    }
-  }
-
-  typedef EnvAlm {
-    type enumeration {
-      enum "AIRCOMPR" {
-        description
-          "Air compressor failure";
-      }
-      enum "AIRCOND" {
-        description
-          "Air conditioning failure";
-      }
-      enum "AIRDRYR" {
-        description
-          "Air dryer failure";
-      }
-      enum "BATDSCHRG" {
-        description
-          "Battery discharging";
-      }
-      enum "BATTERY" {
-        description
-          "Battery failure";
-      }
-      enum "CLFAN" {
-        description
-          "Cooling fan failure";
-      }
-      enum "ENGINE" {
-        description
-          "Engine failure";
-      }
-      enum "ENGOPRG" {
-        description
-          "Engine operating";
-      }
-      enum "EXPLGS" {
-        description
-          "Explosive gas";
-      }
-      enum "FIRDETR" {
-        description
-          "Fire detector failure";
-      }
-      enum "FIRE" {
-        description
-          "Fire";
-      }
-      enum "FLOOD" {
-        description
-          "Flood";
-      }
-      enum "FUSE" {
-        description
-          "Fuse failure";
-      }
-      enum "GEN" {
-        description
-          "Generator failure";
-      }
-      enum "HIAIR" {
-        description
-          "High airflow";
-      }
-      enum "HIHUM" {
-        description
-          "High humidity";
-      }
-      enum "HITEMP" {
-        description
-          "High temperature";
-      }
-      enum "HIWTR" {
-        description
-          "High water";
-      }
-      enum "INTRUDER" {
-        description
-          "Intrusion";
-      }
-      enum "LWBATVG" {
-        description
-          "Low battery voltage";
-      }
-      enum "LWFUEL" {
-        description
-          "Low fuel";
-      }
-      enum "LWHUM" {
-        description
-          "Low humidity";
-      }
-      enum "LWPRES" {
-        description
-          "Low cable pressure";
-      }
-      enum "LWTEMP" {
-        description
-          "Low temperature";
-      }
-      enum "LWWTR" {
-        description
-          "Low water";
-      }
-      enum "MISC" {
-        description
-          "Miscellaneous";
-      }
-      enum "OPENDR" {
-        description
-          "Open door";
-      }
-      enum "PUMP" {
-        description
-          "Pump failure";
-      }
-      enum "POWER" {
-        description
-          "Commercial power failure";
-      }
-      enum "PWR-48" {
-        description
-          "48-V power supply failure";
-      }
-      enum "RECT" {
-        description
-          "Rectifier failure";
-      }
-      enum "RECTHI" {
-        description
-          "Rectifier high voltage";
-      }
-      enum "RECTLO" {
-        description
-          "Rectifier low voltage";
-      }
-      enum "SMOKE" {
-        description
-          "Smoke";
-      }
-      enum "TOXICGAS" {
-        description
-          "Toxic gas";
-      }
-      enum "VENTN" {
-        description
-          "Ventilation system failure";
-      }
-    }
-  }
-
-  typedef MAPMODE {
-    type enumeration {
-      enum "AU3_VT15" {
-        description
-          "AU3_VT15";
-      }
-      enum "AU4_VT2" {
-        description
-          "AU4_VT2";
-      }
-      enum "AU3_VT2" {
-        description
-          "AU3_VT2";
-      }
-      enum "AU4_VT15" {
-        description
-          "AU4VT15";
-      }
-    }
-  }
-
-  typedef WANCONFIG {
-    type enumeration {
-      enum "8HI56LOCAP" {
-        description
-          "8 WAN ports with HI capacity (supports up to STS192C), 56 WAN ports with LO capacity (supports up to STS3C)";
-      }
-      enum "64MEDCAP" {
-        description
-          "64 WAN ports with MED capacity (supports up to STS24C) ";
-      }
-      enum "128LOCAP" {
-        description
-          "128 WAN ports with LO capacity (supports up to STS3C)";
-      }
-    }
-  }
-
-  typedef IOCARRIER {
-    type enumeration {
-      enum "12PORTSFP" {
-        description
-          "Plug IO Carrier that has 12 SFP ports";
-      }
-      enum "NONE" {
-        description
-          "Not support connecting to Plug IO Carrier";
-      }
-    }
-  }
-
-  typedef EQPTPROFILE1 {
-    type enumeration {
-      enum "GFP-T" {
-        description
-          "SMUX - WAN facility supports GFP-T packet mapping";
-      }
-      enum "GFP-F" {
-        description
-          "SMUX - WAN facility supports GFP-F packet mapping";
-      }
-      enum "HO" {
-        description
-          "DSM - HIGH Order";
-      }
-      enum "LO" {
-        description
-          "DSM - LOW Order";
-      }
-      enum "L2SS_UNKNOWN" {
-        description
-          "L2SS - Unknown, Read Only";
-      }
-      enum "L2SS_NONPDH" {
-        description
-          "L2SS - PROVPEC can be NTK531BA or NTK531MA, both function as NONPDH";
-      }
-      enum "L2SS_PDH" {
-        description
-          "L2SS - PROVPEC NTK531MA only, PDH capablity enabled";
-      }
-      enum "OC192" {
-        description
-          "40GXCIF - supports OC192 facility";
-      }
-      enum "OC768" {
-        description
-          "40GXCIF - supports OC768 facility";
-      }
-      enum "INTEROP" {
-        description
-          "CP in interop mode";
-      }
-      enum "OTNMOTR" {
-        description
-          "CP in otnmotr mode";
-      }
-      enum "40GNNI" {
-        description
-          "OTNXCIF - Supports 40G OCLD or 40G OCI or 40G UOCLD";
-      }
-      enum "40GUNI" {
-        description
-          "Supports 40G OCLD or 40G OCI or 40G UOCLD";
-      }
-      enum "40G" {
-        description
-          "Supports 40G OCLD";
-      }
-      enum "4X10G" {
-        description
-          "Supports 40G OCLD or 40G UOCLD";
-      }
-      enum "10G" {
-        description
-          "Supports 4x10G MUX";
-      }
-      enum "NONE" {
-        description
-          "Default - Profile is NONE";
-      }
-      enum "ETH100G_PROPRIETARY" {
-        description
-          "100GOCI - supports ETH100G client facility";
-      }
-      enum "ETH100G_GMP" {
-        description
-          "100GOCI - supports ETH100G client facility";
-      }
-      enum "OTU4" {
-        description
-          "100GOCI - supports OTM4 client facility";
-      }
-      enum "L2STANDARD" {
-        description
-          "L2 - supports standard services";
-      }
-      enum "L2EXTENDED" {
-        description
-          "L2 - supports extended services";
-      }
-      enum "L2STANDARD_EXT_OM" {
-        description
-          "L2 - supports standard services with extra OM";
-      }
-      enum "OTR" {
-        description
-          "4x10G OTR - OTR Mode";
-      }
-      enum "ULL" {
-        description
-          "4x10G OTR - ULL Mode";
-      }
-      enum "2XBPSK100G" {
-        description
-          "2x50G - 100G Binary Phase Shift Keying Mode";
-      }
-      enum "DCQPSK100G" {
-        description
-          "100G Dual Carrier Quadrature Phase Shift Keying Mode";
-      }
-      enum "16QAM200G" {
-        description
-          "200G 16 Quadrature Amplitude Modulation Mode";
-      }
-      enum "2X16QAM400G" {
-        description
-          "2x200G - 400G 16 Quadrature Amplitude Modulation Mode";
-      }
-      enum "QPSK100G" {
-        description
-          "100G Quadrature Phase Shift Keying Mode";
-      }
-      enum "ODU3E2" {
-        description
-          "OTNXCIF - Supports 40G OCLD";
-      }
-      enum "FIXEDGRID" {
-        description
-          "Photonics Equipment - Supports Fixed Grid";
-      }
-      enum "FLEXIBLEGRID" {
-        description
-          "Photonics Equipment - Supports Flexible Grid";
-      }
-      enum "4ASK100G" {
-        description
-          "100G 4 Level Amplitude Shift Keying Modulation Mode";
-      }
-      enum "2X8QAM300G" {
-        description
-          "2x150G - 300G 8 Quadrature Amplitude Modulation Mode";
-      }
-      enum "100GSERVICE" {
-        description
-          "N x 100G MOTR";
-      }
-      enum "MULTISERVICE" {
-        description
-          "Multi-Service Muxponding";
-      }
-    }
-  }
-
-  typedef EQPTPROFILE2 {
-    type enumeration {
-      enum "40G" {
-        description
-          "Supports 40G OCLD";
-      }
-      enum "4X10G" {
-        description
-          "Supports 40G OCLD";
-      }
-      enum "NONE" {
-        description
-          "Default - Profile2 is NONE";
-      }
-      enum "10G" {
-        description
-          "Supports 4x10G MUX";
-      }
-      enum "ETH100G_GMP" {
-        description
-          "Supports ETH100G_GMP";
-      }
-      enum "OTU4" {
-        description
-          "Supports OTU4";
-      }
-    }
-  }
-
-  typedef SSTAINS {
-    type enumeration {
-      enum "AINS" {
-        description
-          "Auto-In-Service";
-      }
-      enum "AINS-DEA" {
-        description
-          "Auto-In-Service Deactivate";
-      }
-    }
-  }
-
-  typedef DB_SYNC_STATE {
-    type enumeration {
-      enum "INSYNC" {
-        description
-          "Database is synchronized. Database changed notifications are reported.";
-      }
-      enum "OOSYNC" {
-        description
-          "Database is not synchronized. Some database changed notifications are suspended during the synch.";
-      }
-    }
-  }
-
-  typedef EXTCONTROL {
-    type enumeration {
-      enum "AIRCOND" {
-        description
-          "Air Conditioning";
-      }
-      enum "ENGINE" {
-        description
-          "Engine";
-      }
-      enum "FAN" {
-        description
-          "Fan";
-      }
-      enum "GEN" {
-        description
-          "Generator";
-      }
-      enum "HEAT" {
-        description
-          "Heat";
-      }
-      enum "LIGHT" {
-        description
-          "Light";
-      }
-      enum "MISC" {
-        description
-          "Miscellaneous";
-      }
-      enum "SPKLR" {
-        description
-          "Sprinkler";
-      }
-    }
-  }
-
-  typedef ENABLE_DISABLE {
-    type enumeration {
-      enum "ENABLE";
-      enum "DISABLE";
-    }
-  }
-
-  typedef COMPLETE_INCOMPLETE {
-    type enumeration {
-      enum "COMPLETE";
-      enum "INCOMPLETE";
-    }
-  }
-
-  typedef DSCM_Mods {
-    type enumeration {
-      enum "OTHER" {
-        description
-          "No DSCM";
-      }
-      enum "MOD5";
-      enum "MOD10";
-      enum "MOD20";
-      enum "MOD30";
-      enum "MOD40";
-      enum "MOD50";
-      enum "MOD60";
-      enum "MOD70";
-      enum "MOD80";
-      enum "MOD90";
-      enum "MOD100";
-      enum "MOD110";
-      enum "MOD120";
-      enum "MOD130";
-      enum "MOD140";
-      enum "MOD150";
-      enum "MOD160";
-      enum "MOD200";
-      enum "MOD240";
-      enum "MOD280";
-      enum "MOD320";
-      enum "MOD12.5";
-      enum "MOD25";
-      enum "MOD75";
-      enum "MOD125";
-      enum "01DB" {
-        description
-          "Pad 01";
-      }
-      enum "02DB" {
-        description
-          "Pad 02";
-      }
-      enum "03DB" {
-        description
-          "Pad 03";
-      }
-      enum "04DB" {
-        description
-          "Pad 04";
-      }
-      enum "05DB" {
-        description
-          "Pad 05";
-      }
-      enum "06DB" {
-        description
-          "Pad 06";
-      }
-      enum "07DB" {
-        description
-          "Pad 07";
-      }
-      enum "08DB" {
-        description
-          "Pad 08";
-      }
-      enum "09DB" {
-        description
-          "Pad 09";
-      }
-      enum "10DB" {
-        description
-          "Pad 10";
-      }
-      enum "11DB" {
-        description
-          "Pad 11";
-      }
-      enum "12DB" {
-        description
-          "Pad 12";
-      }
-      enum "13DB" {
-        description
-          "Pad 13";
-      }
-      enum "14DB" {
-        description
-          "Pad 14";
-      }
-      enum "15DB" {
-        description
-          "Pad 15";
-      }
-      enum "16DB" {
-        description
-          "Pad 16";
-      }
-      enum "17DB" {
-        description
-          "Pad 17";
-      }
-      enum "MOD180";
-      enum "MOD170";
-    }
-  }
-
-  typedef DSCM_Types {
-    type enumeration {
-      enum "OTHER" {
-        description
-          "No DSCM";
-      }
-      enum "TYPE1";
-      enum "TYPE2";
-      enum "TYPE3";
-      enum "TYPE4";
-      enum "TYPE5";
-      enum "TYPE6";
-    }
-  }
-
-  typedef AMPMODE {
-    type enumeration {
-      enum "GAIN" {
-        description
-          "Control to a Gain Mode. (Default) ";
-      }
-      enum "POWER" {
-        description
-          "Control to a Power Mode.";
-      }
-      enum "GAINCLAMP" {
-        description
-          "Control to a Gainclamp Mode.";
-      }
-    }
-  }
-
-  typedef GAINMODE {
-    type enumeration {
-      enum "LOW" {
-        description
-          "Gain Mode is Low.";
-      }
-      enum "HIGH" {
-        description
-          "Gain Mode is High. (Default) ";
-      }
-      enum "NA" {
-        description
-          "Gain Mode is N/A.";
-      }
-    }
-  }
-
-  typedef AMPPKMODE {
-    type enumeration {
-      enum "ENABLED" {
-        description
-          "Peak clamp enabled. (Default) ";
-      }
-      enum "DISABLED" {
-        description
-          "Peak clamp not enabled.";
-      }
-    }
-  }
-
-  typedef FORCEDSHUTOFF {
-    type enumeration {
-      enum "ENABLED" {
-        description
-          "Forced Shutoff enabled. (Default) ";
-      }
-      enum "DISABLED" {
-        description
-          "Forced Shutoff not enabled.";
-      }
-    }
-  }
-
-  typedef refBW {
-    type enumeration {
-      enum "N/A" {
-        description
-          "N/A";
-      }
-      enum "12.5GHZ" {
-        description
-          "12.5GHz";
-      }
-      enum "50GHZITU" {
-        description
-          "50GHz ITU";
-      }
-      enum "PORTBW" {
-        description
-          "Bandwidth of the port";
-      }
-    }
-  }
-
-  typedef PSTfac {
-    type enumeration {
-      enum "IS" {
-        description
-          "In Service";
-      }
-      enum "OOS-MA" {
-        description
-          "Out-of-service maintenance for provisioning memory administration";
-      }
-    }
-  }
-
-  typedef SSTAINSMT {
-    type enumeration {
-      enum "AINS" {
-        description
-          "Auto-In-Service";
-      }
-      enum "AINS-DEA" {
-        description
-          "Auto-In-Service Deactivate";
-      }
-      enum "MT" {
-        description
-          "Maintenance";
-      }
-    }
-  }
-
-  typedef RMVSSTMT {
-    type enumeration {
-      enum "MT" {
-        description
-          "Maintenance";
-      }
-    }
-  }
-
-  typedef flatMode {
-    type enumeration {
-      enum "N/A" {
-        description
-          "N/A";
-      }
-      enum "MODE1" {
-        description
-          "MODE 1";
-      }
-      enum "MODE2" {
-        description
-          "MODE 2";
-      }
-    }
-  }
-
-  typedef BOOL_YES_NO_defaultYES {
-    type enumeration {
-      enum "YES" {
-        description
-          " (Default) ";
-      }
-      enum "NO";
-    }
-  }
-
-  typedef chcMode {
-    type enumeration {
-      enum "LOSS" {
-        description
-          "Target Loss Control Mode";
-      }
-      enum "POWER" {
-        description
-          "Target Power Control Mode";
-      }
-      enum "OPENLOOPLOSS" {
-        description
-          "Target Loss Control Open Loop Mode";
-      }
-    }
-  }
-
-  typedef MTU {
-    type enumeration {
-      enum "174" {
-        description
-          "Supports maximum transmit unit of 174.";
-      }
-      enum "462" {
-        description
-          "Supports maximum transmit unit of 462.";
-      }
-      enum "1470" {
-        description
-          "Supports maximum transmit unit of 1470.";
-      }
-      enum "1522" {
-        description
-          "Supports maximum transmit unit of 1522.";
-      }
-      enum "1600" {
-        description
-          "Supports maximum transmit unit of 1600.";
-      }
-      enum "9100" {
-        description
-          "Supports maximum transmit unit of 9100.";
-      }
-      enum "9018" {
-        description
-          "Supports maximum transmit unit of 9018.";
-      }
-      enum "9216" {
-        description
-          "Supports maximum transmit unit of 9216.";
-      }
-      enum "9600" {
-        description
-          "Supports maximum transmit unit of 9600.";
-      }
-    }
-  }
-
-  typedef SSTTAAINS {
-    type enumeration {
-      enum "AINS" {
-        description
-          "Auto-In-Service";
-      }
-      enum "AINS-DEA" {
-        description
-          "Auto-In-Service Deactivate";
-      }
-      enum "TS" {
-        description
-          "Test Access";
-      }
-      enum "TS-DEA" {
-        description
-          "Test Access Deactivate";
-      }
-    }
-  }
-
-  typedef SSTTAAINSMT {
-    type enumeration {
-      enum "AINS" {
-        description
-          "Auto-In-Service";
-      }
-      enum "AINS-DEA" {
-        description
-          "Auto-In-Service Deactivate";
-      }
-      enum "TS" {
-        description
-          "Test Access";
-      }
-      enum "TS-DEA" {
-        description
-          "Test Access Deactivate";
-      }
-      enum "MT" {
-        description
-          "Maintenance";
-      }
-    }
-  }
-
-  typedef Conditioning {
-    type enumeration {
-      enum "NONE" {
-        description
-          "Only valid value for 10GOTR/10GOTSC";
-      }
-      enum "GFPCMF" {
-        description
-          "GFP CMF is transmitted for conditioning";
-      }
-      enum "GFPCMFUSER" {
-        description
-          "Transmit user specified GFP CMF and GFP IDLE toward line";
-      }
-      enum "GFP10BERR" {
-        description
-          "Transmit GFP 10B_ERR symbols in the GFP frame";
-      }
-      enum "UNEQ" {
-        description
-          "P-UNEQ is transmitted on WAN for conditioning";
-      }
-      enum "NILTR" {
-        description
-          "Nil (empty) path trace will be sent to the backplane when WAN conditioning is required.";
-      }
-      enum "AIS" {
-        description
-          "AIS will transmit SONET/SDH Path AIS on WAN when conditioning is required.";
-      }
-      enum "GFPCSF" {
-        description
-          "GFP CSF is transmitted for conditioning";
-      }
-    }
-  }
-
-  typedef Conditioning_T12 {
-    type enumeration {
-      enum "GFPCMF" {
-        description
-          "GFP CMF is transmitted for conditioning";
-      }
-    }
-  }
-
-  typedef PDHTYPE_LIST {
-    type enumeration {
-      enum "NONPDH" {
-        description
-          "WAN port is not associated with PDH facilities";
-      }
-      enum "T1" {
-        description
-          "WAN port is associated with T1 facilities";
-      }
-      enum "E1" {
-        description
-          "WAN port is associated with E1 facilities";
-      }
-      enum "T3" {
-        description
-          "WAN port is associated with T3 facilities";
-      }
-      enum "E3" {
-        description
-          "WAN port is associated with E3 facilities";
-      }
-    }
-  }
-
-  typedef Laserofffarendfail {
-    type enumeration {
-      enum "ENABLED" {
-        description
-          "Loss of Light feature. Under certain failure scenarios insert Loss of Light (i.e. turn off the TX laser).";
-      }
-      enum "DISABLED" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef FLOWCTRL {
-    type enumeration {
-      enum "NONE" {
-        description
-          "No Flow Control.";
-      }
-      enum "ASYM" {
-        description
-          "ASYM Asymmetric Flow Control.";
-      }
-      enum "PREE" {
-        description
-          "Preemptive Flow Control.";
-      }
-      enum "SYM" {
-        description
-          "Symmetric Flow Control.";
-      }
-    }
-  }
-
-  typedef SSMTRANSMIT {
-    type enumeration {
-      enum "EEC1" {
-        description
-          "Ethernet Equipment Clock 1";
-      }
-      enum "EEC2" {
-        description
-          "Ethernet Equipment Clock 2";
-      }
-      enum "DISABLE";
-    }
-  }
-
-  typedef spliMgmt {
-    type enumeration {
-      enum "ON" {
-        description
-          "Port is Manageable by SPLI (Default) ";
-      }
-      enum "OFF" {
-        description
-          "Port is not Manageable by SPLI";
-      }
-    }
-  }
-
-  typedef spliManaged {
-    type enumeration {
-      enum "YES" {
-        description
-          "Port is Currently Managed by SPLI";
-      }
-      enum "NO" {
-        description
-          "Port is not currently Managed by SPLI (Default) ";
-      }
-    }
-  }
-
-  typedef Service {
-    type enumeration {
-      enum "FICON" {
-        description
-          "The type of service carried for the FC facility";
-      }
-      enum "FC";
-    }
-  }
-
-  typedef PROTOCOL {
-    type enumeration {
-      enum "FC100" {
-        description
-          "Fibre Channel 100";
-      }
-      enum "FICON" {
-        description
-          "FICON";
-      }
-      enum "FC200" {
-        description
-          "Fibre Channel 200";
-      }
-      enum "FICONEXPRESS" {
-        description
-          "FICON Express";
-      }
-      enum "FC400" {
-        description
-          "Fibre Channel 400";
-      }
-      enum "FICON4G" {
-        description
-          "FICON 4G Express";
-      }
-      enum "FC800" {
-        description
-          "Fibre Channel 800";
-      }
-      enum "FICON8G" {
-        description
-          "FICON 8G Excpress";
-      }
-      enum "FC1200" {
-        description
-          "Fibre Channel 1200";
-      }
-      enum "ISC3P1G" {
-        description
-          "IBM ISC-3 Peer Mode 1G";
-      }
-      enum "ISC3P2G" {
-        description
-          "IBM ISC-3 Peer Mode 2G";
-      }
-      enum "OSC" {
-        description
-          "OSC Transparent";
-      }
-      enum "OC3" {
-        description
-          "OC-3 Transparent";
-      }
-      enum "OC12" {
-        description
-          "OC-12 Transparent";
-      }
-      enum "OC48" {
-        description
-          "OC-48 Transparent";
-      }
-      enum "OC3STE" {
-        description
-          "OC-3 Section Terminated";
-      }
-      enum "OC12STE" {
-        description
-          "OC-12 Section Terminated";
-      }
-      enum "OC48STE" {
-        description
-          "OC-48 Section Terminated";
-      }
-      enum "STM1" {
-        description
-          "STM-1 Transparent";
-      }
-      enum "STM4" {
-        description
-          "STM-4 Transparent";
-      }
-      enum "STM16" {
-        description
-          "STM-16 Transparent";
-      }
-      enum "STM1STE" {
-        description
-          "STM-1 Section Terminated";
-      }
-      enum "STM4STE" {
-        description
-          "STM-4 Section Terminated";
-      }
-      enum "STM16STE" {
-        description
-          "STM-16 Section Terminated";
-      }
-      enum "SRM125G" {
-        description
-          "SRM-125";
-      }
-      enum "SRM250G" {
-        description
-          "SRM-250";
-      }
-      enum "ESRM250G" {
-        description
-          "ESRM-250";
-      }
-      enum "PSIFB2G5" {
-        description
-          "IBM PSIFB @ 2.5Gbps";
-      }
-      enum "PSIFB" {
-        description
-          "IBM PSIFB @ 5Gbps";
-      }
-      enum "IB1XSDR" {
-        description
-          "Infiniband 1xSDR";
-      }
-      enum "IB1XDDR" {
-        description
-          "Infiniband 1xDDR";
-      }
-      enum "IB1XQDR" {
-        description
-          "Infiniband 1xQDR";
-      }
-      enum "ESCON" {
-        description
-          "ESCON";
-      }
-      enum "DVBASI270M" {
-        description
-          "DVB-ASI";
-      }
-      enum "SDSDI270MTRANSP" {
-        description
-          "SD-SDI @ 270 Mb/s";
-      }
-      enum "HDSDI1483MTRANSP" {
-        description
-          "HD-SDI @ 1.4835 Gb/s";
-      }
-      enum "HDSDI1485MTRANSP" {
-        description
-          "HD-SDI @ 1.485 Gb/s";
-      }
-      enum "3GSDI2967MTRANSP" {
-        description
-          "3G-SDI @ 2.967 Gb/s";
-      }
-      enum "3GSDI2970MTRANSP" {
-        description
-          "3G-SDI @ 2.970 Gb/s";
-      }
-      enum "CPRI1" {
-        description
-          "CPRI Option 1";
-      }
-      enum "CPRI2" {
-        description
-          "CPRI Option 2";
-      }
-      enum "CPRI3" {
-        description
-          "CPRI Option 3";
-      }
-      enum "CPRI4" {
-        description
-          "CPRI Option 4";
-      }
-      enum "CPRI5" {
-        description
-          "CPRI Option 5";
-      }
-      enum "CPRI6" {
-        description
-          "CPRI Option 6";
-      }
-      enum "SERF9G8" {
-        description
-          "SeRF 9.8304G";
-      }
-      enum "CPRI8" {
-        description
-          "CPRI Option 8";
-      }
-      enum "GEN8B10B" {
-        description
-          "Generic 8B10B";
-      }
-      enum "GENTRANSP" {
-        description
-          "Generic Transparent";
-      }
-      enum "1000BASEX" {
-        description
-          "1000BASE-X (GigE)";
-      }
-      enum "1000BASET" {
-        description
-          "1000BASE-T";
-      }
-      enum "100BASEX" {
-        description
-          "100BASE-X";
-      }
-      enum "ETH40GLANE" {
-        description
-          "ETH40GLANE";
-      }
-      enum "100BASET" {
-        description
-          "100BASE-T";
-      }
-    }
-  }
-
-  typedef FLEX_MAPPING {
-    type enumeration {
-      enum "FLEXCBR";
-      enum "AMP" {
-        description
-          "Asynchronous Mapping Procedure";
-      }
-      enum "BMP" {
-        description
-          "Bit-synchronous Mapping Procedure";
-      }
-      enum "GMP" {
-        description
-          "Generic Mapping Procedure";
-      }
-      enum "TTTGMP" {
-        description
-          "Timing Transparent Transcoding + Generic Mapping Procedure";
-      }
-      enum "TTTBMP" {
-        description
-          "Timing Transparent Transcoding + Bit-synchronous Mapping Procedure";
-      }
-      enum "LLMP" {
-        description
-          "Ciena Low Latency Mapping Procedure";
-      }
-      enum "ENHCBR" {
-        description
-          "Enhanced CBR Mapping Procedure";
-      }
-      enum "TCODEGFPT" {
-        description
-          "Transcoding plus GFP-T Mapping Procedure";
-      }
-      enum "TCODEGFPTSTD" {
-        description
-          "Transcoding plus GFP-T Standard Mapping Procedure";
-      }
-    }
-  }
-
-  typedef tfMode {
-    type enumeration {
-      enum "OFF" {
-        description
-          "Alarms off, no traffic protection (Default) ";
-      }
-      enum "ALMONLY" {
-        description
-          "Alarms on, no traffic protection";
-      }
-      enum "LINEFAIL" {
-        description
-          "Alarms on, with traffic protection";
-      }
-    }
-  }
-
-  typedef SSBITMDE {
-    type enumeration {
-      enum "SDH";
-      enum "SDHJ";
-      enum "SONET";
-    }
-  }
-
-  typedef FEC {
-    type enumeration {
-      enum "RS8" {
-        description
-          "G.709 Reed-Solomon FEC (Default) ";
-      }
-      enum "EFEC" {
-        description
-          "Enhanced FEC - concatenated RS-8";
-      }
-      enum "OFF" {
-        description
-          "Incoming FEC disabled (G.709 wrapper is still output with RS-8 FEC on the optics)";
-      }
-    }
-  }
-
-  typedef BOOL_ON_OFF {
-    type enumeration {
-      enum "ON";
-      enum "OFF";
-    }
-  }
-
-  typedef OTM_CONDTYPE {
-    type enumeration {
-      enum "NONE" {
-        description
-          "No conditioning";
-      }
-      enum "OPUK_AIS" {
-        description
-          "OPUk AIS";
-      }
-      enum "ODUK_AIS" {
-        description
-          "ODUk AIS";
-      }
-      enum "OPUK_CSF" {
-        description
-          "OPUk CSF";
-      }
-    }
-  }
-
-  typedef optimizeMode {
-    type enumeration {
-      enum "OPTIMIZATIONMODE1" {
-        description
-          "for best reach performance";
-      }
-      enum "OPTIMIZATIONMODE2" {
-        description
-          "for best latency performance";
-      }
-      enum "OPTIMIZATIONMODE3" {
-        description
-          "for fast tracking";
-      }
-      enum "OPTIMIZATIONMODE4" {
-        description
-          "for improved tracking";
-      }
-      enum "OPTIMIZATIONMODE5" {
-        description
-          "for tracking mode5";
-      }
-      enum "OPTIMIZATIONMODE6" {
-        description
-          "for tracking mode6";
-      }
-      enum "OPTIMIZATIONMODE7" {
-        description
-          "for tracking mode7";
-      }
-      enum "OPTIMIZATIONMODE8" {
-        description
-          "for tracking mode8";
-      }
-      enum "OPTIMIZATIONMODE9" {
-        description
-          "for tracking mode9";
-      }
-      enum "OPTIMIZATIONMODE10" {
-        description
-          "for tracking mode10";
-      }
-      enum "OPTIMIZATIONMODE11" {
-        description
-          "for tracking mode11";
-      }
-      enum "OPTIMIZATIONMODE12" {
-        description
-          "for tracking mode12";
-      }
-      enum "OPTIMIZATIONMODE13" {
-        description
-          "for tracking mode13";
-      }
-      enum "OPTIMIZATIONMODE14" {
-        description
-          "for tracking mode14";
-      }
-    }
-  }
-
-  typedef ochCarrierCenteringMode {
-    type enumeration {
-      enum "MODE1" {
-        description
-          "Laser centering mode 1";
-      }
-      enum "MODE2" {
-        description
-          "Laser centering mode 2";
-      }
-      enum "MODE3" {
-        description
-          "Laser centering mode 3";
-      }
-      enum "UNKNOWN" {
-        description
-          "Laser centering mode UNKNOWN";
-      }
-    }
-  }
-
-  typedef ccda {
-    type enumeration {
-      enum "ON" {
-        description
-          "Turn ON Channel Contention Detection and Avoidance";
-      }
-      enum "OFF" {
-        description
-          "Turn OFF Channel Contention Dectection and Avoidance";
-      }
-      enum "UNKNOWN" {
-        description
-          "UNKNOWN Channel Contention Dectection and Avoidance";
-      }
-    }
-  }
-
-  typedef SecureOH {
-    type enumeration {
-      enum "OFF" {
-        description
-          "SECUREOH DISABLED";
-      }
-      enum "ON" {
-        description
-          "SECUREOH ENABLED";
-      }
-    }
-  }
-
-  typedef txb {
-    type enumeration {
-      enum "ON" {
-        description
-          "Turn ON TX Power in Reduced State";
-      }
-      enum "OFF" {
-        description
-          "Turn OFF TX Power in Reduced State";
-      }
-      enum "UNKNOWN" {
-        description
-          "UNKNOWN TX Power in Reduced State";
-      }
-    }
-  }
-
-  typedef OFF_ON_UNKNOWN {
-    type enumeration {
-      enum "OFF";
-      enum "ON";
-      enum "UNKNOWN";
-    }
-  }
-
-  typedef BOOL_ON_OFF_defaultOFF {
-    type enumeration {
-      enum "ON";
-      enum "OFF" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef RTRV_STSn_INCSGLBL_parm {
-    type enumeration {
-      enum "Y" {
-        description
-          "Display Incoming Signal Label (Default) ";
-      }
-      enum "N" {
-        description
-          "Exclude Incoming Signal Label";
-      }
-    }
-  }
-
-  typedef ODUTTI {
-    type enumeration {
-      enum "ODURXINCTTI" {
-        description
-          "Incoming ODU TTI message";
-      }
-      enum "ODUTXTTI" {
-        description
-          "Outgoing ODU TTI message";
-      }
-      enum "ODUEXSAPI" {
-        description
-          "Expected incoming ODU SAPI TTI message";
-      }
-      enum "ODURXSAPI" {
-        description
-          "Incoming ODU SAPI TTI message";
-      }
-      enum "ODUTXSAPI" {
-        description
-          "Outgoing ODU SAPI TTI message";
-      }
-      enum "ODUEXDAPI" {
-        description
-          "Expected incoming ODU DAPI TTI message";
-      }
-      enum "ODURXDAPI" {
-        description
-          "Incoming ODU DAPI TTI message";
-      }
-      enum "ODUTXDAPI" {
-        description
-          "Outgoing ODU DAPI TTI message";
-      }
-      enum "ODURXEXPTTI" {
-        description
-          "Expected incoming ODU TTI message";
-      }
-    }
-  }
-
-  typedef FTraceType {
-    type enumeration {
-      enum "EXPTRC" {
-        description
-          "Expected incoming FLEX trace message";
-      }
-      enum "INCTRC" {
-        description
-          "Incoming FLEX trace message";
-      }
-      enum "TRC" {
-        description
-          "Outgoing FLEX trace message (Default) ";
-      }
-    }
-  }
-
-  typedef ptpServiceType {
-    type enumeration {
-      enum "OTU4" {
-        description
-          "OTU TTP with rate OTU4";
-      }
-      enum "OTU3E2" {
-        description
-          "OTU TTP with rate OTU3E2";
-      }
-      enum "OTU3" {
-        description
-          "OTU TTP with rate OTU3";
-      }
-      enum "OTU2" {
-        description
-          "OTU TTP with rate OTU2";
-      }
-      enum "OTU2E" {
-        description
-          "OTU TTP with rate OTU2E";
-      }
-      enum "OTU1" {
-        description
-          "OTU TTP with rate OTU1";
-      }
-      enum "OC768" {
-        description
-          "STTP (SONET) with rate OC768";
-      }
-      enum "STM256" {
-        description
-          "STTP (SDH) with rate STM256";
-      }
-      enum "OC192" {
-        description
-          "STTP (SONET) with rate OC192";
-      }
-      enum "STM64" {
-        description
-          "STTP (SDH) with rate STM64";
-      }
-      enum "OC48" {
-        description
-          "STTP (SONET) with rate OC48";
-      }
-      enum "STM16" {
-        description
-          "STTP (SDH) with rate STM16";
-      }
-      enum "OC12" {
-        description
-          "STTP (SONET) with rate OC12";
-      }
-      enum "STM4" {
-        description
-          "STTP (SDH) with rate STM4";
-      }
-      enum "OC3" {
-        description
-          "STTP (SONET) with rate OC3";
-      }
-      enum "STM1" {
-        description
-          "STTP (SDH) with rate STM1";
-      }
-      enum "ETH100M" {
-        description
-          "ETTP with rate ETH100M";
-      }
-      enum "ETH1G" {
-        description
-          "ETTP with rate ETH1G";
-      }
-      enum "ETH10G" {
-        description
-          "ETTP with rate ETH10G";
-      }
-      enum "ETH40G" {
-        description
-          "ETTP with rate ETH40G";
-      }
-      enum "ETH100G" {
-        description
-          "ETTP with rate ETH100G";
-      }
-      enum "ETH100MPKT" {
-        description
-          "ETTP with rate ETH100M PKT";
-      }
-      enum "ETH1GPKT" {
-        description
-          "ETTP with rate ETH1G PKT";
-      }
-      enum "ETH10GPKT" {
-        description
-          "ETTP with rate ETH10G PKT";
-      }
-      enum "ETH40GPKT" {
-        description
-          "ETTP with rate ETH40G PKT";
-      }
-      enum "ETH100GPKT" {
-        description
-          "ETTP with rate ETH100G PKT";
-      }
-      enum "ETH10GFLEX" {
-        description
-          "ETTP with rate ETH10G FLEX";
-      }
-      enum "ETH40GFLEX" {
-        description
-          "ETTP with rate ETH40G FLEX";
-      }
-      enum "ETH100GFLEX" {
-        description
-          "ETTP with rate ETH100G FLEX";
-      }
-      enum "OTUC2-40" {
-        description
-          "OTUTTP with OTUC2-40 rate";
-      }
-      enum "OTUC2-30" {
-        description
-          "OTUTTP with OTUC2-30 rate";
-      }
-      enum "OTUC4-80" {
-        description
-          "OTUTTP with OTUC4-80 rate";
-      }
-      enum "OTUC4-60" {
-        description
-          "OTUTTP with OTUC4-60 rate";
-      }
-      enum "OTU2REGEN" {
-        description
-          "OTUTTP REGEN with rate OTU2";
-      }
-      enum "OTU2EREGEN" {
-        description
-          "OTUTTP REGEN with rate OTU2E";
-      }
-      enum "UNKNOWN" {
-        description
-          "OTUTTP with UNKNOWN rate";
-      }
-    }
-  }
-
-  typedef PtpRole {
-    type enumeration {
-      enum "PRIME" {
-        description
-          "PTP is prime port in OTUCn-M configuration";
-      }
-      enum "MEMBER" {
-        description
-          "PTP is memver port in OTUCn-M configuration";
-      }
-    }
-  }
-
-  typedef TxMode {
-    type enumeration {
-      enum "MANUAL" {
-        description
-          "Manual Precompensation Mode";
-      }
-      enum "AUTOMATIC" {
-        description
-          "Automatic Precompensation Mode";
-      }
-      enum "CUSTOM1" {
-        description
-          "Custom1 Precompensation Mode";
-      }
-      enum "OFF" {
-        description
-          "No Precompensation Mode";
-      }
-      enum "OFFSETAUTO" {
-        description
-          "Offset Automatic Precompensation Mode";
-      }
-      enum "EXTENDEDMANUAL" {
-        description
-          "Extended Manual Precompensation Mode";
-      }
-      enum "FIXEDTX" {
-        description
-          "FixedTx Precompensation Mode";
-      }
-      enum "EXPERT" {
-        description
-          "Expert Precompensation Mode";
-      }
-      enum "UNKNOWN" {
-        description
-          "UNKNOWN Precompensation Mode";
-      }
-      enum "SEARCH" {
-        description
-          "Search Precompensation Mode";
-      }
-    }
-  }
-
-  typedef ochenm {
-    type enumeration {
-      enum "MODE1" {
-        description
-          "ENM provisioning mode 1 - STANDARD ";
-      }
-      enum "MODE2" {
-        description
-          "ENM provisioning mode 2 - ENHANCED";
-      }
-      enum "AUTO" {
-        description
-          "ENM provisioning auto - COMPATIBLE, RTRV only";
-      }
-      enum "UNKNOWN" {
-        description
-          "ENM default value for RX and TX ENM, RTRV only";
-      }
-    }
-  }
-
-  typedef ochTxWvlngthSpacing {
-    type enumeration {
-      enum "0" {
-        description
-          "0 GHz";
-      }
-      enum "50" {
-        description
-          "50 GHz";
-      }
-      enum "100" {
-        description
-          "100 GHz";
-      }
-      enum "200" {
-        description
-          "200 GHz";
-      }
-      enum "FLEXGRID" {
-        description
-          "FLEXGRID";
-      }
-      enum "UNKNOWN" {
-        description
-          "UNKNOWN";
-      }
-    }
-  }
-
-  typedef rotation {
-    type enumeration {
-      enum "DISABLED" {
-        description
-          "Disable OCH Jones Rotation Feature";
-      }
-      enum "ENABLED" {
-        description
-          "Enable OCH Jones Rotation Feature";
-      }
-    }
-  }
-
-  typedef ptpTransMode {
-    type enumeration {
-      enum "UNKNOWN";
-      enum "35GBAUD_100G" {
-        description
-          "37.87 ~ 38.46 GHz, 35GBaud 100G LH application";
-      }
-      enum "35GBAUD_150G" {
-        description
-          "37.87 ~ 38.46 GHz, 35GBaud 150G Metro application";
-      }
-      enum "35GBAUD_200G" {
-        description
-          "37.87 ~ 38.46 GHz, 35GBaud 200G Metro application";
-      }
-      enum "35GBAUD_250G" {
-        description
-          "37.87 ~ 38.46 GHz, 35GBaud 250G Metro application";
-      }
-      enum "35GBAUD_test" {
-        description
-          "37.87 ~ 38.46 GHz, 35GBaud testing mode for internal use";
-      }
-      enum "56GBAUD_100G" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 100G ULH application";
-      }
-      enum "56GBAUD_100G_2" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 100G ULH application";
-      }
-      enum "56GBAUD_150G" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 150G ULH application";
-      }
-      enum "56GBAUD_200G" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 200G LH application";
-      }
-      enum "56GBAUD_200G_2" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 200G LH application";
-      }
-      enum "56GBAUD_250G" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 250G LH application";
-      }
-      enum "56GBAUD_250G_2" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 250G LH application";
-      }
-      enum "56GBAUD_300G" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 300G Metro application";
-      }
-      enum "56GBAUD_350G" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 350G Metro application";
-      }
-      enum "56GBAUD_400G" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 400G Metro application";
-      }
-      enum "56GBAUD_400G_2" {
-        description
-          "60.59 ~ 61.53 GHz, 56GBaud 400G Metro application";
-      }
-      enum "RSV1";
-      enum "RSV2";
-      enum "RSV3";
-      enum "CUSTOM";
-    }
-  }
-
-  typedef ptpModemClass {
-    type enumeration {
-      enum "TERRESTRIAL";
-      enum "SUBMARINE";
-    }
-  }
-
-  typedef ptpReachClass {
-    type enumeration {
-      enum "TERBASE" {
-        description
-          "Maximum Reach 1~1000 Km Terrestrial";
-      }
-      enum "TER2" {
-        description
-          "Maximum Reach 1~2000 Km Terrestrial";
-      }
-      enum "TER5" {
-        description
-          "Maximum Reach 1~5000 Km Terrestrial";
-      }
-      enum "TER8" {
-        description
-          "Maximum Reach 5001~9000 Km Terrestrial";
-      }
-      enum "SUBBASE" {
-        description
-          "Maximum Reach 1~2000 Km Submarine";
-      }
-      enum "SUB9" {
-        description
-          "Maximum Reach 1~9000 Km Submarine";
-      }
-      enum "SUB14" {
-        description
-          "Maximum Reach 1~14000 Km Submarine";
-      }
-      enum "TER1P5" {
-        description
-          "Maximum Reach 1~1500 Km Submarine";
-      }
-    }
-  }
-
-  typedef ptpLnkOptMode {
-    type enumeration {
-      enum "LNKSTDMODE";
-      enum "LNKSNRMODE";
-      enum "LNKTRACKINGMODE";
-      enum "LNKSPECTRALMODE";
-      enum "LNKLATENCYMODE";
-      enum "LNKNRBWCHMODE";
-      enum "LNKNONLCHMODE";
-      enum "LNKFLINEMODE";
-      enum "LNKRSVMODE1";
-      enum "LNKRSVMODE2";
-      enum "LNKRSVMODE3";
-      enum "CUSTOM";
-      enum "UNKNOWN";
-      enum "35GBAUD_test" {
-        description
-          "35GBaud testing mode for internal use";
-      }
-    }
-  }
-
-  typedef ptpReachType {
-    type enumeration {
-      enum "REACHCD1";
-      enum "REACHCD2";
-      enum "REACHCD3";
-      enum "REACHCD4";
-      enum "REACHCD5";
-      enum "REACHCDRSV1";
-      enum "REACHCDRSV2";
-      enum "REACHCDRSV3";
-      enum "CUSTOM";
-    }
-  }
-
-  typedef ptpLnkCustom1 {
-    type enumeration {
-      enum "DEFAULT";
-    }
-  }
-
-  typedef ptpLnkCustom2 {
-    type enumeration {
-      enum "DEFAULT";
-    }
-  }
-
-  typedef ptpLaserOffMode {
-    type enumeration {
-      enum "MODE1";
-      enum "MODE2";
-    }
-  }
-
-  typedef PtpMod {
-    type enumeration {
-      enum "QPSK";
-      enum "4ASK";
-    }
-  }
-
-  typedef StatsInfoDefYes {
-    type enumeration {
-      enum "NO" {
-        description
-          "Do not include Dynamic Status information in the response";
-      }
-      enum "YES" {
-        description
-          "Include Dynamic Status information in the response (Default) ";
-      }
-    }
-  }
-
-  typedef DispScanInfo {
-    type enumeration {
-      enum "YES" {
-        description
-          "Include SFROM, STO, SSTEP, SDWELL, SCAN, OCHTXDISPFOUND and OCHASSOCQ in the output";
-      }
-      enum "NO" {
-        description
-          "Do not include SFROM,STO, SSTEP, SDWELL, SCAN, OCHTXDISPFOUND and OCHASSOCQ in the output (Default) ";
-      }
-    }
-  }
-
-  typedef PtpRate {
-    type enumeration {
-      enum "150G";
-      enum "200G";
-      enum "300G";
-      enum "400G";
-      enum "100G";
-      enum "250G";
-      enum "350G";
-    }
-  }
-
-  typedef ptpBaud {
-    type enumeration {
-      enum "35G" {
-        description
-          "35G OTSi Baud Rate (Default) ";
-      }
-      enum "56G" {
-        description
-          "56G OTSi Baud Rate";
-      }
-    }
-  }
-
-  typedef ScanState {
-    type enumeration {
-      enum "START" {
-        description
-          "Triggers Q-based pre-dispersion compensation scanning";
-      }
-      enum "STOP" {
-        description
-          "Cancels Q-based Pre-dispersion compensation Scanning";
-      }
-      enum "COMPLETE" {
-        description
-          "Indicates completion of Scanning, only for retrieval";
-      }
-    }
-  }
-
-  typedef OTU_FECFrmt {
-    type enumeration {
-      enum "OFF" {
-        description
-          "No FEC";
-      }
-      enum "PFEC" {
-        description
-          "Product FEC";
-      }
-      enum "RS8" {
-        description
-          "Reed Solomon 8";
-      }
-      enum "SCFEC" {
-        description
-          "Super Concatenated FEC";
-      }
-      enum "UFEC" {
-        description
-          "UFEC";
-      }
-      enum "QFEC" {
-        description
-          "QFEC";
-      }
-    }
-  }
-
-  typedef otntfMode {
-    type enumeration {
-      enum "OFF" {
-        description
-          "Alarms off, no traffic protection (Default) ";
-      }
-      enum "ALMONLY" {
-        description
-          "Alarms on, no traffic protection";
-      }
-      enum "LINEFAIL" {
-        description
-          "Alarms on, with traffic protection";
-      }
-    }
-  }
-
-  typedef TIMEN {
-    type enumeration {
-      enum "TIM_SAPI_ONLY" {
-        description
-          "Only checks for SAPI mismatch";
-      }
-      enum "TIM_DAPI_ONLY" {
-        description
-          "Only checks for DAPI mismatch";
-      }
-      enum "TIM_SAPI_DAPI" {
-        description
-          "Checks for SAPI and DAPI mismatch";
-      }
-      enum "TIM_OPER_SPEC" {
-        description
-          "Checks for Operator Specific mismatch";
-      }
-    }
-  }
-
-  typedef OtuRate {
-    type enumeration {
-      enum "OTU1";
-      enum "OTU1E";
-      enum "OTU2";
-      enum "OTU2E";
-      enum "OTU3";
-      enum "OTU3E2";
-      enum "OTU4";
-      enum "OTUC2-40";
-      enum "OTUC2-30";
-      enum "OTUC4-80";
-      enum "OTUC4-60";
-      enum "OTU2REGEN";
-      enum "OTU2EREGEN";
-      enum "OTUC1";
-      enum "OTUC2";
-      enum "OTUC3";
-      enum "OTUC4";
-      enum "OTUC5";
-      enum "OTUC6";
-      enum "OTUC7";
-      enum "OTUC8";
-    }
-  }
-
-  typedef EncrByte {
-    type enumeration {
-      enum "R2C1" {
-        description
-          "Encryption byte in Row 2, Column 1";
-      }
-      enum "R2C2" {
-        description
-          "Encryption byte in Row 2, Column 2";
-      }
-      enum "R4C9" {
-        description
-          "Encryption byte in Row 4, Column 9";
-      }
-      enum "R4C10" {
-        description
-          "Encryption byte in Row 4, Column 10";
-      }
-      enum "R4C11" {
-        description
-          "Encryption byte in Row 4, Column 11";
-      }
-      enum "R4C12" {
-        description
-          "Encryption byte in Row 4, Column 12";
-      }
-      enum "R4C13" {
-        description
-          "Encryption byte in Row 4, Column 13";
-      }
-      enum "R4C14" {
-        description
-          "Encryption byte in Row 4, Column 14";
-      }
-      enum "R1C13" {
-        description
-          "Encryption byte in Row 1, Column 13";
-      }
-      enum "R1C14" {
-        description
-          "Encryption byte in Row 1, Column 14";
-      }
-      enum "R3C13" {
-        description
-          "Encryption byte in Row 3, Column 13";
-      }
-      enum "R3C14" {
-        description
-          "Encryption byte in Row 3, Column 14";
-      }
-    }
-  }
-
-  typedef OtuActRate {
-    type enumeration {
-      enum "UNKNOWN";
-      enum "OTUC1";
-      enum "OTUC2";
-      enum "OTUC3";
-      enum "OTUC4";
-      enum "OTUC5";
-      enum "OTUC6";
-      enum "OTUC7";
-      enum "OTUC8";
-    }
-  }
-
-  typedef SttpRate {
-    type enumeration {
-      enum "OC768";
-      enum "STM256";
-      enum "OC192";
-      enum "STM64";
-      enum "OC48";
-      enum "STM16";
-      enum "OC12";
-      enum "STM4";
-      enum "OC3";
-      enum "STM1";
-    }
-  }
-
-  typedef SttpMapping {
-    type enumeration {
-      enum "BMP" {
-        description
-          "Bit-synchronous Mapping Procedure";
-      }
-      enum "GMP" {
-        description
-          "Generic Mapping Procedure";
-      }
-      enum "AMP" {
-        description
-          "Asynchronous Mapping Procedure";
-      }
-    }
-  }
-
-  typedef STTPportmode {
-    type enumeration {
-      enum "SONET";
-      enum "SDH";
-    }
-  }
-
-  typedef EttpMapping_WLAI {
-    type enumeration {
-      enum "GMP" {
-        description
-          "Generic Mapping Procedure.";
-      }
-      enum "BMP" {
-        description
-          "Bit-synchronous Mapping Procedure";
-      }
-      enum "IMP" {
-        description
-          "Idle Mapping Procedure";
-      }
-    }
-  }
-
-  typedef EttpCondType {
-    type enumeration {
-      enum "8B10B";
-      enum "K30_7";
-      enum "LF_RF";
-      enum "ETH_IDLE";
-      enum "LNKFLTC1C2";
-      enum "NONE";
-    }
-  }
-
-  typedef EthRate {
-    type enumeration {
-      enum "ETH100M";
-      enum "ETH1G";
-      enum "ETH10G";
-      enum "ETH40G";
-      enum "ETH100G";
-      enum "ETHFLEX";
-      enum "ETH2G5";
-      enum "ETH25G";
-      enum "ETH200G";
-      enum "ETH400G";
-    }
-  }
-
-  typedef EttpMapping {
-    type enumeration {
-      enum "NONE" {
-        description
-          "No mapping";
-      }
-      enum "GFPSTD" {
-        description
-          "GFP Standard/MAC transparent";
-      }
-      enum "GFPMACTR" {
-        description
-          "GFP Preamble/MAC transparent";
-      }
-      enum "GFPMACOSTR" {
-        description
-          "GFP Preamble/Ordered Set/MAC transparent";
-      }
-      enum "PROP237" {
-        description
-          "Fully transparent";
-      }
-      enum "GMP" {
-        description
-          "Generic Mapping Procedure.";
-      }
-      enum "BMP" {
-        description
-          "Bit-synchronous Mapping Procedure";
-      }
-      enum "IMP" {
-        description
-          "Idle Mapping Procedure";
-      }
-    }
-  }
-
-  typedef OduTtpRate {
-    type enumeration {
-      enum "ODU0";
-      enum "ODU1";
-      enum "ODU2";
-      enum "ODU2E";
-      enum "ODU3";
-      enum "ODU3E2";
-      enum "ODU4";
-      enum "ODUFLEX";
-      enum "ODUC1";
-      enum "ODUC2";
-      enum "ODUC3";
-      enum "ODUC4";
-      enum "ODUC5";
-      enum "ODUC6";
-      enum "ODUC7";
-      enum "ODUC8";
-    }
-  }
-
-  typedef OduCtpCondType {
-    type enumeration {
-      enum "NONE";
-      enum "OPUK_AIS";
-      enum "OPUK_CSF";
-      enum "ODUK_AIS";
-    }
-  }
-
-  typedef rxtsMode {
-    type enumeration {
-      enum "OFF" {
-        description
-          "Alarms off, Conditioning off (Default) ";
-      }
-      enum "ALM_ONLY" {
-        description
-          "Alarms on";
-      }
-      enum "COND_ONLY" {
-        description
-          "Conditioning on";
-      }
-      enum "ALM_COND" {
-        description
-          "Alarm on, conditioning on";
-      }
-    }
-  }
-
-  typedef clientTypeTtp {
-    type enumeration {
-      enum "OTN" {
-        description
-          "The ODUTTP supports OTN type of client ";
-      }
-      enum "ETH" {
-        description
-          "The ODUTTP and ODUCTP support GFP type of client";
-      }
-    }
-  }
-
-  typedef baseHO {
-    type enumeration {
-      enum "ODU2" {
-        description
-          "The top level base HO rate is ODU2 ";
-      }
-      enum "ODU3" {
-        description
-          "The top level base HO rate is ODU3 ";
-      }
-      enum "ODU4" {
-        description
-          "The top level base HO rate is ODU4 ";
-      }
-      enum "ODUC1" {
-        description
-          "The top level base HO rate is ODUC1 ";
-      }
-      enum "ODUC2" {
-        description
-          "The top level base HO rate is ODUC2 ";
-      }
-      enum "ODUC3" {
-        description
-          "The top level base HO rate is ODUC3 ";
-      }
-      enum "ODUC4" {
-        description
-          "The top level base HO rate is ODUC4 ";
-      }
-      enum "ODUC5" {
-        description
-          "The top level base HO rate is ODUC5 ";
-      }
-      enum "ODUC6" {
-        description
-          "The top level base HO rate is ODUC6 ";
-      }
-      enum "ODUC7" {
-        description
-          "The top level base HO rate is ODUC7 ";
-      }
-      enum "ODUC8" {
-        description
-          "The top level base HO rate is ODUC8 ";
-      }
-    }
-  }
-
-  typedef TsProv {
-    type enumeration {
-      enum "AUTO" {
-        description
-          "The Rx trib slot is auto-detected by system. ";
-      }
-      enum "MANUAL" {
-        description
-          "The Rx trib slot is user specified. ";
-      }
-    }
-  }
-
-  typedef StatsInfoDefNo {
-    type enumeration {
-      enum "NO" {
-        description
-          "Do not include Dynamic Status information in the response (Default) ";
-      }
-      enum "YES" {
-        description
-          "Include Dynamic Status information in the response";
-      }
-    }
-  }
-
-  typedef Owner {
-    type enumeration {
-      enum "OSRPLINE" {
-        description
-          "This ODU/TCM was autocreated by OSRP for an OSRPLINE";
-      }
-      enum "SNCSLM" {
-        description
-          "This ODU/TCM was autocreated by OSRP for an SNC SLM";
-      }
-      enum "SNCP" {
-        description
-          "This ODU/TCM was autocreated by OSRP for an SNCP";
-      }
-      enum "USER" {
-        description
-          "This ODU/TCM was created by the user";
-      }
-      enum "OSRP" {
-        description
-          "This ODU/TCM was created by OSRP";
-      }
-      enum "PARENT" {
-        description
-          "This ODU/TCM was created by the PARENT";
-      }
-      enum "PARENT_OSRP" {
-        description
-          "This ODU/TCM was created by OSRP for a PARENT TCM";
-      }
-      enum "AUTOCREATEDTCM" {
-        description
-          "This TCM was auto-created by OSRP for protection";
-      }
-      enum "ENCRYPTION" {
-        description
-          "This ODU/TCM was created by encryption";
-      }
-    }
-  }
-
-  typedef flexType {
-    type enumeration {
-      enum "GFP_F" {
-        description
-          "The flex type is GFP_F ";
-      }
-      enum "CBR" {
-        description
-          "The flex type is CBR ";
-      }
-    }
-  }
-
-  typedef OduCtpRate {
-    type enumeration {
-      enum "ODU0";
-      enum "ODU1";
-      enum "ODU2";
-      enum "ODU2E";
-      enum "ODU3";
-      enum "ODU4";
-      enum "ODUFLEX";
-      enum "ODUC2";
-      enum "ODUC4";
-      enum "ODUC1";
-      enum "ODUC3";
-      enum "ODUC5";
-      enum "ODUC6";
-      enum "ODUC7";
-      enum "ODUC8";
-    }
-  }
-
-  typedef clientTypeCtp {
-    type enumeration {
-      enum "ETH" {
-        description
-          "The ODUTTP and ODUCTP support GFP type of client";
-      }
-      enum "2G5_IB" {
-        description
-          "The ODUCTP supports 2G5_IB type of client";
-      }
-      enum "5G_IB" {
-        description
-          "The ODUCTP supports 5G_IB type of client";
-      }
-      enum "10G_IB" {
-        description
-          "The ODUCTP supports 10G_IB type of client";
-      }
-      enum "20G_IB" {
-        description
-          "The ODUCTP supports 20G_IB type of client";
-      }
-      enum "30G_IB" {
-        description
-          "The ODUCTP supports 30G_IB type of client";
-      }
-      enum "40G_IB" {
-        description
-          "The ODUCTP supports 40G_IB type of client";
-      }
-      enum "60G_IB" {
-        description
-          "The ODUCTP supports 60G_IB type of client";
-      }
-      enum "80G_IB" {
-        description
-          "The ODUCTP supports 80G_IB type of client";
-      }
-      enum "FC400" {
-        description
-          "The ODUCTP supports FC400 type of client";
-      }
-      enum "FC800" {
-        description
-          "The ODUCTP supports FC800 type of client";
-      }
-      enum "FC1600" {
-        description
-          "The ODUCTP supports FC1600 type of client";
-      }
-      enum "FC3200" {
-        description
-          "The ODUCTP supports FC3200 type of client";
-      }
-      enum "3GSDI_NTSC" {
-        description
-          "The ODUCTP supports 3GSDI_NTSC type of client";
-      }
-      enum "3GSDI_PAL" {
-        description
-          "The ODUCTP supports 3GSDI_PAL type of client";
-      }
-      enum "10GSDI_NTSC" {
-        description
-          "The ODUCTP supports 10GSDI_NTSC type of client";
-      }
-      enum "10GSDI_PAL" {
-        description
-          "The ODUCTP supports 10GSDI_PAL type of client";
-      }
-      enum "CPRIL4" {
-        description
-          "The ODUCTP supports CPRIL4 type of client";
-      }
-      enum "CPRIL5" {
-        description
-          "The ODUCTP supports CPRIL5 type of client";
-      }
-      enum "CPRIL6" {
-        description
-          "The ODUCTP supports CPRIL6 type of client";
-      }
-      enum "CPRIL7" {
-        description
-          "The ODUCTP supports CPRIL7 type of client";
-      }
-      enum "OTHER" {
-        description
-          "The ODUCTP supports other type of client";
-      }
-    }
-  }
-
-  typedef CbrTtpProtocol {
-    type enumeration {
-      enum "FC";
-      enum "FICON";
-    }
-  }
-
-  typedef AUTO_NEGOTIATION {
-    type enumeration {
-      enum "OFF" {
-        description
-          "Enable speed Auto-negotiation";
-      }
-      enum "ON" {
-        description
-          "Disable speed Auto-negotiation";
-      }
-    }
-  }
-
-  typedef CbrMapping {
-    type enumeration {
-      enum "BMP" {
-        description
-          "Bit-synchronous Mapping Procedure";
-      }
-      enum "PTTBMP" {
-        description
-          "Phase Transparent Transcoding Bit-synchronous Mapping Procedure";
-      }
-    }
-  }
-
-  typedef CbrFECFrmt {
-    type enumeration {
-      enum "OFF" {
-        description
-          "No FEC";
-      }
-      enum "RS10" {
-        description
-          "RS10 FEC";
-      }
-    }
-  }
-
-  typedef CbrTtpCondType {
-    type enumeration {
-      enum "NOS";
-    }
-  }
-
-  typedef SSTODU {
-    type enumeration {
-      enum "AINS" {
-        description
-          "Auto-In-Service";
-      }
-      enum "AINS-DEA" {
-        description
-          "Auto-In-Service Deactivate";
-      }
-      enum "ACT";
-      enum "IDLE";
-      enum "STBYS";
-      enum "WRK";
-      enum "FLT";
-      enum "MEA";
-      enum "UEQ";
-      enum "SGEO";
-      enum "DISCD";
-      enum "LPBK";
-      enum "TS";
-      enum "STBYH";
-      enum "WRKRX";
-      enum "WRKTX";
-      enum "UAS";
-      enum "PROTECTED";
-      enum "MT" {
-        description
-          "Maintenance";
-      }
-      enum "DSBLD";
-    }
-  }
-
-  typedef NmccPst {
-    type enumeration {
-      enum "IS" {
-        description
-          "In Service";
-      }
-      enum "OOS-AU" {
-        description
-          "Out-of-service autonomous (based on parent CHC is OOS (AU/MA/AU-MA). It is not out of service from a state point of view. ";
-      }
-    }
-  }
-
-  typedef NmccSst {
-    type enumeration {
-      enum "SGEO" {
-        description
-          "Supporting Entity Outage (based on parent CHC is OOS (AU/MA/AU-MA) or controller is not in closed loop control for this NMCC.";
-      }
-      enum "LPBK" {
-        description
-          "Loopback";
-      }
-      enum "FAF" {
-        description
-          "Facility failure";
-      }
-    }
-  }
-
-  typedef loctype {
-    type enumeration {
-      enum "LOCNIL" {
-        description
-          "No control";
-      }
-      enum "TXMUX" {
-        description
-          "Tx Controller in the mux direction.";
-      }
-      enum "RXDEMUX" {
-        description
-          "Rx Controller in the demux direction.";
-      }
-      enum "LOCADD" {
-        description
-          "WSS controller on the add control point.";
-      }
-      enum "LOCDROP" {
-        description
-          "WSS controller on the drop control point.";
-      }
-      enum "WSSMUX" {
-        description
-          "WSS controller in the mux direction.";
-      }
-      enum "WSSDEMUX" {
-        description
-          "WSS controller in the demux direction.";
-      }
-    }
-  }
-
-  typedef mcpomode {
-    type enumeration {
-      enum "UNKNOWN" {
-        description
-          "Unknown MCPO mode.";
-      }
-      enum "PSD" {
-        description
-          "PSD Mode.";
-      }
-      enum "PWRPERPORT" {
-        description
-          "Power Per Port Mode.";
-      }
-    }
-  }
-
-  typedef locctrlmode {
-    type enumeration {
-      enum "UNKNOWN" {
-        description
-          "Unknown control mode.";
-      }
-      enum "12.5" {
-        description
-          "12.5GHz resolution bandwidth.";
-      }
-      enum "50" {
-        description
-          "50GHz resolution bandwidth; ITU fixed grid.";
-      }
-    }
-  }
-
-  typedef LocPst {
-    type enumeration {
-      enum "IS" {
-        description
-          "In Service";
-      }
-      enum "OOS-MA" {
-        description
-          "Out-of-service maintenance for provisioning memory administration";
-      }
-      enum "OOS-AU" {
-        description
-          "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-      }
-      enum "OOS-AUMA" {
-        description
-          "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-      }
-    }
-  }
-
-  typedef LocSst {
-    type enumeration {
-      enum "SGEO" {
-        description
-          "Supporting Entity Outage (based on parent CCMD is OOS (AU/MA/AU-MA).";
-      }
-    }
-  }
-
-  typedef OTDRTRACESTATUS {
-    type enumeration {
-      enum "IDLE" {
-        description
-          "OTDR trace has not yet been scheduled on this port (Default) ";
-      }
-      enum "PENDING" {
-        description
-          "OTDR trace has been scheduled on this port but yet to be run (not used)";
-      }
-      enum "RUNNING" {
-        description
-          "OTDR trace is currently in progress against this port (not used)";
-      }
-      enum "QUEUED" {
-        description
-          "OTDR trace has been scheduled on this port but yet to be run";
-      }
-      enum "ACTIVE-LONG" {
-        description
-          "OTDR trace type long is currently in progress against this port";
-      }
-      enum "ACTIVE-SHORT" {
-        description
-          "OTDR trace type short is currently in progress against this port";
-      }
-      enum "ACTIVE-OFFICE" {
-        description
-          "OTDR trace type office is currently in progress against this port";
-      }
-      enum "ACTIVE-AUTO" {
-        description
-          "Auto OTDR trace is currently in progress against this port";
-      }
-      enum "ACTIVE-GONOGO" {
-        description
-          "OTDR trace type GONOGO is currently in progress against this port";
-      }
-    }
-  }
-
-  typedef trace_type {
-    type enumeration {
-      enum "LONG" {
-        description
-          "LONG Trace (Default) ";
-      }
-      enum "SHORT" {
-        description
-          "SHORT Trace";
-      }
-      enum "OFFICE" {
-        description
-          "OFFICE Trace";
-      }
-    }
-  }
-
-  typedef txrxmodclass {
-    type enumeration {
-      enum "CUSTOM1" {
-        description
-          "Custom Modulation Class 1 (Default) ";
-      }
-      enum "CUSTOM2" {
-        description
-          "Custom Modulation Class 2";
-      }
-      enum "CUSTOM3" {
-        description
-          "Custom Modulation Class 3";
-      }
-      enum "CUSTOM4" {
-        description
-          "Custom Modulation Class 4";
-      }
-      enum "CUSTOM5" {
-        description
-          "Custom Modulation Class 5";
-      }
-      enum "CUSTOM6" {
-        description
-          "Custom Modulation Class 6";
-      }
-      enum "QPSK" {
-        description
-          "QPSK Modulation Class";
-      }
-      enum "BPSK" {
-        description
-          "BPSK Modulation Class";
-      }
-      enum "8QAM" {
-        description
-          "8QAM Modulation Class";
-      }
-      enum "16QAM" {
-        description
-          "16QAM Modulation Class";
-      }
-      enum "4ASK" {
-        description
-          "4ASK Modulation Class";
-      }
-      enum "UNKNOWN" {
-        description
-          "Unknown Modulation Class";
-      }
-    }
-  }
-
-  typedef ctrltype {
-    type enumeration {
-      enum "NIL" {
-        description
-          "No control";
-      }
-      enum "TXRX" {
-        description
-          "TxRx Controller.";
-      }
-      enum "SIGNAL" {
-        description
-          "Signal Controller.";
-      }
-    }
-  }
-
-  typedef BWPRF_CIR_EIR_UNITS {
-    type enumeration {
-      enum "0";
-      enum "64000" {
-        description
-          "64 kbps";
-      }
-      enum "1000000" {
-        description
-          "1 Mbps";
-      }
-      enum "10000000" {
-        description
-          "10 Mbps";
-      }
-      enum "100000000" {
-        description
-          "100 Mbps";
-      }
-    }
-  }
-
-  typedef BWPRF_POLICER {
-    type enumeration {
-      enum "2697" {
-        description
-          "RFC 2697 - Not supported by any card yet.";
-      }
-      enum "2698" {
-        description
-          "RFC 2698 - For this policer, CIR+EIR is the BW reserved for green or yellow packets.";
-      }
-      enum "4115" {
-        description
-          "RFC 4115 (default) - For this policer, CIR is the BW reserved for green packets and EIR is the BW reserved for excess green packets and yellow packets.";
-      }
-    }
-  }
-
-  typedef CLASS_OF_SERVICE_DOMAIN {
-    type enumeration {
-      enum "ST" {
-        description
-          "Standard (Default) ";
-      }
-      enum "BR" {
-        description
-          "Bronze";
-      }
-      enum "SL" {
-        description
-          "Silver";
-      }
-      enum "GD" {
-        description
-          "Gold";
-      }
-      enum "PL" {
-        description
-          "Platinum";
-      }
-      enum "PR" {
-        description
-          "Premium";
-      }
-      enum "NT" {
-        description
-          "Network";
-      }
-      enum "NW" {
-        description
-          "Network (DEPRECATED)";
-      }
-      enum "CR" {
-        description
-          "Critical";
-      }
-    }
-  }
-
-  typedef CLASS_OF_SERVICE {
-    type enumeration {
-      enum "NW" {
-        description
-          "Network";
-      }
-      enum "PR" {
-        description
-          "Premium";
-      }
-      enum "GD" {
-        description
-          "Gold";
-      }
-      enum "SL" {
-        description
-          "Silver";
-      }
-      enum "ST" {
-        description
-          "Standard";
-      }
-    }
-  }
-
-  typedef LCASAIDTYPE {
-    type enumeration {
-      enum "STS1" {
-        description
-          "STS1 facility";
-      }
-      enum "STS3C" {
-        description
-          "STS3c facility";
-      }
-      enum "VT1" {
-        description
-          "VT1 facility";
-      }
-      enum "VT2" {
-        description
-          "VT2 facility";
-      }
-      enum "DS1" {
-        description
-          "DS1 facility";
-      }
-      enum "E1" {
-        description
-          "E1 facility";
-      }
-    }
-  }
-
-  typedef AD_RELIABILITY {
-    type enumeration {
-      enum "OFF" {
-        description
-          "Auto-discovery Tag reception is disabled (RX_ENABLED is N)";
-      }
-      enum "RELIABLE" {
-        description
-          "Auto-discovery Tag (RX_ACTUAL) is being correctly received";
-      }
-      enum "UNRELIABLE" {
-        description
-          "Auto-discovery Tag (RX_ACTUAL) is not being correctly received";
-      }
-      enum "MANUAL" {
-        description
-          "Auto-discovery Tag (RX_ACTUAL) is derived from manual provisioning";
-      }
-    }
-  }
-
-  typedef AD_MECHANISM {
-    type enumeration {
-      enum "IIH" {
-        description
-          "Transmission via the ISIS Hello message";
-      }
-      enum "DERIVED" {
-        description
-          "Derived tags based on provisioning";
-      }
-      enum "SONMP" {
-        description
-          "Transmission via SONMP Hello message";
-      }
-      enum "CVM" {
-        description
-          "Transmission via AD-COMMS transport service";
-      }
-      enum "NDP" {
-        description
-          "Transmission via NDP protocol over GCC0";
-      }
-      enum "LLDP" {
-        description
-          "Transmission via Link Layer Discovery Protocol";
-      }
-    }
-  }
-
-  typedef bwthrmode {
-    type enumeration {
-      enum "AUTO" {
-        description
-          "Bandwidth threshold is aumactically set";
-      }
-      enum "MANUAL" {
-        description
-          "Bandwidth threshold is manually set (Default) ";
-      }
-      enum "ADV_ALL" {
-        description
-          "Advertise total available ODUk bandwidth";
-      }
-    }
-  }
-
-  typedef EnumRVRTT {
-    type enumeration {
-      enum "SNC_NO_REVERT";
-      enum "SNC_DELAY";
-      enum "SNC_TIMEOFDAY";
-    }
-  }
-
-  typedef EnumPRIORITY {
-    type enumeration {
-      enum "LOW";
-      enum "HIGH";
-    }
-  }
-
-  typedef EnumENDPTSIZE_SNC {
-    type enumeration {
-      enum "STS1";
-      enum "STS3C";
-      enum "STS12C";
-      enum "STS24C";
-      enum "STS48C";
-      enum "STS192C";
-      enum "ODU0";
-      enum "ODU1";
-      enum "ODU2";
-      enum "ODU2E";
-      enum "ODU3";
-      enum "ODU4";
-      enum "ODUFLEX";
-    }
-  }
-
-  typedef EnumOSRPLINK_State {
-    type enumeration {
-      enum "PRIMARY_OPR";
-      enum "PRIMARY_STDBY";
-      enum "SECONDARY_OPR";
-      enum "NOT_USED";
-    }
-  }
-
-  typedef PSTfac_NOANR {
-    type enumeration {
-      enum "IS" {
-        description
-          "In Service";
-      }
-      enum "OOS-MA" {
-        description
-          "Out-of-service maintenance for provisioning memory administration";
-      }
-      enum "OOS-AU" {
-        description
-          "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-      }
-      enum "OOS-AUMA" {
-        description
-          "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-      }
-    }
-  }
-
-  typedef EnumCostCriteria {
-    type enumeration {
-      enum "DELAY";
-      enum "ADMINWEIGHT";
-    }
-  }
-
-  typedef EnumDTLEXCL_SNC {
-    type enumeration {
-      enum "NO";
-      enum "YES";
-      enum "DISABLE";
-      enum "WORKING";
-      enum "WORKINGPROTECT";
-      enum "PREFERRED";
-    }
-  }
-
-  typedef EnumPRTT_SNC {
-    type enumeration {
-      enum "APS_VLSR_PROTECTED";
-      enum "APS_VLSR_UNPROTECTED";
-      enum "UNPROTECTED";
-      enum "UNPROTECTED_HIGH";
-      enum "UNPROTECTED_LOW";
-      enum "UNPROTECTED_PROTECT";
-    }
-  }
-
-  typedef EnumRMTEPTYPE_SNC {
-    type enumeration {
-      enum "CTP";
-      enum "VCP";
-      enum "VEP";
-      enum "GEP";
-      enum "OSRPLAG";
-    }
-  }
-
-  typedef osrp_rmtttpmux {
-    type enumeration {
-      enum "ODTU01_PT20";
-      enum "ODTU12_PT20";
-      enum "ODTU12_PT21";
-      enum "ODTU13_PT21";
-      enum "ODTU23_PT20";
-      enum "ODTU23_PT21";
-      enum "ODTU34_PT21";
-      enum "ODTU24_PT21";
-      enum "ODTU14_PT21";
-      enum "ODTUK_TS";
-      enum "OTUK";
-      enum "NONE" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef EnumRMTPATHPROTECTION {
-    type enumeration {
-      enum "NONE";
-      enum "HIGH_ORDER";
-      enum "LOW_ORDER";
-    }
-  }
-
-  typedef EnumSNCTYPE {
-    type enumeration {
-      enum "DYNAMIC";
-      enum "PERM";
-    }
-  }
-
-  typedef EnumRMTINTEROP {
-    type enumeration {
-      enum "OTHER" {
-        description
-          "Interop with equipment other than 2G5 MOTR (Default) ";
-      }
-      enum "2G5MOTR" {
-        description
-          "Interop with equipment 2G5 MOTR";
-      }
-    }
-  }
-
-  typedef EnumCostCriteriaSetting {
-    type enumeration {
-      enum "MANDATORY";
-      enum "BESTEFFORT";
-      enum "DISABLE";
-    }
-  }
-
-  typedef EnumHPPREEMPT {
-    type enumeration {
-      enum "DISABLED";
-      enum "RESERVED";
-    }
-  }
-
-  typedef EnumRTEOPR {
-    type enumeration {
-      enum "MANSWITCH";
-      enum "REGROOM";
-      enum "RESIZE";
-      enum "REVERT";
-    }
-  }
-
-  typedef rvrtState {
-    type enumeration {
-      enum "NA";
-      enum "IDLE";
-      enum "PENDING_TODR";
-      enum "PENDING_NA";
-      enum "PENDING_HB";
-      enum "PENDING_SD";
-      enum "PENDING_OTHER";
-    }
-  }
-
-  typedef divtype {
-    type enumeration {
-      enum "LINK" {
-        description
-          "LINK diversity type is required.";
-      }
-      enum "PBID" {
-        description
-          "PBID diversity type is required.";
-      }
-      enum "NODE" {
-        description
-          "NODE diversity type is required.";
-      }
-    }
-  }
-
-  typedef EnumDTLEXCL_SNCG {
-    type enumeration {
-      enum "NO" {
-        description
-          " (Default) ";
-      }
-      enum "YES";
-    }
-  }
-
-  typedef EnumPRTT_SNCG {
-    type enumeration {
-      enum "UNPROTECTED_HIGH" {
-        description
-          " (Default) ";
-      }
-      enum "UNPROTECTED_LOW";
-    }
-  }
-
-  typedef PST_SNCG {
-    type enumeration {
-      enum "IS" {
-        description
-          "In Service";
-      }
-      enum "IS-ANR" {
-        description
-          "In Service - Abnormal";
-      }
-      enum "OOS-MA" {
-        description
-          "Out-of-service maintenance for provisioning memory administration";
-      }
-      enum "OOS-AU" {
-        description
-          "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-      }
-    }
-  }
-
-  typedef EnumDTLEXCL_CRSNC {
-    type enumeration {
-      enum "DISABLE";
-      enum "WORKING";
-      enum "WORKINGPROTECT";
-      enum "PREFERRED";
-    }
-  }
-
-  typedef EnumPRTT_CRSNC {
-    type enumeration {
-      enum "UNPROTECTED_HIGH";
-      enum "UNPROTECTED_LOW";
-    }
-  }
-
-  typedef EnumENDPTSIZE_CRSNC {
-    type enumeration {
-      enum "ODU0";
-      enum "ODU1";
-      enum "ODU2";
-      enum "ODU2E";
-      enum "ODU3";
-      enum "ODU4";
-      enum "ODUFLEX";
-    }
-  }
-
-  typedef EnumRMTEPTYPE_CRSNC {
-    type enumeration {
-      enum "CTP";
-      enum "VCP";
-      enum "GEP";
-    }
-  }
-
-  typedef todrprfen {
-    type enumeration {
-      enum "YES" {
-        description
-          "Time of day reversion profile is enabled. (Default) ";
-      }
-      enum "NO" {
-        description
-          "Time of day reversion profile is disabled.";
-      }
-    }
-  }
-
-  typedef todrmultiday {
-    type enumeration {
-      enum "YES" {
-        description
-          "This is a multiday profile.";
-      }
-      enum "NO" {
-        description
-          "This is a single day profile.";
-      }
-    }
-  }
-
-  typedef todrsunen {
-    type enumeration {
-      enum "YES" {
-        description
-          "Time of day reversion profile is enabled on Sunday.";
-      }
-      enum "NO" {
-        description
-          "Time of day reversion profile is disabled on Sunday. (Default) ";
-      }
-    }
-  }
-
-  typedef todrmonen {
-    type enumeration {
-      enum "YES" {
-        description
-          "Time of day reversion profile is enabled on Monday.";
-      }
-      enum "NO" {
-        description
-          "Time of day reversion profile is disabled on Monday. (Default) ";
-      }
-    }
-  }
-
-  typedef todrtueen {
-    type enumeration {
-      enum "YES" {
-        description
-          "Time of day reversion profile is enabled on Tuesday.";
-      }
-      enum "NO" {
-        description
-          "Time of day reversion profile is disabled on Tuesday. (Default) ";
-      }
-    }
-  }
-
-  typedef todrweden {
-    type enumeration {
-      enum "YES" {
-        description
-          "Time of day reversion profile is enabled on Wednesday.";
-      }
-      enum "NO" {
-        description
-          "Time of day reversion profile is disabled on Wednesday. (Default) ";
-      }
-    }
-  }
-
-  typedef todrthuen {
-    type enumeration {
-      enum "YES" {
-        description
-          "Time of day reversion profile is enabled on Thursday.";
-      }
-      enum "NO" {
-        description
-          "Time of day reversion profile is disabled on Thursday. (Default) ";
-      }
-    }
-  }
-
-  typedef todrfrien {
-    type enumeration {
-      enum "YES" {
-        description
-          "Time of day reversion profile is enabled on Friday.";
-      }
-      enum "NO" {
-        description
-          "Time of day reversion profile is disabled on Friday. (Default) ";
-      }
-    }
-  }
-
-  typedef todrsaten {
-    type enumeration {
-      enum "YES" {
-        description
-          "Time of day reversion profile is enabled on Saturday.";
-      }
-      enum "NO" {
-        description
-          "Time of day reversion profile is disabled on Saturday. (Default) ";
-      }
-    }
-  }
-
-  typedef todrassign {
-    type enumeration {
-      enum "YES" {
-        description
-          "This profile is assigned.";
-      }
-      enum "NO" {
-        description
-          "This profile is not assigned.";
-      }
-    }
-  }
-
-  typedef CCT {
-    type enumeration {
-      enum "1WAY" {
-        description
-          "Unidirectional Connection";
-      }
-      enum "1WAYPR" {
-        description
-          "Unidirectional Path Ring Connection";
-      }
-      enum "2WAY" {
-        description
-          "Bidirectional Connection";
-      }
-      enum "2WAYPR" {
-        description
-          "Bidirectional Path Ring Connection";
-      }
-      enum "2WAYDPR" {
-        description
-          "Bidirectional Single Homed Path Ring Connection";
-      }
-    }
-  }
-
-  typedef OTSsubtype_RTRV {
-    type enumeration {
-      enum "AMP" {
-        description
-          "Line Amplifier";
-      }
-      enum "ROADM" {
-        description
-          "Reconfigurable OADM";
-      }
-      enum "TOADM" {
-        description
-          "Thin OADM";
-      }
-      enum "DIOADM" {
-        description
-          "Direction Independent OADM";
-      }
-      enum "COADM" {
-        description
-          "Colourless OADM";
-      }
-      enum "PASSIVE" {
-        description
-          "Passive OADM or Line Amplifer";
-      }
-    }
-  }
-
-  typedef DISABLE_ENABLE {
-    type enumeration {
-      enum "DISABLE";
-      enum "ENABLE";
-    }
-  }
-
-  typedef slotcfgmode {
-    type enumeration {
-      enum "DERIVED" {
-        description
-          "Derived OTS Slot Data ";
-      }
-      enum "PROVISIONED" {
-        description
-          "Provisioned OTS Slot Data";
-      }
-      enum "CHECK" {
-        description
-          "Check OTS Slot Data";
-      }
-    }
-  }
-
-  typedef controlMode {
-    type enumeration {
-      enum "50" {
-        description
-          "50GHz resolution bandwidth; ITU fixed grid. (Default) ";
-      }
-      enum "12.5" {
-        description
-          "12.5GHz resolution bandwidth.";
-      }
-    }
-  }
-
-  typedef controlCpbl {
-    type enumeration {
-      enum "50" {
-        description
-          "50GHz resolution bandwidth; ITU fixed grid. (Default) ";
-      }
-      enum "12.5" {
-        description
-          "12.5GHz resolution bandwidth.";
-      }
-      enum "UNKNOWN" {
-        description
-          "UNKNOWN resolution bandwidth.";
-      }
-    }
-  }
-
-  typedef OTScfgtype {
-    type enumeration {
-      enum "AMP" {
-        description
-          "Amplifier Configuration";
-      }
-      enum "CHA" {
-        description
-          "Channel Access Configuration";
-      }
-    }
-  }
-
-  typedef OTSsubtype_ENT {
-    type enumeration {
-      enum "AMP" {
-        description
-          "Line Amplifier";
-      }
-      enum "ROADM" {
-        description
-          "Reconfigurable OADM";
-      }
-      enum "TOADM" {
-        description
-          "Thin OADM";
-      }
-      enum "DIOADM" {
-        description
-          "Direction Independent OADM";
-      }
-      enum "COADM" {
-        description
-          "Colourless OADM";
-      }
-      enum "PASSIVE" {
-        description
-          "Passive OADM or Line Amplifer";
-      }
-    }
-  }
-
-  typedef WLRULES {
-    type enumeration {
-      enum "NONE" {
-        description
-          "Wavelength cannot be provisioned on this OTS.";
-      }
-      enum "PASSTHROUGH" {
-        description
-          "Wavelength supports passthrough provisioning on this OTS.";
-      }
-      enum "ADD" {
-        description
-          "Wavelength supports local add provisioning on this OTS.";
-      }
-      enum "DROP" {
-        description
-          "Wavelength supports local drop provisioning on this OTS.";
-      }
-      enum "BLOCKED" {
-        description
-          "Wavelength is blocked on this OTS.";
-      }
-    }
-  }
-
-  typedef ETH_OMTYPE {
-    type enumeration {
-      enum "INFRAMES" {
-        description
-          "Total frames received";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total ETH frames received with FCS errors";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "INOCTETSERR" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "INFRAMESDISCDS" {
-        description
-          "Count of ingress Frames discarded due to FIFO overflow";
-      }
-      enum "INDFR" {
-        description
-          "Total ETH RX frames discarded for reasons other than FCS errors";
-      }
-      enum "INPAUSEFR" {
-        description
-          "Pause frames received";
-      }
-      enum "INCFR" {
-        description
-          "Control frames received";
-      }
-      enum "FRTOOSHORTS" {
-        description
-          "Frames less than 64 bytes in length with valid FCS";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames that exceed the MTU with valid FCS";
-      }
-      enum "FCSERR" {
-        description
-          "Frames of valid length with LAN FCS errors";
-      }
-      enum "FRAG" {
-        description
-          "Undersized frames with FCS errors";
-      }
-      enum "JAB" {
-        description
-          "Oversized frames with FCS errors";
-      }
-      enum "SYMBOLERR" {
-        description
-          "8B-10B coding errors received";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR" {
-        description
-          "Total ETH frames transmitted with errors";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Octets in frames counted by OUTFRAMES";
-      }
-      enum "OUTOCTETSERR" {
-        description
-          "Octets in frames counted by OUTFRAMESERR";
-      }
-      enum "OUTFRAMESDISCDS" {
-        description
-          "Total Egress direction frames discarded due to congestion &FIFO overflow";
-      }
-      enum "OUTPAUSEFR" {
-        description
-          "Total ETH pause frames transmitted";
-      }
-      enum "OUTDFR" {
-        description
-          "Total ETH TX frames discarded ";
-      }
-      enum "AUTONEGCYCLES" {
-        description
-          "counts the number of AutoNegotiation cycles";
-      }
-      enum "INTERNALMACRXERR" {
-        description
-          "Count of frames for which the reception fails because of an internal MAC sublayer receive error.";
-      }
-      enum "INTERNALMACTXERR" {
-        description
-          "Count of frames for which the transmission fails because of an internal MAC sublayer receive error.";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes";
-      }
-      enum "ALL-ETH" {
-        description
-          "All applicable Ethernet specific omtypes";
-      }
-      enum "ALIGNERR" {
-        description
-          "Counts the number of frames received on a particular interface that are not an integral number of octets in length and do not pass the FCS check";
-      }
-      enum "SINGLECOLLFR" {
-        description
-          "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by exactly one collision";
-      }
-      enum "MULTICOLLFR" {
-        description
-          "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by more than one collision";
-      }
-      enum "SQETESTERR" {
-        description
-          "Counts the number of times that the SQE test error message is generated by the PLS sublayer for a particular interface";
-      }
-      enum "DEFERTRANS" {
-        description
-          "Counts the number of frames for which the first transmission attempt on a particular interface is delayed because the medium is busy";
-      }
-      enum "LATECOLL" {
-        description
-          "Counts the number of times that a collision is detected on a particular interface later than 512 bit-times into the transmission of a packet";
-      }
-      enum "EXCESSCOLL" {
-        description
-          "Counts the number of frames for which the transmission on a particular interface fails because of excessive collisionsk";
-      }
-      enum "CARSENERR" {
-        description
-          "Counts the number of times that the carrier sense condition was lost or never asserted when attempting to transmit a frame on a particular interface";
-      }
-      enum "INMACCONTROLFR" {
-        description
-          "Counts the number of Ethernet control frames received (T/L = 0x8808), whether they are discarded (PASSCTRL=DISABLE) or not (PASSCTRL=ENABLE)";
-      }
-      enum "HECDFR" {
-        description
-          "Received frames discarded due to HEC error";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef FLEX_OMTYPE {
-    type enumeration {
-      enum "INFRAMES" {
-        description
-          "Total frames received";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total frames received with FCS errors";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "INFRAMESDISCDS" {
-        description
-          "Count of ingress Frames discarded due to FIFO overflow";
-      }
-      enum "INDFR" {
-        description
-          "Total RX frames discarded for reasons other than FCS errors";
-      }
-      enum "INPAUSEFR" {
-        description
-          "Pause frames received";
-      }
-      enum "FRTOOSHORTS" {
-        description
-          "Frames less than 64 bytes in length with valid FCS";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames that exceed the MTU with valid FCS";
-      }
-      enum "FCSERR" {
-        description
-          "Frames of valid length with LAN FCS errors";
-      }
-      enum "FRAG" {
-        description
-          "Undersized frames with FCS errors";
-      }
-      enum "JAB" {
-        description
-          "Oversized frames with FCS errors";
-      }
-      enum "SYMBOLERR" {
-        description
-          "8B-10B coding errors received";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total frames transmitted";
-      }
-      enum "OUTFRAMESERR" {
-        description
-          "Total frames transmitted with errors";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Octets in frames counted by OUTFRAMES";
-      }
-      enum "OUTFRAMESDISCDS" {
-        description
-          "Total Egress direction frames discarded due to congestion &FIFO overflow";
-      }
-      enum "OUTPAUSEFR" {
-        description
-          "Total pause frames transmitted";
-      }
-      enum "OUTDFR" {
-        description
-          "Total TX frames discarded ";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes";
-      }
-      enum "ALL-ETH" {
-        description
-          "All applicable Ethernet specific omtypes";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef WAN_OMTYPE {
-    type enumeration {
-      enum "INFRAMES" {
-        description
-          "Total WAN frames received";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total WAN frames received with errors";
-      }
-      enum "INDFR" {
-        description
-          "Total WAN frames received with no FCS errors that are discarded";
-      }
-      enum "OUTDFR" {
-        description
-          "Total Egress direction WAN frames discarded";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "INOCTETSERR" {
-        description
-          "Count of Bytes contained in INFRAMESERR";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total WAN frames transmitted";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Count of Bytes contained in OUTFRAMES";
-      }
-      enum "TTLDFR" {
-        description
-          "Total received frames discarded due to zero (0) Time To Live (TTL)";
-      }
-      enum "FRTOOSHORTS" {
-        description
-          "Frames discarded with less than allowable octet count with correct FCS";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames discarded that exceed allowable MTU with a valid FCS";
-      }
-      enum "HECDFR" {
-        description
-          "Received frames discarded due to HEC error";
-      }
-      enum "FCSERR" {
-        description
-          "Received frames discarded due to FCS error";
-      }
-      enum "SSUDFR" {
-        description
-          "Received frames discarded that were Self Source Unicast frames";
-      }
-      enum "PMDAFR" {
-        description
-          "Received frames (PHY to MAC) that were aborted by the PMD";
-      }
-      enum "BADFR" {
-        description
-          "Received frames discarded due to an incorrect or unrecognized Source Address";
-      }
-      enum "BPDFR" {
-        description
-          "Total received frames discarded due to Parity Error";
-      }
-      enum "SCFFFR" {
-        description
-          "Total received (PHY to MAC) errored SCFF frames discarded, with bad parity, bad SCf, or both";
-      }
-      enum "INFILTFR" {
-        description
-          "Total frames received that are discarded due to filtering";
-      }
-      enum "OUTFILTFR" {
-        description
-          "Total frames discarded on transmission due to filtering";
-      }
-      enum "INPEERCFR" {
-        description
-          "Total peered control frames received";
-      }
-      enum "INTUNCFR" {
-        description
-          "Total tunneled control frames received";
-      }
-      enum "INDCFR" {
-        description
-          "Total control frames received and discarded";
-      }
-      enum "INFRCNF" {
-        description
-          "Total Conforming Layer 2 traffic frames received";
-      }
-      enum "INFRNC" {
-        description
-          "Total Non-conforming frames received";
-      }
-      enum "INOCTNC" {
-        description
-          "Total octet count of Non-Conforming Layer 2 traffic frames received";
-      }
-      enum "INOCTCNF" {
-        description
-          "Total octet count of Conforming Layer 2 traffic frames received";
-      }
-      enum "INFRGRNC" {
-        description
-          "Total Non Conforming Layer 2 traffic frames received";
-      }
-      enum "INOCTGRNC" {
-        description
-          "Total octet count of Grossly Non Conforming Layer 2 traffic frames received";
-      }
-      enum "INTERNALERRDFR" {
-        description
-          "In Frames: Data Error";
-      }
-      enum "INMACDADFR" {
-        description
-          "In Frames: MAC Dropped";
-      }
-      enum "OUTFRAMESERR" {
-        description
-          "Counts the total number of frames that could not be transmitted because of errors";
-      }
-      enum "ALL-RPR" {
-        description
-          "All applicable RPR omtypes";
-      }
-      enum "ALL" {
-        description
-          "All applicable omtypes";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes";
-      }
-    }
-  }
-
-  typedef LAG_OMTYPE {
-    type enumeration {
-      enum "INFRAMES" {
-        description
-          "Total WAN frames received";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total WAN frames received with errors";
-      }
-      enum "INDFR" {
-        description
-          "Total WAN frames received with no FCS errors that are discarded";
-      }
-      enum "OUTDFR" {
-        description
-          "Total Egress direction WAN frames discarded";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "INOCTETSERR" {
-        description
-          "Count of Bytes contained in INFRAMESERR";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total WAN frames transmitted";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Count of Bytes contained in OUTFRAMES";
-      }
-      enum "ALL" {
-        description
-          "All applicable omtypes (Default) ";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes";
-      }
-    }
-  }
-
-  typedef COS_OMTYPE {
-    type enumeration {
-      enum "INFRAMES" {
-        description
-          "Total frames received";
-      }
-      enum "INFRAMESDISCDS" {
-        description
-          "Total frames discarded due to over subscription";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "INFRNC" {
-        description
-          "Total non-conforming frames received";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames received which exceed the MTU";
-      }
-      enum "INDFR" {
-        description
-          "Total incoming frames discarded for all reasons";
-      }
-      enum "INDOCT" {
-        description
-          "Total of bytes in INDFR";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total frames transmitted";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Total bytes in OUTFRAMES";
-      }
-      enum "OUTDFR" {
-        description
-          "Total TX frames discarded ";
-      }
-      enum "OUTDFRCNF" {
-        description
-          "Total outgoing conforming frames discarded";
-      }
-      enum "OUTDOCT" {
-        description
-          "Total bytes OUTDFR";
-      }
-      enum "UTL" {
-        description
-          "Average percentage (Queue) Utilization";
-      }
-      enum "UTLMX" {
-        description
-          "Maximum/Peak percentage (Queue) Utilization";
-      }
-      enum "ALL" {
-        description
-          "All supported OMTYPEs (Default) ";
-      }
-    }
-  }
-
-  typedef OMTYPE {
-    type enumeration {
-      enum "INFRAMES";
-      enum "OUTFRAMES" {
-        description
-          "OUTFRAMES";
-      }
-      enum "FCSERR" {
-        description
-          "Frames of valid length with LAN FCS errors.";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames that exceed the MTU with valid FCS.";
-      }
-      enum "FRTOOSHORTS" {
-        description
-          "Frames less than 64 bytes in length with valid FCS.";
-      }
-      enum "ALL-IF" {
-        description
-          "All Generic IF OM Parameters: INFRAMES and OUTFRAMES";
-      }
-      enum "ALL-ETH" {
-        description
-          "All Ethernet OM parameters: FCSERR, FRTOOLONGS and FRTOOSHORTS";
-      }
-      enum "ALL" {
-        description
-          "All OM parameters";
-      }
-      enum "ALIGNERR" {
-        description
-          "Frames received that are not an integral number of octets in length and do not pass the FCS check.";
-      }
-      enum "SINGLECOLLFR" {
-        description
-          "Successfully transmitted frames for which transmission is inhibited by exactly one collision.";
-      }
-      enum "MULTICOLLFR" {
-        description
-          "Count of successfully transmitted frames for which transmission is inhibited by more than one collision.";
-      }
-      enum "SQETESTERR" {
-        description
-          "Count of times that the SQE test error message is generated by the PLS sub-layer.";
-      }
-      enum "DEFERTRANS" {
-        description
-          "Count of frames for which the first transmission attempt is delayed because the medium is busy.";
-      }
-      enum "LATECOLL" {
-        description
-          "Number of times that a collision is detected later than 512 bit-times into the transmission of a packet.";
-      }
-      enum "EXCESSCOLL" {
-        description
-          "Count of frames for which the transmission fails because of excessive collisions.";
-      }
-      enum "CARSENERR" {
-        description
-          "Number of times that the carrier sense condition was lost or never asserted when attempting to transmit a frame.";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total ETH frames received with FCS errors.";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES.";
-      }
-      enum "INFRAMESDISCDS" {
-        description
-          "Count of ingress Frames discarded due to FIFO overflow.";
-      }
-      enum "INDFR" {
-        description
-          "Total ETH RX frames discarded for reasons other than FCS errors.";
-      }
-      enum "INPAUSEFR" {
-        description
-          "Pause frames received.";
-      }
-      enum "INCFR" {
-        description
-          "Control frames received.";
-      }
-      enum "FRAG" {
-        description
-          "Undersized frames with FCS errors.";
-      }
-      enum "JAB" {
-        description
-          "Oversized frames with FCS errors.";
-      }
-      enum "SYMBOLERR" {
-        description
-          "Count of GMII data reception errors.";
-      }
-      enum "OUTFRAMESERR" {
-        description
-          "Total ETH frames transmitted with errors.";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Octets in frames counted by OUTFRAMES.";
-      }
-      enum "OUTOCTETSERR" {
-        description
-          "Octets in frames counted by OUTFRAMESERR";
-      }
-      enum "OUTFRAMESDISCDS" {
-        description
-          "Total Egress direction frames discarded due to congestion &FIFO overflow.";
-      }
-      enum "OUTPAUSEFR" {
-        description
-          "Total ETH pause frames transmitted.";
-      }
-      enum "OUTDFR" {
-        description
-          "Total ETH TX frames discarded.";
-      }
-      enum "AUTONEGCYCLES" {
-        description
-          "counts the number of Auto Negotiation cycles.";
-      }
-      enum "INTERNALMACRXERR" {
-        description
-          "Count of frames for which the reception fails because of an internal MAC sub-layer receive error.";
-      }
-      enum "INTERNALMACTXERR" {
-        description
-          "Count of frames for which the transmission fails because of an internal MAC sub-layer receive error.";
-      }
-    }
-  }
-
-  typedef ETH100_OMTYPE {
-    type enumeration {
-      enum "ALIGNERR";
-      enum "SINGLECOLLFR";
-      enum "MULTICOLLFR";
-      enum "SQETESTERR";
-      enum "DEFERTRANS";
-      enum "LATECOLL";
-      enum "EXCESSCOLL";
-      enum "CARSENERR";
-      enum "INFRAMES" {
-        description
-          "Total frames received";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total ETH frames received with FCS errors";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "INOCTETSERR" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "INFRAMESDISCDS" {
-        description
-          "Count of ingress Frames discarded due to FIFO overflow";
-      }
-      enum "INDFR" {
-        description
-          "Total ETH RX frames discarded for reasons other than FCS errors";
-      }
-      enum "INPAUSEFR" {
-        description
-          "Pause frames received";
-      }
-      enum "INCFR" {
-        description
-          "Control frames received";
-      }
-      enum "FRTOOSHORTS" {
-        description
-          "Frames less than 64 bytes in length with valid FCS";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames that exceed the MTU with valid FCS";
-      }
-      enum "FCSERR" {
-        description
-          "Frames of valid length with LAN FCS errors";
-      }
-      enum "FRAG" {
-        description
-          "Undersized frames with FCS errors";
-      }
-      enum "JAB" {
-        description
-          "Oversized frames with FCS errors";
-      }
-      enum "SYMBOLERR" {
-        description
-          "8B-10B coding errors received";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR" {
-        description
-          "Total ETH frames transmitted with errors";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Octets in frames counted by OUTFRAMES";
-      }
-      enum "OUTOCTETSERR" {
-        description
-          "Octets in frames counted by OUTFRAMESERR";
-      }
-      enum "OUTFRAMESDISCDS" {
-        description
-          "Total Egress direction frames discarded due to congestion &FIFO overflow";
-      }
-      enum "OUTPAUSEFR" {
-        description
-          "Total ETH pause frames transmitted";
-      }
-      enum "OUTDFR" {
-        description
-          "Total ETH TX frames discarded ";
-      }
-      enum "INFRNC";
-      enum "INDOCT";
-      enum "OUTDFRCNF";
-      enum "OUTDOCT";
-      enum "UTL";
-      enum "UTLMX";
-      enum "AUTONEGCYCLES" {
-        description
-          "counts the number of AutoNegotiation cycles";
-      }
-      enum "INTERNALMACRXERR" {
-        description
-          "Count of frames for which the reception fails because of an internal MAC sublayer receive error.";
-      }
-      enum "INTERNALMACTXERR" {
-        description
-          "Count of frames for which the transmission fails because of an internal MAC sublayer receive error.";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes";
-      }
-      enum "ALL-ETH" {
-        description
-          "All applicable Ethernet specific omtypes";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes (Default) ";
-      }
-    }
-  }
-
-  typedef ETHN_OMTYPE {
-    type enumeration {
-      enum "FCSERR";
-      enum "FRTOOSHORTS" {
-        description
-          "Frames less than 64 bytes in length with valid FCS";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames that exceed the MTU with valid FCS";
-      }
-      enum "SYMBOLERR" {
-        description
-          "8B-10B coding errors received";
-      }
-      enum "INPAUSEFR" {
-        description
-          "Pause frames received";
-      }
-      enum "OUTPAUSEFR" {
-        description
-          "Total ETH pause frames transmitted";
-      }
-      enum "INFRAMES" {
-        description
-          "Total frames received";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total ETH frames received with FCS errors";
-      }
-      enum "INFRAMESDISCDS" {
-        description
-          "Count of ingress Frames discarded due to FIFO overflow";
-      }
-      enum "INDFR" {
-        description
-          "Total ETH RX frames discarded for reasons other than FCS errors";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR" {
-        description
-          "Total ETH frames transmitted with errors";
-      }
-      enum "OUTFRAMESDISCDS" {
-        description
-          "Total Egress direction frames discarded due to congestion &FIFO overflow";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Octets in frames counted by OUTFRAMES";
-      }
-      enum "OUTDFR" {
-        description
-          "Total ETH TX frames discarded ";
-      }
-      enum "FRAG" {
-        description
-          "Undersized frames with FCS errors";
-      }
-      enum "JAB" {
-        description
-          "Oversized frames with FCS errors";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes";
-      }
-      enum "ALL-ETH" {
-        description
-          "All applicable Ethernet specific omtypes";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes (Default) ";
-      }
-    }
-  }
-
-  typedef RPR_OMTYPE {
-    type enumeration {
-      enum "INFRAMES" {
-        description
-          "Total frames received on RPR Client port including INFRAMESERR and INDFR.";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total frames received with errors (CRC).";
-      }
-      enum "INDFR" {
-        description
-          "Total frames received that are discarded for reasons other than CRC errors.";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES.";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total frames transmitted to RPR spans.";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Count of Bytes contained in OUTFRAMES.";
-      }
-      enum "OUTDFR" {
-        description
-          "Total Egress direction frames discarded.";
-      }
-      enum "INCFR" {
-        description
-          "Total Control frames received.";
-      }
-      enum "INECHFR" {
-        description
-          "Total ECHO frames received.";
-      }
-      enum "INORGFR" {
-        description
-          "Total ORG frames received.";
-      }
-      enum "INATDFR" {
-        description
-          "Total ATD frames received.";
-      }
-      enum "INTPFR" {
-        description
-          "Total topology frames received.";
-      }
-      enum "OUTCFR" {
-        description
-          "Total Control frames transmitted.";
-      }
-      enum "OUTECHFR" {
-        description
-          "Total ECHO frames transmitted.";
-      }
-      enum "OUTORGFR" {
-        description
-          "Total ORG frames transmitted.";
-      }
-      enum "OUTATDFR" {
-        description
-          "TTotal ATD frames transmitted.";
-      }
-      enum "OUTTPFR" {
-        description
-          "Total topology frames transmitted.";
-      }
-      enum "ALL" {
-        description
-          "All applicable omtypes.";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes.";
-      }
-      enum "ALL-RPR" {
-        description
-          "All applicable RPR specific omtypes.";
-      }
-    }
-  }
-
-  typedef RLE_OMTYPE {
-    type enumeration {
-      enum "SOURCEFIM" {
-        description
-          "Fault Indication Message Originated from the Ringlet.";
-      }
-      enum "SOURCERIM" {
-        description
-          "Recovery Indication Message Originated from the Ringlet.";
-      }
-      enum "SOURCEOK" {
-        description
-          "OK Message Originated from the Ringlet.";
-      }
-      enum "RECEIVEFIM" {
-        description
-          "Fault Indication Message received to Ringlet.";
-      }
-      enum "RECEIVERIM" {
-        description
-          "Recovery Indication Message received to Ringlet.";
-      }
-      enum "RECEIVEOK" {
-        description
-          "OK Message received to Ringlet.";
-      }
-      enum "RECEIVEMYFIM" {
-        description
-          "Fault Indication Message received to Ringlet that was sent from the same Ringlet.";
-      }
-      enum "RECEIVEMYRIM" {
-        description
-          "Recovery Indication Message received to Ringlet that was sent from the same Ringlet.";
-      }
-      enum "RECEIVEMYOK" {
-        description
-          "OK Message received to Ringlet that was sent from the same Ringlet.";
-      }
-      enum "RELAYFIM" {
-        description
-          "Fault Indication Message received from other Ringlet and forward it next Ringlet.";
-      }
-      enum "RELAYRIM" {
-        description
-          "Recovery Indication Message received from other Ringlet and forward it next Ringlet.";
-      }
-      enum "RELAYOK" {
-        description
-          "OK Message received from other Ringlet and forward it next Ringlet.";
-      }
-      enum "UNKRID" {
-        description
-          "This parameter updated when receiving messages for a ring that has not been configured.";
-      }
-      enum "UNKVID" {
-        description
-          "This parameter updated when receiving messages for a ringlet that has not been configured on the ring.";
-      }
-      enum "NWKLOOP" {
-        description
-          "This parameter updated when receiving a message we sourced on the port it was source on.";
-      }
-      enum "INVDRQ" {
-        description
-          "This parameter updated when ring APS message code was not FIM, RIM or OK.";
-      }
-      enum "INVDCTRLFRAME" {
-        description
-          "This parameter is updated when a frame is received which does not conform to the eSpring standard. Examples of this could be invalid etherType, invalid daMac or something else in the future.";
-      }
-      enum "SMALLPDU" {
-        description
-          "This parameter updated when the size of the ring APS message did not meet the minimum PDU size.";
-      }
-      enum "ALL" {
-        description
-          "All applicable omtypes.";
-      }
-    }
-  }
-
-  typedef MEP_OMTYPE_RTRV {
-    type enumeration {
-      enum "OUTFRLBM" {
-        description
-          "Total CFM LoopBack Message Request transmitted.";
-      }
-      enum "INFRLBM" {
-        description
-          "Total CFM LoopBack Message Request received.";
-      }
-      enum "OUTFRLBR" {
-        description
-          "Total CFM LoopBack Response transmitted.";
-      }
-      enum "INFRLBR" {
-        description
-          "Total CFM LoopBack Response received.";
-      }
-      enum "OUTFRLTM" {
-        description
-          "Total CFM Link Trace Message transmitted.";
-      }
-      enum "INFRLTM" {
-        description
-          "Total CFM Link Trace Message received.";
-      }
-      enum "OUTFRLTR" {
-        description
-          "Total CFM Link Trace Response transmitted.";
-      }
-      enum "INFRLTR" {
-        description
-          "Total CFM Link Trace Response received..";
-      }
-      enum "OUTFRCCM" {
-        description
-          "Total CFM Connectivity Check Message transmitted.";
-      }
-      enum "INFRCCM" {
-        description
-          "Total CFM Connectivity Check Message received.";
-      }
-      enum "INFRCCMXCON" {
-        description
-          "Total CCM Connectivity Check Message received with incorrect MD or MAID.";
-      }
-      enum "INFRCCMERR" {
-        description
-          "Total CCM Connectivity Check Message received with incorrect Interval, MEPID, or SA MAC.";
-      }
-      enum "INFRCCMSTATUS" {
-        description
-          "Total CCM Connectivity Check Message received with Remote MEPs reporting incorrect Interface Status or Port Status TLV.";
-      }
-      enum "INFRCCMRDI" {
-        description
-          "Total CCM Connectivity Check Message received with RDI field set to 1.";
-      }
-      enum "OUTFRAIS" {
-        description
-          "Total count of AIS messages transmitted by this MEP.";
-      }
-      enum "INFRAIS" {
-        description
-          "Total count of AIS messages received by this MEP.";
-      }
-      enum "ALL" {
-        description
-          "All applicable omtypes.";
-      }
-    }
-  }
-
-  typedef MIP_OMTYPE_RTRV {
-    type enumeration {
-      enum "INFRLBM" {
-        description
-          "Total CFM LoopBack Message Request received.";
-      }
-      enum "OUTFRLBR" {
-        description
-          "Total CFM LoopBack Response transmitted.";
-      }
-      enum "OUTFRLTM" {
-        description
-          "Total CFM Link Trace Message transmitted.";
-      }
-      enum "INFRLTM" {
-        description
-          "Total CFM Link Trace Message received.";
-      }
-      enum "OUTFRLTR" {
-        description
-          "Total CFM Link Trace Response transmitted.";
-      }
-      enum "ALL" {
-        description
-          "All applicable omtypes.";
-      }
-    }
-  }
-
-  typedef ETTP_OMTYPE {
-    type enumeration {
-      enum "FCSERR";
-      enum "FRTOOSHORTS" {
-        description
-          "Frames less than 64 bytes in length with valid FCS";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames that exceed the MTU with valid FCS";
-      }
-      enum "SYMBOLERR" {
-        description
-          "Coding errors received";
-      }
-      enum "INPAUSEFR" {
-        description
-          "Pause frames received";
-      }
-      enum "OUTPAUSEFR" {
-        description
-          "Total ETH pause frames transmitted";
-      }
-      enum "INFRAMES" {
-        description
-          "Total frames received";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total ETH frames received with FCS errors";
-      }
-      enum "INFRAMESDISCDS" {
-        description
-          "Count of ingress Frames discarded due to FIFO overflow";
-      }
-      enum "INDFR" {
-        description
-          "Total ETH RX frames discarded for reasons other than FCS errors";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR" {
-        description
-          "Total ETH frames transmitted with errors";
-      }
-      enum "OUTFRAMESDISCDS" {
-        description
-          "Total Egress direction frames discarded due to congestion &FIFO overflow";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Octets in frames counted by OUTFRAMES";
-      }
-      enum "OUTDFR" {
-        description
-          "Total ETH TX frames discarded ";
-      }
-      enum "FRAG" {
-        description
-          "Undersized frames with FCS errors";
-      }
-      enum "JAB" {
-        description
-          "Oversized frames with FCS errors";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes";
-      }
-      enum "ALL-ETH" {
-        description
-          "All applicable Ethernet specific omtypes";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes (Default) ";
-      }
-    }
-  }
-
-  typedef CBRTTP_OMTYPE {
-    type enumeration {
-      enum "INFRAMES" {
-        description
-          "Total frames received";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Total ETH frames received with FCS errors";
-      }
-      enum "INOCTETS" {
-        description
-          "Count of Bytes contained in INFRAMES";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR" {
-        description
-          "Total ETH frames transmitted with errors";
-      }
-      enum "OUTOCTETS" {
-        description
-          "Octets in frames counted by OUTFRAMES";
-      }
-      enum "FCSERR";
-      enum "JAB" {
-        description
-          "Oversized frames with FCS errors";
-      }
-      enum "FRAG" {
-        description
-          "Undersized frames with FCS errors";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Frames that exceed the MTU with valid FCS";
-      }
-      enum "FRTOOSHORTS" {
-        description
-          "Frames less than 64 bytes in length with valid FCS";
-      }
-      enum "INPAUSEFR" {
-        description
-          "Pause frames received";
-      }
-      enum "SYMBOLERR" {
-        description
-          "Coding errors received";
-      }
-      enum "OUTPAUSEFR" {
-        description
-          "Total ETH pause frames transmitted";
-      }
-      enum "ALL-IF" {
-        description
-          "All applicable Generic interface omtypes";
-      }
-      enum "ALL-ETH" {
-        description
-          "All applicable Ethernet specific omtypes";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes (Default) ";
-      }
-    }
-  }
-
-  typedef CapacityChangeMode {
-    type enumeration {
-      enum "MODE1" {
-        description
-          " (Default) ";
-      }
-      enum "MODE2";
-      enum "MODE3";
-    }
-  }
-
-  typedef txClass {
-    type enumeration {
-      enum "0" {
-        description
-          "Default for most transmitters";
-      }
-      enum "1" {
-        description
-          "Most 100G transmitters";
-      }
-      enum "2" {
-        description
-          "40G Terrestrial transmitters";
-      }
-      enum "3" {
-        description
-          "40G Submarine transmitters";
-      }
-      enum "4" {
-        description
-          "100G Gen2 transmitters";
-      }
-      enum "NOISE" {
-        description
-          "Noise channel";
-      }
-      enum "ASE" {
-        description
-          "ASE channel";
-      }
-      enum "5" {
-        description
-          "Foreign coherent";
-      }
-      enum "7" {
-        description
-          "56G Baud mode";
-      }
-      enum "SLIC" {
-        description
-          "Submarine SLIC";
-      }
-    }
-  }
-
-  typedef RAMAN_PM_MONTYPE_rtrv {
-    type enumeration {
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPINMIN-OTS" {
-        description
-          "Optical Power Input Minimum";
-      }
-      enum "OPINMAX-OTS" {
-        description
-          "Optical Power Input Maximum";
-      }
-      enum "OPINAVG-OTS" {
-        description
-          "Optical Power Input Average";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "OPOUTMIN-OTS" {
-        description
-          "Optical Power Output Minimum";
-      }
-      enum "OPOUTMAX-OTS" {
-        description
-          "Optical Power Output Maximum";
-      }
-      enum "OPOUTAVG-OTS" {
-        description
-          "Optical Power Output Average";
-      }
-      enum "OPROSC-OTS" {
-        description
-          "Optical Power Receive, OSC";
-      }
-      enum "OPROSCMIN-OTS" {
-        description
-          "Optical Power Receive, OSC Minimum";
-      }
-      enum "OPROSCMAX-OTS" {
-        description
-          "Optical Power Receive, OSC Maximum";
-      }
-      enum "OPROSCAVG-OTS" {
-        description
-          "Optical Power Receive, OSC Average";
-      }
-      enum "ORLIN-OTS" {
-        description
-          "Optical Return Loss Input";
-      }
-      enum "ORLINMIN-OTS" {
-        description
-          "Optical Return Loss Input Minimum";
-      }
-      enum "ORLINMAX-OTS" {
-        description
-          "Optical Return Loss Input Maximum";
-      }
-      enum "ORLINAVG-OTS" {
-        description
-          "Optical Return Loss Input Average";
-      }
-      enum "ORLOUT-OTS" {
-        description
-          "Optical Return Loss Output";
-      }
-      enum "ORLOUTMIN-OTS" {
-        description
-          "Optical Return Loss Output Minimum";
-      }
-      enum "ORLOUTMAX-OTS" {
-        description
-          "Optical Return Loss Output Maximum";
-      }
-      enum "ORLOUTAVG-OTS" {
-        description
-          "Optical Return Loss Output Average";
-      }
-    }
-  }
-
-  typedef MONLEV {
-    type enumeration {
-      enum "0-UP";
-      enum "1-UP";
-      enum "0-ADJ-UP";
-    }
-  }
-
-  typedef LOCN_ALL {
-    type enumeration {
-      enum "NEND" {
-        description
-          "Near End";
-      }
-      enum "FEND" {
-        description
-          "Far End";
-      }
-      enum "ALL" {
-        description
-          "All ends";
-      }
-    }
-  }
-
-  typedef DIRN_INPUT_PHT {
-    type enumeration {
-      enum "NA" {
-        description
-          "Not Applicable";
-      }
-      enum "RCV" {
-        description
-          "Receive direction only";
-      }
-      enum "TRMT" {
-        description
-          "Transmit direction only";
-      }
-      enum "ALL" {
-        description
-          "Both directions";
-      }
-    }
-  }
-
-  typedef TMPER_ALL {
-    type enumeration {
-      enum "15-MIN";
-      enum "1-DAY";
-      enum "1-UNT";
-      enum "BASLN";
-      enum "ALL";
-    }
-  }
-
-  typedef TREXFRMT {
-    type enumeration {
-      enum "GZIP" {
-        description
-          "GZIP format";
-      }
-    }
-  }
-
-  typedef RAMAN_PM_MONTYPE_rtrv_resp {
-    type enumeration {
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPINMIN-OTS" {
-        description
-          "Optical Power Input Minimum";
-      }
-      enum "OPINMAX-OTS" {
-        description
-          "Optical Power Input Maximum";
-      }
-      enum "OPINAVG-OTS" {
-        description
-          "Optical Power Input Average";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "OPOUTMIN-OTS" {
-        description
-          "Optical Power Output Minimum";
-      }
-      enum "OPOUTMAX-OTS" {
-        description
-          "Optical Power Output Maximum";
-      }
-      enum "OPOUTAVG-OTS" {
-        description
-          "Optical Power Output Average";
-      }
-      enum "OPROSC-OTS" {
-        description
-          "Optical Power Receive, OSC";
-      }
-      enum "OPROSCMIN-OTS" {
-        description
-          "Optical Power Receive, OSC Minimum";
-      }
-      enum "OPROSCMAX-OTS" {
-        description
-          "Optical Power Receive, OSC Maximum";
-      }
-      enum "OPROSCAVG-OTS" {
-        description
-          "Optical Power Receive, OSC Average";
-      }
-      enum "ORLIN-OTS" {
-        description
-          "Optical Return Loss Input";
-      }
-      enum "ORLINMIN-OTS" {
-        description
-          "Optical Return Loss Input Minimum";
-      }
-      enum "ORLINMAX-OTS" {
-        description
-          "Optical Return Loss Input Maximum";
-      }
-      enum "ORLINAVG-OTS" {
-        description
-          "Optical Return Loss Input Average";
-      }
-      enum "ORLOUT-OTS" {
-        description
-          "Optical Return Loss Output";
-      }
-      enum "ORLOUTMIN-OTS" {
-        description
-          "Optical Return Loss Output Minimum";
-      }
-      enum "ORLOUTMAX-OTS" {
-        description
-          "Optical Return Loss Output Maximum";
-      }
-      enum "ORLOUTAVG-OTS" {
-        description
-          "Optical Return Loss Output Average";
-      }
-    }
-  }
-
-  typedef VLDTY {
-    type enumeration {
-      enum "COMPL" {
-        description
-          "Interval complete";
-      }
-      enum "PRTL" {
-        description
-          "Interval incomplete (partial) - current time period was cut short";
-      }
-      enum "ADJ" {
-        description
-          "The register data is suspect or has been reset.";
-      }
-      enum "NA" {
-        description
-          "Not available";
-      }
-    }
-  }
-
-  typedef LOCN {
-    type enumeration {
-      enum "NEND" {
-        description
-          "Near End";
-      }
-      enum "FEND" {
-        description
-          "Far End";
-      }
-    }
-  }
-
-  typedef DIRN_RESP_PHT {
-    type enumeration {
-      enum "NA" {
-        description
-          "Not Applicable";
-      }
-      enum "RCV" {
-        description
-          "Receive direction only";
-      }
-      enum "TRMT" {
-        description
-          "Transmit direction only";
-      }
-    }
-  }
-
-  typedef TMPER {
-    type enumeration {
-      enum "15-MIN";
-      enum "1-DAY";
-      enum "1-UNT";
-      enum "BASLN" {
-        description
-          "Baseline register Only applies to gauges values (only applies to the OCH layer)";
-      }
-    }
-  }
-
-  typedef PORTMODE {
-    type enumeration {
-      enum "NONE";
-      enum "SONET";
-      enum "SDH";
-      enum "JSDH";
-    }
-  }
-
-  typedef RAMAN_PM_MONTYPE {
-    type enumeration {
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef RAMAN_TH_MONTYPE_set {
-    type enumeration {
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "ORLIN-OTS" {
-        description
-          "Optical Return Loss Input";
-      }
-      enum "ORLOUT-OTS" {
-        description
-          "Optical Return Loss Output";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef TMPER_TH_PHT {
-    type enumeration {
-      enum "1-UNT";
-      enum "ALL";
-    }
-  }
-
-  typedef PMProfile {
-    type enumeration {
-      enum "PROFILE1" {
-        description
-          "PM Profile 1";
-      }
-      enum "PROFILE2" {
-        description
-          "PM Profile 2";
-      }
-      enum "PROFILE3" {
-        description
-          "PM Profile 3";
-      }
-      enum "PROFILE4" {
-        description
-          "PM Profile 4";
-      }
-      enum "DFLT" {
-        description
-          "ALLOFF - ALL Source Profiles OFF";
-      }
-      enum "ALLOFF" {
-        description
-          "ALL PM Profiles OFF";
-      }
-      enum "FACTORYDFLT" {
-        description
-          "Factory DeFauLT PM Profile";
-      }
-    }
-  }
-
-  typedef EdPMProfile {
-    type enumeration {
-      enum "PROFILE1" {
-        description
-          "PM Profile 1";
-      }
-      enum "PROFILE2" {
-        description
-          "PM Profile 2";
-      }
-      enum "PROFILE3" {
-        description
-          "PM Profile 3";
-      }
-      enum "PROFILE4" {
-        description
-          "PM Profile 4";
-      }
-      enum "DFLT" {
-        description
-          "Default Destination Profile";
-      }
-    }
-  }
-
-  typedef RAMAN_TH_MONTYPE_resp {
-    type enumeration {
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "ORLIN-OTS" {
-        description
-          "Optical Return Loss Input";
-      }
-      enum "ORLOUT-OTS" {
-        description
-          "Optical Return Loss Output";
-      }
-    }
-  }
-
-  typedef VOA_PM_MONTYPE_rtrv {
-    type enumeration {
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "ORLMIN-OTS" {
-        description
-          "Optical Return Loss Minimum";
-      }
-      enum "ORLMAX-OTS" {
-        description
-          "Optical Return Loss Maximum";
-      }
-      enum "ORLAVG-OTS" {
-        description
-          "Optical Return Loss Average";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPINMIN-OTS" {
-        description
-          "Optical Power Input Minimum";
-      }
-      enum "OPINMAX-OTS" {
-        description
-          "Optical Power Input Maximum";
-      }
-      enum "OPINAVG-OTS" {
-        description
-          "Optical Power Input Average";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "OPOUTMIN-OTS" {
-        description
-          "Optical Power Output Minimum";
-      }
-      enum "OPOUTMAX-OTS" {
-        description
-          "Optical Power Output Maximum";
-      }
-      enum "OPOUTAVG-OTS" {
-        description
-          "Optical Power Output Average";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output";
-      }
-      enum "GRPOPOUTMIN-OTS" {
-        description
-          "Group Optical Power Output Minimum";
-      }
-      enum "GRPOPOUTMAX-OTS" {
-        description
-          "Group Optical Power Output Maximum";
-      }
-      enum "GRPOPOUTAVG-OTS" {
-        description
-          "Group Optical Power Output Average";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef INDEX {
-    type enumeration {
-      enum "0" {
-        description
-          "current interval";
-      }
-      enum "1" {
-        description
-          "previous 1st interval";
-      }
-      enum "2" {
-        description
-          "previous 2nd interval";
-      }
-      enum "3" {
-        description
-          "previous 3rd interval";
-      }
-      enum "4" {
-        description
-          "previous 4th interval";
-      }
-      enum "5" {
-        description
-          "previous 5th interval";
-      }
-      enum "6" {
-        description
-          "previous 6th interval";
-      }
-      enum "7" {
-        description
-          "previous 7th interval";
-      }
-      enum "8" {
-        description
-          "previous 8th interval";
-      }
-      enum "9" {
-        description
-          "previous 9th interval";
-      }
-      enum "10" {
-        description
-          "previous 10th interval";
-      }
-      enum "11" {
-        description
-          "previous 11th interval";
-      }
-      enum "12" {
-        description
-          "previous 12th interval";
-      }
-      enum "13" {
-        description
-          "previous 13th interval";
-      }
-      enum "14" {
-        description
-          "previous 14th interval";
-      }
-      enum "15" {
-        description
-          "previous 15th interval";
-      }
-      enum "16" {
-        description
-          "previous 16th interval";
-      }
-      enum "17" {
-        description
-          "previous 17th interval";
-      }
-      enum "18" {
-        description
-          "previous 18th interval";
-      }
-      enum "19" {
-        description
-          "previous 19th interval";
-      }
-      enum "20" {
-        description
-          "previous 20th interval";
-      }
-      enum "21" {
-        description
-          "previous 21st interval";
-      }
-      enum "22" {
-        description
-          "previous 22nd interval";
-      }
-      enum "23" {
-        description
-          "previous 23rd interval";
-      }
-      enum "24" {
-        description
-          "previous 24th interval";
-      }
-      enum "25" {
-        description
-          "previous 25th interval";
-      }
-      enum "26" {
-        description
-          "previous 26th interval";
-      }
-      enum "27" {
-        description
-          "previous 27th interval";
-      }
-      enum "28" {
-        description
-          "previous 28th interval";
-      }
-      enum "29" {
-        description
-          "previous 29th interval";
-      }
-      enum "30" {
-        description
-          "previous 30th interval";
-      }
-      enum "31" {
-        description
-          "previous 31st interval";
-      }
-      enum "32" {
-        description
-          "previous 32nd interval";
-      }
-      enum "ALL" {
-        description
-          "all intervals";
-      }
-    }
-  }
-
-  typedef VOA_PM_MONTYPE_rtrv_resp {
-    type enumeration {
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "ORLMIN-OTS" {
-        description
-          "Optical Return Loss Minimum";
-      }
-      enum "ORLMAX-OTS" {
-        description
-          "Optical Return Loss Maximum";
-      }
-      enum "ORLAVG-OTS" {
-        description
-          "Optical Return Loss Average";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPINMIN-OTS" {
-        description
-          "Optical Power Input Minimum";
-      }
-      enum "OPINMAX-OTS" {
-        description
-          "Optical Power Input Maximum";
-      }
-      enum "OPINAVG-OTS" {
-        description
-          "Optical Power Input Average";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "OPOUTMIN-OTS" {
-        description
-          "Optical Power Output Minimum";
-      }
-      enum "OPOUTMAX-OTS" {
-        description
-          "Optical Power Output Maximum";
-      }
-      enum "OPOUTAVG-OTS" {
-        description
-          "Optical Power Output Average";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output";
-      }
-      enum "GRPOPOUTMIN-OTS" {
-        description
-          "Group Optical Power Output Minimum";
-      }
-      enum "GRPOPOUTMAX-OTS" {
-        description
-          "Group Optical Power Output Maximum";
-      }
-      enum "GRPOPOUTAVG-OTS" {
-        description
-          "Group Optical Power Output Average";
-      }
-    }
-  }
-
-  typedef VOA_PM_MONTYPE {
-    type enumeration {
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef VOA_TH_MONTYPE_set {
-    type enumeration {
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef VOA_TH_MONTYPE_resp {
-    type enumeration {
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output";
-      }
-    }
-  }
-
-  typedef OPTMON_PM_MONTYPE_rtrv {
-    type enumeration {
-      enum "OPR-OTS" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive - Minimum";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive - Maximum";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive - Average";
-      }
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPTMIN-OTS" {
-        description
-          "Optical Power Transmit - Minimum";
-      }
-      enum "OPTMAX-OTS" {
-        description
-          "Optical Power Transmit - Maximum";
-      }
-      enum "OPTAVG-OTS" {
-        description
-          "Optical Power Transmit - Average";
-      }
-      enum "PSD-OTS" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "PSCW-OTS" {
-        description
-          "Protection Switch Count Working";
-      }
-      enum "PSCP-OTS" {
-        description
-          "Protection Switch Count Protection";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef OPTMON_PM_MONTYPE_rtrv_resp {
-    type enumeration {
-      enum "OPR-OTS" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive - Minimum";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive - Maximum";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive - Average";
-      }
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPTMIN-OTS" {
-        description
-          "Optical Power Transmit - Minimum";
-      }
-      enum "OPTMAX-OTS" {
-        description
-          "Optical Power Transmit - Maximum";
-      }
-      enum "OPTAVG-OTS" {
-        description
-          "Optical Power Transmit - Average";
-      }
-      enum "PSD-OTS" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "PSCW-OTS" {
-        description
-          "Protection Switch Count Working";
-      }
-      enum "PSCP-OTS" {
-        description
-          "Protection Switch Count Protection";
-      }
-    }
-  }
-
-  typedef OPTMON_PM_MONTYPE {
-    type enumeration {
-      enum "PSD-OTS" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "PSCW-OTS" {
-        description
-          "Protection Switch Count Working";
-      }
-      enum "PSCP-OTS" {
-        description
-          "Protection Switch Count Protection";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive - Minimum";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive - Maximum";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive - Average";
-      }
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPTMIN-OTS" {
-        description
-          "Optical Power Transmit - Minimum";
-      }
-      enum "OPTMAX-OTS" {
-        description
-          "Optical Power Transmit - Maximum";
-      }
-      enum "OPTAVG-OTS" {
-        description
-          "Optical Power Transmit - Average";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef OPTMON_TH_MONTYPE_set {
-    type enumeration {
-      enum "OPR-OTS" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef RTRVPMProfile {
-    type enumeration {
-      enum "PROFILE1" {
-        description
-          "PM Profile 1";
-      }
-      enum "PROFILE2" {
-        description
-          "PM Profile 2";
-      }
-      enum "PROFILE3" {
-        description
-          "PM Profile 3";
-      }
-      enum "PROFILE4" {
-        description
-          "PM Profile 4";
-      }
-      enum "DFLT" {
-        description
-          "Default Source Profile";
-      }
-      enum "ALLOFF" {
-        description
-          "ALL PM Profiles OFF";
-      }
-      enum "FACTORYDFLT" {
-        description
-          "Factory DeFauLT PM Profile";
-      }
-      enum "ALLPROFILES" {
-        description
-          "All Source Profiles";
-      }
-    }
-  }
-
-  typedef OPTMON_TH_MONTYPE_resp {
-    type enumeration {
-      enum "OPR-OTS" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "GRPOPT-OTS" {
-        description
-          "Group Optical Power Transmit";
-      }
-    }
-  }
-
-  typedef AMP_PM_MONTYPE_rtrv {
-    type enumeration {
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "ORLMIN-OTS" {
-        description
-          "Optical Return Loss Minimum";
-      }
-      enum "ORLMAX-OTS" {
-        description
-          "Optical Return Loss Maximum";
-      }
-      enum "ORLAVG-OTS" {
-        description
-          "Optical Return Loss Average";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPINMIN-OTS" {
-        description
-          "Optical Power Input Minimum";
-      }
-      enum "OPINMAX-OTS" {
-        description
-          "Optical Power Input Maximum";
-      }
-      enum "OPINAVG-OTS" {
-        description
-          "Optical Power Input Average";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "OPOUTMIN-OTS" {
-        description
-          "Optical Power Output Minimum";
-      }
-      enum "OPOUTMAX-OTS" {
-        description
-          "Optical Power Output Maximum";
-      }
-      enum "OPOUTAVG-OTS" {
-        description
-          "Optical Power Output Average";
-      }
-      enum "GRPGAIN-OTS" {
-        description
-          "Group Gain";
-      }
-      enum "GRPGAINMIN-OTS" {
-        description
-          "Group Gain Minimum";
-      }
-      enum "GRPGAINMAX-OTS" {
-        description
-          "Group Gain Maximum";
-      }
-      enum "GRPGAINAVG-OTS" {
-        description
-          "Group Gain Average";
-      }
-      enum "GRPOPIN-OTS" {
-        description
-          "Group Optical Power Input";
-      }
-      enum "GRPOPINMIN-OTS" {
-        description
-          "Group Optical Power Input Minimum";
-      }
-      enum "GRPOPINMAX-OTS" {
-        description
-          "Group Optical Power Input Maximum";
-      }
-      enum "GRPOPINAVG-OTS" {
-        description
-          "Group Optical Power Input Average";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output";
-      }
-      enum "GRPOPOUTMIN-OTS" {
-        description
-          "Group Optical Power Output Minimum";
-      }
-      enum "GRPOPOUTMAX-OTS" {
-        description
-          "Group Optical Power Output Maximum";
-      }
-      enum "GRPOPOUTAVG-OTS" {
-        description
-          "Group Optical Power Output Average";
-      }
-      enum "DROPGAIN-OTS" {
-        description
-          "Drop Gain";
-      }
-      enum "DROPGAINMIN-OTS" {
-        description
-          "Drop Gain Minimum";
-      }
-      enum "DROPGAINMAX-OTS" {
-        description
-          "Drop Gain Maximum";
-      }
-      enum "DROPGAINAVG-OTS" {
-        description
-          "Drop Gain Average";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef AMP_PM_MONTYPE_rtrv_resp {
-    type enumeration {
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "ORLMIN-OTS" {
-        description
-          "Optical Return Loss Minimum";
-      }
-      enum "ORLMAX-OTS" {
-        description
-          "Optical Return Loss Maximum";
-      }
-      enum "ORLAVG-OTS" {
-        description
-          "Optical Return Loss Average";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPINMIN-OTS" {
-        description
-          "Optical Power Input Minimum";
-      }
-      enum "OPINMAX-OTS" {
-        description
-          "Optical Power Input Maximum";
-      }
-      enum "OPINAVG-OTS" {
-        description
-          "Optical Power Input Average";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "OPOUTMIN-OTS" {
-        description
-          "Optical Power Output Minimum";
-      }
-      enum "OPOUTMAX-OTS" {
-        description
-          "Optical Power Output Maximum";
-      }
-      enum "OPOUTAVG-OTS" {
-        description
-          "Optical Power Output Average";
-      }
-      enum "GRPGAIN-OTS" {
-        description
-          "Group Gain";
-      }
-      enum "GRPGAINMIN-OTS" {
-        description
-          "Group Gain Minimum";
-      }
-      enum "GRPGAINMAX-OTS" {
-        description
-          "Group Gain Maximum";
-      }
-      enum "GRPGAINAVG-OTS" {
-        description
-          "Group Gain Average";
-      }
-      enum "GRPOPIN-OTS" {
-        description
-          "Group Optical Power Input";
-      }
-      enum "GRPOPINMIN-OTS" {
-        description
-          "Group Optical Power Input Minimum";
-      }
-      enum "GRPOPINMAX-OTS" {
-        description
-          "Group Optical Power Input Maximum";
-      }
-      enum "GRPOPINAVG-OTS" {
-        description
-          "Group Optical Power Input Average";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output";
-      }
-      enum "GRPOPOUTMIN-OTS" {
-        description
-          "Group Optical Power Output Minimum";
-      }
-      enum "GRPOPOUTMAX-OTS" {
-        description
-          "Group Optical Power Output Maximum";
-      }
-      enum "GRPOPOUTAVG-OTS" {
-        description
-          "Group Optical Power Output Average";
-      }
-      enum "DROPGAIN-OTS" {
-        description
-          "Drop Gain";
-      }
-      enum "DROPGAINMIN-OTS" {
-        description
-          "Drop Gain Minimum";
-      }
-      enum "DROPGAINMAX-OTS" {
-        description
-          "Drop Gain Maximum";
-      }
-      enum "DROPGAINAVG-OTS" {
-        description
-          "Drop Gain Average";
-      }
-    }
-  }
-
-  typedef AMP_PM_MONTYPE {
-    type enumeration {
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef AMP_TH_MONTYPE_set {
-    type enumeration {
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "GRPGAIN-OTS" {
-        description
-          "Group Gain";
-      }
-      enum "GRPOPIN-OTS" {
-        description
-          "Group optical Power Input";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group optical Power Output";
-      }
-      enum "DROPGAIN-OTS" {
-        description
-          "Drop gain";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef AMP_TH_MONTYPE_resp {
-    type enumeration {
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "GRPGAIN-OTS" {
-        description
-          "Group Gain";
-      }
-      enum "GRPOPIN-OTS" {
-        description
-          "Group optical Power Input";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group optical Power Output";
-      }
-      enum "DROPGAIN-OTS" {
-        description
-          "Drop gain";
-      }
-    }
-  }
-
-  typedef ALL_MONTYPE {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "FC-L" {
-        description
-          "Failure Count - Line";
-      }
-      enum "PSCW-L" {
-        description
-          "Protection switch count, working line - LINE";
-      }
-      enum "PSCP-L" {
-        description
-          "Protection switch count, protection line - LINE";
-      }
-      enum "PSD-L" {
-        description
-          "Protection switch duration, line - LINE";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Gauge Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Minimum OPT for interval";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Maximum OPT for interval";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Average OPT for interval";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received.";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "SPANLOSS-OCH" {
-        description
-          "The OSC Span Loss in dB";
-      }
-      enum "SPANLOSSMIN-OCH" {
-        description
-          "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "SPANLOSSMAX-OCH" {
-        description
-          "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "SPANLOSSAVG-OCH" {
-        description
-          "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimates - OTU. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU.";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "UNCFECBLK-OTU" {
-        description
-          "Uncorrected FEC Block - OTU";
-      }
-      enum "IAE-OTU" {
-        description
-          "Incoming Alignment Error - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "CV-TCM" {
-        description
-          "Coding Violations - TCM";
-      }
-      enum "ES-TCM" {
-        description
-          "Errored Seconds - TCM";
-      }
-      enum "SES-TCM" {
-        description
-          "Severely Errored Seconds - TCM";
-      }
-      enum "UAS-TCM" {
-        description
-          "Unavailable Seconds - TCM ";
-      }
-      enum "FC-TCM" {
-        description
-          "Failure Count - TCM";
-      }
-      enum "PSD-TCM" {
-        description
-          "Protection Switch Duration - TCM";
-      }
-      enum "PSCW-TCM" {
-        description
-          "Protection Switch Count, Working - TCM";
-      }
-      enum "PSCP-TCM" {
-        description
-          "Protection Switch Count, Protection - TCM";
-      }
-      enum "DMMIN-TCM" {
-        description
-          "Delay Measurement Min - TCM";
-      }
-      enum "DMMAX-TCM" {
-        description
-          "Delay Measurement Max - TCM";
-      }
-      enum "DMAVG-TCM" {
-        description
-          "Delay Measurement Avg - TCM";
-      }
-      enum "IAE-TCM" {
-        description
-          "Incoming Alignment Error - TCM";
-      }
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "Errored Seconds -ETH";
-      }
-      enum "SES-E" {
-        description
-          "Severely Errored Seconds";
-      }
-      enum "UAS-E" {
-        description
-          "Unavailable Seconds";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Number of frames received (binned OM) - Ethernet.";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Frame Check Sequence Errors (binned OM) - Ethernet";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Number of errored frames received";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Number of errored frames transmitted";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Number of ingress discarded frames due to congestion or overflow";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Number of egress discarded frames due to congestion or overflow";
-      }
-      enum "DFR-E" {
-        description
-          "Aggregate count of discarded frames";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors";
-      }
-      enum "FEC-PMA" {
-        description
-          "Forward Error Corrections - Physical Medium Attachment";
-      }
-      enum "FECCCW-PMA" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-      }
-      enum "FECUNCCW-PMA" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-      enum "REMOTEINFRAMES-E" {
-        description
-          "Remote In Frames";
-      }
-      enum "REMOTEOUTFRAMES-E" {
-        description
-          "Remote Out Frames";
-      }
-      enum "REMOTEINFRAMESERR-E" {
-        description
-          "Remote In Frames Err";
-      }
-      enum "REMOTEOUTFRAMESDISCDS-E" {
-        description
-          "Remote Out Frames Disc";
-      }
-      enum "REMOTEFCSERR-E" {
-        description
-          "Remote FCS Err";
-      }
-      enum "GRPOPT-OTS" {
-        description
-          "Group Optical Power Transmit";
-      }
-      enum "GRPOPTMIN-OTS" {
-        description
-          "Group Optical Power Transmit - Minimum";
-      }
-      enum "GRPOPTMAX-OTS" {
-        description
-          "Group Optical Power Transmit - Maximum";
-      }
-      enum "GRPOPTAVG-OTS" {
-        description
-          "Group Optical Power Transmit - Average";
-      }
-      enum "OPROSC-OTS" {
-        description
-          "Optical Power Receive, OSC";
-      }
-      enum "OPROSCMIN-OTS" {
-        description
-          "Optical Power Receive, OSC Minimum";
-      }
-      enum "OPROSCMAX-OTS" {
-        description
-          "Optical Power Receive, OSC Maximum";
-      }
-      enum "OPROSCAVG-OTS" {
-        description
-          "Optical Power Receive, OSC Average";
-      }
-      enum "ORLIN-OTS" {
-        description
-          "Optical Return Loss Input";
-      }
-      enum "ORLINMIN-OTS" {
-        description
-          "Optical Return Loss Input Minimum";
-      }
-      enum "ORLINMAX-OTS" {
-        description
-          "Optical Return Loss Input Maximum";
-      }
-      enum "ORLINAVG-OTS" {
-        description
-          "Optical Return Loss Input Average";
-      }
-      enum "ORLOUT-OTS" {
-        description
-          "Optical Return Loss Output";
-      }
-      enum "ORLOUTMIN-OTS" {
-        description
-          "Optical Return Loss Output Minimum";
-      }
-      enum "ORLOUTMAX-OTS" {
-        description
-          "Optical Return Loss Output Maximum";
-      }
-      enum "ORLOUTAVG-OTS" {
-        description
-          "Optical Return Loss Output Average";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive - Minimum";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive - Maximum";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive - Average";
-      }
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPTMIN-OTS" {
-        description
-          "Optical Power Transmit - Minimum";
-      }
-      enum "OPTMAX-OTS" {
-        description
-          "Optical Power Transmit - Maximum";
-      }
-      enum "OPTAVG-OTS" {
-        description
-          "Optical Power Transmit - Average";
-      }
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "ORLMIN-OTS" {
-        description
-          "Optical Return Loss Minimum";
-      }
-      enum "ORLMAX-OTS" {
-        description
-          "Optical Return Loss Maximum";
-      }
-      enum "ORLAVG-OTS" {
-        description
-          "Optical Return Loss Average";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPINMIN-OTS" {
-        description
-          "Optical Power Input Minimum";
-      }
-      enum "OPINMAX-OTS" {
-        description
-          "Optical Power Input Maximum";
-      }
-      enum "OPINAVG-OTS" {
-        description
-          "Optical Power Input Average";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "OPOUTMIN-OTS" {
-        description
-          "Optical Power Output Minimum";
-      }
-      enum "OPOUTMAX-OTS" {
-        description
-          "Optical Power Output Maximum";
-      }
-      enum "OPOUTAVG-OTS" {
-        description
-          "Optical Power Output Average";
-      }
-      enum "GRPGAIN-OTS" {
-        description
-          "Group Gain";
-      }
-      enum "GRPGAINMIN-OTS" {
-        description
-          "Group Gain Minimum";
-      }
-      enum "GRPGAINMAX-OTS" {
-        description
-          "Group Gain Maximum";
-      }
-      enum "GRPGAINAVG-OTS" {
-        description
-          "Group Gain Average";
-      }
-      enum "GRPOPIN-OTS" {
-        description
-          "Group Optical Power Input";
-      }
-      enum "GRPOPINMIN-OTS" {
-        description
-          "Group Optical Power Input Minimum";
-      }
-      enum "GRPOPINMAX-OTS" {
-        description
-          "Group Optical Power Input Maximum";
-      }
-      enum "GRPOPINAVG-OTS" {
-        description
-          "Group Optical Power Input Average";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output";
-      }
-      enum "GRPOPOUTMIN-OTS" {
-        description
-          "Group Optical Power Output Minimum";
-      }
-      enum "GRPOPOUTMAX-OTS" {
-        description
-          "Group Optical Power Output Maximum";
-      }
-      enum "GRPOPOUTAVG-OTS" {
-        description
-          "Group Optical Power Output Average";
-      }
-      enum "DROPGAIN-OTS" {
-        description
-          "Drop Gain";
-      }
-      enum "DROPGAINMIN-OTS" {
-        description
-          "Drop Gain Minimum";
-      }
-      enum "DROPGAINMAX-OTS" {
-        description
-          "Drop Gain Maximum";
-      }
-      enum "DROPGAINAVG-OTS" {
-        description
-          "Drop Gain Average";
-      }
-      enum "PSD-OTS" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "PSCW-OTS" {
-        description
-          "Protection Switch Count Working";
-      }
-      enum "PSCP-OTS" {
-        description
-          "Protection Switch Count Protection";
-      }
-      enum "EVCSH-OTS" {
-        description
-          "Event Count Short";
-      }
-      enum "EVCSHMAX-OTS" {
-        description
-          "Event Count Short - MAX";
-      }
-      enum "EVCLG-OTS" {
-        description
-          "Event Count Long";
-      }
-      enum "EVCLGMAX-OTS" {
-        description
-          "Event Count Long - MAX";
-      }
-      enum "MAXEVLDISSH-OTS" {
-        description
-          "Maximum Event Loss Distance Short";
-      }
-      enum "MAXEVLDISSHMAX-OTS" {
-        description
-          "Maximum Event Loss Distance Short - MAX";
-      }
-      enum "MAXEVLDISLG-OTS" {
-        description
-          "Maximum Event Loss Distance Long";
-      }
-      enum "MAXEVLDISLGMAX-OTS" {
-        description
-          "Maximum Event Loss Distance Long - MAX";
-      }
-      enum "MAXEVRDISSH-OTS" {
-        description
-          "Maximum Event Reflection Distance Short";
-      }
-      enum "MAXEVRDISSHMAX-OTS" {
-        description
-          "Maximum Event Reflection Distance Short - MAX";
-      }
-      enum "MAXEVRDISLG-OTS" {
-        description
-          "Maximum Event Reflection Distance Long";
-      }
-      enum "MAXEVRDISLGMAX-OTS" {
-        description
-          "Maximum Event Reflection Distance Long - MAX";
-      }
-      enum "MAXEVLSH-OTS" {
-        description
-          "Maximum Event Loss Short";
-      }
-      enum "MAXEVLSHMAX-OTS" {
-        description
-          "Maximum Event Loss Short - MAX";
-      }
-      enum "MAXEVLLG-OTS" {
-        description
-          "Maximum Event Loss Long";
-      }
-      enum "MAXEVLLGMAX-OTS" {
-        description
-          "Maximum Event Loss Long - MAX";
-      }
-      enum "MAXEVRSH-OTS" {
-        description
-          "Maximum Event Reflection Short";
-      }
-      enum "MAXEVRSHMAX-OTS" {
-        description
-          "Maximum Event Reflection Short - MAX";
-      }
-      enum "MAXEVRLG-OTS" {
-        description
-          "Maximum Event Reflection Long";
-      }
-      enum "MAXEVRLGMAX-OTS" {
-        description
-          "Maximum Event Reflection Long - MAX";
-      }
-      enum "CUMEVLSH-OTS" {
-        description
-          "Cumulative Event Loss Short";
-      }
-      enum "CUMEVLSHMAX-OTS" {
-        description
-          "Cumulative Event Loss Short MAX";
-      }
-      enum "CUMEVLLG-OTS" {
-        description
-          "Cumulative Event Loss Long";
-      }
-      enum "CUMEVLLGMAX-OTS" {
-        description
-          "Cumulative Event Loss Long MAX";
-      }
-      enum "CUMEVRSH-OTS" {
-        description
-          "Cumulative Event Reflection Short";
-      }
-      enum "CUMEVRSHMAX-OTS" {
-        description
-          "Cumulative Event Reflection Short MAX";
-      }
-      enum "CUMEVRLG-OTS" {
-        description
-          "Cumulative Event Reflection Long";
-      }
-      enum "CUMEVRLGMAX-OTS" {
-        description
-          "Cumulative Event Reflection Long MAX";
-      }
-      enum "DMMIN-L" {
-        description
-          "Delay Measurement MINimum - Line";
-      }
-      enum "DMMAX-L" {
-        description
-          "Delay Measurement MAXimum - Line";
-      }
-      enum "DMAVG-L" {
-        description
-          "Delay Measurement AVGrage - Line";
-      }
-      enum "ES-W" {
-        description
-          "Errored Seconds - WAN";
-      }
-      enum "SES-W" {
-        description
-          "Severely Errored Seconds - WAN";
-      }
-      enum "UAS-W" {
-        description
-          "Unavailable Seconds - WAN";
-      }
-      enum "INFRAMES-W" {
-        description
-          "Number of frames received (binned OM) - WAN";
-      }
-      enum "INFRAMESERR-W" {
-        description
-          "Number of errored frames received - WAN";
-      }
-      enum "OUTFRAMES-W" {
-        description
-          "Number of frames transmitted (binned OM)- WAN";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-      enum "LDS-W" {
-        description
-          "LCAS Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LSDS-W" {
-        description
-          "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LUAS-W" {
-        description
-          "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-      }
-      enum "DFR-W" {
-        description
-          "Aggregate count of discarded frames - WAN";
-      }
-      enum "UTL-W" {
-        description
-          "Average percentage link utilization - WAN";
-      }
-      enum "UTLMX-W" {
-        description
-          "Maximum percentage link utilization - WAN";
-      }
-      enum "OUTFRAMESERR-W" {
-        description
-          "Out Frames Error Count, Wan";
-      }
-      enum "OPR-OTSI" {
-        description
-          "Optical Power Receive- OTSI";
-      }
-      enum "OPT-OTSI" {
-        description
-          "Optical Power Transmit- OTSI";
-      }
-      enum "OPRN-OTSI" {
-        description
-          "Normalized Optical Power Receive- OTSI";
-      }
-      enum "OPTN-OTSI" {
-        description
-          "Normalized Optical Power Transmit- OTSI";
-      }
-      enum "OPRAVG-OTSI" {
-        description
-          "Optical Power Receive, Average - OTSI";
-      }
-      enum "OPRMIN-OTSI" {
-        description
-          "Optical Power Receive, Minimum - OTSI";
-      }
-      enum "OPRMAX-OTSI" {
-        description
-          "Optical Power Receive, Maximum - OTSI";
-      }
-      enum "OPTAVG-OTSI" {
-        description
-          "Optical Power Transmit, Average - OTSI";
-      }
-      enum "OPTMIN-OTSI" {
-        description
-          "Optical Power Transmit, Minimum - OTSI";
-      }
-      enum "OPTMAX-OTSI" {
-        description
-          "Optical Power Transmit, Maximum - OTSI";
-      }
-      enum "DGDAVG-OTSI" {
-        description
-          "Differential Group Delay (Average) OTSI";
-      }
-      enum "DGDMAX-OTSI" {
-        description
-          "Differential Group Delay (Maximum) OTSI";
-      }
-      enum "PDLAVG-OTSI" {
-        description
-          "Polarization Dependent Loss, Average - OTSI";
-      }
-      enum "PDLMAX-OTSI" {
-        description
-          "Polarization Dependent Loss, Maximum - OTSI";
-      }
-      enum "HCCS-OTSI" {
-        description
-          "High Correction Count Seconds - OTSI";
-      }
-      enum "FEC-OTSI" {
-        description
-          "FEC Corrections - OTSI";
-      }
-      enum "PRFBER-OTSI" {
-        description
-          "Post-FEC BER - OTSI";
-      }
-      enum "PRFBERMAX-OTSI" {
-        description
-          "Pre-FEC BER Maximum - OTSI";
-      }
-      enum "QMIN-OTSI" {
-        description
-          "Q MIN - OTSI";
-      }
-      enum "QMAX-OTSI" {
-        description
-          "Q MAX - OTSI";
-      }
-      enum "QAVG-OTSI" {
-        description
-          "Q AVG - OTSI";
-      }
-      enum "QSTDEV-OTSI" {
-        description
-          "Q StDev - OTSI";
-      }
-      enum "UNCFECBLK-OTSI" {
-        description
-          "Uncorrected FEC Block - OTSI";
-      }
-      enum "OSNRMIN-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "OSNRMAX-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "OSNRAVG-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "ESNRMIN-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "ESNRMAX-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "ESNRAVG-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "CDMIN-OTSI" {
-        description
-          "Dispersion compensation (Minimum) OTSI";
-      }
-      enum "CDMAX-OTSI" {
-        description
-          "Dispersion compensation (Maximum) OTSI";
-      }
-      enum "CDAVG-OTSI" {
-        description
-          "Dispersion compensation (Average) OTSI";
-      }
-      enum "FEC-PCS" {
-        description
-          "Forward Error Corrections - Physical Coding Sublayer";
-      }
-      enum "FECCCW-PCS" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-      }
-      enum "FECUNCCW-PCS" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-      }
-      enum "HCCS-PCS" {
-        description
-          "High Correction Count Second - Physical Coding Sublayer";
-      }
-      enum "PRFBER-PCS" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-      }
-      enum "PRFBERMAX-PCS" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef PMAIDTYPE {
-    type enumeration {
-      enum "RAMAN" {
-        description
-          "RAMAN";
-      }
-      enum "OPTMON" {
-        description
-          "OPTMON";
-      }
-      enum "AMP" {
-        description
-          "AMP";
-      }
-      enum "CHMON" {
-        description
-          "CHMON";
-      }
-      enum "SDMON" {
-        description
-          "SDMON";
-      }
-      enum "OTDRCFG" {
-        description
-          "OTDRCFG";
-      }
-      enum "VOA" {
-        description
-          "VOA";
-      }
-      enum "NMCMON" {
-        description
-          "NMCMON";
-      }
-      enum "VT1" {
-        description
-          "VT1 type AID";
-      }
-      enum "VT2" {
-        description
-          "VT2 type AID";
-      }
-      enum "STS1" {
-        description
-          "STS1 type AID";
-      }
-      enum "STS3C" {
-        description
-          "STS3C type AID";
-      }
-      enum "STS12C" {
-        description
-          "STS12C type AID";
-      }
-      enum "STS24C" {
-        description
-          "STS24C type AID";
-      }
-      enum "STS48C" {
-        description
-          "STS48C type AID";
-      }
-      enum "STS192C" {
-        description
-          "STS192C type AID";
-      }
-      enum "E1" {
-        description
-          "E1 Facility";
-      }
-      enum "E3" {
-        description
-          "E3 Facility";
-      }
-      enum "T1" {
-        description
-          "T1/DS1 Facility";
-      }
-      enum "T3" {
-        description
-          "T3/DS3 Facility";
-      }
-      enum "EC1" {
-        description
-          "EC1 Facility";
-      }
-      enum "STM1E" {
-        description
-          "STM1E Facility";
-      }
-      enum "OSC" {
-        description
-          "OSC type AID";
-      }
-      enum "OC1" {
-        description
-          "OC1 type AID";
-      }
-      enum "OC3" {
-        description
-          "OC3 type AID";
-      }
-      enum "OC12" {
-        description
-          "OC12 type AID";
-      }
-      enum "OC48" {
-        description
-          "OC48 type AID";
-      }
-      enum "OC192" {
-        description
-          "OC192 type AID";
-      }
-      enum "OC768" {
-        description
-          "OC768 type AID";
-      }
-      enum "ETH100" {
-        description
-          "ETH100 Facility";
-      }
-      enum "ETH" {
-        description
-          "Ethernet client AID";
-      }
-      enum "ETH10G" {
-        description
-          "ETH10G Facility";
-      }
-      enum "ETHN" {
-        description
-          "ETHn Facility";
-      }
-      enum "WAN" {
-        description
-          "WAN facility AID";
-      }
-      enum "OTM2" {
-        description
-          "OTM2";
-      }
-      enum "OTM3" {
-        description
-          "OTM3";
-      }
-      enum "OTM" {
-        description
-          "OTMn facility";
-      }
-      enum "ODU" {
-        description
-          "ODU Facility";
-      }
-      enum "FLEX" {
-        description
-          "FLEX Facility";
-      }
-      enum "FC" {
-        description
-          "FC";
-      }
-      enum "PTP" {
-        description
-          "PTP Facility";
-      }
-      enum "OTUTTP" {
-        description
-          "OTUTTP Facility";
-      }
-      enum "ETTP" {
-        description
-          "ETTP Facility";
-      }
-      enum "CBRTTP" {
-        description
-          "CBRTTP Facility";
-      }
-      enum "STTP" {
-        description
-          "STTP Facility";
-      }
-      enum "ODUTTP" {
-        description
-          "ODUTTP Facility";
-      }
-      enum "ODUCTP" {
-        description
-          "ODUCTP Facility";
-      }
-      enum "TCM" {
-        description
-          "TCM Facility";
-      }
-    }
-  }
-
-  typedef ALL_MONTYPE_resp {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "FC-L" {
-        description
-          "Failure Count - Line";
-      }
-      enum "PSCW-L" {
-        description
-          "Protection switch count, working line - LINE";
-      }
-      enum "PSCP-L" {
-        description
-          "Protection switch count, protection line - LINE";
-      }
-      enum "PSD-L" {
-        description
-          "Protection switch duration, line - LINE";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Gauge Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Minimum OPT for interval";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Maximum OPT for interval";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Average OPT for interval";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received.";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "SPANLOSS-OCH" {
-        description
-          "The OSC Span Loss in dB";
-      }
-      enum "SPANLOSSMIN-OCH" {
-        description
-          "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "SPANLOSSMAX-OCH" {
-        description
-          "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "SPANLOSSAVG-OCH" {
-        description
-          "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimates - OTU. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "UNCFECBLK-OTU" {
-        description
-          "Uncorrected FEC Block - OTU";
-      }
-      enum "IAE-OTU" {
-        description
-          "Incoming Alignment Error - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "CV-TCM" {
-        description
-          "Coding Violations - TCM";
-      }
-      enum "ES-TCM" {
-        description
-          "Errored Seconds - TCM";
-      }
-      enum "SES-TCM" {
-        description
-          "Severely Errored Seconds - TCM";
-      }
-      enum "UAS-TCM" {
-        description
-          "Unavailable Seconds - TCM ";
-      }
-      enum "FC-TCM" {
-        description
-          "Failure Count - TCM";
-      }
-      enum "PSD-TCM" {
-        description
-          "Protection Switch Duration - TCM";
-      }
-      enum "PSCW-TCM" {
-        description
-          "Protection Switch Count, Working - TCM";
-      }
-      enum "PSCP-TCM" {
-        description
-          "Protection Switch Count, Protection - TCM";
-      }
-      enum "DMMIN-TCM" {
-        description
-          "Delay Measurement Min - TCM";
-      }
-      enum "DMMAX-TCM" {
-        description
-          "Delay Measurement Max - TCM";
-      }
-      enum "DMAVG-TCM" {
-        description
-          "Delay Measurement Avg - TCM";
-      }
-      enum "IAE-TCM" {
-        description
-          "Incoming Alignment Error - TCM";
-      }
-      enum "DMMIN-L" {
-        description
-          "Delay Measurement MINimum - Line";
-      }
-      enum "DMMAX-L" {
-        description
-          "Delay Measurement MAXimum - Line";
-      }
-      enum "DMAVG-L" {
-        description
-          "Delay Measurement AVGrage - Line";
-      }
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "Errored Seconds -ETH";
-      }
-      enum "SES-E" {
-        description
-          "Severely Errored Seconds";
-      }
-      enum "UAS-E" {
-        description
-          "Unavailable Seconds";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Number of frames received (binned OM) - Ethernet.";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Frame Check Sequence Errors (binned OM) - Ethernet";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Number of errored frames received";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Number of errored frames transmitted";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Number of ingress discarded frames due to congestion or overflow";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Number of egress discarded frames due to congestion or overflow";
-      }
-      enum "DFR-E" {
-        description
-          "Aggregate count of discarded frames";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors";
-      }
-      enum "FEC-PMA" {
-        description
-          "Forward Error Corrections - Physical Medium Attachment";
-      }
-      enum "FECCCW-PMA" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-      }
-      enum "FECUNCCW-PMA" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-      enum "REMOTEINFRAMES-E" {
-        description
-          "Remote In Frames";
-      }
-      enum "REMOTEOUTFRAMES-E" {
-        description
-          "Remote Out Frames";
-      }
-      enum "REMOTEINFRAMESERR-E" {
-        description
-          "Remote In Frames Err";
-      }
-      enum "REMOTEOUTFRAMESDISCDS-E" {
-        description
-          "Remote Out Frames Disc";
-      }
-      enum "REMOTEFCSERR-E" {
-        description
-          "Remote FCS Err";
-      }
-      enum "GRPOPT-OTS" {
-        description
-          "Group Optical Power Transmit";
-      }
-      enum "GRPOPTMIN-OTS" {
-        description
-          "Group Optical Power Transmit - Minimum";
-      }
-      enum "GRPOPTMAX-OTS" {
-        description
-          "Group Optical Power Transmit - Maximum";
-      }
-      enum "GRPOPTAVG-OTS" {
-        description
-          "Group Optical Power Transmit - Average";
-      }
-      enum "OPROSC-OTS" {
-        description
-          "Optical Power Receive, OSC";
-      }
-      enum "OPROSCMIN-OTS" {
-        description
-          "Optical Power Receive, OSC Minimum";
-      }
-      enum "OPROSCMAX-OTS" {
-        description
-          "Optical Power Receive, OSC Maximum";
-      }
-      enum "OPROSCAVG-OTS" {
-        description
-          "Optical Power Receive, OSC Average";
-      }
-      enum "ORLIN-OTS" {
-        description
-          "Optical Return Loss Input";
-      }
-      enum "ORLINMIN-OTS" {
-        description
-          "Optical Return Loss Input Minimum";
-      }
-      enum "ORLINMAX-OTS" {
-        description
-          "Optical Return Loss Input Maximum";
-      }
-      enum "ORLINAVG-OTS" {
-        description
-          "Optical Return Loss Input Average";
-      }
-      enum "ORLOUT-OTS" {
-        description
-          "Optical Return Loss Output";
-      }
-      enum "ORLOUTMIN-OTS" {
-        description
-          "Optical Return Loss Output Minimum";
-      }
-      enum "ORLOUTMAX-OTS" {
-        description
-          "Optical Return Loss Output Maximum";
-      }
-      enum "ORLOUTAVG-OTS" {
-        description
-          "Optical Return Loss Output Average";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive - Minimum";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive - Maximum";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive - Average";
-      }
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPTMIN-OTS" {
-        description
-          "Optical Power Transmit - Minimum";
-      }
-      enum "OPTMAX-OTS" {
-        description
-          "Optical Power Transmit - Maximum";
-      }
-      enum "OPTAVG-OTS" {
-        description
-          "Optical Power Transmit - Average";
-      }
-      enum "ORL-OTS" {
-        description
-          "Optical Return Loss";
-      }
-      enum "ORLMIN-OTS" {
-        description
-          "Optical Return Loss Minimum";
-      }
-      enum "ORLMAX-OTS" {
-        description
-          "Optical Return Loss Maximum";
-      }
-      enum "ORLAVG-OTS" {
-        description
-          "Optical Return Loss Average";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input";
-      }
-      enum "OPINMIN-OTS" {
-        description
-          "Optical Power Input Minimum";
-      }
-      enum "OPINMAX-OTS" {
-        description
-          "Optical Power Input Maximum";
-      }
-      enum "OPINAVG-OTS" {
-        description
-          "Optical Power Input Average";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output";
-      }
-      enum "OPOUTMIN-OTS" {
-        description
-          "Optical Power Output Minimum";
-      }
-      enum "OPOUTMAX-OTS" {
-        description
-          "Optical Power Output Maximum";
-      }
-      enum "OPOUTAVG-OTS" {
-        description
-          "Optical Power Output Average";
-      }
-      enum "GRPGAIN-OTS" {
-        description
-          "Group Gain";
-      }
-      enum "GRPGAINMIN-OTS" {
-        description
-          "Group Gain Minimum";
-      }
-      enum "GRPGAINMAX-OTS" {
-        description
-          "Group Gain Maximum";
-      }
-      enum "GRPGAINAVG-OTS" {
-        description
-          "Group Gain Average";
-      }
-      enum "GRPOPIN-OTS" {
-        description
-          "Group Optical Power Input";
-      }
-      enum "GRPOPINMIN-OTS" {
-        description
-          "Group Optical Power Input Minimum";
-      }
-      enum "GRPOPINMAX-OTS" {
-        description
-          "Group Optical Power Input Maximum";
-      }
-      enum "GRPOPINAVG-OTS" {
-        description
-          "Group Optical Power Input Average";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output";
-      }
-      enum "GRPOPOUTMIN-OTS" {
-        description
-          "Group Optical Power Output Minimum";
-      }
-      enum "GRPOPOUTMAX-OTS" {
-        description
-          "Group Optical Power Output Maximum";
-      }
-      enum "GRPOPOUTAVG-OTS" {
-        description
-          "Group Optical Power Output Average";
-      }
-      enum "DROPGAIN-OTS" {
-        description
-          "Drop Gain";
-      }
-      enum "DROPGAINMIN-OTS" {
-        description
-          "Drop Gain Minimum";
-      }
-      enum "DROPGAINMAX-OTS" {
-        description
-          "Drop Gain Maximum";
-      }
-      enum "DROPGAINAVG-OTS" {
-        description
-          "Drop Gain Average";
-      }
-      enum "PSD-OTS" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "PSCW-OTS" {
-        description
-          "Protection Switch Count Working";
-      }
-      enum "PSCP-OTS" {
-        description
-          "Protection Switch Count Protection";
-      }
-      enum "EVCSH-OTS" {
-        description
-          "Event Count Short";
-      }
-      enum "EVCSHMAX-OTS" {
-        description
-          "Event Count Short - MAX";
-      }
-      enum "EVCLG-OTS" {
-        description
-          "Event Count Long";
-      }
-      enum "EVCLGMAX-OTS" {
-        description
-          "Event Count Long - MAX";
-      }
-      enum "MAXEVLDISSH-OTS" {
-        description
-          "Maximum Event Loss Distance Short";
-      }
-      enum "MAXEVLDISSHMAX-OTS" {
-        description
-          "Maximum Event Loss Distance Short - MAX";
-      }
-      enum "MAXEVLDISLG-OTS" {
-        description
-          "Maximum Event Loss Distance Long";
-      }
-      enum "MAXEVLDISLGMAX-OTS" {
-        description
-          "Maximum Event Loss Distance Long - MAX";
-      }
-      enum "MAXEVRDISSH-OTS" {
-        description
-          "Maximum Event Reflection Distance Short";
-      }
-      enum "MAXEVRDISSHMAX-OTS" {
-        description
-          "Maximum Event Reflection Distance Short - MAX";
-      }
-      enum "MAXEVRDISLG-OTS" {
-        description
-          "Maximum Event Reflection Distance Long";
-      }
-      enum "MAXEVRDISLGMAX-OTS" {
-        description
-          "Maximum Event Reflection Distance Long - MAX";
-      }
-      enum "MAXEVLSH-OTS" {
-        description
-          "Maximum Event Loss Short";
-      }
-      enum "MAXEVLSHMAX-OTS" {
-        description
-          "Maximum Event Loss Short - MAX";
-      }
-      enum "MAXEVLLG-OTS" {
-        description
-          "Maximum Event Loss Long";
-      }
-      enum "MAXEVLLGMAX-OTS" {
-        description
-          "Maximum Event Loss Long - MAX";
-      }
-      enum "MAXEVRSH-OTS" {
-        description
-          "Maximum Event Reflection Short";
-      }
-      enum "MAXEVRSHMAX-OTS" {
-        description
-          "Maximum Event Reflection Short - MAX";
-      }
-      enum "MAXEVRLG-OTS" {
-        description
-          "Maximum Event Reflection Long";
-      }
-      enum "MAXEVRLGMAX-OTS" {
-        description
-          "Maximum Event Reflection Long - MAX";
-      }
-      enum "CUMEVLSH-OTS" {
-        description
-          "Cumulative Event Loss Short";
-      }
-      enum "CUMEVLSHMAX-OTS" {
-        description
-          "Cumulative Event Loss Short MAX";
-      }
-      enum "CUMEVLLG-OTS" {
-        description
-          "Cumulative Event Loss Long";
-      }
-      enum "CUMEVLLGMAX-OTS" {
-        description
-          "Cumulative Event Loss Long MAX";
-      }
-      enum "CUMEVRSH-OTS" {
-        description
-          "Cumulative Event Reflection Short";
-      }
-      enum "CUMEVRSHMAX-OTS" {
-        description
-          "Cumulative Event Reflection Short MAX";
-      }
-      enum "CUMEVRLG-OTS" {
-        description
-          "Cumulative Event Reflection Long";
-      }
-      enum "CUMEVRLGMAX-OTS" {
-        description
-          "Cumulative Event Reflection Long MAX";
-      }
-      enum "ES-W" {
-        description
-          "Errored Seconds - WAN";
-      }
-      enum "SES-W" {
-        description
-          "Severely Errored Seconds - WAN";
-      }
-      enum "UAS-W" {
-        description
-          "Unavailable Seconds - WAN";
-      }
-      enum "INFRAMES-W" {
-        description
-          "Number of frames received (binned OM) - WAN";
-      }
-      enum "INFRAMESERR-W" {
-        description
-          "Number of errored frames received - WAN";
-      }
-      enum "OUTFRAMES-W" {
-        description
-          "ANumber of frames transmitted (binned OM)- WAN";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-      enum "LDS-W" {
-        description
-          "LCAS Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LSDS-W" {
-        description
-          "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LUAS-W" {
-        description
-          "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-      }
-      enum "DFR-W" {
-        description
-          "Aggregate count of discarded frames - WAN";
-      }
-      enum "UTL-W" {
-        description
-          "Average percentage link utilization - WAN";
-      }
-      enum "UTLMX-W" {
-        description
-          "Maximum percentage link utilization - WAN";
-      }
-      enum "OUTFRAMESERR-W" {
-        description
-          "Out Frames Error Count, Wan";
-      }
-      enum "OPR-OTSI" {
-        description
-          "Optical Power Receive- OTSI";
-      }
-      enum "OPT-OTSI" {
-        description
-          "Optical Power Transmit- OTSI";
-      }
-      enum "OPRN-OTSI" {
-        description
-          "Normalized Optical Power Receive- OTSI";
-      }
-      enum "OPTN-OTSI" {
-        description
-          "Normalized Optical Power Transmit- OTSI";
-      }
-      enum "OPRAVG-OTSI" {
-        description
-          "Optical Power Receive, Average - OTSI";
-      }
-      enum "OPRMIN-OTSI" {
-        description
-          "Optical Power Receive, Minimum - OTSI";
-      }
-      enum "OPRMAX-OTSI" {
-        description
-          "Optical Power Receive, Maximum - OTSI";
-      }
-      enum "OPTAVG-OTSI" {
-        description
-          "Optical Power Transmit, Average - OTSI";
-      }
-      enum "OPTMIN-OTSI" {
-        description
-          "Optical Power Transmit, Minimum - OTSI";
-      }
-      enum "OPTMAX-OTSI" {
-        description
-          "Optical Power Transmit, Maximum - OTSI";
-      }
-      enum "DGDAVG-OTSI" {
-        description
-          "Differential Group Delay (Average) OTSI";
-      }
-      enum "DGDMAX-OTSI" {
-        description
-          "Differential Group Delay (Maximum) OTSI";
-      }
-      enum "PDLAVG-OTSI" {
-        description
-          "Polarization Dependent Loss, Average - OTSI";
-      }
-      enum "PDLMAX-OTSI" {
-        description
-          "Polarization Dependent Loss, Maximum - OTSI";
-      }
-      enum "HCCS-OTSI" {
-        description
-          "High Correction Count Seconds - OTSI";
-      }
-      enum "FEC-OTSI" {
-        description
-          "FEC Corrections - OTSI";
-      }
-      enum "PRFBER-OTSI" {
-        description
-          "Post-FEC BER - OTSI";
-      }
-      enum "PRFBERMAX-OTSI" {
-        description
-          "Pre-FEC BER Maximum - OTSI";
-      }
-      enum "QMIN-OTSI" {
-        description
-          "Q MIN - OTSI";
-      }
-      enum "QMAX-OTSI" {
-        description
-          "Q MAX - OTSI";
-      }
-      enum "QAVG-OTSI" {
-        description
-          "Q AVG - OTSI";
-      }
-      enum "QSTDEV-OTSI" {
-        description
-          "Q StDev - OTSI";
-      }
-      enum "UNCFECBLK-OTSI" {
-        description
-          "Uncorrected FEC Block - OTSI";
-      }
-      enum "OSNRMIN-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "OSNRMAX-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "OSNRAVG-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "ESNRMIN-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "ESNRMAX-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "ESNRAVG-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "CDMIN-OTSI" {
-        description
-          "Dispersion compensation (Minimum) OTSI";
-      }
-      enum "CDMAX-OTSI" {
-        description
-          "Dispersion compensation (Maximum) OTSI";
-      }
-      enum "CDAVG-OTSI" {
-        description
-          "Dispersion compensation (Average) OTSI";
-      }
-      enum "FEC-PCS" {
-        description
-          "Forward Error Corrections - Physical Coding Sublayer";
-      }
-      enum "FECCCW-PCS" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-      }
-      enum "FECUNCCW-PCS" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-      }
-      enum "HCCS-PCS" {
-        description
-          "High Correction Count Second - Physical Coding Sublayer";
-      }
-      enum "PRFBER-PCS" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-      }
-      enum "PRFBERMAX-PCS" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-      }
-    }
-  }
-
-  typedef ALL_TH_MONTYPE_resp {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "CV-P" {
-        description
-          "Coding Violations - Path";
-      }
-      enum "BBE-P" {
-        description
-          "Background Block Error - Path";
-      }
-      enum "ES-P" {
-        description
-          "Errored Seconds - Path";
-      }
-      enum "SES-P" {
-        description
-          "Severely Errored Seconds - Path";
-      }
-      enum "SAS-P" {
-        description
-          "SEF/AIS Seconds - Path";
-      }
-      enum "SEFS-P" {
-        description
-          "Severely Errored Frame Seconds - Path";
-      }
-      enum "CSS-P" {
-        description
-          "Controlled Slip Seconds - Path";
-      }
-      enum "UAS-P" {
-        description
-          "Unavailable Seconds - Path";
-      }
-      enum "CVC-P" {
-        description
-          "Coding Violation, C-bit, Path";
-      }
-      enum "ESC-P" {
-        description
-          "Errored Second, C-bit, Path";
-      }
-      enum "SESC-P" {
-        description
-          "Severely Errored Second, C-bit, Path";
-      }
-      enum "UASC-P" {
-        description
-          "Unavailable Second, C-bit, Path";
-      }
-      enum "CV-V" {
-        description
-          "Coding Violations - VT";
-      }
-      enum "ES-V" {
-        description
-          "Errored Seconds - VT";
-      }
-      enum "SES-V" {
-        description
-          "Severely Errored Seconds - VT";
-      }
-      enum "UAS-V" {
-        description
-          "Unavailable Seconds - VT";
-      }
-      enum "BBE-PPI" {
-        description
-          "Background Block Error - PPI";
-      }
-      enum "ES-PPI" {
-        description
-          "Errored Seconds - PPI";
-      }
-      enum "SES-PPI" {
-        description
-          "Severely Errored Seconds - PPI";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel. When tmper=1-UNT this is a gauge value ; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "SPANLOSS-OCH" {
-        description
-          "The OSC Span Loss in dB";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit.";
-      }
-      enum "MAXEVLSH-OTS" {
-        description
-          "Maximum Event Loss Short";
-      }
-      enum "MAXEVLLG-OTS" {
-        description
-          "Maximum Event Loss Long";
-      }
-      enum "MAXEVRSH-OTS" {
-        description
-          "Maximum Event Reflection Short";
-      }
-      enum "MAXEVRLG-OTS" {
-        description
-          "Maximum Event Reflection Long";
-      }
-      enum "CUMEVLSH-OTS" {
-        description
-          "Cumulative Event Loss Short";
-      }
-      enum "CUMEVLLG-OTS" {
-        description
-          "Cumulative Event Loss Long";
-      }
-      enum "CUMEVRSH-OTS" {
-        description
-          "Cumulative Event Reflection Short";
-      }
-      enum "CUMEVRLG-OTS" {
-        description
-          "Cumulative Event Reflection Long";
-      }
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimates - OTU. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "UNCFECBLK-OTU" {
-        description
-          "Uncorrected FEC Block - OTU";
-      }
-      enum "IAE-OTU" {
-        description
-          "Incoming Alignment Error - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "CV-TCM" {
-        description
-          "Coding Violations - TCM";
-      }
-      enum "ES-TCM" {
-        description
-          "Errored Seconds - TCM";
-      }
-      enum "SES-TCM" {
-        description
-          "Severely Errored Seconds - TCM";
-      }
-      enum "UAS-TCM" {
-        description
-          "Unavailable Seconds - TCM ";
-      }
-      enum "DMMIN-TCM" {
-        description
-          "Delay Measurement Min - TCM";
-      }
-      enum "DMMAX-TCM" {
-        description
-          "Delay Measurement Max - TCM";
-      }
-      enum "DMAVG-TCM" {
-        description
-          "Delay Measurement Avg - TCM";
-      }
-      enum "IAE-TCM" {
-        description
-          "Incoming Alignment Error - TCM";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "Errored Seconds - ETH";
-      }
-      enum "SES-E" {
-        description
-          "Severely Errored Seconds - ETH";
-      }
-      enum "UAS-E" {
-        description
-          "Unavailable Seconds - ETH";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Number of frames received (binned OM) - Ethernet, valid only for Ethernet an d WAN";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Number of errored frames received - ETH";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Number of ingress discarded frames due to congestion or overflow - ETH";
-      }
-      enum "DFR-E" {
-        description
-          "Aggregate count of discarded frames - ETH";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Number of frames transmitted (binned OM)- Ethernet";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors (binned OM) - Ethernet";
-      }
-      enum "UTLMIN-E" {
-        description
-          "Percent Bandwidth Utilization Min";
-      }
-      enum "UTLMAX-E" {
-        description
-          "Percent Bandwidth Utilization Max";
-      }
-      enum "UTLAVG-E" {
-        description
-          "Percent Bandwidth Utilization Avg";
-      }
-      enum "ES-W" {
-        description
-          "Errored Seconds - WAN";
-      }
-      enum "SES-W" {
-        description
-          "Severely Errored Seconds - WAN";
-      }
-      enum "UAS-W" {
-        description
-          "Unavailable Seconds - WAN";
-      }
-      enum "INFRAMES-W" {
-        description
-          "Number of frames received (binned OM) - WAN";
-      }
-      enum "INFRAMESERR-W" {
-        description
-          "Number of errored frames received - WAN";
-      }
-      enum "OUTFRAMES-W" {
-        description
-          "Number of frames transmitted (binned OM)- WAN";
-      }
-      enum "LDS-W" {
-        description
-          "LCAS Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LSDS-W" {
-        description
-          "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LUAS-W" {
-        description
-          "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-      }
-      enum "UTL-W" {
-        description
-          "Average WAN link Utilization (Rx and Tx)";
-      }
-      enum "UTLMX-W" {
-        description
-          "Maximum (peak) WAN link Utilization (Rx and Tx)";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-      enum "ORL-OTS" {
-        description
-          "Optical return Loss - Optical Transport Section ";
-      }
-      enum "OPIN-OTS" {
-        description
-          "Optical Power Input - Optical Transport Section ";
-      }
-      enum "OPOUT-OTS" {
-        description
-          "Optical Power Output - Optical Transport Section ";
-      }
-      enum "GRPGAIN-OTS" {
-        description
-          "Group Gain - Optical Transport Section ";
-      }
-      enum "GRPOPIN-OTS" {
-        description
-          "Group Optical Power Input - Optical Transport Section ";
-      }
-      enum "GRPOPOUT-OTS" {
-        description
-          "Group Optical Power Output - Optical Transport Section ";
-      }
-      enum "DROPGAIN-OTS" {
-        description
-          "Drop Gain - Optical Transport Section ";
-      }
-      enum "GRPOPT-OTS" {
-        description
-          "Group Optical Power Transmit - Optical Transport Section ";
-      }
-      enum "OPROSC-OTS" {
-        description
-          "Optical Power Receive OSC - Optical Transport Section ";
-      }
-      enum "ORLIN-OTS" {
-        description
-          "Optical Return Loss Input - Optical Transport Section ";
-      }
-      enum "ORLOUT-OTS" {
-        description
-          "Optical Return Loss Output - Optical Transport Section ";
-      }
-      enum "DMMIN-L" {
-        description
-          "Delay Measurement MINimum - Line";
-      }
-      enum "DMMAX-L" {
-        description
-          "Delay Measurement MAXimum - Line";
-      }
-      enum "DMAVG-L" {
-        description
-          "Delay Measurement AVGrage - Line";
-      }
-      enum "OPR-OTSI" {
-        description
-          "Optical Power Receive- OTSI";
-      }
-      enum "OPT-OTSI" {
-        description
-          "Optical Power Transmit- OTSI";
-      }
-      enum "OPRN-OTSI" {
-        description
-          "Normalized Optical Power Receive- OTSI";
-      }
-      enum "DGDAVG-OTSI" {
-        description
-          "Differential Group Delay (Average) OTSI";
-      }
-      enum "DGDMAX-OTSI" {
-        description
-          "Differential Group Delay (Maximum) OTSI";
-      }
-      enum "PDLAVG-OTSI" {
-        description
-          "Polarization Dependent Loss, Average - OTSI";
-      }
-      enum "PDLMAX-OTSI" {
-        description
-          "Polarization Dependent Loss, Maximum - OTSI";
-      }
-      enum "HCCS-OTSI" {
-        description
-          "High Correction Count Seconds - OTSI";
-      }
-      enum "PRFBER-OTSI" {
-        description
-          "Post-FEC BER - OTSI";
-      }
-      enum "PRFBERMAX-OTSI" {
-        description
-          "Pre-FEC BER Maximum - OTSI";
-      }
-      enum "QMIN-OTSI" {
-        description
-          "Q MIN - OTSI";
-      }
-      enum "QMAX-OTSI" {
-        description
-          "Q MAX - OTSI";
-      }
-      enum "QAVG-OTSI" {
-        description
-          "Q AVG - OTSI";
-      }
-      enum "QSTDEV-OTSI" {
-        description
-          "Q StDev - OTSI";
-      }
-      enum "UNCFECBLK-OTSI" {
-        description
-          "Uncorrected FEC Block - OTSI";
-      }
-      enum "OSNRMIN-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "OSNRMAX-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "OSNRAVG-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "ESNRMIN-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "ESNRMAX-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "ESNRAVG-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "CDMIN-OTSI" {
-        description
-          "Dispersion compensation (Minimum) OTSI";
-      }
-      enum "CDMAX-OTSI" {
-        description
-          "Dispersion compensation (Maximum) OTSI";
-      }
-      enum "CDAVG-OTSI" {
-        description
-          "Dispersion compensation (Average) OTSI";
-      }
-      enum "HCCS-PCS" {
-        description
-          "High Correction Count Second - Physical Coding Sublayer";
-      }
-      enum "PRFBER-PCS" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-      }
-      enum "PRFBERMAX-PCS" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-      }
-    }
-  }
-
-  typedef TMPER_MIN {
-    type enumeration {
-      enum "15-MIN";
-      enum "1-DAY";
-      enum "1-UNT";
-    }
-  }
-
-  typedef OSC_MONTYPE_ALL {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "FC-L" {
-        description
-          "Failure Count - Line";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "SPANLOSS-OCH" {
-        description
-          "The OSC Span Loss in dB";
-      }
-      enum "SPANLOSSMIN-OCH" {
-        description
-          "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "SPANLOSSMAX-OCH" {
-        description
-          "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "SPANLOSSAVG-OCH" {
-        description
-          "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "DMMIN-L" {
-        description
-          "Delay Measurement MINimum - Line";
-      }
-      enum "DMMAX-L" {
-        description
-          "Delay Measurement MAXimum - Line";
-      }
-      enum "DMAVG-L" {
-        description
-          "Delay Measurement AVGrage - Line";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef DIRN_INPUT {
-    type enumeration {
-      enum "RCV" {
-        description
-          "Receive direction only";
-      }
-      enum "TRMT" {
-        description
-          "Transmit direction only";
-      }
-      enum "ALL" {
-        description
-          "All directions";
-      }
-    }
-  }
-
-  typedef OCn_MONTYPE_ALL {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "FC-L" {
-        description
-          "Failure Count - Line";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized";
-      }
-      enum "PSCW-L" {
-        description
-          "Protection Switch Count Working - Line";
-      }
-      enum "PSCP-L" {
-        description
-          "Protection Switch Count Protection - Line";
-      }
-      enum "PSD-L" {
-        description
-          "Protection Switch Duration - Line";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef OTM2_MONTYPE {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Correction - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef OTM3_MONTYPE {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive Min - Optical Transport Section";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive Max - Optical Transport Section";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive Avg - Optical Transport Section";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef OTM_MONTYPE {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive Min - Optical Transport Section";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive Max - Optical Transport Section";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive Avg - Optical Transport Section";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "UNCFECBLK-OTU" {
-        description
-          "Uncorrected FEC Block - OTU";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef ETH10G_MONTYPE {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Number of frames received (binned OM) - Ethernet, NEND RCV supported";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Number of errored frames received.";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Number of frames transmitted (binned OM) - Ethernet, NEND TRMT supported";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors (binned OM) - Ethernet";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel, NEND TRMT supported";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel, NEND TRMT supported";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds.";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds.";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds.";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors.";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx).";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing.";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing.";
-      }
-      enum "UTLMIN-E" {
-        description
-          "Percent Bandwidth Utilization Min";
-      }
-      enum "UTLMAX-E" {
-        description
-          "Percent Bandwidth Utilization Max";
-      }
-      enum "UTLAVG-E" {
-        description
-          "Percent Bandwidth Utilization Avg";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef ETH_MONTYPE {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Total ETH frames received";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Total ETH frames received with errors";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "REMOTEINFRAMES-E" {
-        description
-          "Remote In Frames";
-      }
-      enum "REMOTEOUTFRAMES-E" {
-        description
-          "Remote Out Frames";
-      }
-      enum "REMOTEINFRAMESERR-E" {
-        description
-          "Remote In Frames Err";
-      }
-      enum "REMOTEOUTFRAMESDISCDS-E" {
-        description
-          "Remote Out Frames Disc";
-      }
-      enum "REMOTEFCSERR-E" {
-        description
-          "Remote FCS Err";
-      }
-      enum "PSD-E" {
-        description
-          "Protection Switch Duration - Ethernet";
-      }
-      enum "PSCW-E" {
-        description
-          "Protection Switch Count - Working - Ethernet";
-      }
-      enum "PSCP-E" {
-        description
-          "Protection Switch Count - Protection - Ethernet";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical power transmitted (normalized)";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef ETH100_MONTYPE {
-    type enumeration {
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Total ETH frames received";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Total ETH frames received with errors";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical power transmitted (normalized)";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef ETHN_MONTYPE {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "FEC-PMA" {
-        description
-          "Forward Error Corrections - Physical Medium Attachment";
-      }
-      enum "FECCCW-PMA" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-      }
-      enum "FECUNCCW-PMA" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Total ETH frames received";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Total ETH frames received with errors";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "UTLMIN-E" {
-        description
-          "Percent Bandwidth Utilization Min";
-      }
-      enum "UTLMAX-E" {
-        description
-          "Percent Bandwidth Utilization Max";
-      }
-      enum "UTLAVG-E" {
-        description
-          "Percent Bandwidth Utilization Avg";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef FC_MONTYPE {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violation - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Second - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Second - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Second - Physical Coding Sublayer";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef FLEX_MONTYPE {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Total ETH frames received";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Total ETH frames received with errors";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors (binned OM) - Ethernet";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical power transmitted (normalized)";
-      }
-      enum "PSD-E" {
-        description
-          "Protection Switch Duration - Ethernet";
-      }
-      enum "PSCW-E" {
-        description
-          "Protection Switch Count - Working - Ethernet";
-      }
-      enum "PSCP-E" {
-        description
-          "Protection Switch Count - Protection - Ethernet";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef WAN_MONTYPE {
-    type enumeration {
-      enum "ES-W" {
-        description
-          "WAN Errored seconds (RX)";
-      }
-      enum "SES-W" {
-        description
-          "WAN Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-W" {
-        description
-          "WAN Unavailable Seconds (Rx)";
-      }
-      enum "INFRAMES-W" {
-        description
-          "Total WAN frames received";
-      }
-      enum "INFRAMESERR-W" {
-        description
-          "Total WAN frames received with errors";
-      }
-      enum "OUTFRAMES-W" {
-        description
-          "Total WAN frames transmitted";
-      }
-      enum "OUTFRAMESERR-W" {
-        description
-          "Out Frames Error Count, WAN";
-      }
-      enum "DFR-W" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "UTL-W" {
-        description
-          "Average WAN link Utilization (Rx and Tx)";
-      }
-      enum "UTLMX-W" {
-        description
-          "Maximum (peak) WAN link Utilization (Rx and Tx)";
-      }
-      enum "LDS-W" {
-        description
-          "LCAS Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LSDS-W" {
-        description
-          "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LUAS-W" {
-        description
-          "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef OSC_MONTYPE_resp_ALL {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "FC-L" {
-        description
-          "Failure Count - Line";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "SPANLOSS-OCH" {
-        description
-          "The OSC Span Loss in dB";
-      }
-      enum "SPANLOSSMIN-OCH" {
-        description
-          "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "SPANLOSSMAX-OCH" {
-        description
-          "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "SPANLOSSAVG-OCH" {
-        description
-          "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "DMMIN-L" {
-        description
-          "Delay Measurement MINimum - Line";
-      }
-      enum "DMMAX-L" {
-        description
-          "Delay Measurement MAXimum - Line";
-      }
-      enum "DMAVG-L" {
-        description
-          "Delay Measurement AVGrage - Line";
-      }
-    }
-  }
-
-  typedef DIRN_RESP {
-    type enumeration {
-      enum "RCV" {
-        description
-          "Receive direction only";
-      }
-      enum "TRMT" {
-        description
-          "Transmit direction only";
-      }
-    }
-  }
-
-  typedef OCn_MONTYPE_resp_ALL {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "FC-L" {
-        description
-          "Failure Count - Line";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized";
-      }
-      enum "PSCW-L" {
-        description
-          "Protection Switch Count Working - Line";
-      }
-      enum "PSCP-L" {
-        description
-          "Protection Switch Count Protection - Line";
-      }
-      enum "PSD-L" {
-        description
-          "Protection Switch Duration - Line";
-      }
-    }
-  }
-
-  typedef OTM2_MONTYPE_resp {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU, NEND RCV supported.";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU, NEND RCV supported.";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU, NEND RCV supported";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Frame Seconds - OTU, NEND RCV supported";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Correction - OTU, NEND RCV supported.";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU, NEND RCV supported.";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post FEC Bit Error Rate Estimate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU, NEND RCV supported.";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU, NEND RCV supported.";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU, NEND RCV supported.";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-    }
-  }
-
-  typedef OTM3_MONTYPE_resp {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU, NEND RCV supported.";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU, NEND RCV supported.";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU, NEND RCV supported";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Frame Seconds - OTU, NEND RCV supported";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU, NEND RCV supported.";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post FEC Bit Error Rate Estimate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU, NEND RCV supported.";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU, NEND RCV supported.";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU, NEND RCV supported.";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive Min - Optical Transport Section";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive Max - Optical Transport Section";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive Avg - Optical Transport Section";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-    }
-  }
-
-  typedef OTM_MONTYPE_resp {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU, NEND RCV supported.";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU, NEND RCV supported.";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU, NEND RCV supported";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Frame Seconds - OTU, NEND RCV supported";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU, NEND RCV supported.";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post FEC Bit Error Rate Estimate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU, NEND RCV supported.";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU, NEND RCV supported.";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU, NEND RCV supported.";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Optical Power Receive Min - Optical Transport Section";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Optical Power Receive Max - Optical Transport Section";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Optical Power Receive Avg - Optical Transport Section";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "UNCFECBLK-OTU" {
-        description
-          "Forward Error Corrections block - OTU";
-      }
-    }
-  }
-
-  typedef ETH10G_MONTYPE_resp {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Number of frames received (binned OM) - Ethernet, NEND RCV supported";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Number of errored frames received.";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Number of frames transmitted (binned OM) - Ethernet, NEND TRMT supported";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors (binned OM) - Ethernet";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel, NEND TRMT supported";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel, NEND TRMT supported";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds.";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds.";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds.";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors.";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx).";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing.";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing.";
-      }
-      enum "UTLMIN-E" {
-        description
-          "Percent Bandwidth Utilization Min";
-      }
-      enum "UTLMAX-E" {
-        description
-          "Percent Bandwidth Utilization Max";
-      }
-      enum "UTLAVG-E" {
-        description
-          "Percent Bandwidth Utilization Avg";
-      }
-    }
-  }
-
-  typedef ETH100_MONTYPE_resp {
-    type enumeration {
-      enum "ES-E" {
-        description
-          "Errored Seconds, Ethernet";
-      }
-      enum "SES-E" {
-        description
-          "Severely Errored Seconds, Ethernet";
-      }
-      enum "UAS-E" {
-        description
-          "Unavailable Seconds, Ethernet";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Number of frames received (binned OM)";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Number of errored frames received (binned OM)";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Number of received frames discarded (binned OM)";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Number of frames transmitted (binned OM), Ethernet";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Number of frames transmitted (binned OM) with FCS error, Ethernet";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical power transmitted (normalized)";
-      }
-    }
-  }
-
-  typedef ETHN_MONTYPE_resp {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "FEC-PMA" {
-        description
-          "Forward Error Corrections - Physical Medium Attachment";
-      }
-      enum "FECCCW-PMA" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-      }
-      enum "FECUNCCW-PMA" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Total ETH frames received";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Total ETH frames received with errors";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "UTLMIN-E" {
-        description
-          "Percent Bandwidth Utilization Min";
-      }
-      enum "UTLMAX-E" {
-        description
-          "Percent Bandwidth Utilization Max";
-      }
-      enum "UTLAVG-E" {
-        description
-          "Percent Bandwidth Utilization Avg";
-      }
-    }
-  }
-
-  typedef ETH_MONTYPE_resp {
-    type enumeration {
-      enum "ES" {
-        description
-          "Errored Seconds";
-      }
-      enum "SES" {
-        description
-          "Severely Errored Seconds";
-      }
-      enum "UAS" {
-        description
-          "Unavailable Seconds";
-      }
-      enum "INFRAMES" {
-        description
-          "Number of frames received (binned OM)";
-      }
-      enum "INFRAMESERR" {
-        description
-          "Number of errored frames received (binned OM)";
-      }
-      enum "INFRAMESDISCDS" {
-        description
-          "Number of received frames discarded (binned OM)";
-      }
-      enum "OUTFRAMES" {
-        description
-          "Number of frames transmitted (binned OM)";
-      }
-      enum "FRTOOLONGS" {
-        description
-          "Number of frames too long";
-      }
-      enum "FRTOOSHORT" {
-        description
-          "Number of frames too short";
-      }
-      enum "INMACCONTROLFR" {
-        description
-          "Number of Ethernet control frames received (discarded or not)";
-      }
-    }
-  }
-
-  typedef FC_MONTYPE_resp {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violation - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Second - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Second - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Second - Physical Coding Sublayer";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized";
-      }
-    }
-  }
-
-  typedef FLEX_MONTYPE_resp {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Total ETH frames received";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Total ETH frames received with errors";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors (binned OM) - Ethernet";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Optical Power Receive Min - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Optical Power Receive Max - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Optical Power Receive Avg - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Power Transmit Min - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Power Transmit Max - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Power Transmit Avg - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical power transmitted (normalized)";
-      }
-      enum "PSD-E" {
-        description
-          "Protection Switch Duration, Ethernet";
-      }
-      enum "PSCW-E" {
-        description
-          "Protection Switch Count - Working, Ethernet";
-      }
-      enum "PSCP-E" {
-        description
-          "Protection Switch Count - Protection, Ethernet";
-      }
-    }
-  }
-
-  typedef WAN_MONTYPE_resp {
-    type enumeration {
-      enum "ES-W" {
-        description
-          "WAN Errored seconds (RX)";
-      }
-      enum "SES-W" {
-        description
-          "WAN Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-W" {
-        description
-          "WAN Unavailable Seconds (Rx)";
-      }
-      enum "INFRAMES-W" {
-        description
-          "Total WAN frames received";
-      }
-      enum "INFRAMESERR-W" {
-        description
-          "Total WAN frames received with errors";
-      }
-      enum "OUTFRAMES-W" {
-        description
-          "Total WAN frames transmitted";
-      }
-      enum "OUTFRAMESERR-W" {
-        description
-          "Out Frames Error Count, WAN";
-      }
-      enum "DFR-W" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "UTL-W" {
-        description
-          "Average WAN link Utilization (Rx and Tx)";
-      }
-      enum "UTLMX-W" {
-        description
-          "Maximum (peak) WAN link Utilization (Rx and Tx)";
-      }
-      enum "LDS-W" {
-        description
-          "LCAS Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LSDS-W" {
-        description
-          "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LUAS-W" {
-        description
-          "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-      }
-    }
-  }
-
-  typedef OSC_TH_MONTYPE {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "SPANLOSS-OCH" {
-        description
-          "The OSC Span Loss in dB";
-      }
-      enum "DMMIN-L" {
-        description
-          "Delay Measurement MINimum - Line";
-      }
-      enum "DMMAX-L" {
-        description
-          "Delay Measurement MAXimum - Line";
-      }
-      enum "DMAVG-L" {
-        description
-          "Delay Measurement AVGrage - Line";
-      }
-    }
-  }
-
-  typedef OCn_TH_MONTYPE {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-    }
-  }
-
-  typedef OTM2_TH_MONTYPE_resp {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU, NEND RCV supported.";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU, NEND RCV supported.";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU, NEND RCV supported";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Frame Seconds - OTU, NEND RCV supported";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU, NEND RCV supported.";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post FEC Bit Error Rate Estimate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU, NEND RCV supported.";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU, NEND RCV supported.";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-    }
-  }
-
-  typedef OTM3_TH_MONTYPE_resp {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU, NEND RCV supported.";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU, NEND RCV supported.";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU, NEND RCV supported";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Frame Seconds - OTU, NEND RCV supported";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU, NEND RCV supported.";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post FEC Bit Error Rate Estimate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU, NEND RCV supported.";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU, NEND RCV supported.";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value ; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-    }
-  }
-
-  typedef OTM_TH_MONTYPE_resp {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU, NEND RCV supported.";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU, NEND RCV supported.";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU, NEND RCV supported";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Frame Seconds - OTU, NEND RCV supported";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU, NEND RCV supported.";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post FEC Bit Error Rate Estimate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate-OTU, NEND RCV supported.";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU, NEND RCV supported.";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU, NEND RCV supported.";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU, NEND RCV supported.";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value ; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-    }
-  }
-
-  typedef ETH10G_TH_MONTYPE {
-    type enumeration {
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel, NEND TRMT supported";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds.";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds.";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds.";
-      }
-      enum "UTLMIN-E" {
-        description
-          "Percent Bandwidth Utilization Min";
-      }
-      enum "UTLMAX-E" {
-        description
-          "Percent Bandwidth Utilization Max";
-      }
-      enum "UTLAVG-E" {
-        description
-          "Percent Bandwidth Utilization Avg";
-      }
-    }
-  }
-
-  typedef ETH_SET_MONTYPE {
-    type enumeration {
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-    }
-  }
-
-  typedef ETHN_TH_MONTYPE {
-    type enumeration {
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "UTLMIN-E" {
-        description
-          "Percent Bandwidth Utilization Min";
-      }
-      enum "UTLMAX-E" {
-        description
-          "Percent Bandwidth Utilization Max";
-      }
-      enum "UTLAVG-E" {
-        description
-          "Percent Bandwidth Utilization Avg";
-      }
-    }
-  }
-
-  typedef FC_TH_MONTYPE_resp {
-    type enumeration {
-      enum "ES-PCS" {
-        description
-          "Errored Second - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Second - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Second - Physical Coding Sublayer";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized";
-      }
-    }
-  }
-
-  typedef FLEX_TH_MONTYPE_resp {
-    type enumeration {
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-    }
-  }
-
-  typedef TMPR {
-    type enumeration {
-      enum "15-MIN";
-      enum "1-DAY";
-      enum "1-UNT";
-      enum "ALL";
-    }
-  }
-
-  typedef OTM2_TH_MONTYPE {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-    }
-  }
-
-  typedef OTM3_SET_MONTYPE {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; w hen tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-    }
-  }
-
-  typedef OTM_SET_MONTYPE {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU ";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU ";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU ";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; w hen tmper=1-15-MIN, 1-DAY this is a snapshot value";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized).";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized).";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized)";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized)";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section ";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Receive - Normalized - Optical Transport Section";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average), Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max), Optical Channel";
-      }
-    }
-  }
-
-  typedef FC_TH_MONTYPE {
-    type enumeration {
-      enum "ES-PCS" {
-        description
-          "Errored Second - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Second - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Second - Physical Coding Sublayer";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef FLEX_TH_MONTYPE {
-    type enumeration {
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "OPR-OCH" {
-        description
-          "Optical power received";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical power received (normalized).";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical power transmitted";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef WAN_SET_MONTYPE {
-    type enumeration {
-      enum "ES-W" {
-        description
-          "WAN Errored seconds (RX)";
-      }
-      enum "SES-W" {
-        description
-          "WAN Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-W" {
-        description
-          "WAN Unavailable Seconds (Rx)";
-      }
-      enum "UTL-W" {
-        description
-          "Average WAN link Utilization (Rx and Tx)";
-      }
-      enum "UTLMX-W" {
-        description
-          "Maximum (peak) WAN link Utilization (Rx and Tx)";
-      }
-      enum "LDS-W" {
-        description
-          "LCAS Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LSDS-W" {
-        description
-          "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-      }
-      enum "LUAS-W" {
-        description
-          "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-      }
-    }
-  }
-
-  typedef COS_MONTYPE {
-    type enumeration {
-      enum "CNGS-TM" {
-        description
-          "Seconds with TX queue congestion at the L2SS Traffic Management layer. This includes seconds with TX queue overflow if they are occurring";
-      }
-      enum "OVFS-TM" {
-        description
-          "Seconds with TX queue overflow at the L2SS Traffic Management layer. ";
-      }
-      enum "UTL-TM" {
-        description
-          "Average percentage TX queue utilization. Running average for interval.";
-      }
-      enum "UTLMX-TM" {
-        description
-          "Average percentage TX queue utilization. High tide mark for interval. ";
-      }
-    }
-  }
-
-  typedef CHMON_PM_MONTYPE_rtrv {
-    type enumeration {
-      enum "OPT-OCH" {
-        description
-          "Optical Channel Power Transmit.";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Channel Power Transmit Minimum.";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Channel Power Transmit Maximum.";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Channel Power Transmit Average.";
-      }
-      enum "ALL";
-    }
-  }
-
-  typedef CHMON_PM_MONTYPE_rtrv_resp {
-    type enumeration {
-      enum "OPT-OCH" {
-        description
-          "Optical Channel Power Transmit.";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Channel Power Transmit Minimum.";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Channel Power Transmit Maximum.";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Channel Power Transmit Average.";
-      }
-    }
-  }
-
-  typedef CHMON_MONTYPE {
-    type enumeration {
-      enum "ALL";
-    }
-  }
-
-  typedef CHMON_TH_MONTYPE_set {
-    type enumeration {
-      enum "OPT-OCH" {
-        description
-          "Optical Channel Power Transmit.";
-      }
-      enum "ALL";
-    }
-  }
-
-  typedef AIDTYPE {
-    type enumeration {
-      enum "OPTMON" {
-        description
-          "Optical Monitoring";
-      }
-      enum "VOA" {
-        description
-          "VOA facility";
-      }
-      enum "AMP" {
-        description
-          "AMP facility";
-      }
-      enum "OTDRCFG" {
-        description
-          "OTDR Monitoring";
-      }
-      enum "DOC" {
-        description
-          "DOC facility";
-      }
-      enum "DISP" {
-        description
-          "DSCM facility";
-      }
-      enum "ADJ" {
-        description
-          "Adjacency";
-      }
-      enum "SWT" {
-        description
-          "Shelf Wavelength Topology";
-      }
-      enum "NCT" {
-        description
-          "Network Channel Topology";
-      }
-      enum "GMD" {
-        description
-          "GMD";
-      }
-      enum "DOSC" {
-        description
-          "DOSC";
-      }
-      enum "CMD4" {
-        description
-          "CMD4";
-      }
-      enum "LIM" {
-        description
-          "LIM";
-      }
-      enum "SECU" {
-        description
-          "Security related";
-      }
-      enum "EQPT" {
-        description
-          "Equipment";
-      }
-      enum "COM" {
-        description
-          "Common to Shelf or SP";
-      }
-      enum "OSC" {
-        description
-          "OSC facility";
-      }
-      enum "OC3" {
-        description
-          "OC3 facility";
-      }
-      enum "OC12" {
-        description
-          "OC12 facility";
-      }
-      enum "OC48" {
-        description
-          "OC48 facility";
-      }
-      enum "OC192" {
-        description
-          "OC192 facility";
-      }
-      enum "OC768" {
-        description
-          "OC768 facility";
-      }
-      enum "STS1" {
-        description
-          "STS1 facility";
-      }
-      enum "STS3C" {
-        description
-          "STS3C facility";
-      }
-      enum "STS12C" {
-        description
-          "STS12C facility";
-      }
-      enum "STS24C" {
-        description
-          "STS24C facility";
-      }
-      enum "STS48C" {
-        description
-          "STS48C facility";
-      }
-      enum "STS192C" {
-        description
-          "STS192C facility";
-      }
-      enum "VT1" {
-        description
-          "VT1 facility";
-      }
-      enum "VT2" {
-        description
-          "VT2 facility";
-      }
-      enum "ETH" {
-        description
-          "Ethernet client facility";
-      }
-      enum "WAN" {
-        description
-          "WAN client facility";
-      }
-      enum "E1" {
-        description
-          "E1 Facility";
-      }
-      enum "T1" {
-        description
-          "T1/DS1 facility";
-      }
-      enum "T3" {
-        description
-          "T3/DS3 facility";
-      }
-      enum "EC1" {
-        description
-          "EC1 facility";
-      }
-      enum "STM1E" {
-        description
-          "STM1E facility";
-      }
-      enum "DSM" {
-        description
-          "DSM entities";
-      }
-      enum "OTM" {
-        description
-          "OTM0 facility";
-      }
-      enum "OTM2" {
-        description
-          "OTM2 facility";
-      }
-      enum "OTM3" {
-        description
-          "OTM3 facility";
-      }
-      enum "LAG" {
-        description
-          "LAG facility";
-      }
-      enum "E3" {
-        description
-          "E3 facility";
-      }
-      enum "RPR" {
-        description
-          "RPR facility";
-      }
-      enum "ETH10G" {
-        description
-          "ETH10G facility AID";
-      }
-      enum "ETH100" {
-        description
-          "ETH100 facility AID";
-      }
-      enum "FC" {
-        description
-          "FC facility AID";
-      }
-      enum "ADJPEER" {
-        description
-          "Adjacency PEER facility AID";
-      }
-    }
-  }
-
-  typedef CHMON_TH_MONTYPE_resp {
-    type enumeration {
-      enum "OPT-OCH" {
-        description
-          "Optical Channel Power Transmit.";
-      }
-    }
-  }
-
-  typedef SDMON_MONTYPE {
-    type enumeration {
-      enum "OPT-OTS" {
-        description
-          "Optical Power Transmit.";
-      }
-      enum "ALL";
-    }
-  }
-
-  typedef OTDRCFG_PM_MONTYPE {
-    type enumeration {
-      enum "EVCSH-OTS" {
-        description
-          "Event Count Short";
-      }
-      enum "EVCSHMAX-OTS" {
-        description
-          "Event Count Short - MAX";
-      }
-      enum "EVCLG-OTS" {
-        description
-          "Event Count Long";
-      }
-      enum "EVCLGMAX-OTS" {
-        description
-          "Event Count Long - MAX";
-      }
-      enum "MAXEVLDISSH-OTS" {
-        description
-          "Maximum Event Loss Distance Short";
-      }
-      enum "MAXEVLDISSHMAX-OTS" {
-        description
-          "Maximum Event Loss Distance Short - MAX";
-      }
-      enum "MAXEVLDISLG-OTS" {
-        description
-          "Maximum Event Loss Distance Long";
-      }
-      enum "MAXEVLDISLGMAX-OTS" {
-        description
-          "Maximum Event Loss Distance Long - MAX";
-      }
-      enum "MAXEVRDISSH-OTS" {
-        description
-          "Maximum Event Reflection Distance Short";
-      }
-      enum "MAXEVRDISSHMAX-OTS" {
-        description
-          "Maximum Event Reflection Distance Short - MAX";
-      }
-      enum "MAXEVRDISLG-OTS" {
-        description
-          "Maximum Event Reflection Distance Long";
-      }
-      enum "MAXEVRDISLGMAX-OTS" {
-        description
-          "Maximum Event Reflection Distance Long - MAX";
-      }
-      enum "MAXEVLSH-OTS" {
-        description
-          "Maximum Event Loss Short";
-      }
-      enum "MAXEVLSHMAX-OTS" {
-        description
-          "Maximum Event Loss Short - MAX";
-      }
-      enum "MAXEVLLG-OTS" {
-        description
-          "Maximum Event Loss Long";
-      }
-      enum "MAXEVLLGMAX-OTS" {
-        description
-          "Maximum Event Loss Long - MAX";
-      }
-      enum "MAXEVRSH-OTS" {
-        description
-          "Maximum Event Reflection Short";
-      }
-      enum "MAXEVRSHMAX-OTS" {
-        description
-          "Maximum Event Reflection Short - MAX";
-      }
-      enum "MAXEVRLG-OTS" {
-        description
-          "Maximum Event Reflection Long";
-      }
-      enum "MAXEVRLGMAX-OTS" {
-        description
-          "Maximum Event Reflection Long - MAX";
-      }
-      enum "CUMEVLSH-OTS" {
-        description
-          "Cumulative Event Loss Short";
-      }
-      enum "CUMEVLSHMAX-OTS" {
-        description
-          "Cumulative Event Loss Short MAX";
-      }
-      enum "CUMEVLLG-OTS" {
-        description
-          "Cumulative Event Loss Long";
-      }
-      enum "CUMEVLLGMAX-OTS" {
-        description
-          "Cumulative Event Loss Long MAX";
-      }
-      enum "CUMEVRSH-OTS" {
-        description
-          "Cumulative Event Reflection Short";
-      }
-      enum "CUMEVRSHMAX-OTS" {
-        description
-          "Cumulative Event Reflection Short MAX";
-      }
-      enum "CUMEVRLG-OTS" {
-        description
-          "Cumulative Event Reflection Long";
-      }
-      enum "CUMEVRLGMAX-OTS" {
-        description
-          "Cumulative Event Reflection Long MAX";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef OTDRCFG_PM_MONTYPE_rtrv_resp {
-    type enumeration {
-      enum "EVCSH-OTS" {
-        description
-          "Event Count Short";
-      }
-      enum "EVCSHMAX-OTS" {
-        description
-          "Event Count Short - MAX";
-      }
-      enum "EVCLG-OTS" {
-        description
-          "Event Count Long";
-      }
-      enum "EVCLGMAX-OTS" {
-        description
-          "Event Count Long - MAX";
-      }
-      enum "MAXEVLDISSH-OTS" {
-        description
-          "Maximum Event Loss Distance Short";
-      }
-      enum "MAXEVLDISSHMAX-OTS" {
-        description
-          "Maximum Event Loss Distance Short - MAX";
-      }
-      enum "MAXEVLDISLG-OTS" {
-        description
-          "Maximum Event Loss Distance Long";
-      }
-      enum "MAXEVLDISLGMAX-OTS" {
-        description
-          "Maximum Event Loss Distance Long - MAX";
-      }
-      enum "MAXEVRDISSH-OTS" {
-        description
-          "Maximum Event Reflection Distance Short";
-      }
-      enum "MAXEVRDISSHMAX-OTS" {
-        description
-          "Maximum Event Reflection Distance Short - MAX";
-      }
-      enum "MAXEVRDISLG-OTS" {
-        description
-          "Maximum Event Reflection Distance Long";
-      }
-      enum "MAXEVRDISLGMAX-OTS" {
-        description
-          "Maximum Event Reflection Distance Long - MAX";
-      }
-      enum "MAXEVLSH-OTS" {
-        description
-          "Maximum Event Loss Short";
-      }
-      enum "MAXEVLSHMAX-OTS" {
-        description
-          "Maximum Event Loss Short - MAX";
-      }
-      enum "MAXEVLLG-OTS" {
-        description
-          "Maximum Event Loss Long";
-      }
-      enum "MAXEVLLGMAX-OTS" {
-        description
-          "Maximum Event Loss Long - MAX";
-      }
-      enum "MAXEVRSH-OTS" {
-        description
-          "Maximum Event Reflection Short";
-      }
-      enum "MAXEVRSHMAX-OTS" {
-        description
-          "Maximum Event Reflection Short - MAX";
-      }
-      enum "MAXEVRLG-OTS" {
-        description
-          "Maximum Event Reflection Long";
-      }
-      enum "MAXEVRLGMAX-OTS" {
-        description
-          "Maximum Event Reflection Long - MAX";
-      }
-      enum "CUMEVLSH-OTS" {
-        description
-          "Cumulative Event Loss Short";
-      }
-      enum "CUMEVLSHMAX-OTS" {
-        description
-          "Cumulative Event Loss Short MAX";
-      }
-      enum "CUMEVLLG-OTS" {
-        description
-          "Cumulative Event Loss Long";
-      }
-      enum "CUMEVLLGMAX-OTS" {
-        description
-          "Cumulative Event Loss Long MAX";
-      }
-      enum "CUMEVRSH-OTS" {
-        description
-          "Cumulative Event Reflection Short";
-      }
-      enum "CUMEVRSHMAX-OTS" {
-        description
-          "Cumulative Event Reflection Short MAX";
-      }
-      enum "CUMEVRLG-OTS" {
-        description
-          "Cumulative Event Reflection Long";
-      }
-      enum "CUMEVRLGMAX-OTS" {
-        description
-          "Cumulative Event Reflection Long MAX";
-      }
-    }
-  }
-
-  typedef OTDRCFG_TH_MONTYPE_set {
-    type enumeration {
-      enum "MAXEVLSH-OTS" {
-        description
-          "Maximum Event Loss Short";
-      }
-      enum "MAXEVLLG-OTS" {
-        description
-          "Maximum Event Loss Long";
-      }
-      enum "MAXEVRSH-OTS" {
-        description
-          "Maximum Event Reflection Short";
-      }
-      enum "MAXEVRLG-OTS" {
-        description
-          "Maximum Event Reflection Long";
-      }
-      enum "CUMEVLSH-OTS" {
-        description
-          "Cumulative Event Loss Short";
-      }
-      enum "CUMEVLLG-OTS" {
-        description
-          "Cumulative Event Loss Long";
-      }
-      enum "CUMEVRSH-OTS" {
-        description
-          "Cumulative Event Reflection Short";
-      }
-      enum "CUMEVRLG-OTS" {
-        description
-          "Cumulative Event Reflection Long";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef OTDRCFG_TH_MONTYPE_resp {
-    type enumeration {
-      enum "MAXEVLSH-OTS" {
-        description
-          "Maximum Event Loss Short";
-      }
-      enum "MAXEVLLG-OTS" {
-        description
-          "Maximum Event Loss Long";
-      }
-      enum "MAXEVRSH-OTS" {
-        description
-          "Maximum Event Reflection Short";
-      }
-      enum "MAXEVRLG-OTS" {
-        description
-          "Maximum Event Reflection Long";
-      }
-      enum "CUMEVLSH-OTS" {
-        description
-          "Cumulative Event Loss Short";
-      }
-      enum "CUMEVLLG-OTS" {
-        description
-          "Cumulative Event Loss Long";
-      }
-      enum "CUMEVRSH-OTS" {
-        description
-          "Cumulative Event Reflection Short";
-      }
-      enum "CUMEVRLG-OTS" {
-        description
-          "Cumulative Event Reflection Long";
-      }
-      enum "ALL" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef NMCMON_PM_MONTYPE {
-    type enumeration {
-      enum "OPT-OCH" {
-        description
-          "Optical Channel Power Transmit.";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Channel Power Transmit Minimum.";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Channel Power Transmit Maximum.";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Channel Power Transmit Average.";
-      }
-      enum "ALL";
-    }
-  }
-
-  typedef NMCMON_PM_MONTYPE_resp {
-    type enumeration {
-      enum "OPT-OCH" {
-        description
-          "Optical Channel Power Transmit.";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Optical Channel Power Transmit Minimum.";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Optical Channel Power Transmit Maximum.";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Optical Channel Power Transmit Average.";
-      }
-    }
-  }
-
-  typedef NMCMON_MONTYPE {
-    type enumeration {
-      enum "ALL";
-    }
-  }
-
-  typedef NMCMON_TH_MONTYPE_set {
-    type enumeration {
-      enum "OPT-OCH" {
-        description
-          "Optical Channel Power Transmit.";
-      }
-      enum "ALL";
-    }
-  }
-
-  typedef NMCMON_TH_MONTYPE_resp {
-    type enumeration {
-      enum "OPT-OCH" {
-        description
-          "Optical Channel Power Transmit.";
-      }
-    }
-  }
-
-  typedef PTP_MONTYPE {
-    type enumeration {
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Average Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Minimum Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Maximum Optical Power Transmit - Optical Channel";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average) - Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max) - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received - Optical Channel";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted - Optical Channel";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized) - Optical Channel";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized) - Optical Channel";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received - Optical Channel";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted - Optical Channel";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized) - Optical Channel";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized) - Optical Channel";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Minimum Optical Power Receive - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Maximum Optical Power Receive - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Average Optical Power Receive - Optical Channel";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Received (normalized) - Optical Transport Section";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Total Optical Power Received (Minimum) - Optical Transport Section";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Total Optical Power Received (Maximum) - Optical Transport Section";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Total Optical Power Received (Average) - Optical Transport Section";
-      }
-      enum "OPR-OTSI" {
-        description
-          "Optical Power Receive- OTSI";
-      }
-      enum "OPT-OTSI" {
-        description
-          "Optical Power Transmit- OTSI";
-      }
-      enum "OPRN-OTSI" {
-        description
-          "Normalized Optical Power Receive- OTSI";
-      }
-      enum "OPTN-OTSI" {
-        description
-          "Normalized Optical Power Transmit- OTSI";
-      }
-      enum "OPRAVG-OTSI" {
-        description
-          "Optical Power Receive, Average - OTSI";
-      }
-      enum "OPRMIN-OTSI" {
-        description
-          "Optical Power Receive, Minimum - OTSI";
-      }
-      enum "OPRMAX-OTSI" {
-        description
-          "Optical Power Receive, Maximum - OTSI";
-      }
-      enum "OPTAVG-OTSI" {
-        description
-          "Optical Power Transmit, Average - OTSI";
-      }
-      enum "OPTMIN-OTSI" {
-        description
-          "Optical Power Transmit, Minimum - OTSI";
-      }
-      enum "OPTMAX-OTSI" {
-        description
-          "Optical Power Transmit, Maximum - OTSI";
-      }
-      enum "DGDAVG-OTSI" {
-        description
-          "Differential Group Delay (Average) OTSI";
-      }
-      enum "DGDMAX-OTSI" {
-        description
-          "Differential Group Delay (Maximum) OTSI";
-      }
-      enum "PDLAVG-OTSI" {
-        description
-          "Polarization Dependent Loss, Average - OTSI";
-      }
-      enum "PDLMAX-OTSI" {
-        description
-          "Polarization Dependent Loss, Maximum - OTSI";
-      }
-      enum "HCCS-OTSI" {
-        description
-          "High Correction Count Seconds - OTSI";
-      }
-      enum "FEC-OTSI" {
-        description
-          "FEC Corrections - OTSI";
-      }
-      enum "PRFBER-OTSI" {
-        description
-          "Post-FEC BER - OTSI";
-      }
-      enum "PRFBERMAX-OTSI" {
-        description
-          "Pre-FEC BER Maximum - OTSI";
-      }
-      enum "QMIN-OTSI" {
-        description
-          "Q MIN - OTSI";
-      }
-      enum "QMAX-OTSI" {
-        description
-          "Q MAX - OTSI";
-      }
-      enum "QAVG-OTSI" {
-        description
-          "Q AVG - OTSI";
-      }
-      enum "QSTDEV-OTSI" {
-        description
-          "Q StDev - OTSI";
-      }
-      enum "UNCFECBLK-OTSI" {
-        description
-          "Uncorrected FEC Block - OTSI";
-      }
-      enum "OSNRMIN-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "OSNRMAX-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "OSNRAVG-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "ESNRMIN-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "ESNRMAX-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "ESNRAVG-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "CDMIN-OTSI" {
-        description
-          "Dispersion compensation (Minimum) OTSI";
-      }
-      enum "CDMAX-OTSI" {
-        description
-          "Dispersion compensation (Maximum) OTSI";
-      }
-      enum "CDAVG-OTSI" {
-        description
-          "Dispersion compensation (Average) OTSI";
-      }
-      enum "PSCW-OTS" {
-        description
-          "Protection Switch Count Working";
-      }
-      enum "PSCP-OTS" {
-        description
-          "Protection Switch Count Protection";
-      }
-      enum "PSD-OTS" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef PTP_MONTYPE_resp {
-    type enumeration {
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTN-OCH" {
-        description
-          "Optical Power Transmit - Normalized - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Average Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Minimum Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Maximum Optical Power Transmit - Optical Channel";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average) - Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max) - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received - Optical Channel";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted - Optical Channel";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized) - Optical Channel";
-      }
-      enum "OPTNLOW-OCH" {
-        description
-          "Lowest optical power transmitted (normalized) - Optical Channel";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received - Optical Channel";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted - Optical Channel";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized) - Optical Channel";
-      }
-      enum "OPTNHIGH-OCH" {
-        description
-          "Highest optical power transmitted (normalized) - Optical Channel";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Minimum Optical Power Receive - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Maximum Optical Power Receive - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Average Optical Power Receive - Optical Channel";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Received (normalized) - Optical Transport Section";
-      }
-      enum "OPRMIN-OTS" {
-        description
-          "Total Optical Power Received (Minimum) - Optical Transport Section";
-      }
-      enum "OPRMAX-OTS" {
-        description
-          "Total Optical Power Received (Maximum) - Optical Transport Section";
-      }
-      enum "OPRAVG-OTS" {
-        description
-          "Total Optical Power Received (Average) - Optical Transport Section";
-      }
-      enum "OPR-OTSI" {
-        description
-          "Optical Power Receive- OTSI";
-      }
-      enum "OPT-OTSI" {
-        description
-          "Optical Power Transmit- OTSI";
-      }
-      enum "OPRN-OTSI" {
-        description
-          "Normalized Optical Power Receive- OTSI";
-      }
-      enum "OPTN-OTSI" {
-        description
-          "Normalized Optical Power Transmit- OTSI";
-      }
-      enum "OPRAVG-OTSI" {
-        description
-          "Optical Power Receive, Average - OTSI";
-      }
-      enum "OPRMIN-OTSI" {
-        description
-          "Optical Power Receive, Minimum - OTSI";
-      }
-      enum "OPRMAX-OTSI" {
-        description
-          "Optical Power Receive, Maximum - OTSI";
-      }
-      enum "OPTAVG-OTSI" {
-        description
-          "Optical Power Transmit, Average - OTSI";
-      }
-      enum "OPTMIN-OTSI" {
-        description
-          "Optical Power Transmit, Minimum - OTSI";
-      }
-      enum "OPTMAX-OTSI" {
-        description
-          "Optical Power Transmit, Maximum - OTSI";
-      }
-      enum "DGDAVG-OTSI" {
-        description
-          "Differential Group Delay (Average) OTSI";
-      }
-      enum "DGDMAX-OTSI" {
-        description
-          "Differential Group Delay (Maximum) OTSI";
-      }
-      enum "PDLAVG-OTSI" {
-        description
-          "Polarization Dependent Loss, Average - OTSI";
-      }
-      enum "PDLMAX-OTSI" {
-        description
-          "Polarization Dependent Loss, Maximum - OTSI";
-      }
-      enum "HCCS-OTSI" {
-        description
-          "High Correction Count Seconds - OTSI";
-      }
-      enum "FEC-OTSI" {
-        description
-          "FEC Corrections - OTSI";
-      }
-      enum "PRFBER-OTSI" {
-        description
-          "Post-FEC BER - OTSI";
-      }
-      enum "PRFBERMAX-OTSI" {
-        description
-          "Pre-FEC BER Maximum - OTSI";
-      }
-      enum "QMIN-OTSI" {
-        description
-          "Q MIN - OTSI";
-      }
-      enum "QMAX-OTSI" {
-        description
-          "Q MAX - OTSI";
-      }
-      enum "QAVG-OTSI" {
-        description
-          "Q AVG - OTSI";
-      }
-      enum "QSTDEV-OTSI" {
-        description
-          "Q StDev - OTSI";
-      }
-      enum "UNCFECBLK-OTSI" {
-        description
-          "Uncorrected FEC Block - OTSI";
-      }
-      enum "OSNRMIN-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "OSNRMAX-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "OSNRAVG-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "ESNRMIN-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "ESNRMAX-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "ESNRAVG-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "CDMIN-OTSI" {
-        description
-          "Dispersion compensation (Minimum) OTSI";
-      }
-      enum "CDMAX-OTSI" {
-        description
-          "Dispersion compensation (Maximum) OTSI";
-      }
-      enum "CDAVG-OTSI" {
-        description
-          "Dispersion compensation (Average) OTSI";
-      }
-      enum "PSCW-OTS" {
-        description
-          "Protection Switch Count Working";
-      }
-      enum "PSCP-OTS" {
-        description
-          "Protection Switch Count Protection";
-      }
-      enum "PSD-OTS" {
-        description
-          "Protection Switch Duration";
-      }
-    }
-  }
-
-  typedef PTP_TH_MONTYPE {
-    type enumeration {
-      enum "OPR-OCH" {
-        description
-          "Optical Power Receive - Optical Channel";
-      }
-      enum "OPT-OCH" {
-        description
-          "Optical Power Transmit - Optical Channel";
-      }
-      enum "OPRN-OCH" {
-        description
-          "Optical Power Receive - Normalized - Optical Channel";
-      }
-      enum "OPTAVG-OCH" {
-        description
-          "Average Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMIN-OCH" {
-        description
-          "Minimum Optical Power Transmit - Optical Channel";
-      }
-      enum "OPTMAX-OCH" {
-        description
-          "Maximum Optical Power Transmit - Optical Channel";
-      }
-      enum "DGDAVG-OCH" {
-        description
-          "Differential Group Delay (Average) - Optical Channel";
-      }
-      enum "DGDMAX-OCH" {
-        description
-          "Differential Group Delay (Max) - Optical Channel";
-      }
-      enum "OPRLOW-OCH" {
-        description
-          "Lowest optical power received - Optical Channel";
-      }
-      enum "OPTLOW-OCH" {
-        description
-          "Lowest optical power transmitted - Optical Channel";
-      }
-      enum "OPRNLOW-OCH" {
-        description
-          "Lowest optical power received (normalized) - Optical Channel";
-      }
-      enum "OPRHIGH-OCH" {
-        description
-          "Highest optical power received - Optical Channel";
-      }
-      enum "OPTHIGH-OCH" {
-        description
-          "Highest optical power transmitted - Optical Channel";
-      }
-      enum "OPRNHIGH-OCH" {
-        description
-          "Highest optical power received (normalized) - Optical Channel";
-      }
-      enum "OPRAVG-OCH" {
-        description
-          "Average Optical Power Receive - Optical Channel";
-      }
-      enum "OPRMIN-OCH" {
-        description
-          "Minimum Optical Power Receive - Optical Channel";
-      }
-      enum "OPRMAX-OCH" {
-        description
-          "Maximum Optical Power Receive - Optical Channel";
-      }
-      enum "OPR-OTS" {
-        description
-          "Optical Power Received - Optical Transport Section";
-      }
-      enum "OPRN-OTS" {
-        description
-          "Optical Power Received (normalized) - Optical Transport Section";
-      }
-      enum "OPR-OTSI" {
-        description
-          "Optical Power Receive- OTSI";
-      }
-      enum "OPT-OTSI" {
-        description
-          "Optical Power Transmit- OTSI";
-      }
-      enum "OPRN-OTSI" {
-        description
-          "Normalized Optical Power Receive- OTSI";
-      }
-      enum "DGDAVG-OTSI" {
-        description
-          "Differential Group Delay (Average) OTSI";
-      }
-      enum "DGDMAX-OTSI" {
-        description
-          "Differential Group Delay (Maximum) OTSI";
-      }
-      enum "PDLAVG-OTSI" {
-        description
-          "Polarization Dependent Loss, Average - OTSI";
-      }
-      enum "PDLMAX-OTSI" {
-        description
-          "Polarization Dependent Loss, Maximum - OTSI";
-      }
-      enum "HCCS-OTSI" {
-        description
-          "High Correction Count Seconds - OTSI";
-      }
-      enum "PRFBER-OTSI" {
-        description
-          "Post-FEC BER - OTSI";
-      }
-      enum "PRFBERMAX-OTSI" {
-        description
-          "Pre-FEC BER Maximum - OTSI";
-      }
-      enum "QMIN-OTSI" {
-        description
-          "Q MIN - OTSI";
-      }
-      enum "QMAX-OTSI" {
-        description
-          "Q MAX - OTSI";
-      }
-      enum "QAVG-OTSI" {
-        description
-          "Q AVG - OTSI";
-      }
-      enum "QSTDEV-OTSI" {
-        description
-          "Q StDev - OTSI";
-      }
-      enum "UNCFECBLK-OTSI" {
-        description
-          "Uncorrected FEC Block - OTSI";
-      }
-      enum "OSNRMIN-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "OSNRMAX-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "OSNRAVG-OTSI" {
-        description
-          "Optical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "ESNRMIN-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Minimum) OTSI";
-      }
-      enum "ESNRMAX-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Maximum) OTSI";
-      }
-      enum "ESNRAVG-OTSI" {
-        description
-          "Electrical Signal to Noise Ratio (Average) OTSI";
-      }
-      enum "CDMIN-OTSI" {
-        description
-          "Dispersion compensation (Minimum) OTSI";
-      }
-      enum "CDMAX-OTSI" {
-        description
-          "Dispersion compensation (Maximum) OTSI";
-      }
-      enum "CDAVG-OTSI" {
-        description
-          "Dispersion compensation (Average) OTSI";
-      }
-    }
-  }
-
-  typedef OTUTTP_MONTYPE {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "IAE-OTU" {
-        description
-          "Incoming Alignment Error - OTU";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "UNCFECBLK-OTU" {
-        description
-          "Uncorrected FEC Block - OTU";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef OTUTTP_MONTYPE_resp {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "FEC-OTU" {
-        description
-          "Forward Error Corrections - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "IAE-OTU" {
-        description
-          "Incoming Alignment Error - OTU";
-      }
-      enum "QMIN-OTU" {
-        description
-          "Minimum Q - OTU";
-      }
-      enum "QMAX-OTU" {
-        description
-          "Maximum Q - OTU";
-      }
-      enum "QAVG-OTU" {
-        description
-          "Average Q - OTU";
-      }
-      enum "QSTDEV-OTU" {
-        description
-          "Q Standard Deviation - OTU";
-      }
-      enum "UNCFECBLK-OTU" {
-        description
-          "Uncorrected FEC Block - OTU";
-      }
-    }
-  }
-
-  typedef OTUTTP_TH_MONTYPE {
-    type enumeration {
-      enum "CV-OTU" {
-        description
-          "Coding Violations - OTU ";
-      }
-      enum "ES-OTU" {
-        description
-          "Errored Seconds - OTU";
-      }
-      enum "SES-OTU" {
-        description
-          "Severely Errored Seconds - OTU";
-      }
-      enum "SEFS-OTU" {
-        description
-          "Severely Errored Framing Seconds - OTU";
-      }
-      enum "HCCS-OTU" {
-        description
-          "High Correction Count Seconds - OTU";
-      }
-      enum "PFBERE-OTU" {
-        description
-          "Post-FEC Bit Error Rate Estimate - OTU";
-      }
-      enum "PRFBER-OTU" {
-        description
-          "Pre-FEC Bit Error Rate - OTU";
-      }
-      enum "PRFBERMAX-OTU" {
-        description
-          "Pre-FEC Bit Max Error Rate - OTU";
-      }
-      enum "IAE-OTU" {
-        description
-          "Incoming Alignment Error - OTU";
-      }
-      enum "UNCFECBLK-OTU" {
-        description
-          "Uncorrected FEC Block - OTU";
-      }
-    }
-  }
-
-  typedef STTP_MONTYPE {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "FC-L" {
-        description
-          "Failure Count - Line";
-      }
-      enum "ALL" {
-        description
-          "All ends";
-      }
-    }
-  }
-
-  typedef STTP_MONTYPE_resp {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-      enum "FC-L" {
-        description
-          "Failure Count - Line";
-      }
-    }
-  }
-
-  typedef STTP_TH_MONTYPE {
-    type enumeration {
-      enum "CV-S" {
-        description
-          "Coding Violations - Section";
-      }
-      enum "ES-S" {
-        description
-          "Errored Seconds - Section";
-      }
-      enum "SES-S" {
-        description
-          "Severely Errored Seconds - Section";
-      }
-      enum "SEFS-S" {
-        description
-          "Severely Errored Frame Seconds - Section";
-      }
-      enum "CV-L" {
-        description
-          "Coding Violations - Line";
-      }
-      enum "ES-L" {
-        description
-          "Errored Seconds - Line";
-      }
-      enum "SES-L" {
-        description
-          "Severely Errored Seconds - Line";
-      }
-      enum "UAS-L" {
-        description
-          "Unavailable Seconds - Line";
-      }
-    }
-  }
-
-  typedef ETTP_MONTYPE {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "FEC-PMA" {
-        description
-          "Forward Error Corrections - Physical Medium Attachment";
-      }
-      enum "FECCCW-PMA" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-      }
-      enum "FECUNCCW-PMA" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Total ETH frames received";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Total ETH frames received with errors";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef ETTP_MONTYPE_resp {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "FEC-PMA" {
-        description
-          "Forward Error Corrections - Physical Medium Attachment";
-      }
-      enum "FECCCW-PMA" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-      }
-      enum "FECUNCCW-PMA" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-      enum "INFRAMES-E" {
-        description
-          "Total ETH frames received";
-      }
-      enum "INFRAMESERR-E" {
-        description
-          "Total ETH frames received with errors";
-      }
-      enum "INFRAMESDISCDS-E" {
-        description
-          "Ingress frames discarded due to congestion or policing";
-      }
-      enum "DFR-E" {
-        description
-          "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-      }
-      enum "OUTFRAMES-E" {
-        description
-          "Total ETH frames transmitted";
-      }
-      enum "OUTFRAMESERR-E" {
-        description
-          "Total egress direction ETH frames transmitted with FCS errors";
-      }
-      enum "OUTFRAMESDISCDS-E" {
-        description
-          "Egress frames discarded due to congestion or policing";
-      }
-      enum "FCSERR-E" {
-        description
-          "Frame Check Sequence Errors";
-      }
-    }
-  }
-
-  typedef ETTP_TH_MONTYPE {
-    type enumeration {
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "ES-E" {
-        description
-          "ETH Errored seconds (RX)";
-      }
-      enum "SES-E" {
-        description
-          "ETH Severely Errored Seconds (Rx)";
-      }
-      enum "UAS-E" {
-        description
-          "ETH Unavailable Seconds (Rx)";
-      }
-      enum "HCCS-PMA" {
-        description
-          "High Correction Count Second - Physical Medium Attachment";
-      }
-      enum "PRFBER-PMA" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-      }
-      enum "PRFBERMAX-PMA" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-      }
-    }
-  }
-
-  typedef ODU_MONTYPE {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef ODU_MONTYPE_resp {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-    }
-  }
-
-  typedef ODUTTP_MONTYPE {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef ODUTTP_MONTYPE_resp {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-    }
-  }
-
-  typedef ODU_TH_MONTYPE {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-    }
-  }
-
-  typedef ODUTTP_TH_MONTYPE {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU";
-      }
-    }
-  }
-
-  typedef ODUCTP_MONTYPE {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef ODUCTP_MONTYPE_resp {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "FC-ODU" {
-        description
-          "Failure Count - ODU";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU";
-      }
-      enum "PSCW-ODU" {
-        description
-          "Protection Switch Count - Working";
-      }
-      enum "PSCP-ODU" {
-        description
-          "Protection Switch Count - Protection";
-      }
-      enum "PSD-ODU" {
-        description
-          "Protection Switch Duration";
-      }
-    }
-  }
-
-  typedef ODUCTP_TH_MONTYPE {
-    type enumeration {
-      enum "CV-ODU" {
-        description
-          "Coding Violations - ODU";
-      }
-      enum "ES-ODU" {
-        description
-          "Errored Seconds - ODU";
-      }
-      enum "SES-ODU" {
-        description
-          "Severely Errored Seconds - ODU";
-      }
-      enum "UAS-ODU" {
-        description
-          "Unavailable Seconds - ODU ";
-      }
-      enum "DMMIN-ODU" {
-        description
-          "Delay Measurement Min - ODU";
-      }
-      enum "DMMAX-ODU" {
-        description
-          "Delay Measurement Max - ODU";
-      }
-      enum "DMAVG-ODU" {
-        description
-          "Delay Measurement Avg - ODU";
-      }
-    }
-  }
-
-  typedef TCM_MONTYPE {
-    type enumeration {
-      enum "CV-TCM" {
-        description
-          "Coding Violations - TCM";
-      }
-      enum "ES-TCM" {
-        description
-          "Errored Seconds - TCM";
-      }
-      enum "SES-TCM" {
-        description
-          "Severely Errored Seconds - TCM";
-      }
-      enum "UAS-TCM" {
-        description
-          "Unavailable Seconds - TCM ";
-      }
-      enum "FC-TCM" {
-        description
-          "Failure Count - TCM";
-      }
-      enum "PSCW-TCM" {
-        description
-          "Protection Switch Count, Working - TCM";
-      }
-      enum "PSCP-TCM" {
-        description
-          "Protection Switch Count, Protection - TCM";
-      }
-      enum "PSD-TCM" {
-        description
-          "Protection Switch Duration - TCM";
-      }
-      enum "DMMIN-TCM" {
-        description
-          "Delay Measurement Min - TCM";
-      }
-      enum "DMMAX-TCM" {
-        description
-          "Delay Measurement Max - TCM";
-      }
-      enum "DMAVG-TCM" {
-        description
-          "Delay Measurement Avg - TCM";
-      }
-      enum "IAE-TCM" {
-        description
-          "Incoming Alignment Error - TCM";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef TCM_MONTYPE_resp {
-    type enumeration {
-      enum "CV-TCM" {
-        description
-          "Coding Violations - TCM";
-      }
-      enum "ES-TCM" {
-        description
-          "Errored Seconds - TCM";
-      }
-      enum "SES-TCM" {
-        description
-          "Severely Errored Seconds - TCM";
-      }
-      enum "UAS-TCM" {
-        description
-          "Unavailable Seconds - TCM ";
-      }
-      enum "FC-TCM" {
-        description
-          "Failure Count - TCM";
-      }
-      enum "PSCW-TCM" {
-        description
-          "Protection Switch Count, Working - TCM";
-      }
-      enum "PSCP-TCM" {
-        description
-          "Protection Switch Count, Protection - TCM";
-      }
-      enum "PSD-TCM" {
-        description
-          "Protection Switch Duration - TCM";
-      }
-      enum "DMMIN-TCM" {
-        description
-          "Delay Measurement Min - TCM";
-      }
-      enum "DMMAX-TCM" {
-        description
-          "Delay Measurement Max - TCM";
-      }
-      enum "DMAVG-TCM" {
-        description
-          "Delay Measurement Avg - TCM";
-      }
-      enum "IAE-TCM" {
-        description
-          "Incoming Alignment Error - TCM";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef TCM_TH_MONTYPE {
-    type enumeration {
-      enum "CV-TCM" {
-        description
-          "Coding Violations - TCM";
-      }
-      enum "ES-TCM" {
-        description
-          "Errored Seconds - TCM";
-      }
-      enum "SES-TCM" {
-        description
-          "Severely Errored Seconds - TCM";
-      }
-      enum "UAS-TCM" {
-        description
-          "Unavailable Seconds - TCM ";
-      }
-      enum "DMMIN-TCM" {
-        description
-          "Delay Measurement Min - TCM";
-      }
-      enum "DMMAX-TCM" {
-        description
-          "Delay Measurement Max - TCM";
-      }
-      enum "DMAVG-TCM" {
-        description
-          "Delay Measurement Avg - TCM";
-      }
-      enum "IAE-TCM" {
-        description
-          "Incoming Alignment Error - TCM";
-      }
-    }
-  }
-
-  typedef CBRTTP_MONTYPE {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "FEC-PCS" {
-        description
-          "Forward Error Corrections - Physical Coding Sublayer";
-      }
-      enum "FECCCW-PCS" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-      }
-      enum "FECUNCCW-PCS" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-      }
-      enum "HCCS-PCS" {
-        description
-          "High Correction Count Second - Physical Coding Sublayer";
-      }
-      enum "PRFBER-PCS" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-      }
-      enum "PRFBERMAX-PCS" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-      }
-      enum "ALL" {
-        description
-          "All applicable montypes";
-      }
-    }
-  }
-
-  typedef CBRTTP_MONTYPE_resp {
-    type enumeration {
-      enum "CV-PCS" {
-        description
-          "Coding Violations - Physical Coding Sublayer";
-      }
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "FEC-PCS" {
-        description
-          "Forward Error Corrections - Physical Coding Sublayer";
-      }
-      enum "FECCCW-PCS" {
-        description
-          "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-      }
-      enum "FECUNCCW-PCS" {
-        description
-          "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-      }
-      enum "HCCS-PCS" {
-        description
-          "High Correction Count Second - Physical Coding Sublayer";
-      }
-      enum "PRFBER-PCS" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-      }
-      enum "PRFBERMAX-PCS" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-      }
-    }
-  }
-
-  typedef CBRTTP_TH_MONTYPE {
-    type enumeration {
-      enum "ES-PCS" {
-        description
-          "Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "SES-PCS" {
-        description
-          "Severely Errored Seconds - Physical Coding Sublayer";
-      }
-      enum "UAS-PCS" {
-        description
-          "Unavailable Seconds - Physical Coding Sublayer";
-      }
-      enum "HCCS-PCS" {
-        description
-          "High Correction Count Second - Physical Coding Sublayer";
-      }
-      enum "PRFBER-PCS" {
-        description
-          "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-      }
-      enum "PRFBERMAX-PCS" {
-        description
-          "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-      }
-    }
-  }
-
-  typedef ExResult {
-    type enumeration {
-      enum "PASS" {
-        description
-          "Exerciser Test Passed";
-      }
-      enum "NOEX" {
-        description
-          "Exerciser Test was not run. The exerciser will not run if there is a protection switch active, except on the card that is currently switched";
-      }
-      enum "FAIL-W" {
-        description
-          "Exerciser Test Failed. The fault shows up as a signal fail against the working card and not against a bridged P card. The working card and signal paths form the IO should be investigated for problems.";
-      }
-      enum "FAIL-P" {
-        description
-          "Exerciser Test Failed. The fault shows up as a signal fail against the protection card but not on the working card it is bridged to. The protection card and signal path from the IO through the PSM to protection should be investigated.";
-      }
-    }
-  }
-
-  typedef ExInvl {
-    type enumeration {
-      enum "1-DAY" {
-        description
-          " (Default) ";
-      }
-      enum "2-DAY";
-      enum "3-DAY";
-      enum "4-DAY";
-      enum "5-DAY";
-      enum "6-DAY";
-      enum "7-DAY";
-      enum "1-HR";
-      enum "2-HR";
-      enum "3-HR";
-      enum "4-HR";
-      enum "5-HR";
-      enum "6-HR";
-      enum "7-HR";
-      enum "8-HR";
-      enum "9-HR";
-      enum "10-HR";
-      enum "11-HR";
-      enum "12-HR";
-      enum "13-HR";
-      enum "14-HR";
-      enum "15-HR";
-      enum "16-HR";
-      enum "17-HR";
-      enum "18-HR";
-      enum "19-HR";
-      enum "20-HR";
-      enum "21-HR";
-      enum "22-HR";
-      enum "23-HR";
-      enum "5-MIN";
-      enum "6-MIN";
-      enum "7-MIN";
-      enum "8-MIN";
-      enum "9-MIN";
-      enum "10-MIN";
-      enum "11-MIN";
-      enum "12-MIN";
-      enum "13-MIN";
-      enum "14-MIN";
-      enum "15-MIN";
-      enum "16-MIN";
-      enum "17-MIN";
-      enum "18-MIN";
-      enum "19-MIN";
-      enum "20-MIN";
-      enum "21-MIN";
-      enum "22-MIN";
-      enum "23-MIN";
-      enum "24-MIN";
-      enum "25-MIN";
-      enum "26-MIN";
-      enum "27-MIN";
-      enum "28-MIN";
-      enum "29-MIN";
-      enum "30-MIN";
-      enum "31-MIN";
-      enum "32-MIN";
-      enum "33-MIN";
-      enum "34-MIN";
-      enum "35-MIN";
-      enum "36-MIN";
-      enum "37-MIN";
-      enum "38-MIN";
-      enum "39-MIN";
-      enum "40-MIN";
-      enum "41-MIN";
-      enum "42-MIN";
-      enum "43-MIN";
-      enum "44-MIN";
-      enum "45-MIN";
-      enum "46-MIN";
-      enum "47-MIN";
-      enum "48-MIN";
-      enum "49-MIN";
-      enum "50-MIN";
-      enum "51-MIN";
-      enum "52-MIN";
-      enum "53-MIN";
-      enum "54-MIN";
-      enum "55-MIN";
-    }
-  }
-
-  typedef EqptProtScheme {
-    type enumeration {
-      enum "1FORN" {
-        description
-          "1:N";
-      }
-      enum "1PLUS1" {
-        description
-          "1+1";
-      }
-    }
-  }
-
-  typedef EqptProtPrio {
-    type enumeration {
-      enum "HI";
-      enum "LO";
-    }
-  }
-
-  typedef WTR_default_5MIN {
-    type enumeration {
-      enum "0-MIN";
-      enum "1-MIN";
-      enum "2-MIN";
-      enum "3-MIN";
-      enum "4-MIN";
-      enum "5-MIN" {
-        description
-          " (Default) ";
-      }
-      enum "6-MIN";
-      enum "7-MIN";
-      enum "8-MIN";
-      enum "9-MIN";
-      enum "10-MIN";
-      enum "11-MIN";
-      enum "12-MIN";
-      enum "15-MIN";
-      enum "30-MIN";
-      enum "45-MIN";
-      enum "60-MIN";
-      enum "INFINITE";
-      enum "30-SEC";
-    }
-  }
-
-  typedef SWMODE {
-    type enumeration {
-      enum "EQPT" {
-        description
-          "Equipment protection only.";
-      }
-      enum "L2" {
-        description
-          "Equipment and layer 2 LAN protection.";
-      }
-      enum "L3" {
-        description
-          "Equipment and layer 3 LAN protection. This is the default value.";
-      }
-      enum "LACP" {
-        description
-          "Link Aggregation Control Protocol.";
-      }
-    }
-  }
-
-  typedef SwitchReason_EQPT {
-    type enumeration {
-      enum "SIGOK" {
-        description
-          "Signal OK. Signal/path/line/equipment is able to carry traffic.";
-      }
-      enum "DBSYNC" {
-        description
-          "Redundant Database Sync Fail. Autonomous switch due to redundant database sync failure.";
-      }
-      enum "EQPFL" {
-        description
-          "Equipment Fail. Autonomous switch due to equipment failure.";
-      }
-      enum "EQPOOS" {
-        description
-          "Equipment OOS. Autonomous switch due to equipment OOS.";
-      }
-      enum "WTR" {
-        description
-          "Wait to restore. Autonomous switch active because the wait to restore period has not yet expired.";
-      }
-      enum "NOTRDY" {
-        description
-          "Equipment Not Ready. Autonomous switch active because the equipment is not ready or initializing.";
-      }
-    }
-  }
-
-  typedef WTR_ETH_default_5MIN {
-    type enumeration {
-      enum "1-MIN";
-      enum "2-MIN";
-      enum "3-MIN";
-      enum "4-MIN";
-      enum "5-MIN" {
-        description
-          " (Default) ";
-      }
-      enum "6-MIN";
-      enum "7-MIN";
-      enum "8-MIN";
-      enum "9-MIN";
-      enum "10-MIN";
-      enum "11-MIN";
-      enum "12-MIN";
-    }
-  }
-
-  typedef BOOL_Y_N_defaultN {
-    type enumeration {
-      enum "Y";
-      enum "N" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef STDBYTX {
-    type enumeration {
-      enum "IDLE" {
-        description
-          "Transmit Idle Traffic";
-      }
-      enum "DUP" {
-        description
-          "Transmit Duplicate Traffic";
-      }
-      enum "OFF" {
-        description
-          "Transmitter Off (Squelched)";
-      }
-    }
-  }
-
-  typedef SWCR {
-    type enumeration {
-      enum "IDLE" {
-        description
-          "Idle Traffic";
-      }
-      enum "SD" {
-        description
-          "Signal Degrade (Default) ";
-      }
-      enum "EBER" {
-        description
-          "Excessive Bit Error Rate (Default) ";
-      }
-      enum "NONE" {
-        description
-          "No Switch Criteria";
-      }
-    }
-  }
-
-  typedef SwitchCommandOC {
-    type enumeration {
-      enum "MAN" {
-        description
-          "If the AID identifies a working circuit pack, then service will be transferred from it to the protection circuit pack if and only if the latter is neither failed nor servicing a higher or equal priority request.";
-      }
-      enum "FRCD" {
-        description
-          "If the AID identifies a working circuit pack, then service will be transferred from it to the protection circuit pack if and only if the latter is not servicing a higher or equal priority request. If the AID identifies a working circuit pack that has already been switched to protection, no switch occurs; however, the priority of the existing switch will be raised to forced.";
-      }
-      enum "LOCKOUT" {
-        description
-          "If the AID identifies the protection circuit pack then the command will prevent any working circuit pack from switching to the protection circuit pack. If a working circuit pack is already on protection, it will be switched back.";
-      }
-    }
-  }
-
-  typedef SwitchStatusBLSR {
-    type enumeration {
-      enum "IDLE" {
-        description
-          "No switch";
-      }
-      enum "AUTO" {
-        description
-          "Autonomous switch by network element";
-      }
-      enum "MAN" {
-        description
-          "Manual switch by user (Default) ";
-      }
-      enum "FRCD" {
-        description
-          "Forced switch by user";
-      }
-      enum "LOCKOUT" {
-        description
-          "Lockout by user";
-      }
-      enum "LOCKOUT_PROT" {
-        description
-          "Protection lockout in a BLSR system";
-      }
-      enum "LOCKOUT_WRKG" {
-        description
-          "Working lockout in a BLSR system";
-      }
-    }
-  }
-
-  typedef SwitchReason_OCn {
-    type enumeration {
-      enum "SIGOK" {
-        description
-          "Signal OK. Signal/path/line/equipment is able to carry traffic.";
-      }
-      enum "SF" {
-        description
-          "Signal Fail. Autonomous switch due to complete line/path failure.";
-      }
-      enum "SD" {
-        description
-          "Signal Degrade. Autonomous switch due to line/path signal degrade condition.";
-      }
-      enum "EBER" {
-        description
-          "Excessive BIP error. Autonomous switch due to excessive BIP error.";
-      }
-      enum "EQPFL" {
-        description
-          "Equipment Fail. Autonomous switch due to equipment failure.";
-      }
-      enum "FACOOS" {
-        description
-          "Facility OOS. Autonomous switch due to facility OOS.";
-      }
-      enum "EQPOOS" {
-        description
-          "Equipment OOS. Autonomous switch due to equipment OOS.";
-      }
-      enum "OSC" {
-        description
-          "Oscillation. Autonomous switch locked onto working or protection facility due to switch oscillation control by firmware.";
-      }
-      enum "WTR" {
-        description
-          "Wait to restore. Autonomous switch active because the wait to restore period has not yet expired.";
-      }
-    }
-  }
-
-  typedef SwitchStatusRPR {
-    type enumeration {
-      enum "MAN" {
-        description
-          "Manual switch by user (Default) ";
-      }
-      enum "FRCD" {
-        description
-          "Forced switch by user";
-      }
-    }
-  }
-
-  typedef SwitchReasonRPR {
-    type enumeration {
-      enum "SIGOK" {
-        description
-          "Signal OK. Signal/path/line/equipment is able to carry traffic.";
-      }
-      enum "SF" {
-        description
-          "Signal Fail. Autonomous switch due to complete line/path failure.";
-      }
-      enum "SD" {
-        description
-          "Signal Degrade. Autonomous switch due to line/path signal degrade condition.";
-      }
-      enum "FAOOS";
-      enum "WTR" {
-        description
-          "Wait to restore. Autonomous switch active because the wait to restore period has not yet expired.";
-      }
-    }
-  }
-
-  typedef WTR_OTMn_default_5MIN {
-    type enumeration {
-      enum "1-MIN";
-      enum "2-MIN";
-      enum "3-MIN";
-      enum "4-MIN";
-      enum "5-MIN" {
-        description
-          " (Default) ";
-      }
-      enum "6-MIN";
-      enum "7-MIN";
-      enum "8-MIN";
-      enum "9-MIN";
-      enum "10-MIN";
-      enum "11-MIN";
-      enum "12-MIN";
-      enum "15-MIN";
-      enum "30-MIN";
-      enum "45-MIN";
-      enum "60-MIN";
-    }
-  }
-
-  typedef TDG_OTM_default_0SEC {
-    type enumeration {
-      enum "0-MSEC" {
-        description
-          " (Default) ";
-      }
-      enum "5-MSEC";
-      enum "10-MSEC";
-      enum "15-MSEC";
-      enum "20-MSEC";
-      enum "25-MSEC";
-      enum "30-MSEC";
-      enum "35-MSEC";
-      enum "40-MSEC";
-      enum "45-MSEC";
-      enum "50-MSEC";
-      enum "100-MSEC";
-      enum "200-MSEC";
-      enum "300-MSEC";
-      enum "400-MSEC";
-      enum "500-MSEC";
-      enum "600-MSEC";
-      enum "700-MSEC";
-      enum "800-MSEC";
-      enum "900-MSEC";
-      enum "1-SEC";
-      enum "2-SEC";
-      enum "3-SEC";
-      enum "4-SEC";
-      enum "5-SEC";
-      enum "6-SEC";
-      enum "7-SEC";
-      enum "8-SEC";
-      enum "9-SEC";
-      enum "10-SEC";
-    }
-  }
-
-  typedef TRG_OTM_default_0MSEC {
-    type enumeration {
-      enum "0-MSEC" {
-        description
-          " (Default) ";
-      }
-      enum "5-MSEC";
-      enum "10-MSEC";
-      enum "15-MSEC";
-      enum "20-MSEC";
-      enum "25-MSEC";
-      enum "30-MSEC";
-      enum "35-MSEC";
-      enum "40-MSEC";
-      enum "45-MSEC";
-      enum "50-MSEC";
-      enum "100-MSEC";
-      enum "200-MSEC";
-      enum "300-MSEC";
-      enum "400-MSEC";
-      enum "500-MSEC";
-      enum "600-MSEC";
-      enum "700-MSEC";
-      enum "800-MSEC";
-      enum "900-MSEC";
-      enum "1-SEC";
-      enum "2-SEC";
-      enum "3-SEC";
-      enum "4-SEC";
-      enum "5-SEC";
-      enum "6-SEC";
-      enum "7-SEC";
-      enum "8-SEC";
-      enum "9-SEC";
-      enum "10-SEC";
-    }
-  }
-
-  typedef ProtStandardOTMn {
-    type enumeration {
-      enum "G8731" {
-        description
-          "OTN G-873.1 (Default) ";
-      }
-    }
-  }
-
-  typedef SwitchStatusOTMn {
-    type enumeration {
-      enum "IDLE" {
-        description
-          "No switch";
-      }
-      enum "AUTO" {
-        description
-          "Autonomous switch by network element";
-      }
-      enum "MAN" {
-        description
-          "Manual switch by user";
-      }
-      enum "FRCD" {
-        description
-          "Forced switch by user";
-      }
-      enum "LOCKOUT" {
-        description
-          "Lockout by user";
-      }
-    }
-  }
-
-  typedef SwitchReasonOTMn {
-    type enumeration {
-      enum "SIGOK" {
-        description
-          "Signal OK. Signal/path/line/equipment is able to carry traffic.";
-      }
-      enum "SF" {
-        description
-          "Signal Fail. Autonomous switch due to complete line/path failure.";
-      }
-      enum "SD" {
-        description
-          "Signal Degrade. Autonomous switch due to line/path signal degrade condition.";
-      }
-      enum "EBER" {
-        description
-          "Excessive BIP error. Autonomous switch due to excessive BIP error.";
-      }
-      enum "EQPFL" {
-        description
-          "Equipment Fail. Autonomous switch due to equipment failure.";
-      }
-      enum "FACOOS" {
-        description
-          "Facility OOS. Autonomous switch due to facility OOS.";
-      }
-      enum "EQPOOS" {
-        description
-          "Equipment OOS. Autonomous switch due to equipment OOS.";
-      }
-      enum "WTR" {
-        description
-          "Wait to restore. Autonomous switch active because the wait to restore period has not yet expired.";
-      }
-    }
-  }
-
-  typedef SwitchCommandOTMn {
-    type enumeration {
-      enum "MAN" {
-        description
-          "If the AID identifies a working circuit pack, then service will be transferred from it to the protection circuit pack if and only if the latter is neither failed nor servicing a higher or equal priority request. (Default) ";
-      }
-      enum "FRCD" {
-        description
-          "If the AID identifies a working circuit pack, then service will be transferred from it to the protection circuit pack if and only if the latter is not servicing a higher or equal priority request. If the AID identifies a working circuit pack that has already been switched to protection, no switch occurs; however, the priority of the existing switch will be raised to forced.";
-      }
-      enum "LOCKOUT" {
-        description
-          "If the AID identifies the protection circuit pack then the command will prevent any working circuit pack from switching to the protection circuit pack. If a working circuit pack is already on protection, it will be switched back.";
-      }
-    }
-  }
-
-  typedef SWMODE_LAG {
-    type enumeration {
-      enum "L3" {
-        description
-          "Protected links will turn off lasers in a failure situation.";
-      }
-      enum "LACP" {
-        description
-          "Protected links will use LACP protocol in a failure situation.";
-      }
-    }
-  }
-
-  typedef SwitchReasonLAG {
-    type enumeration {
-      enum "SIGOK" {
-        description
-          "Signal OK. Signal/path/line/equipment is able to carry traffic.";
-      }
-      enum "SF" {
-        description
-          "Signal Fail. Autonomous switch due to complete line/path failure.";
-      }
-      enum "EQPFL" {
-        description
-          "Equipment Fail. Autonomous switch due to equipment failure.";
-      }
-      enum "FACOOS" {
-        description
-          "Facility OOS. Autonomous switch due to facility OOS.";
-      }
-      enum "EQPOOS" {
-        description
-          "Equipment OOS. Autonomous switch due to equipment OOS.";
-      }
-    }
-  }
-
-  typedef PG_PSDIRN_defaultUNI {
-    type enumeration {
-      enum "UNI" {
-        description
-          "Unidirectional (Default) ";
-      }
-      enum "BI" {
-        description
-          "Bidirectional";
-      }
-    }
-  }
-
-  typedef EnumRVRTTYPE {
-    type enumeration {
-      enum "WTR" {
-        description
-          "Wait to restore. (Default) ";
-      }
-      enum "TODR" {
-        description
-          "Time of day reversion.";
-      }
-    }
-  }
-
-  typedef PG_RVRTV_defaultN {
-    type enumeration {
-      enum "Y" {
-        description
-          "Revertive";
-      }
-      enum "N" {
-        description
-          "Non-Revertive (Default) ";
-      }
-    }
-  }
-
-  typedef PG_SIGTYPE {
-    type enumeration {
-      enum "PM" {
-        description
-          "PM";
-      }
-      enum "TCMLEVEL1" {
-        description
-          "TCM level 1";
-      }
-      enum "TCMLEVEL2" {
-        description
-          "TCM level 2";
-      }
-      enum "TCMLEVEL3" {
-        description
-          "TCM level 3";
-      }
-      enum "TCMLEVEL4" {
-        description
-          "TCM level 4";
-      }
-      enum "TCMLEVEL5" {
-        description
-          "TCM level 5";
-      }
-      enum "TCMLEVEL6" {
-        description
-          "TCM level 6";
-      }
-    }
-  }
-
-  typedef PG_WTR_default_5MIN {
-    type enumeration {
-      enum "0-MIN";
-      enum "1-MIN";
-      enum "2-MIN";
-      enum "3-MIN";
-      enum "4-MIN";
-      enum "5-MIN" {
-        description
-          " (Default) ";
-      }
-      enum "6-MIN";
-      enum "7-MIN";
-      enum "8-MIN";
-      enum "9-MIN";
-      enum "10-MIN";
-      enum "11-MIN";
-      enum "12-MIN";
-      enum "15-MIN";
-      enum "30-MIN";
-      enum "45-MIN";
-      enum "60-MIN";
-    }
-  }
-
-  typedef PG_PS_default1PLUS1 {
-    type enumeration {
-      enum "1PLUS1" {
-        description
-          "1+1 (Default) ";
-      }
-      enum "1PLUS1PTPT" {
-        description
-          "1 Plus 1 Port TPT";
-      }
-    }
-  }
-
-  typedef PG_PS_RTRV {
-    type enumeration {
-      enum "1PLUS1" {
-        description
-          "Linear 1+1";
-      }
-      enum "1PLUS1PTPT" {
-        description
-          "1 Plus 1 Port TPT";
-      }
-      enum "A-SNCP" {
-        description
-          "A-SNCP";
-      }
-      enum "SNCP" {
-        description
-          "SNCP";
-      }
-    }
-  }
-
-  typedef PG_SST {
-    type enumeration {
-      enum "ACT" {
-        description
-          "Active, carrying traffic";
-      }
-      enum "IDLE" {
-        description
-          "Idle, not carrying traffic";
-      }
-      enum "FLT" {
-        description
-          "Fault detected";
-      }
-    }
-  }
-
-  typedef SwitchCommandPG_defaultMAN {
-    type enumeration {
-      enum "MAN" {
-        description
-          "Operates a manual switch to the other facility in the protection pair, but will be denied if that facility is already servicing a higher or equal priority request. If protection is revertive then the request stays active until released, at which time traffic will revert back. If protection is non-revertive then the request does not stay active and traffic does not revert back. (Default) ";
-      }
-      enum "FRCD" {
-        description
-          "Operates a forced switch to the other facility in the protection pair, but will be denied if that facility is already servicing a higher or equal priority request. If the facility identifies a working member that has already been switched to protection, no switch occurs; however, the priority of the existing switch will be raised to forced.";
-      }
-      enum "LOCKOUT" {
-        description
-          "If the facility identifies the protection member in the protection group, then the command will prevent a switch from the working member to the protection member. If the working member is already on protection, it will be switched back.";
-      }
-    }
-  }
-
-  typedef SwitchStatusPG {
-    type enumeration {
-      enum "IDLE" {
-        description
-          "No switch";
-      }
-      enum "AUTO" {
-        description
-          "Autonomous switch by network element";
-      }
-      enum "PENDING" {
-        description
-          "Switch pending";
-      }
-      enum "MAN" {
-        description
-          "Manual switch by user";
-      }
-      enum "FRCD" {
-        description
-          "Forced switch by user";
-      }
-      enum "LOCKOUT" {
-        description
-          "Lockout by user";
-      }
-      enum "TTOPS" {
-        description
-          "Autonomous switch triggered by transpondeAutonomous switch triggered by transponderr";
-      }
-    }
-  }
-
-  typedef SwitchEndPG {
-    type enumeration {
-      enum "LOCAL" {
-        description
-          "The switch is initiated by the local network element. All equipment and path switches are always locally initiated. PG switches are LOCAL when a failure is detected on the local network element or if the user request is initiated locally.";
-      }
-      enum "REMOTE" {
-        description
-          "The switch is initiated at the far end. Applicable to protection such as OTN APS where the protocol requires negotiation of switch requests between network elements.";
-      }
-    }
-  }
-
-  typedef SwitchReasonPG {
-    type enumeration {
-      enum "SIGOK" {
-        description
-          "Signal OK. Signal/path/line/equipment is able to carry traffic.";
-      }
-      enum "SF" {
-        description
-          "Signal Fail. Autonomous switch due to complete line/path failure.";
-      }
-      enum "SD" {
-        description
-          "Signal Degrade. Autonomous switch due to line/path signal degrade condition.";
-      }
-      enum "WTR" {
-        description
-          "Wait to restore. Autonomous switch active because the wait to restore period has not yet expired.";
-      }
-      enum "AIS" {
-        description
-          "Alarm Indication Signal.Autonomous switch due to path AIS condition.";
-      }
-      enum "OCI" {
-        description
-          "Open Connection Indication. Autonomous switch due to path OCI condition.";
-      }
-      enum "LCK" {
-        description
-          "Locked.Autonomous switch due to path LCK condition.";
-      }
-      enum "PLM" {
-        description
-          "Payload Mismatch. Autonomous switch due to path PLM condition.";
-      }
-      enum "TIM" {
-        description
-          "Trace Identifier Mismatch. Autonomous switch due to path TIM condition.";
-      }
-      enum "LOF" {
-        description
-          "Loss of Frame. Autonomous switch due to path LOF condition.";
-      }
-      enum "NHP" {
-        description
-          "Working leg is not on home route.";
-      }
-      enum "TODR" {
-        description
-          "Waiting for Time of Day Reversion window to open.";
-      }
-      enum "TODRHB" {
-        description
-          "Outside of TODR window and/or holdback requirement not met.";
-      }
-      enum "TRFLT" {
-        description
-          "TTOP fault";
-      }
-    }
-  }
-
-  typedef WTR_OPS_default_5MIN {
-    type enumeration {
-      enum "1-MIN";
-      enum "2-MIN";
-      enum "3-MIN";
-      enum "4-MIN";
-      enum "5-MIN" {
-        description
-          " (Default) ";
-      }
-      enum "6-MIN";
-      enum "7-MIN";
-      enum "8-MIN";
-      enum "9-MIN";
-      enum "10-MIN";
-      enum "11-MIN";
-      enum "12-MIN";
-      enum "15-MIN";
-      enum "30-MIN";
-      enum "45-MIN";
-      enum "60-MIN";
-    }
-  }
-
-  typedef TDG_default_0SEC {
-    type enumeration {
-      enum "0-MSEC" {
-        description
-          " (Default) ";
-      }
-      enum "50-MSEC";
-      enum "100-MSEC";
-      enum "500-MSEC";
-      enum "1-SEC";
-      enum "2-SEC";
-      enum "3-SEC";
-      enum "4-SEC";
-      enum "5-SEC";
-    }
-  }
-
-  typedef SwitchReasonOPS {
-    type enumeration {
-      enum "SIGOK" {
-        description
-          "Signal OK. Signal/path/line/equipment is able to carry traffic.";
-      }
-      enum "SF" {
-        description
-          "Signal Fail. Autonomous switch due to complete line/path failure.";
-      }
-      enum "FACOOS" {
-        description
-          "Facility OOS. Autonomous switch due to facility OOS.";
-      }
-      enum "WTR" {
-        description
-          "Wait to restore. Autonomous switch active because the wait to restore period has not yet expired.";
-      }
-      enum "TRFLT" {
-        description
-          "Transponder Fault. Autonomous switch due to fault detected by the transponder.";
-      }
-    }
-  }
-
-  typedef ODU_SIGTYPE {
-    type enumeration {
-      enum "PM" {
-        description
-          "PM";
-      }
-    }
-  }
-
-  typedef RecircOper {
-    type enumeration {
-      enum "UNKNOWN" {
-        description
-          "Recirculation Loop Testbed - UNKNOWN";
-      }
-      enum "START" {
-        description
-          "Recirculation Loop Testbed is ACTIVE";
-      }
-      enum "STOP" {
-        description
-          "Recirculation Loop Testbed is INACTIVE";
-      }
-    }
-  }
-
-  typedef Direction {
-    type enumeration {
-      enum "X" {
-        description
-          "default for FAMILY_A or FAMILY_C";
-      }
-      enum "Y" {
-        description
-          "Direction Y for FAMILY_A or FAMILY_C";
-      }
-      enum "DOWN" {
-        description
-          "default for FAMILY_B";
-      }
-      enum "UP" {
-        description
-          "Direction UP for FAMILY_B";
-      }
-      enum "AB" {
-        description
-          "Direction AB for FAMILY_A or FAMILY_C";
-      }
-      enum "AC" {
-        description
-          "Direction AC for FAMILY_A or FAMILY_C";
-      }
-      enum "BA" {
-        description
-          "Direction BA for FAMILY_A or FAMILY_C";
-      }
-      enum "BC" {
-        description
-          "Direction BC for FAMILY_A or FAMILY_C";
-      }
-      enum "CA" {
-        description
-          "Direction CA for FAMILY_A or FAMILY_C";
-      }
-      enum "CB" {
-        description
-          "Direction CB for FAMILY_A or FAMILY_C";
-      }
-      enum "ABAC" {
-        description
-          "Direction ABAC for FAMILY_A or FAMILY_C";
-      }
-      enum "BABC" {
-        description
-          "Direction BABC for FAMILY_A or FAMILY_C";
-      }
-      enum "CACB" {
-        description
-          "Direction CACB for FAMILY_A or FAMILY_C";
-      }
-      enum "CBAB" {
-        description
-          "Direction CBAB for FAMILY_A or FAMILY_C";
-      }
-    }
-  }
-
-  typedef DevType {
-    type enumeration {
-      enum "RPTR" {
-        description
-          "Repeater Device Type (Default) ";
-      }
-      enum "TEQ" {
-        description
-          "Tilt Equalizer Device Type";
-      }
-      enum "BU" {
-        description
-          "Branching Unit Device Type";
-      }
-      enum "SUPVTX" {
-        description
-          "Supervisory Tx";
-      }
-      enum "SUPVRX" {
-        description
-          "Supervisory Rx";
-      }
-      enum "BUDCSW" {
-        description
-          "Supervisory Rx";
-      }
-    }
-  }
-
-  typedef DfltSetting {
-    type enumeration {
-      enum "ALC1" {
-        description
-          "RPTR Device Type - ALC1 (Default) ";
-      }
-      enum "ALC2" {
-        description
-          "RPTR Device Type - ALC2";
-      }
-      enum "ALC3" {
-        description
-          "RPTR Device Type - ALC3";
-      }
-      enum "ALC4" {
-        description
-          "RPTR Device Type - ALC4";
-      }
-      enum "SETTING0" {
-        description
-          "TEQ Device Type - Setting 0";
-      }
-      enum "SETTING1" {
-        description
-          "TEQ Device Type - Setting 1";
-      }
-      enum "SETTING2" {
-        description
-          "TEQ Device Type - Setting 2";
-      }
-      enum "SETTING3" {
-        description
-          "TEQ Device Type - Setting 3";
-      }
-      enum "SETTING4" {
-        description
-          "TEQ Device Type - Setting 4";
-      }
-      enum "SETTING5" {
-        description
-          "TEQ Device Type - Setting 5";
-      }
-      enum "SETTING6" {
-        description
-          "TEQ Device Type - Setting 6";
-      }
-      enum "SETTING7" {
-        description
-          "TEQ Device Type - Setting 7";
-      }
-      enum "SETTING8" {
-        description
-          "TEQ Device Type - Setting 8";
-      }
-      enum "SETTING9" {
-        description
-          "TEQ Device Type - Setting 9";
-      }
-      enum "SETTING10" {
-        description
-          "TEQ Device Type - Setting 10";
-      }
-      enum "SETTING11" {
-        description
-          "TEQ Device Type - Setting 11";
-      }
-      enum "SETTING12" {
-        description
-          "TEQ Device Type - Setting 12";
-      }
-      enum "SETTING13" {
-        description
-          "TEQ Device Type - Setting 13";
-      }
-      enum "SETTING14" {
-        description
-          "TEQ Device Type - Setting 14";
-      }
-      enum "SETTING15" {
-        description
-          "TEQ Device Type - Setting 15";
-      }
-      enum "CONFIGURATION1" {
-        description
-          "BU Device Type - Configuration 1";
-      }
-      enum "CONFIGURATION2" {
-        description
-          "BU Device Type - Configuration 2";
-      }
-      enum "CONFIGURATION3" {
-        description
-          "BU Device Type - Configuration 3";
-      }
-      enum "CONFIGURATION4" {
-        description
-          "BU Device Type - Configuration 4";
-      }
-      enum "CONFIGURATION5" {
-        description
-          "BU Device Type - Configuration 5";
-      }
-      enum "CONFIGURATION6" {
-        description
-          "BU Device Type - Configuration 6";
-      }
-      enum "CONFIGURATION7" {
-        description
-          "BU Device Type - Configuration 7";
-      }
-      enum "CONFIGURATION8" {
-        description
-          "BU Device Type - Configuration 8";
-      }
-      enum "CONFIGURATION9" {
-        description
-          "BU Device Type - Configuration 9";
-      }
-      enum "CONFIGURATION10" {
-        description
-          "BU Device Type - Configuration 10";
-      }
-      enum "CONFIGURATION11" {
-        description
-          "BU Device Type - Configuration 11";
-      }
-      enum "CONFIGURATION12" {
-        description
-          "BU Device Type - Configuration 12";
-      }
-      enum "CONFIGURATION13" {
-        description
-          "BU Device Type - Configuration 13";
-      }
-      enum "CONFIGURATION14" {
-        description
-          "BU Device Type - Configuration 14";
-      }
-      enum "CONFIGURATION15" {
-        description
-          "BU Device Type - Configuration 15";
-      }
-      enum "CONFIGURATION16" {
-        description
-          "BU Device Type - Configuration 16";
-      }
-      enum "RESPONSELEVEL1" {
-        description
-          "RPTR Device Type - Response Level 1";
-      }
-      enum "RESPONSELEVEL2" {
-        description
-          "RPTR Device Type - Response Level 2";
-      }
-      enum "RESPONSELEVEL3" {
-        description
-          "RPTR Device Type - Response Level 3";
-      }
-      enum "RESPONSELEVEL4" {
-        description
-          "RPTR Device Type - Response Level 4";
-      }
-      enum "RESPONSELEVEL5" {
-        description
-          "RPTR Device Type - Response Level 5";
-      }
-      enum "RESPONSELEVEL6" {
-        description
-          "RPTR Device Type - Response Level 6";
-      }
-      enum "RESPONSELEVEL7" {
-        description
-          "RPTR Device Type - Response Level 7";
-      }
-      enum "RESPONSELEVEL8" {
-        description
-          "RPTR Device Type - Response Level 8";
-      }
-      enum "MAINAB" {
-        description
-          "BUDCSW Device Type - MAIN A-B";
-      }
-      enum "MAINBC" {
-        description
-          "BUDCSW Device Type - MAIN B-C";
-      }
-      enum "MAINCA" {
-        description
-          "BUDCSW Device Type - MAIN C-A";
-      }
-    }
-  }
-
-  typedef TRAPIF {
-    type enumeration {
-      enum "AUTO" {
-        description
-          "Source IP address in trap shall be selected by Comms automatically (Default) ";
-      }
-      enum "COLAN-A" {
-        description
-          "COLAN-A interface IP address shall be used as source IP address in traps";
-      }
-      enum "COLAN-X" {
-        description
-          "COLAN-X interface IP address shall be used as source IP address in traps";
-      }
-      enum "SHELF-IP" {
-        description
-          "SHELF IP address shall be used as source IP address in traps";
-      }
-    }
-  }
-
-  typedef UPC {
-    type enumeration {
-      enum "1" {
-        description
-          "Retrieve: allows retrieve and report related commands to be executed; because of its limitations";
-      }
-      enum "2" {
-        description
-          "Control: permits access to operate, release, and retrieve commands but not provisioning.";
-      }
-      enum "3" {
-        description
-          "Provisioning: allows access to provisioning, testing, editing, and retrieving commands.";
-      }
-      enum "4" {
-        description
-          "Administration: allows complete access to all commands and processes, except for automatic surveillance of all network elements. Same as Level 5";
-      }
-      enum "5" {
-        description
-          "Administration: allows complete access to all commands and processes, except for automatic surveillance of all network elements. Same as Level 4";
-      }
-    }
-  }
-
-  typedef CSA_QUERYMODE {
-    type enumeration {
-      enum "ROUND_ROBIN" {
-        description
-          "Query servers in round-robin mode";
-      }
-      enum "PRIMARY_FIRST" {
-        description
-          "Query PRIMARY server first";
-      }
-    }
-  }
-
-  typedef AlternateSecurityDomains {
-    type enumeration {
-      enum "CHALLENGE" {
-        description
-          "Use Challenge - response algorithm";
-      }
-      enum "LOCAL" {
-        description
-          "Use locally provisioned userids";
-      }
-    }
-  }
-
-  typedef ENABLED_DISABLED {
-    type enumeration {
-      enum "ENABLED";
-      enum "DISABLED";
-    }
-  }
-
-  typedef BLOCKED_UNBLOCKED {
-    type enumeration {
-      enum "BLOCKED";
-      enum "UNBLOCKED";
-    }
-  }
-
-  typedef intersectingSlotseqStatus {
-    type enumeration {
-      enum "NOT_APPLICABLE" {
-        description
-          "Not Applicable";
-      }
-      enum "UNRESOLVED" {
-        description
-          "Unresolved";
-      }
-      enum "RESOLVED" {
-        description
-          "Resolved";
-      }
-    }
-  }
-
-  typedef VALIDATION_OFF_ON {
-    type enumeration {
-      enum "ON" {
-        description
-          "Validation ON";
-      }
-      enum "OFF" {
-        description
-          "Validation OFF";
-      }
-    }
-  }
-
-  typedef WTR_Sync {
-    type enumeration {
-      enum "0-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "1-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "2-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "3-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "4-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "5-MIN" {
-        description
-          "Wait To Restore (in minutes) (Default) ";
-      }
-      enum "6-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "7-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "8-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "9-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "10-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "11-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-      enum "12-MIN" {
-        description
-          "Wait To Restore (in minutes)";
-      }
-    }
-  }
-
-  typedef PathRDIAISInsert {
-    type enumeration {
-      enum "AIS" {
-        description
-          "Alarm Indication Signal (Default) ";
-      }
-      enum "LOP" {
-        description
-          "Loss of Pointer (Default) ";
-      }
-      enum "TIM" {
-        description
-          "Trace Identifier Mismatch";
-      }
-      enum "PLM" {
-        description
-          "Payload Label Mismatch";
-      }
-      enum "UNEQ" {
-        description
-          "Payload Label Unequipped";
-      }
-      enum "LOM" {
-        description
-          "Loss Of Multiframe";
-      }
-    }
-  }
-
-  typedef provcurrentinfo {
-    type enumeration {
-      enum "4" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 2-Slot";
-      }
-      enum "5" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 2-Slot and 6500 7-Slot";
-      }
-      enum "7" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 2-Slot";
-      }
-      enum "10" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 2-Slot and 6500 7-Slot";
-      }
-      enum "15" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 7-Slot";
-      }
-      enum "18" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 2-Slot";
-      }
-      enum "20" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 7-Slot and 6500 14-Slot";
-      }
-      enum "30" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 7-Slot and 6500 14-Slot";
-      }
-      enum "40" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 7-Slot and 6500 14-Slot";
-      }
-      enum "50" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 14-Slot and 7 slot type 2";
-      }
-      enum "60" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 14-Slot and 32-Slot";
-      }
-      enum "80" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 32-Slot and 6500-T12";
-      }
-      enum "100" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 32-Slot and 6500-T12";
-      }
-      enum "120" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 and 6500-T12";
-      }
-      enum "150" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500";
-      }
-      enum "180" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500";
-      }
-      enum "3X40" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 32-Slot";
-      }
-      enum "3X50" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 32-Slot and 6500-T12";
-      }
-      enum "3X60" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 32-Slot and 6500-T12";
-      }
-      enum "2X40" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 14-Slot and 4x60 32-Slot";
-      }
-      enum "2X50" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 14-Slot, 4x60 32-Slot and 6500-T12";
-      }
-      enum "2X60" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 4x60 32-Slot and 6500-T12";
-      }
-      enum "2X80" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 4x60 32-Slot and 6500-T12";
-      }
-      enum "2X100" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 4x60 32-Slot and 6500-T12";
-      }
-      enum "4X40" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 4x60 32-Slot";
-      }
-      enum "4X50" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 4x60 32-Slot";
-      }
-      enum "4X60" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 4x60 32-Slot";
-      }
-      enum "1X5_1X5" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 7-Slot type 2";
-      }
-      enum "1X5_2X5" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 7-Slot type 2";
-      }
-      enum "1X5_3X5" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 7-Slot type 2";
-      }
-      enum "2X5_2X5" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500 7-Slot type 2";
-      }
-      enum "2X120" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T12 shelf";
-      }
-      enum "3X80" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T12 and 6500-T24 shelf";
-      }
-      enum "3X100" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T12 and 6500-T24 shelf";
-      }
-      enum "3X120" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T12 and 6500-T24 shelf";
-      }
-      enum "6X40" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T12 shelf";
-      }
-      enum "6X50" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T12 and 6500-T24 shelf";
-      }
-      enum "6X60" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T12 and 6500-T24 shelf";
-      }
-      enum "3X125" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T24 shelf";
-      }
-      enum "3X150" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T24 shelf";
-      }
-      enum "3X160" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T24 shelf";
-      }
-      enum "6X70" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T24 shelf";
-      }
-      enum "6X80" {
-        description
-          "Provisioned shelf power limit (Amps) for 6500-T24 shelf";
-      }
-    }
-  }
-
-  typedef OSCMODE {
-    type enumeration {
-      enum "OSPF" {
-        description
-          "OSC auto-provision, associated, OSPF circuit will auto-provision, OSPF router will auto-provision if it doesn't already exist. ";
-      }
-      enum "DISABLED" {
-        description
-          "OSC auto-provision is disabled";
-      }
-    }
-  }
-
-  typedef ALMCORR {
-    type enumeration {
-      enum "OFF" {
-        description
-          "Alarm correlation is disabled. No symptomatic alarms are suppressed.";
-      }
-      enum "ON" {
-        description
-          "Alarm correlation is enabled. All symptomatic alarms are suppressed.";
-      }
-      enum "CUSTOM" {
-        description
-          "Alarm correlation is enabled. Virtual LOS detection on passive filters carrying only a single channel is disabled.";
-      }
-    }
-  }
-
-  typedef ENABLED_defaultDISABLED {
-    type enumeration {
-      enum "ENABLED";
-      enum "DISABLED" {
-        description
-          " (Default) ";
-      }
-    }
-  }
-
-  typedef ALARMINFO {
-    type enumeration {
-      enum "DSBL" {
-        description
-          "No alarm information is reported in AOs.";
-      }
-      enum "CRDTYP" {
-        description
-          "Card Type is reported in AOs.";
-      }
-      enum "WVLNGTH" {
-        description
-          "Wavelength is reported in AOs.";
-      }
-      enum "FIC" {
-        description
-          "FIC is reported in AOs.";
-      }
-      enum "SBNTNM" {
-        description
-          "Subnet Name is reported in AOs.";
-      }
-      enum "PHYSSHLF" {
-        description
-          "Physical Shelf ID is reported in AOs.";
-      }
-      enum "BYNMBR" {
-        description
-          "Bay Number is reported in AOs.";
-      }
-      enum "LABEL" {
-        description
-          "Label is reported in AOs. This field is supported only on SP2 and SPTX cards.";
-      }
-      enum "CLFI" {
-        description
-          "CLFI is reported in AOs. This field is supported only on SP2 and SPTX cards.";
-      }
-      enum "NM" {
-        description
-          "NAME is reported in AOs. This field is supported only on SP2 card.";
-      }
-    }
-  }
-
-  typedef ConditioningOverride {
-    type enumeration {
-      enum "OFF" {
-        description
-          "BDI Conditioning AOs are suppressed";
-      }
-      enum "SC" {
-        description
-          "BDI Conditioning AOs are Standing Conditions";
-      }
-      enum "PROFILE" {
-        description
-          "BDI Conditioning AOs used alarm profiles for severity (Default) ";
-      }
-    }
-  }
-
-  typedef ETHLoopBack {
-    type enumeration {
-      enum "FACILITY" {
-        description
-          "Signal looped toward the equipment";
-      }
-      enum "TERMINAL" {
-        description
-          "Signal looped away from the equipment";
-      }
-      enum "EFMREMOTE" {
-        description
-          "Ethernet at first mile";
-      }
-    }
-  }
-
-  typedef FLEXLoopBack {
-    type enumeration {
-      enum "FACILITY" {
-        description
-          "Signal looped toward the equipment";
-      }
-      enum "TERMINAL" {
-        description
-          "Signal looped away from the equipment";
-      }
-    }
-  }
-
-  typedef LoopBack_NGM {
-    type enumeration {
-      enum "FACILITY" {
-        description
-          "Signal looped toward the equipment";
-      }
-    }
-  }
-
-  typedef LoopBack {
-    type enumeration {
-      enum "FACILITY" {
-        description
-          "Signal looped toward the equipment";
-      }
-      enum "TERMINAL" {
-        description
-          "Signal looped away from the equipment";
-      }
-      enum "EFMREMOTE" {
-        description
-          "Request the equivalent of a TERMINAL loopback at the far end equipment";
-      }
-    }
-  }
-
-  typedef TACC_Mode_1 {
-    type enumeration {
-      enum "MONE" {
-        description
-          "Monitor Path at From end";
-      }
-      enum "MONF" {
-        description
-          "Monitor Path at To end";
-      }
-      enum "MONEF" {
-        description
-          "Monitor Path at both From and To end";
-      }
-    }
-  }
-
-  typedef TACC_Mode {
-    type enumeration {
-      enum "MONE" {
-        description
-          "Monitor Path at From end";
-      }
-      enum "MONF" {
-        description
-          "Monitor Path at To end";
-      }
-      enum "MONEF" {
-        description
-          "Monitor Path at both From and To end";
-      }
-      enum "SPLTE" {
-        description
-          "Split the From end";
-      }
-      enum "SPLTF" {
-        description
-          "Split the To end";
-      }
-      enum "SPLTEF" {
-        description
-          "Split both ends";
-      }
-      enum "SPLTA" {
-        description
-          "Split forward path";
-      }
-      enum "SPLTB" {
-        description
-          "Split toward path";
-      }
-    }
-  }
-
-  typedef TSTSIG_Pattern {
-    type enumeration {
-      enum "100GETESTPATTERN" {
-        description
-          "100G Ethernet test pattern";
-      }
-      enum "OPU4PRBS31PATTERN" {
-        description
-          "OPU4 PRBS 31 test pattern";
-      }
-      enum "OPU4INVPRBS31PATTERN" {
-        description
-          "OPU4 Inverted PRBS 31 test pattern";
-      }
-      enum "OPU4100GE" {
-        description
-          "OPU4 (100GE 802.3ba Ethernet) test pattern";
-      }
-      enum "40GETESTPATTERN" {
-        description
-          "40G Ethernet test pattern";
-      }
-      enum "OPU340GE" {
-        description
-          "OPU3 (40GE 802.3ba Ethernet) test pattern";
-      }
-      enum "OPU3OC768PRBS31" {
-        description
-          "OPU3 OC768 PRBS 31 test pattern";
-      }
-      enum "OPU3OC768INVPRBS31" {
-        description
-          "OPU3 OC768 Inverted PRBS 31 test pattern";
-      }
-      enum "OC768PRBS31" {
-        description
-          "OC768 PRBS 31 test pattern";
-      }
-      enum "OC768INVPRBS31" {
-        description
-          "OC768 Inverted PRBS 31 test pattern";
-      }
-      enum "10GETESTPATTERN1" {
-        description
-          "10G Ethernet test pattern 1";
-      }
-      enum "10GETESTPATTERN2" {
-        description
-          "10G Ethernet test pattern 2";
-      }
-      enum "OPU210GE1" {
-        description
-          "OPU2 (10GE Pattern 1) test pattern";
-      }
-      enum "OPU210GE2" {
-        description
-          "OPU2 (10GE Pattern 2) test pattern";
-      }
-      enum "OPU2PRBS23" {
-        description
-          "OPU2 PRBS 23 test pattern";
-      }
-      enum "OPU2PRBS31" {
-        description
-          "OPU2 PRBS 31 test pattern";
-      }
-      enum "OPU2OC192PRBS23" {
-        description
-          "OPU2 (OC192 (PRBS23)) test pattern";
-      }
-      enum "OPU2OC192PRBS31" {
-        description
-          "OPU2 (OC192 (PRBS31)) test pattern";
-      }
-      enum "OC192PRBS23" {
-        description
-          "OC192 PRBS 23 test pattern";
-      }
-      enum "OC192PRBS31" {
-        description
-          "OC192 PRBS 31 test pattern";
-      }
-      enum "OPU0PRBS31" {
-        description
-          "OPU0 PRBS 31 test pattern";
-      }
-      enum "OPU0INVPRBS31" {
-        description
-          "OPU0 Inverted PRBS 31 test pattern";
-      }
-      enum "OPU1PRBS31" {
-        description
-          "OPU1 PRBS 31 test pattern";
-      }
-      enum "OPU1INVPRBS31" {
-        description
-          "OPU1 Inverted PRBS 31 test pattern";
-      }
-      enum "OPU2INVPRBS31" {
-        description
-          "OPU2 Inverted PRBS 31 test pattern";
-      }
-      enum "OPU2EPRBS31" {
-        description
-          "OPU2E PRBS 31 test pattern";
-      }
-      enum "OPU2EINVPRBS31" {
-        description
-          "OPU2E Inverted PRBS 31 test pattern";
-      }
-      enum "OPU3PRBS31" {
-        description
-          "OPU3 PRBS 31 test pattern";
-      }
-      enum "OPU3INVPRBS31" {
-        description
-          "OPU3 Inverted PRBS 31 test pattern";
-      }
-      enum "OPUFLEXPRBS31" {
-        description
-          "OPUFLEX PRBS 31 test pattern";
-      }
-      enum "OPUFLEXINVPRBS31" {
-        description
-          "OPUFLEX Inverted PRBS 31 test pattern";
-      }
-      enum "10GETESTPATTERN4" {
-        description
-          "10G Ethernet test pattern 4";
-      }
-      enum "O150PRBS11" {
-        description
-          "O150 test pattern";
-      }
-      enum "O150INVPRBS11" {
-        description
-          "O150 Inverted PRBS 11 test pattern";
-      }
-      enum "O151PRBS15" {
-        description
-          "O151 PRBS 15 test pattern";
-      }
-      enum "O151INVPRBS15" {
-        description
-          "O151 Inverted PRBS 15 test pattern";
-      }
-      enum "O153PRBS20" {
-        description
-          "O153 PRBS 20 test pattern";
-      }
-      enum "O153INVPRBS20" {
-        description
-          "O153 Inverted PRBS 20 test pattern";
-      }
-      enum "O151PRBS20" {
-        description
-          "O151 PRBS 20 test pattern";
-      }
-      enum "O151INVPRBS20" {
-        description
-          "O151 Inverted PRBS 20 test pattern";
-      }
-      enum "O151PRBS23" {
-        description
-          "O151 PRBS 23 test pattern";
-      }
-      enum "O151INVPRBS23" {
-        description
-          "O151 Inverted PRBS 23 test pattern";
-      }
-      enum "O150PRBS31" {
-        description
-          "O150 PRBS 31 test pattern";
-      }
-      enum "O150INVPRBS31" {
-        description
-          "O150 Inverted PRBS 31 test pattern";
-      }
-      enum "PTTRN1" {
-        description
-          "Test pattern 1";
-      }
-      enum "PTTRN2" {
-        description
-          "Test pattern 2";
-      }
-      enum "PTTRN3" {
-        description
-          "Test pattern 3";
-      }
-      enum "PTTRN4" {
-        description
-          "Test pattern 4";
-      }
-      enum "PTTRN5" {
-        description
-          "Test pattern 5";
-      }
-      enum "PTTRN6" {
-        description
-          "Test pattern 6";
-      }
-      enum "PTTRN7" {
-        description
-          "Test pattern 7";
-      }
-      enum "ETHPACKETPTTRN1" {
-        description
-          "Ethernet packet test pattern 1";
-      }
-      enum "ETHPACKETPTTRN2" {
-        description
-          "Ethernet packet test pattern 2";
-      }
-      enum "ETHPACKETPTTRN3" {
-        description
-          "Ethernet packet test pattern 3";
-      }
-      enum "16GFICONTESTPATTERN" {
-        description
-          "16G FICON test pattern";
-      }
-      enum "16GFCTESTPATTERN" {
-        description
-          "16G FC test pattern";
-      }
-      enum "32GFCTESTPATTERN" {
-        description
-          "32G FC test pattern";
-      }
-      enum "32GFICONTESTPATTERN" {
-        description
-          "32G FICON test pattern";
-      }
-      enum "NOPATTERN" {
-        description
-          "No test pattern";
-      }
-    }
-  }
-
-  typedef EnumVCPTYPE {
-    type enumeration {
-      enum "ODU0" {
-        description
-          " (Default) ";
-      }
-      enum "ODU1";
-      enum "ODU2";
-      enum "ODU3";
-      enum "ODU2E";
-      enum "ODU4";
-      enum "ODUFLEX";
-    }
-  }
-}
diff --git a/models/ciena-6500-equipment-status.yang b/models/ciena-6500-equipment-status.yang
deleted file mode 100644
index 82e4f4c275c382895adea5eaf6b35f17b761bfc7..0000000000000000000000000000000000000000
--- a/models/ciena-6500-equipment-status.yang
+++ /dev/null
@@ -1,45 +0,0 @@
-module ciena-6500-equipment-status {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-cardstemperature";
-  prefix equipment-status;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's equipment temperature object for the 6500";
-
-  revision 2015-01-01 {
-    description
-      "Initial revision.";
-  }
-
-  container equipment-status {
-    list temperature {
-      key "slot";
-      config false;
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot";
-        type ciena-6500-types:IDENT;
-      }
-      leaf temp-current {
-        description
-          "Current Temperature";
-        type ciena-6500-types:IDENT;
-        config false;
-      }
-      leaf temp-average {
-        description
-          "Average Temperature";
-        type ciena-6500-types:IDENT;
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-equipment.yang b/models/ciena-6500-equipment.yang
deleted file mode 100644
index dd2d4da7a909e7dd59120e31a04f40078002318e..0000000000000000000000000000000000000000
--- a/models/ciena-6500-equipment.yang
+++ /dev/null
@@ -1,1758 +0,0 @@
-module ciena-6500-equipment {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-equipment";
-  prefix equipment;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's equipment object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: equipment-show-config
-       - Added rpc: equipment-invoke-delay
-       - Added rpc: equipment-check-usb
-       - Added rpc: equipment-clear-group-member
-         container equipment
-         - Added container: cem
-         - Added container: equipment
-         - Added container: group
-         - Added container: shelf
-         - Added container: site
-         - Added list: inventory-fan
-         - Added list: inventory-io
-         - Added list: usb
-         - Added list: prot-group
-           list config
-           - Added leaf: label
-           - Added leaf: projid
-           - Added leaf: date1
-           - Added leaf: date2
-           - Added leaf: date3
-           - Added leaf: phase
-           - Added leaf: usage
-           - Added leaf: ctm-extender
-           - Added leaf: ntwksvc
-             leaf eqpt
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf prov-pec
-             - Added mandatory: true 
-             leaf eqpt-profile2
-               type enumeration
-               - Added enum: 10G
-               - Added enum: ETH100G_GMP
-               - Added enum: OTU4
-             leaf pst
-             - Added default: IS 
-             leaf-list sst
-               type enumeration
-               - Added enum: AINS-DEA
-               - Added enum: STBY
-               - Added enum: XALGN
-             leaf snmp-index
-               type ciena-6500-types:INT
-               - Added range: 0..4294967295 
-           list auto-equip
-             leaf slot
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list inventory
-           - Added leaf: power
-           - Added leaf: speed
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf snmp-index
-               type ciena-6500-types:INT
-               - Added range: 0..4294967295 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container equipment
-           list config
-           - Changed key from aid to eqpt
-           - Removed leaf: aid
-           - Removed leaf: phys-locn
-           - Removed leaf: rack-unit-num
-           - Removed leaf: flt-rec-info
-           - Removed leaf: temp-current
-           - Removed leaf: temp-average
-           - Removed leaf: provpec
-           - Added leaf: eqpt
-             leaf prov-pec
-             - Changed config from false to true
-             leaf eqpt-profile2
-             - Changed type from ciena-6500-enums:EQPTPROFILE2 to enumeration
-               type enumeration
-               - Added enum: STS3C
-               - Added enum: STS1/STS3C
-               - Added enum: PRIME
-               - Added enum: MEMBER2
-               - Added enum: 40G
-               - Added enum: 4X10G
-               - Added enum: NONE
-             leaf pst
-               type enumeration
-               - Added enum: IS-ANR
-               - Added enum: OOS-AU
-               - Added enum: OOS-AUMA
-               - Added enum: OOS-MAANR
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTAINS to enumeration
-               type enumeration
-               - Added enum: ACT
-               - Added enum: AINS
-               - Added enum: FLT
-               - Added enum: IDLE
-               - Added enum: MEA
-               - Added enum: PSI
-               - Added enum: PWROFF
-               - Added enum: SGEO
-               - Added enum: STBYH
-               - Added enum: STBYS
-               - Added enum: TS
-               - Added enum: UEQ
-               - Added enum: WRK
-               - Added enum: WRKCTRL
-               - Added enum: WRKOAM
-               - Added enum: WRKSYNC
-               - Added enum: WRKTRAF
-             leaf pec
-             - Changed config from true to false
-             leaf site
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..40 
-           list auto-equip
-           - Changed key from aid to slot
-           - Removed leaf: aid
-           - Added leaf: slot
-           list inventory
-           - Removed leaf: phys-locn
-           - Removed leaf: rack-unit-num
-           - Added leaf: cardpwr
-             leaf aid
-             - Removed mandatory
-             - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT
-             leaf temp-current
-             - Changed type from ciena-6500-types:INT to ciena-6500-types:IDENT
-             leaf temp-average
-             - Changed type from ciena-6500-types:INT to ciena-6500-types:IDENT
-         rpc equipment-disable-config
-           input
-           - Added leaf: eqpt
-         rpc equipment-enable-config
-           input
-           - Added leaf: eqpt";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: equipment
-       - Added rpc: equipment-disable-config
-       - Added rpc: equipment-enable-config";
-  }
-
-  rpc equipment-disable-config {
-    description
-      "Remove Equipment: This command allows you to remove one or more equipment modules to out-of-service management state. The equipment goes from in-service to an out-of-service management state.";
-    input {
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format 10G-shelf-slot, 10G-shelf-ALL, 2G5-shelf-slot, 2G5-shelf-ALL, 155622M-shelf-slot, 155622M-shelf-ALL, GE-shelf-slot, GE-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, XC-shelf-slot, XC-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, SMUX-shelf-slot, SMUX-shelf-ALL, MRO-shelf-slot, MRO-shelf-ALL, L2MOTR-shelf-slot, L2MOTR-shelf-ALL, FLEXMOTR-shelf-slot, FLEXMOTR-shelf-ALL, EMOTR-shelf-slot, EMOTR-shelf-ALL, OTNFMOTR-shelf-slot, OTNFMOTR-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, 10GWT-shelf-slot, 10GWT-shelf-ALL, 10GELWT-shelf-slot, 10GELWT-shelf-ALL, 10GOTNWT-shelf-slot, 10GOTNWT-shelf-ALL, 2G5MOTR-shelf-slot, 2G5MOTR-shelf-ALL, 10GOTR-shelf-slot, 10GOTR-shelf-ALL, 10GOTSC-shelf-slot, 10GOTSC-shelf-ALL, OSIC-shelf-slot, OSIC-shelf-ALL, ISS-shelf-slot, ISS-shelf-ALL, 40GOCLD-shelf-slot, 40GOCLD-shelf-ALL, 40GUOCLD-shelf-slot, 40GUOCLD-shelf-ALL, 40GOCI-shelf-slot, 40GOCI-shelf-ALL, 40GMUX-shelf-slot, 40GMUX-shelf-ALL, 40GXCIF-shelf-slot, 40GXCIF-shelf-ALL, 100GOCLD-shelf-slot, 100GOCLD-shelf-ALL, 100GMUX-shelf-slot, 100GMUX-shelf-ALL, 100GOCI-shelf-slot, 100GOCI-shelf-ALL, OTR-shelf-slot, OTR-shelf-ALL, MOTR-shelf-slot, MOTR-shelf-ALL, OCI-shelf-slot, OCI-shelf-ALL, OTSC-shelf-slot, OTSC-shelf-ALL, TRM-shelf-slot, TRM-shelf-ALL, PCXM-shelf-slot-port, POPS-shelf-slot-port, OSCFM-shelf-slot, WSSOPM-shelf-slot, OPM-shelf-slot, SMD-shelf-slot, TCC-shelf-slot, SLIC-shelf-slot, LIM-shelf-slot, ESAM-shelf-slot, SAM-shelf-slot, SRA-shelf-slot, XLA-shelf-slot, RLA-shelf-slot, FGA-shelf-slot, CMD4-shelf-slot, CCMD12-shelf-slot, CCMD8X16-shelf-slot, CCMD16X12-shelf-slot, AMP4-shelf-slotSsubslot, FIM-shelf-slot, MFC-shelf-slot, CCMD8X4-shelf-slotSsubslot, OTDR4-shelf-slotSsubslot, CMD44-shelf-slot, CMD96-shelf-slot, CMD96-shelf-ALL, CCMD64-shelf-slot, CCMD64-shelf-ALL, CMD16-shelf-slot, CMD16-shelf-ALL, CMD64-shelf-slot, CMD64-shelf-ALL, CMD24-shelf-slot, CMD24-shelf-ALL, OPS-shelf-slot, OPS-shelf-ALL, DSCM-shelf-slot, BMD-shelf-slot, OMD-shelf-slot, OMX-shelf-slot, TPT-shelf-slot, PPC6-shelf-slot, OSCF-shelf-slotSsubslot, OMDF4-shelf-slotSsubslot, OMDF8-shelf-slotSsubslot, BS-shelf-slotSsubslot, GMD10-shelf-slot, OBB-shelf-slot, OBMD8-shelf-slot, P10GEL-shelf-slot-port, P10GEL-shelf-slot-ALL, P10GSEL-shelf-slot-port, P10GSEL-shelf-slot-ALL, P10GSOEL-shelf-slot-port, P10GSOEL-shelf-slot-ALL, P155622M-shelf-slot-port, P155622M-shelf-slot-ALL, P155M-shelf-slot-port, P155M-shelf-slot-ALL, P2G5-shelf-slot-port, P2G5-shelf-slot-ALL, P622M-shelf-slot-port, P622M-shelf-slot-ALL, PCWDMS-shelf-slot-port, PCWDMS-shelf-slot-ALL, PFC400-shelf-slot-port, PFC400-shelf-slot-ALL, PFE-shelf-slot-port, PFE-shelf-slot-ALL, PGEFC200-shelf-slot-port, PGEFC200-shelf-slot-ALL, PGEFC-shelf-slot-port, PGEFC-shelf-slot-ALL, PGE-shelf-slot-port, PGE-shelf-slot-ALL, PCFP-shelf-slot-port, PCFP-shelf-slot-ALL, PSFP-shelf-slot-port, PSFP-shelf-slot-ALL, PQSFP-shelf-slot-port, PQSFP-shelf-slot-ALL, PXFP-shelf-slot-port, PXFP-shelf-slot-ALL, POPS-shelf-slot-ALL, PCXM-shelf-slot-ALL, PCFP2-shelf-slot-port, PCFP2-shelf-slot-ALL, P155622M-shelf-ALL, P155M-shelf-ALL, P2G5-shelf-ALL, P622M-shelf-ALL, PCWDMS-shelf-ALL, PFE-shelf-ALL, PGEFC200-shelf-ALL, PGEFC-shelf-ALL, PGE-shelf-ALL, PSFP-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, FE-shelf-slot, FE-shelf-ALL, L2RPR-shelf-slot, L2RPR-shelf-ALL, MXC-shelf-slot, MXC-shelf-ALL, PXFP-shelf-ALL, P10GSOEL-shelf-ALL, P10GSEL-shelf-ALL, SPOTNFMOTR-shelf-slot, SPOTNFMOTR-shelf-ALL, SP-shelf-slot, CTM-shelf-slot, SM-shelf-slot, OTNFLEX-shelf-slot, PKTFLEX-shelf-slot, OTNXCIF-shelf-slot, PKTOTN-shelf-slot, PKTOTNXCIF-shelf-slot";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc equipment-enable-config {
-    description
-      "Restore Equipment: This command allows you to restore one or more equipment modules to in-service. The equipment goes from an out-of-service management state to an in-service state.";
-    input {
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format 10G-shelf-slot, 10G-shelf-ALL, 2G5-shelf-slot, 2G5-shelf-ALL, 155622M-shelf-slot, 155622M-shelf-ALL, GE-shelf-slot, GE-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, XC-shelf-slot, XC-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, SMUX-shelf-slot, SMUX-shelf-ALL, MRO-shelf-slot, MRO-shelf-ALL, L2MOTR-shelf-slot, L2MOTR-shelf-ALL, FLEXMOTR-shelf-slot, FLEXMOTR-shelf-ALL, EMOTR-shelf-slot, EMOTR-shelf-ALL, OTNFMOTR-shelf-slot, OTNFMOTR-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, 10GWT-shelf-slot, 10GWT-shelf-ALL, 10GELWT-shelf-slot, 10GELWT-shelf-ALL, 10GOTNWT-shelf-slot, 10GOTNWT-shelf-ALL, 2G5MOTR-shelf-slot, 2G5MOTR-shelf-ALL, 10GOTR-shelf-slot, 10GOTR-shelf-ALL, 10GOTSC-shelf-slot, 10GOTSC-shelf-ALL, OSIC-shelf-slot, OSIC-shelf-ALL, ISS-shelf-slot, ISS-shelf-ALL, 40GOCLD-shelf-slot, 40GOCLD-shelf-ALL, 40GUOCLD-shelf-slot, 40GUOCLD-shelf-ALL, 40GOCI-shelf-slot, 40GOCI-shelf-ALL, 40GMUX-shelf-slot, 40GMUX-shelf-ALL, 40GXCIF-shelf-slot, 40GXCIF-shelf-ALL, 100GOCLD-shelf-slot, 100GOCLD-shelf-ALL, 100GMUX-shelf-slot, 100GMUX-shelf-ALL, 100GOCI-shelf-slot, 100GOCI-shelf-ALL, OTR-shelf-slot, OTR-shelf-ALL, MOTR-shelf-slot, MOTR-shelf-ALL, OCI-shelf-slot, OCI-shelf-ALL, OTSC-shelf-slot, OTSC-shelf-ALL, TRM-shelf-slot, TRM-shelf-ALL, PCXM-shelf-slot-port, POPS-shelf-slot-port, OSCFM-shelf-slot, WSSOPM-shelf-slot, OPM-shelf-slot, SMD-shelf-slot, TCC-shelf-slot, SLIC-shelf-slot, LIM-shelf-slot, ESAM-shelf-slot, SAM-shelf-slot, SRA-shelf-slot, XLA-shelf-slot, RLA-shelf-slot, FGA-shelf-slot, CMD4-shelf-slot, CCMD12-shelf-slot, CCMD8X16-shelf-slot, CCMD16X12-shelf-slot, AMP4-shelf-slotSsubslot, FIM-shelf-slot, MFC-shelf-slot, CCMD8X4-shelf-slotSsubslot, OTDR4-shelf-slotSsubslot, CMD44-shelf-slot, CMD96-shelf-slot, CMD96-shelf-ALL, CCMD64-shelf-slot, CCMD64-shelf-ALL, CMD16-shelf-slot, CMD16-shelf-ALL, CMD64-shelf-slot, CMD64-shelf-ALL, CMD24-shelf-slot, CMD24-shelf-ALL, OPS-shelf-slot, OPS-shelf-ALL, DSCM-shelf-slot, BMD-shelf-slot, OMD-shelf-slot, OMX-shelf-slot, TPT-shelf-slot, PPC6-shelf-slot, OSCF-shelf-slotSsubslot, OMDF4-shelf-slotSsubslot, OMDF8-shelf-slotSsubslot, BS-shelf-slotSsubslot, GMD10-shelf-slot, OBB-shelf-slot, OBMD8-shelf-slot, P10GEL-shelf-slot-port, P10GEL-shelf-slot-ALL, P10GSEL-shelf-slot-port, P10GSEL-shelf-slot-ALL, P10GSOEL-shelf-slot-port, P10GSOEL-shelf-slot-ALL, P155622M-shelf-slot-port, P155622M-shelf-slot-ALL, P155M-shelf-slot-port, P155M-shelf-slot-ALL, P2G5-shelf-slot-port, P2G5-shelf-slot-ALL, P622M-shelf-slot-port, P622M-shelf-slot-ALL, PCWDMS-shelf-slot-port, PCWDMS-shelf-slot-ALL, PFC400-shelf-slot-port, PFC400-shelf-slot-ALL, PFE-shelf-slot-port, PFE-shelf-slot-ALL, PGEFC200-shelf-slot-port, PGEFC200-shelf-slot-ALL, PGEFC-shelf-slot-port, PGEFC-shelf-slot-ALL, PGE-shelf-slot-port, PGE-shelf-slot-ALL, PCFP-shelf-slot-port, PCFP-shelf-slot-ALL, PSFP-shelf-slot-port, PSFP-shelf-slot-ALL, PQSFP-shelf-slot-port, PQSFP-shelf-slot-ALL, PXFP-shelf-slot-port, PXFP-shelf-slot-ALL, POPS-shelf-slot-ALL, PCXM-shelf-slot-ALL, PCFP2-shelf-slot-port, PCFP2-shelf-slot-ALL, P155622M-shelf-ALL, P155M-shelf-ALL, P2G5-shelf-ALL, P622M-shelf-ALL, PCWDMS-shelf-ALL, PFE-shelf-ALL, PGEFC200-shelf-ALL, PGEFC-shelf-ALL, PGE-shelf-ALL, PSFP-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, FE-shelf-slot, FE-shelf-ALL, L2RPR-shelf-slot, L2RPR-shelf-ALL, MXC-shelf-slot, MXC-shelf-ALL, PXFP-shelf-ALL, P10GSOEL-shelf-ALL, P10GSEL-shelf-ALL, SPOTNFMOTR-shelf-slot, SPOTNFMOTR-shelf-ALL, SP-shelf-slot, CTM-shelf-slot, SM-shelf-slot, OTNFLEX-shelf-slot, PKTFLEX-shelf-slot, OTNXCIF-shelf-slot, PKTOTN-shelf-slot, PKTOTNXCIF-shelf-slot";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc equipment-show-config {
-    description
-      "Retrieve Equipment: Retrieves the data parameters and state parameters for provisioned equipment. If the equipment is not present when this command is issued, it identifies only what is provisioned and does not identify which equipment is actually present or missing. If the equipment is present when the command is issued, it returns what is provisioned and in addition returns information retrieved from the actual equipment.";
-    input {
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format 10G-shelf-slot, 10G-shelf-ALL, 2G5-shelf-slot, 2G5-shelf-ALL, 155622M-shelf-slot, 155622M-shelf-ALL, GE-shelf-slot, GE-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, XC-shelf-slot, XC-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, SMUX-shelf-slot, SMUX-shelf-ALL, MRO-shelf-slot, MRO-shelf-ALL, L2MOTR-shelf-slot, L2MOTR-shelf-ALL, FLEXMOTR-shelf-slot, FLEXMOTR-shelf-ALL, EMOTR-shelf-slot, EMOTR-shelf-ALL, OTNFMOTR-shelf-slot, OTNFMOTR-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, 10GWT-shelf-slot, 10GWT-shelf-ALL, 10GELWT-shelf-slot, 10GELWT-shelf-ALL, 10GOTNWT-shelf-slot, 10GOTNWT-shelf-ALL, 2G5MOTR-shelf-slot, 2G5MOTR-shelf-ALL, 10GOTR-shelf-slot, 10GOTR-shelf-ALL, 10GOTSC-shelf-slot, 10GOTSC-shelf-ALL, OSIC-shelf-slot, OSIC-shelf-ALL, ISS-shelf-slot, ISS-shelf-ALL, 40GOCLD-shelf-slot, 40GOCLD-shelf-ALL, 40GUOCLD-shelf-slot, 40GUOCLD-shelf-ALL, 40GOCI-shelf-slot, 40GOCI-shelf-ALL, 40GMUX-shelf-slot, 40GMUX-shelf-ALL, 40GXCIF-shelf-slot, 40GXCIF-shelf-ALL, 100GOCLD-shelf-slot, 100GOCLD-shelf-ALL, 100GMUX-shelf-slot, 100GMUX-shelf-ALL, 100GOCI-shelf-slot, 100GOCI-shelf-ALL, OTR-shelf-slot, OTR-shelf-ALL, MOTR-shelf-slot, MOTR-shelf-ALL, OCI-shelf-slot, OCI-shelf-ALL, OTSC-shelf-slot, OTSC-shelf-ALL, TRM-shelf-slot, TRM-shelf-ALL, PCXM-shelf-slot-port, OSCFM-shelf-slot, WSSOPM-shelf-slot, WSSOPM-shelf-ALL, OPM-shelf-slot, OPM-shelf-ALL, SMD-shelf-slot, SMD-shelf-ALL, TCC-shelf-slot, TCC-shelf-ALL, SLIC-shelf-slot, SLIC-shelf-ALL, LIM-shelf-slot, LIM-shelf-ALL, ESAM-shelf-slot, ESAM-shelf-ALL, SAM-shelf-slot, SAM-shelf-ALL, SRA-shelf-slot, SRA-shelf-ALL, XLA-shelf-slot, XLA-shelf-ALL, RLA-shelf-slot, RLA-shelf-ALL, FGA-shelf-slot, FGA-shelf-ALL, CMD4-shelf-slot, CMD4-shelf-ALL, CCMD12-shelf-slot, CCMD12-shelf-ALL, CCMD8X16-shelf-slot, CCMD8X16-shelf-ALL, CCMD16X12-shelf-slot, CCMD16X12-shelf-ALL, AMP4-shelf-slotSsubslot, AMP4-shelf-ALL, FIM-shelf-slot, FIM-shelf-ALL, MFC-shelf-slot, MFC-shelf-ALL, CCMD8X4-shelf-slotSsubslot, CCMD8X4-shelf-ALL, CMD44-shelf-slot, CMD44-shelf-ALL, DSCM-shelf-slot, DSCM-shelf-ALL, BMD-shelf-slot, BMD-shelf-ALL, OMD-shelf-slot, OMD-shelf-ALL, OMX-shelf-slot, OMX-shelf-ALL, TPT-shelf-slot, TPT-shelf-ALL, PPC6-shelf-slot, PPC6-shelf-ALL, OSCF-shelf-slotSsubslot, OSCF-shelf-ALL, OMDF4-shelf-slotSsubslot, OMDF4-shelf-ALL, OMDF8-shelf-slotSsubslot, OMDF8-shelf-ALL, BS-shelf-slotSsubslot, BS-shelf-ALL, GMD10-shelf-slot, GMD10-shelf-ALL, OBB-shelf-slot, OBB-shelf-ALL, OBMD8-shelf-slot, OBMD8-shelf-ALL, SP-shelf-slot, SP-shelf-ALL, CTM-shelf-slot, CTM-shelf-ALL, SM-shelf-slot, SM-shelf-ALL, P10GEL-shelf-slot-port, P10GEL-shelf-slot-ALL, P10GEL-shelf-ALL, P10GSEL-shelf-slot-port, P10GSEL-shelf-slot-ALL, P10GSEL-shelf-ALL, P10GSOEL-shelf-slot-port, P10GSOEL-shelf-slot-ALL, P10GSOEL-shelf-ALL, P155622M-shelf-slot-port, P155622M-shelf-slot-ALL, P155622M-shelf-ALL, P155M-shelf-slot-port, P155M-shelf-slot-ALL, P155M-shelf-ALL, P2G5-shelf-slot-port, P2G5-shelf-slot-ALL, P2G5-shelf-ALL, P622M-shelf-slot-port, P622M-shelf-slot-ALL, P622M-shelf-ALL, PCWDMS-shelf-slot-port, PCWDMS-shelf-slot-ALL, PCWDMS-shelf-ALL, PFC400-shelf-slot-port, PFC400-shelf-slot-ALL, PFC400-shelf-ALL, PFE-shelf-slot-port, PFE-shelf-slot-ALL, PFE-shelf-ALL, PGEFC200-shelf-slot-port, PGEFC200-shelf-slot-ALL, PGEFC200-shelf-ALL, PGEFC-shelf-slot-port, PGEFC-shelf-slot-ALL, PGEFC-shelf-ALL, PGE-shelf-slot-port, PGE-shelf-slot-ALL, PGE-shelf-ALL, PCFP-shelf-slot-port, PCFP-shelf-slot-ALL, PCFP-shelf-ALL, PSFP-shelf-slot-port, PSFP-shelf-slot-ALL, PSFP-shelf-ALL, PQSFP-shelf-slot-port, PQSFP-shelf-slot-ALL, PQSFP-shelf-ALL, PXFP-shelf-slot-port, PXFP-shelf-slot-ALL, PXFP-shelf-ALL, POPS-shelf-slot-port, POPS-shelf-slot-ALL, POPS-shelf-ALL, PCXM-shelf-slot-ALL, PCXM-shelf-ALL, PCFP2-shelf-slot-port, PCFP2-shelf-slot-ALL, PCFP2-shelf-ALL, SHELF-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, DS1TM-hshelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, FE-shelf-slot, FE-shelf-ALL, L2RPR-shelf-slot, L2RPR-shelf-ALL, MXC-shelf-slot, MXC-shelf-ALL, OPS-shelf-slot, OPS-shelf-ALL, OTNFLEX-shelf-slot, OTNFLEX-shelf-ALL, PKTFLEX-shelf-slot, PKTFLEX-shelf-ALL, OTNXCIF-shelf-slot, OTNXCIF-shelf-ALL, PKTOTN-shelf-slot, PKTOTN-shelf-ALL, PKTOTNXCIF-shelf-slot, PKTOTNXCIF-shelf-ALL, OTDR4-shelf-slotSsubslot, OTDR4-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf flt-rec-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Flight Recorder information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Flight Recorder information in the response";
-          }
-        }
-        description
-          "Flight Recorder information";
-      }
-    }
-    output {
-      list output {
-        leaf eqpt {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf ctype {
-          type ciena-6500-types:STRING;
-          description
-            "Card Type";
-        }
-        leaf snmp-index {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Identifies the index of the equivalent entity instance in the SNMP entityPhysical MIB group";
-        }
-        leaf pec {
-          type ciena-6500-types:IDENT;
-          description
-            "Actual PEC Code";
-        }
-        leaf rel {
-          type ciena-6500-types:STRING;
-          description
-            "Release Level";
-        }
-        leaf clei {
-          type ciena-6500-types:IDENT;
-          description
-            "CLEI";
-        }
-        leaf ser {
-          type ciena-6500-types:IDENT;
-          description
-            "Serial Number";
-        }
-        leaf mdat {
-          type ciena-6500-types:IDENT;
-          description
-            "Date of Manufacture, in the format: year-week of year (YYYY-WW).";
-        }
-        leaf width {
-          type ciena-6500-types:IDENT;
-          description
-            "Card Slot Width";
-        }
-        leaf age {
-          type ciena-6500-types:IDENT;
-          description
-            "Age, cumulative in-service time elapsed since manufacture, in the format: years-days-hours-minutes (YY-DDD-HH-MM).";
-        }
-        leaf on-since {
-          type ciena-6500-types:IDENT;
-          description
-            "On since, cumulative time since the unit was last inserted, in the format: years-days-hours-minutes (YY-DDD-HH-MM).";
-        }
-        leaf prov-pec {
-          type ciena-6500-types:IDENT;
-          description
-            "Provisioned PEC Code";
-        }
-        leaf map-mode {
-          type ciena-6500-enums:MAPMODE;
-          description
-            "Payload Mapping Mode - FE and 20GL2SS only";
-        }
-        leaf wan-config {
-          type ciena-6500-enums:WANCONFIG;
-          description
-            "WAN Config Mode - 20GL2SS only";
-        }
-        leaf timing-group-id {
-          type ciena-6500-types:IDENT;
-          description
-            "Timing Group ID - SMUX, L2MOTR, and FLEXMOTR only";
-        }
-        leaf carrier1 {
-          type ciena-6500-enums:IOCARRIER;
-          description
-            "Plug IO Carrier 1";
-        }
-        leaf carrier2 {
-          type ciena-6500-enums:IOCARRIER;
-          description
-            "Plug IO Carrier 2";
-        }
-        leaf dsm-mate {
-          type ciena-6500-types:IDENT;
-          description
-            "Serial Number of MATE DSM";
-        }
-        leaf dsm-conn {
-          type enumeration {
-            enum "D" {
-              description
-                "Direct";
-            }
-            enum "I" {
-              description
-                "Indirect";
-            }
-          }
-          description
-            "DSM Connection";
-        }
-        leaf site {
-          type string {
-            length "1..40";
-          }
-          description
-            "DSM Site address";
-        }
-        leaf eqpt-grp {
-          type ciena-6500-types:IDENT;
-          description
-            "Equipment Group AID";
-        }
-        leaf eqpt-profile {
-          type ciena-6500-enums:EQPTPROFILE1;
-          description
-            "Equipment Profile";
-        }
-        leaf eqpt-profile2 {
-          type enumeration {
-            enum "STS3C" {
-              description
-                "SMUX - GE/FC GFP Mapper Mode: Compatibility - STS3c";
-            }
-            enum "STS1/STS3C" {
-              description
-                "SMUX - GE/FC GFP Mapper Mode: Mixed - STS1/STS3c";
-            }
-            enum "PRIME" {
-              description
-                "FlexOCLD - First Member ID of the equipment group";
-            }
-            enum "MEMBER2" {
-              description
-                "FlexOCLD - Second Member ID of the equipment group";
-            }
-            enum "40G" {
-              description
-                "Supports 40G OCLD";
-            }
-            enum "4X10G" {
-              description
-                "Supports 40G OCLD";
-            }
-            enum "NONE" {
-              description
-                "Default - Profile is NONE";
-            }
-          }
-          description
-            "Equipment Profile 2";
-        }
-        leaf etype {
-          type ciena-6500-types:IDENT;
-          description
-            "ETYPE - L2MOTR only";
-        }
-        leaf label {
-          type ciena-6500-types:STRING;
-          description
-            "Operator identifier for equipment description. 64 Character Maximum.";
-        }
-        leaf projid {
-          type ciena-6500-types:STRING;
-          description
-            "Operator defined usage for Project IDentifier. 16 Character Maximum.";
-        }
-        leaf date1 {
-          type ciena-6500-types:DATE;
-          description
-            "Operator defined usage for Date1 : yy = 00..99, mm = 01..12, dd = 01..31";
-        }
-        leaf date2 {
-          type ciena-6500-types:DATE;
-          description
-            "Operator defined usage for Date2: yy = 00..99, mm = 01..12, dd = 01..31";
-        }
-        leaf date3 {
-          type ciena-6500-types:DATE;
-          description
-            "Operator defined usage for Date3: yy = 00..99, mm = 01..12, dd = 01..31";
-        }
-        leaf phase {
-          type enumeration {
-            enum "PLANNED" {
-              description
-                "Planned";
-            }
-            enum "UNVALIDATED" {
-              description
-                "Unvalidated";
-            }
-            enum "AVAILABLE" {
-              description
-                "Available";
-            }
-            enum "INUSE" {
-              description
-                "In Use";
-            }
-          }
-          description
-            "Circuit Packet Availability Field";
-        }
-        leaf usage {
-          type enumeration {
-            enum "UNKNOWN" {
-              description
-                "Unknown";
-            }
-            enum "NOTRSVD" {
-              description
-                "Not Reserved";
-            }
-            enum "RSVDMTC" {
-              description
-                "Reserved For Maintenance";
-            }
-            enum "RSVDSVC" {
-              description
-                "Reserved For Facility";
-            }
-            enum "RSVDREV" {
-              description
-                "Reserved For Reversion";
-            }
-          }
-          description
-            "Circuit Packet Usage Field";
-        }
-        leaf prov-mode {
-          type enumeration {
-            enum "TRNSPNDR" {
-              description
-                "Can only provision Transponder (BB) facilities";
-            }
-            enum "POTS" {
-              description
-                "Can only provision Packet-OTN Switching (POTS) facilities";
-            }
-            enum "PENDING" {
-              description
-                "Cannot provision any facilities";
-            }
-          }
-          description
-            "Mode of Operation. Used only by cards that have multiple mode of operation.";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf ctm-extender {
-          type ciena-6500-types:IDENT;
-          description
-            "The CTM Extender AID that the CTM is interworking with in a 6500-T24 shelf(Param is applicable only on T-Series shelf.)";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal.";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "ACT" {
-              description
-                "Active, carrying traffic";
-            }
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "IDLE" {
-              description
-                "Idle, not carrying traffic";
-            }
-            enum "MEA" {
-              description
-                "Mismatched equipment attributes";
-            }
-            enum "PSI" {
-              description
-                "Protection switch inhibited";
-            }
-            enum "PWROFF" {
-              description
-                "Power Off";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "STBY" {
-              description
-                "Standby";
-            }
-            enum "STBYH" {
-              description
-                "Hot standby";
-            }
-            enum "STBYS" {
-              description
-                "Standby";
-            }
-            enum "TS" {
-              description
-                "Test";
-            }
-            enum "UEQ" {
-              description
-                "Unequipped, circuit pack missing";
-            }
-            enum "WRK" {
-              description
-                "Working";
-            }
-            enum "WRKCTRL" {
-              description
-                "Working Control Plane";
-            }
-            enum "WRKOAM" {
-              description
-                "Working Operations, Administration, and Maintenance";
-            }
-            enum "WRKSYNC" {
-              description
-                "Working clock";
-            }
-            enum "WRKTRAF" {
-              description
-                "Working traffic";
-            }
-            enum "XALGN" {
-              description
-                "CTM Extender Aligned: In 6500-T24, CTM in slot 41 is aligned with non-faulty CTM Extender in slot 43, or CTM in slot 42 is aligned with non-faulty CTM Extender in slot 44";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc equipment-invoke-delay {
-    description
-      "Delay the response by given time (in seconds)";
-    input {
-      leaf delaytime {
-        type ciena-6500-types:INT {
-          range "1..3600";
-        }
-        mandatory true;
-        description
-          "Delay Time (in seconds)";
-      }
-    }
-  }
-  rpc equipment-check-usb {
-    description
-      "Check Usb Equipment: This command allows you to check if there is any usb devices on both usb ports.";
-    input {
-      leaf usb {
-        mandatory true;
-        description
-          "AID in format USB-shelf-ALL, USB-shelf-slot-port, USB-shelf-slot-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf usb {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf usb-status {
-          type enumeration {
-            enum "ENABLED" {
-              description
-                "USB device enabled";
-            }
-            enum "DISABLED" {
-              description
-                "USB device disabled";
-            }
-          }
-          mandatory true;
-          description
-            "Status of USB port";
-        }
-        leaf usb-port {
-          type enumeration {
-            enum "PORT_1" {
-              description
-                "USB hub port 1";
-            }
-            enum "PORT_2" {
-              description
-                "USB hub port 2";
-            }
-          }
-          description
-            "USB port number";
-        }
-        leaf desc {
-          type enumeration {
-            enum "Host card error/internal failure" {
-              description
-                "Host error condition";
-            }
-            enum "Cannot read device information" {
-              description
-                "USB configuration failure";
-            }
-            enum "This device is not supported" {
-              description
-                "USB not supported";
-            }
-            enum "Cannot retrieve size info from USB" {
-              description
-                "Cannot retrieve USB capacity info";
-            }
-            enum "Failed to retrieve product info" {
-              description
-                "Cannot retrieve product data";
-            }
-            enum "Failed to create the USB block device" {
-              description
-                "Fail create USB block device";
-            }
-            enum "Cannot mount /usb to file system" {
-              description
-                "Cannot attach /usb";
-            }
-            enum "Device is deleted" {
-              description
-                "USB deleted, disabled";
-            }
-          }
-          mandatory true;
-          description
-            "Description code of USB port";
-        }
-      }
-    }
-  }
-  rpc equipment-clear-group-member {
-    description
-      "Remove a card from an Equipment Group";
-    input {
-      leaf eqptgrp {
-        mandatory true;
-        description
-          "AID in format EQPTGRP-shelf-eqptGrpId";
-        type ciena-6500-types:aid;
-      }
-      leaf member {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "member card AID";
-      }
-    }
-  }
-  container equipment {
-    container cem {
-      list dsm {
-        key "dsm";
-        config false;
-        leaf dsm {
-          mandatory true;
-          description
-            "AID in format ALL-%HLINK-facility-hshelf-hslot-hport, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf ctype {
-          type ciena-6500-types:STRING;
-          description
-            "Card Type";
-          config false;
-        }
-        leaf pec {
-          type ciena-6500-types:IDENT;
-          description
-            "Actual PEC Code";
-          config false;
-        }
-        leaf rel {
-          type ciena-6500-types:STRING;
-          description
-            "Release Level";
-          config false;
-        }
-        leaf clei {
-          type ciena-6500-types:IDENT;
-          description
-            "CLEI";
-          config false;
-        }
-      }
-    }
-    container equipment {
-      list mode {
-        key "eqpt";
-        config true;
-        leaf eqpt {
-          mandatory true;
-          description
-            "AID in format SMUX-shelf-slot, SMUX-shelf-ALL, 10G-shelf-slot, 10G-shelf-ALL, 10GWT-shelf-slot, 10GWT-shelf-ALL, 10GELWT-shelf-slot, 10GELWT-shelf-ALL, 10GOTNWT-shelf-slot, 10GOTNWT-shelf-ALL, 2G5MOTR-shelf-slot, 2G5MOTR-shelf-ALL, 10GOTR-shelf-slot, 10GOTR-shelf-ALL, 10GOTSC-shelf-slot, 10GOTSC-shelf-ALL, OSIC-shelf-slot, OSIC-shelf-ALL, ISS-shelf-slot, ISS-shelf-ALL, 40GOCLD-shelf-slot, 40GOCLD-shelf-ALL, 40GUOCLD-shelf-slot, 40GUOCLD-shelf-ALL, 40GOCI-shelf-slot, 40GOCI-shelf-ALL, 40GMUX-shelf-slot, 40GMUX-shelf-ALL, 40GXCIF-shelf-slot, 40GXCIF-shelf-ALL, 100GOCLD-shelf-slot, 100GOCLD-shelf-ALL, 100GMUX-shelf-slot, 100GMUX-shelf-ALL, 100GOCI-shelf-slot, 100GOCI-shelf-ALL, OTR-shelf-slot, OTR-shelf-ALL, MOTR-shelf-slot, MOTR-shelf-ALL, OCI-shelf-slot, OCI-shelf-ALL, OTSC-shelf-slot, OTSC-shelf-ALL, TRM-shelf-slot, TRM-shelf-ALL, 2G5-shelf-slot, 2G5-shelf-ALL, 155622M-shelf-slot, 155622M-shelf-ALL, GE-shelf-slot, GE-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, MRO-shelf-slot, MRO-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, WSSOPM-shelf-slot, WSSOPM-shelf-ALL, SMD-shelf-slot, SMD-shelf-ALL, TCC-shelf-slot, TCC-shelf-ALL, LIM-shelf-slot, LIM-shelf-ALL, ESAM-shelf-slot, ESAM-shelf-ALL, SAM-shelf-slot, SAM-shelf-ALL, SRA-shelf-slot, SRA-shelf-ALL, XLA-shelf-slot, XLA-shelf-ALL, RLA-shelf-slot, RLA-shelf-ALL, CMD4-shelf-slot, CMD4-shelf-ALL, CCMD12-shelf-slot, CCMD12-shelf-ALL, CCMD16X12-shelf-slot, CCMD16X12-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, FE-shelf-slot, FE-shelf-ALL, L2RPR-shelf-slot, L2RPR-shelf-ALL, MXC-shelf-slot, MXC-shelf-ALL, L2MOTR-shelf-slot, L2MOTR-shelf-ALL, EMOTR-shelf-slot, EMOTR-shelf-ALL, FLEXMOTR-shelf-slot, FLEXMOTR-shelf-ALL, OTNFMOTR-shelf-slot, OTNFMOTR-shelf-ALL, OTNFLEX-shelf-slot, OTNFLEX-shelf-ALL, PKTFLEX-shelf-slot, PKTFLEX-shelf-ALL, OTNXCIF-shelf-slot, OTNXCIF-shelf-ALL, PKTOTN-shelf-slot, PKTOTN-shelf-ALL, PKTOTNXCIF-shelf-slot, PKTOTNXCIF-shelf-ALL, SM-shelf-slot, SM-shelf-ALL, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf eqpt-mode {
-          type enumeration {
-            enum "I" {
-              description
-                "Internal: Traffic is routed internally(This value can be used in edit operation)";
-            }
-            enum "XC" {
-              description
-                "Cross-connected: Traffic is routed through the shelf cross-connect card(This value can be used in edit operation)";
-            }
-            enum "NONE" {
-              description
-                "No Equipment Mode";
-            }
-            enum "M" {
-              description
-                "Mated: Traffic is routed to mated equipment";
-            }
-            enum "IM" {
-              description
-                "Internal and Mated: Traffic is routed internally and to mated equipment";
-            }
-            enum "IXC" {
-              description
-                "Internal and Cross-connected: Traffic is routed internally and to shelf cross-connect card";
-            }
-            enum "MXC" {
-              description
-                "Mated and Cross-connected: Traffic is routed to mated equipment and the shelf cross-connect card";
-            }
-            enum "IMXC" {
-              description
-                "Internal, Mated and Cross-connected: Traffic is routed internally, to mated equipment and to the shelf cross-connect card";
-            }
-            enum "MS" {
-              description
-                "Mated Symetrically: Traffic is routed to equipment in two mate slots";
-            }
-            enum "IMS" {
-              description
-                "Internal and Mated Symetrically: Traffic is routed internally and to equipment in two mate slots";
-            }
-            enum "MSXC" {
-              description
-                "Mated Symetrically and Cross-connected: Traffic is routed to equipment in two mate slots and through the shelf cross-connect card";
-            }
-            enum "IMSXC" {
-              description
-                "Internal, Mated Symetrically and Cross-connected: Traffic is routed internally, to equipment in two mate slots and through the shelf cross-connect card";
-            }
-            enum "MP" {
-              description
-                "Mate Pending: Card requires a mate to carry traffic, but no mate is provisioned";
-            }
-            enum "MPXC" {
-              description
-                "Mate Pending Cross-connected: Card requires a mate to carry traffic through the shelf cross-connect card, but no mate is provisioned";
-            }
-            enum "IMP" {
-              description
-                "Internal and Mate Pending: Traffic is routed internally, the card could carry traffic to a mated card but the connection is not provisioned";
-            }
-          }
-          description
-            "Equipment Mode(Mandatory for edit operations)";
-          config true;
-        }
-        leaf mate-eqpt-1 {
-          type ciena-6500-types:IDENT;
-          description
-            "AID of equipment in first slot of mating group";
-          config false;
-        }
-        leaf mate-eqpt-2 {
-          type ciena-6500-types:IDENT;
-          description
-            "AID of equipment in second slot of mating group";
-          config false;
-        }
-        leaf mate-eqpt-3 {
-          type ciena-6500-types:IDENT;
-          description
-            "AID of equipment in third slot of mating group";
-          config false;
-        }
-        leaf mate-eqpt-4 {
-          type ciena-6500-types:IDENT;
-          description
-            "AID of equipment in forth slot of mating group";
-          config false;
-        }
-        leaf mate-eqpt-5 {
-          type ciena-6500-types:IDENT;
-          description
-            "AID of equipment in fifth slot of mating group";
-          config false;
-        }
-      }
-    }
-    container group {
-      list config {
-        key "eqpt-grp";
-        config true;
-        leaf eqpt-grp {
-          mandatory true;
-          description
-            "AID in format EQPTGRP-shelf-eqptGrpId, EQPTGRP-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf description {
-          type ciena-6500-types:STRING;
-          description
-            "string description";
-          config true;
-        }
-        leaf mode {
-          type enumeration {
-            enum "L2_STANDARD" {
-              description
-                "L2_STANDARD";
-            }
-            enum "L2_EXTENDED" {
-              description
-                "L2_EXTENDED";
-            }
-          }
-          description
-            "Equipmment Group MODE";
-          config true;
-        }
-        leaf cpfail_action {
-          type enumeration {
-            enum "NONE" {
-              description
-                "NONE";
-            }
-            enum "TRAFFIC_DOWN" {
-              description
-                "TRAFFIC_DOWN";
-            }
-          }
-          description
-            "Equipmment Group CP Fail Action";
-          config true;
-        }
-        leaf snmpproxyengid {
-          type ciena-6500-types:STRING;
-          description
-            "SNMP Proxy Engine ID, display in 24 alphanumeric characters";
-          config false;
-        }
-        leaf member1 {
-          type ciena-6500-types:IDENT;
-          description
-            "member card AID";
-          config false;
-        }
-        leaf member2 {
-          type ciena-6500-types:IDENT;
-          description
-            "member card AID";
-          config false;
-        }
-        leaf member3 {
-          type ciena-6500-types:IDENT;
-          description
-            "member card AID";
-          config false;
-        }
-        leaf member4 {
-          type ciena-6500-types:IDENT;
-          description
-            "member card AID";
-          config false;
-        }
-        leaf l2cfg {
-          type enumeration {
-            enum "SAVED" {
-              description
-                "There is no unsaved Layer 2 configuration";
-            }
-            enum "SAVE_NEEDED" {
-              description
-                "There exists an unsaved Layer 2 configuration";
-            }
-            enum "NA" {
-              description
-                "This parameter is not applicable to the EQPTGRP";
-            }
-          }
-          description
-            "Whether Layer 2 Configuration is saved or not";
-          config false;
-        }
-        leaf tmgdomain {
-          type ciena-6500-types:aid;
-          description
-            "The Timing Group Domain.";
-          config false;
-        }
-      }
-      list member {
-        key "eqptgrp";
-        config true;
-        leaf eqptgrp {
-          mandatory true;
-          description
-            "AID in format EQPTGRP-shelf-eqptGrpId";
-          type ciena-6500-types:aid;
-        }
-        leaf member {
-          type ciena-6500-types:aid;
-          description
-            "member card AID(Mandatory for edit operations)";
-          config true;
-        }
-      }
-    }
-    container shelf {
-      list nodeid {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf node-id {
-          type ciena-6500-types:INT;
-          description
-            "Shelf Node ID.(Mandatory for edit operations)";
-          config true;
-        }
-      }
-    }
-    container site {
-      list dsm {
-        key "dsm";
-        config true;
-        leaf dsm {
-          mandatory true;
-          description
-            "AID in format DSM-%HLINK-facility-hshelf-hslot-hport";
-          type ciena-6500-types:aid;
-        }
-        leaf site {
-          type string {
-            length "1..40";
-          }
-          description
-            "DSM site address.(Mandatory for edit operations)";
-          config true;
-        }
-      }
-    }
-    list config {
-      key "eqpt";
-      config true;
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format 10G-shelf-slot, 10G-shelf-ALL, 2G5-shelf-slot, 2G5-shelf-ALL, 155622M-shelf-slot, 155622M-shelf-ALL, GE-shelf-slot, GE-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, XC-shelf-slot, XC-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, SMUX-shelf-slot, SMUX-shelf-ALL, MRO-shelf-slot, MRO-shelf-ALL, L2MOTR-shelf-slot, L2MOTR-shelf-ALL, FLEXMOTR-shelf-slot, FLEXMOTR-shelf-ALL, EMOTR-shelf-slot, EMOTR-shelf-ALL, OTNFMOTR-shelf-slot, OTNFMOTR-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, 10GWT-shelf-slot, 10GWT-shelf-ALL, 10GELWT-shelf-slot, 10GELWT-shelf-ALL, 10GOTNWT-shelf-slot, 10GOTNWT-shelf-ALL, 2G5MOTR-shelf-slot, 2G5MOTR-shelf-ALL, 10GOTR-shelf-slot, 10GOTR-shelf-ALL, 10GOTSC-shelf-slot, 10GOTSC-shelf-ALL, OSIC-shelf-slot, OSIC-shelf-ALL, ISS-shelf-slot, ISS-shelf-ALL, 40GOCLD-shelf-slot, 40GOCLD-shelf-ALL, 40GUOCLD-shelf-slot, 40GUOCLD-shelf-ALL, 40GOCI-shelf-slot, 40GOCI-shelf-ALL, 40GMUX-shelf-slot, 40GMUX-shelf-ALL, 40GXCIF-shelf-slot, 40GXCIF-shelf-ALL, 100GOCLD-shelf-slot, 100GOCLD-shelf-ALL, 100GMUX-shelf-slot, 100GMUX-shelf-ALL, 100GOCI-shelf-slot, 100GOCI-shelf-ALL, OTR-shelf-slot, OTR-shelf-ALL, MOTR-shelf-slot, MOTR-shelf-ALL, OCI-shelf-slot, OCI-shelf-ALL, OTSC-shelf-slot, OTSC-shelf-ALL, TRM-shelf-slot, TRM-shelf-ALL, PCXM-shelf-slot-port, POPS-shelf-slot-port, OSCFM-shelf-slot, WSSOPM-shelf-slot, OPM-shelf-slot, SMD-shelf-slot, TCC-shelf-slot, SLIC-shelf-slot, LIM-shelf-slot, ESAM-shelf-slot, SAM-shelf-slot, SRA-shelf-slot, XLA-shelf-slot, RLA-shelf-slot, FGA-shelf-slot, CMD4-shelf-slot, CCMD12-shelf-slot, CCMD8X16-shelf-slot, CCMD16X12-shelf-slot, AMP4-shelf-slotSsubslot, FIM-shelf-slot, MFC-shelf-slot, CCMD8X4-shelf-slotSsubslot, OTDR4-shelf-slotSsubslot, CMD44-shelf-slot, CMD96-shelf-slot, CMD96-shelf-ALL, CCMD64-shelf-slot, CCMD64-shelf-ALL, CMD16-shelf-slot, CMD16-shelf-ALL, CMD64-shelf-slot, CMD64-shelf-ALL, CMD24-shelf-slot, CMD24-shelf-ALL, OPS-shelf-slot, OPS-shelf-ALL, DSCM-shelf-slot, BMD-shelf-slot, OMD-shelf-slot, OMX-shelf-slot, TPT-shelf-slot, PPC6-shelf-slot, OSCF-shelf-slotSsubslot, OMDF4-shelf-slotSsubslot, OMDF8-shelf-slotSsubslot, BS-shelf-slotSsubslot, GMD10-shelf-slot, OBB-shelf-slot, OBMD8-shelf-slot, P10GEL-shelf-slot-port, P10GSEL-shelf-slot-port, P10GSOEL-shelf-slot-port, P155622M-shelf-slot-port, P155M-shelf-slot-port, P2G5-shelf-slot-port, P622M-shelf-slot-port, PCWDMS-shelf-slot-port, PFC400-shelf-slot-port, PFE-shelf-slot-port, PGEFC200-shelf-slot-port, PGEFC-shelf-slot-port, PGE-shelf-slot-port, PCFP-shelf-slot-port, PSFP-shelf-slot-port, PQSFP-shelf-slot-port, PXFP-shelf-slot-port, PCFP2-shelf-slot-port, P155622M-shelf-slot-ALL, P155622M-shelf-ALL, P155M-shelf-slot-ALL, P155M-shelf-ALL, P2G5-shelf-slot-ALL, P2G5-shelf-ALL, P622M-shelf-slot-ALL, P622M-shelf-ALL, PCWDMS-shelf-slot-ALL, PCWDMS-shelf-ALL, PFE-shelf-slot-ALL, PFE-shelf-ALL, PGEFC200-shelf-slot-ALL, PGEFC200-shelf-ALL, PGEFC-shelf-slot-ALL, PGEFC-shelf-ALL, PGE-shelf-slot-ALL, PGE-shelf-ALL, PSFP-shelf-slot-ALL, PSFP-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, FE-shelf-slot, FE-shelf-ALL, L2RPR-shelf-slot, L2RPR-shelf-ALL, MXC-shelf-slot, MXC-shelf-ALL, PXFP-shelf-slot-ALL, PXFP-shelf-ALL, P10GSOEL-shelf-slot-ALL, P10GSOEL-shelf-ALL, P10GSEL-shelf-slot-ALL, P10GSEL-shelf-ALL, SP-shelf-slot, OTNFLEX-shelf-slot, PKTFLEX-shelf-slot, OTNXCIF-shelf-slot, PKTOTN-shelf-slot, PKTOTNXCIF-shelf-slot, SM-shelf-slot, SPOTNFMOTR-shelf-slot, SPOTNFMOTR-shelf-ALL, CTM-shelf-slot, P10GEL-shelf-slot-ALL, PFC400-shelf-slot-ALL, PCFP-shelf-slot-ALL, PQSFP-shelf-slot-ALL, POPS-shelf-slot-ALL, PCXM-shelf-slot-ALL, PCFP2-shelf-slot-ALL, WSSOPM-shelf-ALL, OPM-shelf-ALL, SMD-shelf-ALL, TCC-shelf-ALL, SLIC-shelf-ALL, LIM-shelf-ALL, ESAM-shelf-ALL, SAM-shelf-ALL, SRA-shelf-ALL, XLA-shelf-ALL, RLA-shelf-ALL, FGA-shelf-ALL, CMD4-shelf-ALL, CCMD12-shelf-ALL, CCMD8X16-shelf-ALL, CCMD16X12-shelf-ALL, AMP4-shelf-ALL, FIM-shelf-ALL, MFC-shelf-ALL, CCMD8X4-shelf-ALL, CMD44-shelf-ALL, DSCM-shelf-ALL, BMD-shelf-ALL, OMD-shelf-ALL, OMX-shelf-ALL, TPT-shelf-ALL, PPC6-shelf-ALL, OSCF-shelf-ALL, OMDF4-shelf-ALL, OMDF8-shelf-ALL, BS-shelf-ALL, GMD10-shelf-ALL, OBB-shelf-ALL, OBMD8-shelf-ALL, SP-shelf-ALL, CTM-shelf-ALL, SM-shelf-ALL, P10GEL-shelf-ALL, PFC400-shelf-ALL, PCFP-shelf-ALL, PQSFP-shelf-ALL, POPS-shelf-ALL, PCXM-shelf-ALL, PCFP2-shelf-ALL, SHELF-shelf-ALL, DS1TM-hshelf-ALL, OTNFLEX-shelf-ALL, PKTFLEX-shelf-ALL, OTNXCIF-shelf-ALL, PKTOTN-shelf-ALL, PKTOTNXCIF-shelf-ALL, OTDR4-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf prov-pec {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "Provisioned PEC code";
-        config true;
-      }
-      leaf map-mode {
-        type ciena-6500-enums:MAPMODE;
-        description
-          "Payload Mapping Mode - FE and 20GL2SS only";
-        config true;
-      }
-      leaf wan-config {
-        type ciena-6500-enums:WANCONFIG;
-        description
-          "WAN Config Mode - 20GL2SS only";
-        config true;
-      }
-      leaf carrier1 {
-        type ciena-6500-enums:IOCARRIER;
-        description
-          "Plug IO Carrier 1";
-        config true;
-      }
-      leaf carrier2 {
-        type ciena-6500-enums:IOCARRIER;
-        description
-          "Plug IO Carrier 2";
-        config true;
-      }
-      leaf eqpt-profile {
-        type ciena-6500-enums:EQPTPROFILE1;
-        description
-          "Equipment Profile";
-        config true;
-      }
-      leaf eqpt-profile2 {
-        type enumeration {
-          enum "40G" {
-            description
-              "Supports 40G OCLD(This value can be used in create and edit operations)";
-          }
-          enum "4X10G" {
-            description
-              "Supports 40G OCLD(This value can be used in create and edit operations)";
-          }
-          enum "NONE" {
-            description
-              "Default - Profile2 is NONE(This value can be used in create and edit operations)";
-          }
-          enum "10G" {
-            description
-              "Supports 4x10G MUX(This value can be used in create and edit operations)";
-          }
-          enum "ETH100G_GMP" {
-            description
-              "Supports ETH100G_GMP(This value can be used in create and edit operations)";
-          }
-          enum "OTU4" {
-            description
-              "Supports OTU4(This value can be used in create and edit operations)";
-          }
-          enum "STS3C" {
-            description
-              "SMUX - GE/FC GFP Mapper Mode: Compatibility - STS3c";
-          }
-          enum "STS1/STS3C" {
-            description
-              "SMUX - GE/FC GFP Mapper Mode: Mixed - STS1/STS3c";
-          }
-          enum "PRIME" {
-            description
-              "FlexOCLD - First Member ID of the equipment group";
-          }
-          enum "MEMBER2" {
-            description
-              "FlexOCLD - Second Member ID of the equipment group";
-          }
-        }
-        description
-          "Equipment Profile2";
-        config true;
-      }
-      leaf etype {
-        type ciena-6500-types:IDENT;
-        description
-          "ETYPE - L2MOTR only";
-        config true;
-      }
-      leaf label {
-        type ciena-6500-types:STRING;
-        description
-          "Operator identifier for equipment description. 64 Character Maximum.";
-        config true;
-      }
-      leaf projid {
-        type ciena-6500-types:STRING;
-        description
-          "Operator defined usage for Project IDentifier. 16 Character Maximum.";
-        config true;
-      }
-      leaf date1 {
-        type ciena-6500-types:DATE;
-        description
-          "Operator defined usage for Date1 : yy = 00..99, mm = 01..12, dd = 01..31";
-        config true;
-      }
-      leaf date2 {
-        type ciena-6500-types:DATE;
-        description
-          "Operator defined usage for Date2: yy = 00..99, mm = 01..12, dd = 01..31";
-        config true;
-      }
-      leaf date3 {
-        type ciena-6500-types:DATE;
-        description
-          "Operator defined usage for Date3: yy = 00..99, mm = 01..12, dd = 01..31";
-        config true;
-      }
-      leaf phase {
-        type enumeration {
-          enum "PLANNED" {
-            description
-              "Planned";
-          }
-          enum "UNVALIDATED" {
-            description
-              "Unvalidated";
-          }
-          enum "AVAILABLE" {
-            description
-              "Available";
-          }
-          enum "INUSE" {
-            description
-              "In Use";
-          }
-        }
-        description
-          "Circuit Packet Availability Field";
-        config true;
-      }
-      leaf usage {
-        type enumeration {
-          enum "UNKNOWN" {
-            description
-              "Unknown";
-          }
-          enum "NOTRSVD" {
-            description
-              "Not Reserved";
-          }
-          enum "RSVDMTC" {
-            description
-              "Reserved For Maintenance";
-          }
-          enum "RSVDSVC" {
-            description
-              "Reserved For Facility";
-          }
-          enum "RSVDREV" {
-            description
-              "Reserved For Reversion";
-          }
-        }
-        description
-          "Circuit Packet Usage Field";
-        config true;
-      }
-      leaf prov-mode {
-        type enumeration {
-          enum "TRNSPNDR" {
-            description
-              "Can only provision Transponder (BB) facilities";
-          }
-          enum "POTS" {
-            description
-              "Can only provision Packet-OTN Switching (POTS) facilities";
-          }
-          enum "PENDING" {
-            description
-              "Cannot provision any facilities";
-          }
-        }
-        description
-          "Mode of Operation. Used only by cards that have multiple mode of operation.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out of Service - Management(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        default "IS";
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "ACT" {
-            description
-              "Active, carrying traffic";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "IDLE" {
-            description
-              "Idle, not carrying traffic";
-          }
-          enum "MEA" {
-            description
-              "Mismatched equipment attributes";
-          }
-          enum "PSI" {
-            description
-              "Protection switch inhibited";
-          }
-          enum "PWROFF" {
-            description
-              "Power Off";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "STBY" {
-            description
-              "Standby";
-          }
-          enum "STBYH" {
-            description
-              "Hot standby";
-          }
-          enum "STBYS" {
-            description
-              "Standby";
-          }
-          enum "TS" {
-            description
-              "Test";
-          }
-          enum "UEQ" {
-            description
-              "Unequipped, circuit pack missing";
-          }
-          enum "WRK" {
-            description
-              "Working";
-          }
-          enum "WRKCTRL" {
-            description
-              "Working Control Plane";
-          }
-          enum "WRKOAM" {
-            description
-              "Working Operations, Administration, and Maintenance";
-          }
-          enum "WRKSYNC" {
-            description
-              "Working clock";
-          }
-          enum "WRKTRAF" {
-            description
-              "Working traffic";
-          }
-          enum "XALGN" {
-            description
-              "CTM Extender Aligned: In 6500-T24, CTM in slot 41 is aligned with non-faulty CTM Extender in slot 43, or CTM in slot 42 is aligned with non-faulty CTM Extender in slot 44";
-          }
-        }
-        description
-          "Identify the secondary state's auto-in-service state";
-        config true;
-      }
-      leaf timing-group-id {
-        type ciena-6500-types:IDENT;
-        description
-          "Timing Group ID - SMUX, L2MOTR, and FLEXMOTR only";
-        config true;
-      }
-      leaf ctype {
-        type ciena-6500-types:STRING;
-        description
-          "Card Type";
-        config false;
-      }
-      leaf snmp-index {
-        type ciena-6500-types:INT {
-          range "0..4294967295";
-        }
-        description
-          "Identifies the index of the equivalent entity instance in the SNMP entityPhysical MIB group";
-        config false;
-      }
-      leaf pec {
-        type ciena-6500-types:IDENT;
-        description
-          "Actual PEC Code";
-        config false;
-      }
-      leaf rel {
-        type ciena-6500-types:STRING;
-        description
-          "Release Level";
-        config false;
-      }
-      leaf clei {
-        type ciena-6500-types:IDENT;
-        description
-          "CLEI";
-        config false;
-      }
-      leaf ser {
-        type ciena-6500-types:IDENT;
-        description
-          "Serial Number";
-        config false;
-      }
-      leaf mdat {
-        type ciena-6500-types:IDENT;
-        description
-          "Date of Manufacture, in the format: year-week of year (YYYY-WW).";
-        config false;
-      }
-      leaf width {
-        type ciena-6500-types:IDENT;
-        description
-          "Card Slot Width";
-        config false;
-      }
-      leaf age {
-        type ciena-6500-types:IDENT;
-        description
-          "Age, cumulative in-service time elapsed since manufacture, in the format: years-days-hours-minutes (YY-DDD-HH-MM).";
-        config false;
-      }
-      leaf on-since {
-        type ciena-6500-types:IDENT;
-        description
-          "On since, cumulative time since the unit was last inserted, in the format: years-days-hours-minutes (YY-DDD-HH-MM).";
-        config false;
-      }
-      leaf dsm-mate {
-        type ciena-6500-types:IDENT;
-        description
-          "Serial Number of MATE DSM";
-        config false;
-      }
-      leaf dsm-conn {
-        type enumeration {
-          enum "D" {
-            description
-              "Direct";
-          }
-          enum "I" {
-            description
-              "Indirect";
-          }
-        }
-        description
-          "DSM Connection";
-        config false;
-      }
-      leaf site {
-        type string {
-          length "1..40";
-        }
-        description
-          "DSM Site address";
-        config false;
-      }
-      leaf eqpt-grp {
-        type ciena-6500-types:IDENT;
-        description
-          "Equipment Group AID";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf ctm-extender {
-        type ciena-6500-types:IDENT;
-        description
-          "The CTM Extender AID that the CTM is interworking with in a 6500-T24 shelf(Param is applicable only on T-Series shelf.)";
-        config false;
-      }
-      leaf ntwksvc {
-        type ciena-6500-types:STRING;
-        description
-          "Operator identifier for facility name. 64 Character Maximum.";
-        config true;
-      }
-    }
-    list auto-equip {
-      key "slot";
-      config true;
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mode {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "Auto-equip mode. Default mode = disabled.(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    list inventory {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SLOT-slot-%HLINK-facility-hshelf-hslot-hport, SLOT-shelf-slotSsubslot, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ctype {
-        type ciena-6500-types:STRING;
-        description
-          "Card Type";
-        config false;
-      }
-      leaf snmp-index {
-        type ciena-6500-types:INT {
-          range "0..4294967295";
-        }
-        description
-          "Identifies the index of the equivalent entity instance in the SNMP entityPhysical MIB group";
-        config false;
-      }
-      leaf pec {
-        type ciena-6500-types:IDENT;
-        description
-          "Actual PEC Code";
-        config false;
-      }
-      leaf rel {
-        type ciena-6500-types:STRING;
-        description
-          "Release Level";
-        config false;
-      }
-      leaf clei {
-        type ciena-6500-types:IDENT;
-        description
-          "CLEI";
-        config false;
-      }
-      leaf ser {
-        type ciena-6500-types:IDENT;
-        description
-          "Serial Number";
-        config false;
-      }
-      leaf mdat {
-        type ciena-6500-types:IDENT;
-        description
-          "Date of Manufacture, in the format: year-week of year (YYYY-WW).";
-        config false;
-      }
-      leaf width {
-        type ciena-6500-types:IDENT;
-        description
-          "Card Slot Width";
-        config false;
-      }
-      leaf age {
-        type ciena-6500-types:IDENT;
-        description
-          "Age, cumulative in-service time elapsed since manufacture, in the format: years-days-hours-minutes (YY-DDD-HH-MM).";
-        config false;
-      }
-      leaf on-since {
-        type ciena-6500-types:IDENT;
-        description
-          "On since, cumulative time since the unit was last inserted, in the format: years-days-hours-minutes (YY-DDD-HH-MM).";
-        config false;
-      }
-      leaf temp-current {
-        type ciena-6500-types:IDENT;
-        description
-          "Current Temperature";
-        config false;
-      }
-      leaf temp-average {
-        type ciena-6500-types:IDENT;
-        description
-          "Average Temperature";
-        config false;
-      }
-      leaf slot-type {
-        type ciena-6500-types:STRING;
-        description
-          "Slot Type";
-        config false;
-      }
-      leaf dsm-mate {
-        type ciena-6500-types:IDENT;
-        description
-          "Serial Number of MATE DSM";
-        config false;
-      }
-      leaf dsm-conn {
-        type enumeration {
-          enum "D" {
-            description
-              "Direct";
-          }
-          enum "I" {
-            description
-              "Indirect";
-          }
-        }
-        description
-          "DSM Connection";
-        config false;
-      }
-      leaf cardpwr {
-        type enumeration {
-          enum "OFF";
-          enum "FULL";
-          enum "UNKNOWN";
-        }
-        description
-          "Card Power";
-        config false;
-      }
-      leaf power {
-        type ciena-6500-types:IDENT;
-        description
-          "Power (in Watts).(Param is applicable only on T-Series shelf.)";
-        config false;
-      }
-      leaf speed {
-        type ciena-6500-types:IDENT;
-        description
-          "Reported speed of FAN in Rotation per minute(Param is applicable only on T-Series shelf.)";
-        config false;
-      }
-    }
-    list inventory-fan {
-      key "fan";
-      config false;
-      leaf fan {
-        mandatory true;
-        description
-          "AID in format FAN-shelf-slot, FAN-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ctype {
-        type ciena-6500-types:STRING;
-        description
-          "Card Type";
-        config false;
-      }
-      leaf pec {
-        type ciena-6500-types:IDENT;
-        description
-          "PEC Code";
-        config false;
-      }
-      leaf rel {
-        type ciena-6500-types:STRING;
-        description
-          "Release Level";
-        config false;
-      }
-      leaf clei {
-        type ciena-6500-types:IDENT;
-        description
-          "CLEI";
-        config false;
-      }
-      leaf ser {
-        type ciena-6500-types:IDENT;
-        description
-          "Serial Number";
-        config false;
-      }
-      leaf manufacture-date {
-        type ciena-6500-types:IDENT;
-        description
-          "Date of Manufacture, in the format: year-week of year (YYYY-WW).";
-        config false;
-      }
-    }
-    list inventory-io {
-      key "ioslot";
-      config false;
-      leaf ioslot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ctype {
-        type ciena-6500-types:STRING;
-        description
-          "Card Type";
-        config false;
-      }
-      leaf pec {
-        type ciena-6500-types:IDENT;
-        description
-          "Actual PEC Code";
-        config false;
-      }
-      leaf rel {
-        type ciena-6500-types:STRING;
-        description
-          "Release Level";
-        config false;
-      }
-      leaf clei {
-        type ciena-6500-types:IDENT;
-        description
-          "CLEI";
-        config false;
-      }
-      leaf ser {
-        type ciena-6500-types:IDENT;
-        description
-          "Serial Number";
-        config false;
-      }
-      leaf manufacture-date {
-        type ciena-6500-types:IDENT;
-        description
-          "Date of Manufacture, in the format: year-week of year (YYYY-WW).";
-        config false;
-      }
-    }
-    list usb {
-      key "usb";
-      config false;
-      leaf usb {
-        mandatory true;
-        description
-          "AID in format USB-shelf-ALL, USB-shelf-slot-port, USB-shelf-slot-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-    list prot-group {
-      key "wrkgaid protaid";
-      config true;
-      leaf wrkgaid {
-        mandatory true;
-        description
-          "AID in format DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, SP-shelf-slot, SP-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, DS1TM-hshelf-ALL, CTM-shelf-slot, CTM-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf protaid {
-        mandatory true;
-        description
-          "AID in format DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, SP-shelf-slot, SP-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, DS1TM-hshelf-ALL, CTM-shelf-slot, CTM-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf prot-scheme {
-        type ciena-6500-enums:EqptProtScheme;
-        mandatory true;
-        description
-          "Protection scheme to be used.";
-        config true;
-      }
-      leaf prio {
-        type ciena-6500-enums:EqptProtPrio;
-        description
-          "Precedence for automatic protection switching";
-        config true;
-      }
-      leaf wait-to-restore {
-        type ciena-6500-enums:WTR_default_5MIN;
-        default "5-MIN";
-        description
-          "Wait-to-restore period (in minutes).";
-        config true;
-      }
-      leaf switch-mode {
-        type ciena-6500-enums:SWMODE;
-        description
-          "Equipment protection switch mode for the L2SS card.";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-events.yang b/models/ciena-6500-events.yang
deleted file mode 100644
index 9127f54598471882257843c2cfee3f9d880d56ae..0000000000000000000000000000000000000000
--- a/models/ciena-6500-events.yang
+++ /dev/null
@@ -1,327 +0,0 @@
-module ciena-6500-events {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-events";
-  prefix events;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's events object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: events-show-ao
-       - Added rpc: events-show-last-seq-num
-         container events
-           list ao
-           - Removed key
-           - Removed leaf: shelf
-             leaf-list atag-seq
-               type ciena-6500-types:INT
-               - Added range: 1..2000000000 
-             leaf msg-type
-             - Changed type from enumeration to ciena-6500-types:STRING
-           list last-seq-num
-           - Removed key
-           - Removed leaf: shelf
-             leaf atagseq
-               type ciena-6500-types:INT
-               - Added range: 0000000001..9999999999 
-             leaf dbchgseq
-               type ciena-6500-types:INT
-               - Added range: 0000000001..9999999999 
-             leaf itagseq
-               type ciena-6500-types:INT
-               - Added range: 0000000001..9999999999 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container events
-           list ao
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: count
-           - Removed leaf: order
-           - Removed leaf: AO_message
-           - Added leaf: shelf
-           - Added leaf: ao_message
-             leaf-list msg-type
-             - Changed type from bits to enumeration
-               type enumeration
-               - Added enum: ALM
-               - Added enum: EVT
-               - Added enum: ALM-ENV
-               - Added enum: INHIBITED
-               - Added enum: DBCHG
-               - Added enum: STATUS
-               - Added enum: ALL
-           list last-seq-num
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: seqtype
-           - Added leaf: shelf
-           - Added leaf: atagseq";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: events";
-  }
-
-  rpc events-show-ao {
-    description
-      "Retrieve Automatic Output : This command retrieves an historical list of automatic output (AO) messages stored on the NE. The message list provides historical autonomous messages including all events, alarm raises and clears, and environmental alarms. The AO list cannot be deleted, reset, or altered. The message list holds messages in a first-in-first-out buffer:";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      choice atag-seq-choice {
-        case list {
-          leaf-list atag-seq {
-            type ciena-6500-types:INT {
-              range "1..2000000000";
-            }
-            description
-              "Autonomous Event Sequence Number. Range format: low_ATAG&&high_ATAG Group format: ATAG_1&ATAG_2&ATAG_3...";
-          }
-        }
-        case range {
-          leaf atag-seq-min {
-            type ciena-6500-types:INT {
-              range "1..2000000000";
-            }
-            description
-              "Autonomous Event Sequence Number. Range format: low_ATAG&&high_ATAG Group format: ATAG_1&ATAG_2&ATAG_3...";
-          }
-          leaf atag-seq-max {
-            type ciena-6500-types:INT {
-              range "1..2000000000";
-            }
-            description
-              "Autonomous Event Sequence Number. Range format: low_ATAG&&high_ATAG Group format: ATAG_1&ATAG_2&ATAG_3...";
-          }
-        }
-      }
-      leaf count {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Count of AO to be retrieved.";
-      }
-      leaf-list event-msg-type {
-        type enumeration {
-          enum "ALM" {
-            description
-              "Alarm messages";
-          }
-          enum "EVT" {
-            description
-              "Event messages";
-          }
-          enum "ALM-ENV" {
-            description
-              "Environmental alarm messages";
-          }
-          enum "INHIBITED" {
-            description
-              "Inhibited alarm messages";
-          }
-          enum "DBCHG" {
-            description
-              "Database Change events";
-          }
-          enum "STATUS" {
-            description
-              "Status events";
-          }
-          enum "ECHO" {
-            description
-              "Command Echo";
-          }
-          enum "ALL" {
-            description
-              "All AO except Inhibited alarms";
-          }
-        }
-        description
-          "The type of autonomous message to be retrieved.";
-      }
-      leaf order {
-        type enumeration {
-          enum "ASCENDING" {
-            description
-              "Ascending (oldest to newest)";
-          }
-          enum "DESCENDING" {
-            description
-              "Descending (newest to oldest)";
-          }
-        }
-        description
-          "The order in which results should be displayed.";
-      }
-    }
-    output {
-      list output {
-        leaf-list atag-seq {
-          type ciena-6500-types:INT {
-            range "1..2000000000";
-          }
-          description
-            "Autonomous Event Sequence Number. Range format: low_ATAG&&high_ATAG Group format: ATAG_1&ATAG_2&ATAG_3...";
-        }
-        leaf msg-type {
-          type ciena-6500-types:STRING;
-          description
-            "Autonomous Event Message Type";
-        }
-        leaf subtype {
-          type ciena-6500-types:STRING;
-          description
-            "Autonomous Event Message Subtype";
-        }
-        leaf ao_message {
-          type string {
-            length "0..2048";
-          }
-          description
-            "Autonomous Message";
-        }
-      }
-    }
-  }
-  rpc events-show-last-seq-num {
-    description
-      "Retrieve Last Sequence Number :Retrieve the Last Sequence Number Used";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf seqtype {
-        type enumeration {
-          enum "DBCHGSEQ" {
-            description
-              "Database Change Sequence Number";
-          }
-          enum "ATAGSEQ" {
-            description
-              "Autonomous Event Sequence Number";
-          }
-          enum "BOTH" {
-            description
-              "Both Sequence Numbers";
-          }
-          enum "ITAGSEQ" {
-            description
-              "Inhibited Events Sequence Number";
-          }
-          enum "ALL" {
-            description
-              "All Sequence Number";
-          }
-        }
-        description
-          "Sequence Number Type";
-      }
-    }
-    output {
-      list output {
-        leaf atagseq {
-          type ciena-6500-types:INT {
-            range "0000000001..9999999999";
-          }
-          description
-            "Autonomous Event Sequence Number";
-        }
-        leaf dbchgseq {
-          type ciena-6500-types:INT {
-            range "0000000001..9999999999";
-          }
-          description
-            "Database Change Sequence Number";
-        }
-        leaf itagseq {
-          type ciena-6500-types:INT {
-            range "0000000001..9999999999";
-          }
-          description
-            "Inhibited Message tag Sequence";
-        }
-      }
-    }
-  }
-  container events {
-    list ao {
-      config false;
-      leaf-list atag-seq {
-        type ciena-6500-types:INT {
-          range "1..2000000000";
-        }
-        description
-          "Autonomous Event Sequence Number. Range format: low_ATAG&&high_ATAG Group format: ATAG_1&ATAG_2&ATAG_3...";
-        config false;
-      }
-      leaf msg-type {
-        type ciena-6500-types:STRING;
-        description
-          "Autonomous Event Message Type";
-        config false;
-      }
-      leaf subtype {
-        type ciena-6500-types:STRING;
-        description
-          "Autonomous Event Message Subtype";
-        config false;
-      }
-      leaf ao_message {
-        type string {
-          length "0..2048";
-        }
-        description
-          "Autonomous Message";
-        config false;
-      }
-    }
-    list last-seq-num {
-      config false;
-      leaf atagseq {
-        type ciena-6500-types:INT {
-          range "0000000001..9999999999";
-        }
-        description
-          "Autonomous Event Sequence Number";
-        config false;
-      }
-      leaf dbchgseq {
-        type ciena-6500-types:INT {
-          range "0000000001..9999999999";
-        }
-        description
-          "Database Change Sequence Number";
-        config false;
-      }
-      leaf itagseq {
-        type ciena-6500-types:INT {
-          range "0000000001..9999999999";
-        }
-        description
-          "Inhibited Message tag Sequence";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-idlers.yang b/models/ciena-6500-idlers.yang
deleted file mode 100644
index e904f686613e797a12895ddbfebe17bf77285b9c..0000000000000000000000000000000000000000
--- a/models/ciena-6500-idlers.yang
+++ /dev/null
@@ -1,287 +0,0 @@
-module ciena-6500-idlers {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-idlers";
-  prefix idlers;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's idlers object for the 6500 platform";
-
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container idlers
-           list idler
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: idlers-disable-idler
-       - Added rpc: idlers-enable-idler
-       - Added container: idlers";
-  }
-
-  rpc idlers-disable-idler {
-    description
-      "Remove an IDLER facility from service";
-    input {
-      leaf idler {
-        mandatory true;
-        description
-          "AID in format IDLER-shelf-slot-port-instance, IDLER-shelf-slot-port-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Remove facility from Maintenance State";
-      }
-    }
-  }
-  rpc idlers-enable-idler {
-    description
-      "Restore an IDLER facility to service";
-    input {
-      leaf idler {
-        mandatory true;
-        description
-          "AID in format IDLER-shelf-slot-port-instance, IDLER-shelf-slot-port-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container idlers {
-    list idler {
-      key "idler";
-      config true;
-      leaf idler {
-        mandatory true;
-        description
-          "AID in format IDLER-shelf-slot-port-instance, IDLER-shelf-slot-port-ALL, IDLER-shelf-slot-ALL, IDLER-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf wavelength-1 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Wavelength of Laser 1 (nm)";
-        config true;
-      }
-      leaf wavelength-2 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Wavelength of Laser 2 (nm)";
-        config true;
-      }
-      leaf offset1 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Offset for Laser 1 (GHz)";
-        config true;
-      }
-      leaf offset2 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Offset for Laser 2 (GHz)";
-        config true;
-      }
-      leaf frequency-1 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Frequency for Laser 1 (THz)";
-        config true;
-      }
-      leaf frequency-2 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Frequency for Laser 2 (THz)";
-        config true;
-      }
-      leaf targ-power-1 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Target Power for Laser 1 (dBm)";
-        config true;
-      }
-      leaf targ-power-2 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Target Power for Laser 2 (dBm)";
-        config true;
-      }
-      leaf sbs-dither-1 {
-        type enumeration {
-          enum "OFF" {
-            description
-              "SBS Dither off";
-          }
-          enum "ON" {
-            description
-              "SBS Dither on";
-          }
-        }
-        description
-          "SBS Dither for Laser 1";
-        config true;
-      }
-      leaf sbs-dither-2 {
-        type enumeration {
-          enum "OFF" {
-            description
-              "SBS Dither off";
-          }
-          enum "ON" {
-            description
-              "SBS Dither on";
-          }
-        }
-        description
-          "SBS Dither for Laser 2";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state's auto-inservice state";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf measured-power-1 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Measured Power of Laser 1 (dBm)";
-        config false;
-      }
-      leaf measured-power-2 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Measured Power of Laser 2 (dBm)";
-        config false;
-      }
-      leaf min-power-1 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Minimum Power of Laser 1 (dBm)";
-        config false;
-      }
-      leaf min-power-2 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Minimum Power of Laser 2 (dBm)";
-        config false;
-      }
-      leaf max-power-1 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Maximum Power of Laser 1 (dBm)";
-        config false;
-      }
-      leaf max-power-2 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Maximum Power of Laser 2 (dBm)";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "AINS time left \"HH-MM\"";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-install.yang b/models/ciena-6500-install.yang
deleted file mode 100644
index 0a4c45dbe0e94fb3c418e576a5014d3bec5f3b88..0000000000000000000000000000000000000000
--- a/models/ciena-6500-install.yang
+++ /dev/null
@@ -1,130 +0,0 @@
-module ciena-6500-install {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-install";
-  prefix install;
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's install object for the 6500 platform";
-
-  revision 2016-10-17 {
-    description
-      "Initial revision.";
-  }
-
-  rpc install-create {
-    description
-      "Install a new system.";
-    input {
-      leaf group-id {
-        type int64;
-        mandatory true;
-        description
-          "Group Identifier.  This number should match the group ID of the Waveservers connected to the line system.  This group ID is combined with the site name to generate a node name.";
-      }
-      leaf site-id {
-        type int64;
-        mandatory true;
-        description
-          "Site ID.  This number should be a unique ID within the comms connected network.  It is used to associate all photonic equipment at the same site together into logical groupings for management interfaces";
-      }
-      leaf remote-site-id {
-        type int64;
-        mandatory true;
-        description
-          "Remote Site ID.  This remote site ID is used to generate a unique optical system ID, if a systemID is not provided.  It is also used to properly provision the Path ID for the OTS equipment created.";
-      }
-      leaf system-name {
-        type string;
-        description
-          "System ID.  The system name is used to uniquely identify the links between sites in a network.  If it is provided, it is generated based on the local site ID and the remote site ID.  If the system is a protected system, the system ID is limited to 7 characters so that a 'W' or 'P' can be appeneded to indicate the working and protection lines";
-      }
-      leaf site-name {
-        type string;
-        description
-          "Site name.  The site name is a human readable name common to the nodes at a site.  If it is provided, it is combined with the provided group ID to provision the node name of the device as well.";
-      }
-      leaf netmask {
-        type string;
-        description
-          "Netmask of the COLAN port.";
-      }
-      leaf def-gateway {
-        type string;
-        description
-          "Netmask of the COLAN port.";
-      }
-      leaf ip {
-        type string;
-        description
-          "IP Address of the COLAN port.";
-      }
-      leaf location {
-        type string;
-        description
-          "Location of the site.  GPS coordinates.";
-      }
-      leaf protected {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "OPS Protection flag.  If this is set to yes, it indicates that an OPS will be provisioned with two Mux/Demux groups";
-      }
-      leaf otdr {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "OTDR flag. Set this to yes for the configuration to support OTDR functionality.";
-      }
-      leaf auto-prov {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Autoprovision flag.  If the equipment is not provisioned, provision it using nominally acceptable cards";
-      }
-      leaf display {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Display commands flag.  If this flag is set, the commands will be printed to the screen and not executed";
-      }
-      leaf band-plan {
-        type enumeration {
-          enum "fixed44" {
-            description
-              "Fixed 100 GHz Grid, 44 Channels";
-          }
-          enum "fixed88" {
-            description
-              "Fixed 50 GHz Grid, 88 Channels";
-          }
-          enum "fixed96" {
-            description
-              "Fixed 50 GHz Grid, 96 Channels";
-          }
-          enum "fixed64" {
-            description
-              "Fixed 75 GHz Grid, 64 Channels";
-          }
-          enum "flex12" {
-            description
-              "Flex Grid, 12 Channels";
-          }
-        }
-        mandatory true;
-        description
-          "Band plan type.  This determines the provisioning of the equipment in the configuration as well as the channel to wavelength mappings";
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-l2services.yang b/models/ciena-6500-l2services.yang
deleted file mode 100644
index 18158d013cd7b014fb08f2e08dfb3eddb723b115..0000000000000000000000000000000000000000
--- a/models/ciena-6500-l2services.yang
+++ /dev/null
@@ -1,5600 +0,0 @@
-module ciena-6500-l2services {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-l2services";
-  prefix l2services;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's l2services object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: l2services-show-rx-cos-profile-default
-       - Added rpc: l2services-show-tx-cos-profile-default
-       - Added rpc: l2services-show-dm-profile-default
-       - Added rpc: l2services-show-bw-profile-default
-       - Added rpc: l2services-show-raps-segment-config
-       - Added rpc: l2services-show-raps-endpoint-config
-       - Added rpc: l2services-show-raps-ringlet-config
-       - Added rpc: l2services-show-raps-ringlet-port-config
-       - Added rpc: l2services-show-vcs
-       - Added rpc: l2services-disable-vcs
-       - Added rpc: l2services-enable-vcs
-       - Added rpc: l2services-disable-vce
-       - Added rpc: l2services-enable-vce
-       - Added rpc: l2services-delete-vce
-       - Added rpc: l2services-show-vce
-       - Added rpc: l2services-show-virtual-circuit-endpoint-map-config
-       - Added rpc: l2services-show-fdb-table
-       - Added rpc: l2services-show-fdb-count
-       - Added rpc: l2services-show-fdb-static-entry
-       - Added rpc: l2services-disable-tns
-       - Added rpc: l2services-enable-tns
-       - Added rpc: l2services-show-tne
-       - Added rpc: l2services-disable-tne
-       - Added rpc: l2services-enable-tne
-       - Added rpc: l2services-show-port-scheduler-profile-default
-       - Added rpc: l2services-show-queue-group-default
-       - Added rpc: l2services-show-evpl-virtual-circuit-endpoint-xconn
-       - Added rpc: l2services-disable-eth-oam-maintenance-endpoint
-       - Added rpc: l2services-enable-eth-oam-maintenance-endpoint
-       - Added rpc: l2services-show-eth-oam-maintenance-endpoint
-       - Added rpc: l2services-show-eth-oam-maintenance-intermediate-point
-       - Added rpc: l2services-operate-eth-oam-loopback-maintenance-endpoint
-       - Added rpc: l2services-release-eth-oam-loopback-maintenance-endpoint
-       - Added rpc: l2services-show-eth-oam-trace-maintenance-endpoint
-       - Added rpc: l2services-show-eth-oam-misconfig-maintenance-endpoint
-       - Added rpc: l2services-disable-lcas
-       - Added rpc: l2services-enable-lcas
-       - Added container: l2services";
-  }
-
-  rpc l2services-show-rx-cos-profile-default {
-    description
-      "Retrieve the default RX COS profile";
-    input {
-      leaf rx-cos-prf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf type {
-        type enumeration {
-          enum "L2SS";
-          enum "L2RPR";
-          enum "20GL2SS";
-          enum "L2MOTR";
-          enum "FLEXMOTR";
-        }
-        description
-          "Layer 2 equipment type";
-      }
-    }
-    output {
-      list output {
-        leaf rx-cos-prf {
-          type ciena-6500-types:IDENT;
-          description
-            "RX COS profile AID";
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the default profile";
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2RPR";
-            enum "20GL2SS";
-            enum "L2MOTR";
-            enum "FLEXMOTR";
-          }
-          description
-            "Layer 2 equipment type";
-        }
-      }
-    }
-  }
-  rpc l2services-show-tx-cos-profile-default {
-    description
-      "Retrieve the default TX COS profile";
-    input {
-      leaf tx-cos-prf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf type {
-        type enumeration {
-          enum "L2SS";
-          enum "L2RPR";
-          enum "20GL2SS";
-          enum "L2MOTR";
-          enum "FLEXMOTR";
-        }
-        description
-          "Layer 2 equipment type";
-      }
-    }
-    output {
-      list output {
-        leaf tx-cos-prf {
-          type ciena-6500-types:IDENT;
-          description
-            "TX COS profile AID";
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the default profile";
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2RPR";
-            enum "20GL2SS";
-            enum "L2MOTR";
-            enum "FLEXMOTR";
-          }
-          description
-            "Layer 2 equipment type";
-        }
-      }
-    }
-  }
-  rpc l2services-show-dm-profile-default {
-    description
-      "Retrieve the default discard marking conversion profile. (Deprecated)";
-    input {
-      leaf dm-prf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf type {
-        type enumeration {
-          enum "L2SS";
-          enum "L2RPR";
-        }
-        description
-          "layer 2 equipment type";
-      }
-    }
-    output {
-      list output {
-        leaf dm-prf {
-          type ciena-6500-types:IDENT;
-          description
-            "DM profile AID";
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the profile being created";
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2RPR";
-          }
-          description
-            "layer 2 equipment type";
-        }
-      }
-    }
-  }
-  rpc l2services-show-bw-profile-default {
-    description
-      "Retrieve the default bandwidth profile of a given class of service (COS).";
-    input {
-      leaf bw-prf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf cos {
-        type enumeration {
-          enum "ST";
-          enum "BR";
-          enum "PL";
-          enum "PR";
-          enum "NT";
-          enum "CR";
-          enum "NW";
-          enum "SL";
-          enum "GD";
-        }
-        description
-          "Classes of Service Domain to return the default profile. The default is to return the default profile of all classes";
-      }
-    }
-    output {
-      list output {
-        leaf bw-prf {
-          type ciena-6500-types:IDENT;
-          description
-            "BW profile AID. BWPRF-[shelf]-[0..200]. BWPRF-[shelf]-0 indicates no policing.";
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the default profile";
-        }
-        leaf cos {
-          type enumeration {
-            enum "ST";
-            enum "BR";
-            enum "PL";
-            enum "PR";
-            enum "NT";
-            enum "CR";
-            enum "NW";
-            enum "SL";
-            enum "GD";
-          }
-          description
-            "Classes of Service Domain to return the default profile. The default is to return the default profile of all classes";
-        }
-      }
-    }
-  }
-  rpc l2services-show-raps-segment-config {
-    description
-      "Retrieve provisioned E-SPRing rings (RNS)";
-    input {
-      leaf rns {
-        mandatory true;
-        description
-          "AID in format RNS-shelf-slot-ringid";
-        type ciena-6500-types:aid;
-      }
-      leaf ringfilter {
-        type ciena-6500-types:INT {
-          range "1..255";
-        }
-        description
-          "Ringid Filter";
-      }
-    }
-    output {
-      list output {
-        leaf rns {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf wtr {
-          type string {
-            length "10..720";
-          }
-          description
-            "Time (secs) to restore ring after notification of fault recovery. Values 10-720 with increments of 10 or INFINITE. Default is 300.";
-        }
-        leaf guard {
-          type ciena-6500-types:INT {
-            range "10 | 20 | 30..2000";
-          }
-          description
-            "Time (milliseconds) that R-APS msgs will be ignored after fault cleared";
-        }
-      }
-    }
-  }
-  rpc l2services-show-raps-endpoint-config {
-    description
-      "Retrieve Provisioned ESPRING Ring Port (RNE)";
-    input {
-      leaf rne {
-        mandatory true;
-        description
-          "AID in format RNE-shelf-slot-port-ringid";
-        type ciena-6500-types:aid;
-      }
-      leaf ringfilter {
-        type ciena-6500-types:INT {
-          range "1..255";
-        }
-        description
-          "Ringid Filter";
-      }
-      leaf mepfilter {
-        type ciena-6500-types:IDENT;
-        description
-          "MEP Filter";
-      }
-    }
-    output {
-      list output {
-        leaf rne {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf hold-off {
-          type ciena-6500-types:INT {
-            range "0 | 100 | 200..10000";
-          }
-          description
-            "Holdoff time is a length of time (in milliseconds) between noticing a failure and reporting the failure.";
-        }
-        leaf maint-endpoint {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of a MEP for 802.1ag G8032 protection switching.";
-        }
-      }
-    }
-  }
-  rpc l2services-show-raps-ringlet-config {
-    description
-      "Retrieve provisioned E-SPRing ringlets (RLS)";
-    input {
-      leaf rls {
-        mandatory true;
-        description
-          "AID in format RLS-shelf-slot-ringid-grpid";
-        type ciena-6500-types:aid;
-      }
-      leaf ringfilter {
-        type ciena-6500-types:INT {
-          range "1..255";
-        }
-        description
-          "Ringid Filter";
-      }
-      leaf rgrpfilter {
-        type ciena-6500-types:INT {
-          range "1..256";
-        }
-        description
-          "Ring Group Filter";
-      }
-    }
-    output {
-      list output {
-        leaf rls {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf raps-vid {
-          type ciena-6500-types:INT {
-            range "1..4094";
-          }
-          description
-            "VID of the R-APS messages";
-        }
-        leaf raps-style {
-          type enumeration {
-            enum "RING" {
-              description
-                "RING is a ringlet with enclosed loop topology.";
-            }
-            enum "SUBRING" {
-              description
-                "SUBRING is a ringlet with an open topology.";
-            }
-          }
-          description
-            "It indicates whether or not the ringlet is an enclosed loop";
-        }
-        leaf state {
-          type enumeration {
-            enum "INIT" {
-              description
-                "The node is either being added newly to the E-SPRing, or the node is coming out of a cold state.";
-            }
-            enum "IDLE" {
-              description
-                "The node preceives the E-SPRing to be in a CLOSED state.";
-            }
-            enum "PROTECTED" {
-              description
-                "The node perceives the E-SPRing to be in a OPEN state.";
-            }
-            enum "PENDING" {
-              description
-                "The node is attempting to CLOSE the E-SPRing.The Guard Time is active in this state.";
-            }
-            enum "RECOVERY";
-            enum "UNKNOWN" {
-              description
-                "Unable to retrieve the information from the node at this time.";
-            }
-          }
-          description
-            "It indicates the state of the Ringlet";
-        }
-        leaf rpl-port {
-          type ciena-6500-types:STRING;
-          description
-            "It indicates if one of ring ports on this node is the RPL owner for the ringlet.";
-        }
-      }
-    }
-  }
-  rpc l2services-show-raps-ringlet-port-config {
-    description
-      "Retrieve Provisioned ESPRING Ringlet Port (RLE)";
-    input {
-      leaf rle {
-        mandatory true;
-        description
-          "AID in format RLE-shelf-slot-port-ringid-grpid";
-        type ciena-6500-types:aid;
-      }
-      leaf ringfilter {
-        type ciena-6500-types:INT {
-          range "1..255";
-        }
-        description
-          "Ringid Filter";
-      }
-      leaf rgrpfilter {
-        type ciena-6500-types:INT {
-          range "1..256";
-        }
-        description
-          "Ring Group Filter";
-      }
-    }
-    output {
-      list output {
-        leaf rle {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf raps-role {
-          type enumeration {
-            enum "TANDEM";
-            enum "TERM";
-          }
-          description
-            "It indicates the port role on the ringlet topology";
-        }
-        leaf block {
-          type enumeration {
-            enum "NOTBLOCKED";
-            enum "BLOCKED";
-            enum "UNKNOWN";
-          }
-          description
-            "Blocking Status";
-        }
-        leaf vce-avail {
-          type enumeration {
-            enum "TRUE";
-            enum "FALSE";
-            enum "UNKNOWN";
-          }
-          description
-            "VCEAVAIL Status";
-        }
-      }
-    }
-  }
-  rpc l2services-show-vcs {
-    description
-      "Retrieve VCS data.";
-    input {
-      leaf vcs {
-        mandatory true;
-        description
-          "AID in format VCS-shelf-vcid";
-        type ciena-6500-types:aid;
-      }
-      leaf rgrpfilter {
-        type ciena-6500-types:INT {
-          range "0..256";
-        }
-        description
-          "Ring Group Filter";
-      }
-    }
-    output {
-      list output {
-        leaf vcs {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf protocol {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "Type of traffic carried in VC. (DEPRECATED)";
-        }
-        leaf encap {
-          type enumeration {
-            enum "SVLAN";
-          }
-          description
-            "Type of encapsulation. (DEPRECATED)";
-        }
-        leaf datatype {
-          type enumeration {
-            enum "CUSTDATA";
-            enum "CUSTMGMT";
-            enum "MGMT";
-          }
-          description
-            "Type of data carried";
-        }
-        leaf topo {
-          type enumeration {
-            enum "P2P";
-            enum "M2M";
-          }
-          description
-            "Network Topology";
-        }
-        leaf-list cos-supported {
-          type ciena-6500-enums:CLASS_OF_SERVICE_DOMAIN;
-          description
-            "Class of service supported in Virtual Circuit";
-        }
-        leaf max-transmit-unit {
-          type enumeration {
-            enum "1600";
-            enum "9100";
-          }
-          description
-            "Maximum Ethernet frame size supported. Setting the MTU size will influence the distance that lossless local flow control is supported (the smaller the MTU, the larger the lossless distance).";
-        }
-        leaf q-grp {
-          type ciena-6500-types:INT {
-            range "1 | 2";
-          }
-          description
-            "The queue group to be used by te VCS (1 or 2). The actual queue group profile is indicated by the attribute QGRP1 and QGRP2 of the facility";
-        }
-        leaf rgrp {
-          type enumeration {
-            enum "RGRP-shelf-rgrpid";
-          }
-          description
-            "ESPRING ring group (RGRP) associated to the VCS";
-        }
-        leaf fwd-db-id {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "The Forwarding Database ID associated to the VCS";
-        }
-      }
-    }
-  }
-  rpc l2services-disable-vcs {
-    description
-      "Set ADMIN state for VCS to OOS";
-    input {
-      leaf vcs {
-        mandatory true;
-        description
-          "AID in format VCS-shelf-vcid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-enable-vcs {
-    description
-      "Set ADMIN state for VCS to IS";
-    input {
-      leaf vcs {
-        mandatory true;
-        description
-          "AID in format VCS-shelf-vcid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-disable-vce {
-    description
-      "Set ADMIN state for VCE to OOS";
-    input {
-      leaf vce {
-        mandatory true;
-        description
-          "AID in format VCE-shelf-slot-port-vcid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-enable-vce {
-    description
-      "Set ADMIN state for VCE to IS";
-    input {
-      leaf vce {
-        mandatory true;
-        description
-          "AID in format VCE-shelf-slot-port-vcid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-delete-vce {
-    description
-      "Delete a VCE";
-    input {
-      leaf vce {
-        mandatory true;
-        description
-          "AID in format VCE-shelf-slot-port-vcid";
-        type ciena-6500-types:aid;
-      }
-      leaf autodltchild {
-        type enumeration {
-          enum "TXADDRXDELONLY" {
-            description
-              "Default TXADDRXDELONLY map is auto deleted";
-          }
-          enum "NONE" {
-            description
-              "No auto deleting any VCEMAP";
-          }
-          enum "ALL" {
-            description
-              "Auto deleting all present VCEMAPs";
-          }
-        }
-        description
-          "If VCEMAP to be auto deleted";
-      }
-      leaf keeptandem {
-        type enumeration {
-          enum "YES" {
-            description
-              "Keep mirrored VCEs on protection when LAG port is deleted";
-          }
-          enum "NO" {
-            description
-              "Mirrored VCEs on protection are deleted when LAG port is deleted";
-          }
-        }
-        description
-          " 1+1 LAG mirrored VCEs are kept on deletion";
-      }
-    }
-  }
-  rpc l2services-show-vce {
-    description
-      "Retrieve VC Endpoint data.";
-    input {
-      leaf vce {
-        mandatory true;
-        description
-          "AID in format VCE-shelf-slot-port-vcid";
-        type ciena-6500-types:aid;
-      }
-      leaf display {
-        type ciena-6500-types:IDENT;
-        description
-          "Display the AID of the VCS ";
-      }
-    }
-    output {
-      list output {
-        leaf vce {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf cos-p-0 {
-          type ciena-6500-enums:CLASS_OF_SERVICE;
-          description
-            "Provider CoS for this customer p-bit";
-        }
-        leaf cos-p-1 {
-          type ciena-6500-enums:CLASS_OF_SERVICE;
-          description
-            "Provider CoS for this customer p-bit";
-        }
-        leaf cos-p-2 {
-          type ciena-6500-enums:CLASS_OF_SERVICE;
-          description
-            "Provider CoS for this customer p-bit";
-        }
-        leaf cos-p-3 {
-          type ciena-6500-enums:CLASS_OF_SERVICE;
-          description
-            "Provider CoS for this customer p-bit";
-        }
-        leaf cos-p-4 {
-          type ciena-6500-enums:CLASS_OF_SERVICE;
-          description
-            "Provider CoS for this customer p-bit";
-        }
-        leaf cos-p-5 {
-          type ciena-6500-enums:CLASS_OF_SERVICE;
-          description
-            "Provider CoS for this customer p-bit";
-        }
-        leaf cos-p-6 {
-          type ciena-6500-enums:CLASS_OF_SERVICE;
-          description
-            "Provider CoS for this customer p-bit";
-        }
-        leaf cos-p-7 {
-          type ciena-6500-enums:CLASS_OF_SERVICE;
-          description
-            "Provider CoS for this customer p-bit";
-        }
-        leaf if-label {
-          type ciena-6500-types:INT {
-            range "0..4096";
-          }
-          description
-            "Interfacing Label at NNI port. If Stack VLAN is used, the VLAN # is entered here";
-        }
-        leaf if-encap {
-          type enumeration {
-            enum "SVLAN";
-          }
-          description
-            "Interfacing Encap at NNI port";
-        }
-        leaf dir {
-          type enumeration {
-            enum "TXRX";
-          }
-          description
-            "Direction";
-        }
-        leaf critical-bw {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Critical.";
-        }
-        leaf nw-bw {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Network.";
-        }
-        leaf nt-bw {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Network";
-        }
-        leaf platinum-bw-profile {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Platinum";
-        }
-        leaf prbw {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Premium";
-        }
-        leaf gold-bw {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Gold";
-        }
-        leaf silver-bw {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Silver";
-        }
-        leaf br-bw {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Bronze";
-        }
-        leaf standard-bw {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the Bandwidth profile being used for Standard";
-        }
-        leaf detailed-om-stats {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Indicates if OMs are enabled for the Virtual Circuit Endpoints associated with the Virtual Circuit Segment.";
-        }
-        leaf dist-algorithm {
-          type enumeration {
-            enum "DISABLE";
-            enum "PREFMBR";
-          }
-          description
-            "Indicates which, if any, traffic distribution algorithm will be used.";
-        }
-        leaf dist-pre-fmbr {
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "The index of the Preferred Member to be used for steering.";
-        }
-        leaf protection {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Indicates whether to use RPR protection path in the event of failure";
-        }
-        leaf tx-cos-prf {
-          type ciena-6500-types:IDENT;
-          description
-            "The TXCOSPRF to use for this VCE. (TXCOSPRF-shelf-profileNo)";
-        }
-        leaf rx-cos-profile {
-          type ciena-6500-types:IDENT;
-          description
-            "The RXCOSPRF to use for this VCE. (RXCOSPRF-shelf-profileNo)";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS";
-            enum "OOS-MA";
-          }
-          description
-            "Primary State of the VCE";
-        }
-      }
-    }
-  }
-  rpc l2services-show-virtual-circuit-endpoint-map-config {
-    description
-      "Retrieve virtual circuit endpoint map attibutes.";
-    input {
-      leaf vce-map {
-        mandatory true;
-        description
-          "AID in format VCEMAP-shelf-slot-port-vcid-mapNo";
-        type ciena-6500-types:aid;
-      }
-      leaf version {
-        type enumeration {
-          enum "VER2" {
-            description
-              "Version 2 parameters to be reported";
-          }
-        }
-        description
-          "Indicates which version of parameters to be reported";
-      }
-    }
-    output {
-      list output {
-        leaf vce-map {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf dir {
-          type enumeration {
-            enum "TX" {
-              description
-                "On the egress, modify the outgoing packet";
-            }
-            enum "RX" {
-              description
-                "On the ingress, classify the received packet.";
-            }
-            enum "TXADDRXDEL" {
-              description
-                "On the egress, add a tag. On the ingress,, remove a tag.";
-            }
-          }
-          description
-            "Direction to which this MAP applies";
-        }
-        leaf access {
-          type enumeration {
-            enum "ALLOW" {
-              description
-                "Allow the specified packet";
-            }
-            enum "FILTER" {
-              description
-                "Filter the specified packet";
-            }
-          }
-          description
-            "Indicates whether to allow or filter the specified packet";
-        }
-        leaf tags-to-match {
-          type ciena-6500-types:INT {
-            range "1 | 2";
-          }
-          description
-            "Number of tags to be classified or modified";
-        }
-        leaf loc-label-1 {
-          type ciena-6500-types:INT {
-            range "0..4098";
-          }
-          description
-            "First level or outer local customer VID";
-        }
-        leaf loc-tag-action-1 {
-          type enumeration {
-            enum "ADD" {
-              description
-                "Add LOCLBL1 to tag1";
-            }
-            enum "MODPRI" {
-              description
-                "Modify priority only";
-            }
-            enum "NONE" {
-              description
-                "Do nothing";
-            }
-          }
-          description
-            "Action to the local tag1. It is for TX only";
-        }
-        leaf loc-priority-source-1 {
-          type enumeration {
-            enum "EXPLCT" {
-              description
-                "Use explicit priority value specified in LOCEXPRIO1";
-            }
-            enum "REMTAG1" {
-              description
-                "Use remote tag1 priority";
-            }
-            enum "REMTAG2" {
-              description
-                "Use remote tag2 priority";
-            }
-            enum "COSPRF" {
-              description
-                "Use CoS profile";
-            }
-          }
-          description
-            "Indicates where to take the priority bit for local tag1. It is for TX only";
-        }
-        leaf loc-ex-priority-1 {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "Static provisioned priority value for local tag1 when LOCPRIOSRC1=EXPLCT. t is a 4-bit value, with the first 3 bits as priority and the last bit as CFI. For example, a value of 5, or 0101 impilies priority is 2, and the CFI is 1";
-        }
-        leaf loc-label-2 {
-          type enumeration {
-            enum "(0-4095, 4098)";
-          }
-          description
-            "Second level local customer VID. It is for TX and RX";
-        }
-        leaf loc-tag-action-2 {
-          type enumeration {
-            enum "ADD" {
-              description
-                "Add LOCLBL2 to tag2";
-            }
-            enum "MODPRI" {
-              description
-                "Modify priority only";
-            }
-            enum "NONE" {
-              description
-                "Do nothing";
-            }
-          }
-          description
-            "Action to the local tag2. It is for TX only";
-        }
-        leaf loc-priority-source-2 {
-          type enumeration {
-            enum "EXPLCT" {
-              description
-                "Use explicit priority value specified in LOCEXPRIO2";
-            }
-            enum "REMTAG1" {
-              description
-                "Use remote tag1 priority";
-            }
-            enum "REMTAG2" {
-              description
-                "Use remote tag2 priority";
-            }
-            enum "COSPRF" {
-              description
-                "Use CoS profile";
-            }
-          }
-          description
-            "Indicates where to take the priority bit for local tag2. It is for TX only";
-        }
-        leaf loc-ex-priority-2 {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "Static provisioned priority value for local tag2 when LOCPRIOSRC2=EXPLCT. It is a 4-bit value, with the first 3 bits as priority and the last bit as CFI. For example, a value of 5, or 0101 impilies priority is 2, and the CFI is 1";
-        }
-        leaf rem-label-1 {
-          type ciena-6500-types:INT {
-            range "0..4098";
-          }
-          description
-            "First level or outer remote customer tag, It is for TX only";
-        }
-        leaf rem-label-2 {
-          type ciena-6500-types:INT {
-            range "0..4098";
-          }
-          description
-            "Second level remote customer tag It is for TX only";
-        }
-        leaf rem-tags-to-delete {
-          type ciena-6500-types:INT {
-            range "0..2";
-          }
-          description
-            "Number of tags to be deleted. It is for TX only";
-        }
-        leaf rx-prio-src {
-          type enumeration {
-            enum "LOCTAG1" {
-              description
-                "Take pbit from local tag1 for classification";
-            }
-            enum "LOCTAG2" {
-              description
-                "Take pbit from local tag2 for classification";
-            }
-            enum "NONE" {
-              description
-                "Only applicable for untagged packet";
-            }
-          }
-          description
-            "Indicates where to look for the pbit for classification, whether tag1 or tag2. It is for RX only";
-        }
-        leaf rx-prio-mask {
-          type string {
-            length "8";
-          }
-          description
-            "Priority mask for classification. It indicates which pbit patterns are included for the classification. The least significant bit corresponds to pattern=000, and the most significant bit to pattern=111. It is for RX only";
-        }
-        leaf loc-tag-eth-1 {
-          type enumeration {
-            enum "0";
-            enum "8100";
-            enum "9100";
-            enum "88A8";
-          }
-          description
-            "Ethernet type of the local first level or outer tag (tag1). It is for TX only";
-        }
-        leaf loc-tag-eth-2 {
-          type enumeration {
-            enum "0";
-            enum "8100";
-            enum "9100";
-            enum "88A8";
-          }
-          description
-            "Ethernet type of the local second level or inner tag (tag2). It is for TX only.";
-        }
-      }
-    }
-  }
-  rpc l2services-show-fdb-table {
-    description
-      "Retrieve the Forwarding Database entries (both static and dynamic).";
-    input {
-      leaf fdb {
-        mandatory true;
-        description
-          "AID in format FDB-shelf-slot";
-        type ciena-6500-types:aid;
-      }
-      leaf fwd-db-id {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "FDB ID";
-      }
-      leaf vc-pid {
-        type ciena-6500-types:INT {
-          range "1..16777215";
-        }
-        description
-          "VC Label.";
-      }
-      leaf cond {
-        type enumeration {
-          enum "MACFLAP";
-        }
-        description
-          "Condition type";
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes).";
-      }
-      leaf trexfrmt {
-        type ciena-6500-types:STRING;
-        description
-          "Format to store remote file in.";
-      }
-    }
-    output {
-      list output {
-        leaf fdb {
-          type ciena-6500-types:IDENT;
-          description
-            "FDB aid";
-        }
-        leaf fwd-db-id {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "FDB ID";
-        }
-        leaf mac {
-          type ciena-6500-types:IDENT;
-          description
-            "MAC pertaining to this entry";
-        }
-        leaf port {
-          type ciena-6500-types:STRING;
-          description
-            "Port AID on this node that this entry was learnt on.";
-        }
-        leaf vc-pid {
-          type ciena-6500-types:INT {
-            range "1..16777215";
-          }
-          description
-            "VC Label.";
-        }
-        leaf next-hop-mac {
-          type ciena-6500-types:IDENT;
-          description
-            "Station on this RPR ring that this MAC came from.";
-        }
-        leaf next-hop-port-index {
-          type ciena-6500-types:IDENT;
-          description
-            "Port Index on NEXTHOPMAC that this MAC came from.";
-        }
-        leaf remote-host-mac {
-          type ciena-6500-types:STRING;
-          description
-            "MAC of the destination node in the network that hosts MAC";
-        }
-        leaf remote-host-ip {
-          type ciena-6500-types:IDENT;
-          description
-            "IP Address of the destination node in the network that hosts MAC.";
-        }
-        leaf status {
-          type enumeration {
-            enum "STATIC";
-            enum "LEARNED";
-            enum "FILTERED";
-            enum "P2P";
-            enum "PBT";
-            enum "SHARED_STATIC";
-            enum "SHARED_FILTERED";
-          }
-          description
-            "Indicates whether entry is LEARNED, learned on P2P segment or STATICally provisioned for forwarding, FILTERED, PBT, SHARED_STATIC, SHARED_FILTERED, for shared static FDB entries..";
-        }
-      }
-    }
-  }
-  rpc l2services-show-fdb-count {
-    description
-      "Retrieve the Count of Forwarding Database entries (both static and dynamic).";
-    input {
-      leaf fdb {
-        mandatory true;
-        description
-          "AID in format FDB-shelf-slot";
-        type ciena-6500-types:aid;
-      }
-      leaf fwd-db-id {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "FDB ID";
-      }
-      leaf vc-pid {
-        type ciena-6500-types:INT {
-          range "1..16777215";
-        }
-        description
-          "VC Label.";
-      }
-      leaf cond {
-        type enumeration {
-          enum "HICOUNT";
-        }
-        description
-          "Condition type";
-      }
-    }
-    output {
-      list output {
-        leaf fdb {
-          type ciena-6500-types:IDENT;
-          description
-            "FDB aid";
-        }
-        leaf fwd-db-id {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "FDB ID";
-        }
-        leaf fdb-count {
-          type ciena-6500-types:INT {
-            range "0..147456";
-          }
-          description
-            "Count of entries in the FDB";
-        }
-      }
-    }
-  }
-  rpc l2services-show-fdb-static-entry {
-    description
-      "Retrieve static entries from the Forwarding Database.";
-    input {
-      leaf fdb-static {
-        mandatory true;
-        description
-          "AID in format FDBSTATIC-shelf-slot-entryNo";
-        type ciena-6500-types:aid;
-      }
-      leaf fwd-db-id {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "The Forwarding Database ID associated to the FDB entry";
-      }
-    }
-    output {
-      list output {
-        leaf fdb-static {
-          type ciena-6500-types:IDENT;
-          description
-            "FDB aid";
-        }
-        leaf fwd-db-id {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "The Forwarding Database ID associated to the FDB entry";
-        }
-        leaf vc-pid {
-          type ciena-6500-types:INT {
-            range "1..16777215";
-          }
-          description
-            "VC Label.";
-        }
-        leaf mac {
-          type ciena-6500-types:IDENT;
-          description
-            "MAC pertaining to this entry";
-        }
-        leaf port {
-          type ciena-6500-types:STRING;
-          description
-            "Port AID on this node that this entry is created on.";
-        }
-        leaf next-hop-mac {
-          type ciena-6500-types:IDENT;
-          description
-            "Station on this RPR ring that traffic for this MAC is being sent to.";
-        }
-        leaf next-hop-port-index {
-          type ciena-6500-types:IDENT;
-          description
-            "Port Index on NEXTHOPMAC that traffic for this MAC is being sent to.";
-        }
-        leaf status {
-          type enumeration {
-            enum "STATIC";
-            enum "FILTERED";
-          }
-          description
-            "Indicates whether entry is STATICally provisioned for forwarding or FILTERED.";
-        }
-      }
-    }
-  }
-  rpc l2services-disable-tns {
-    description
-      "Set ADMIN state for TNS to OOS";
-    input {
-      leaf tns {
-        mandatory true;
-        description
-          "AID in format TNS-shelf-tnid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-enable-tns {
-    description
-      "Set ADMIN state for TNS to IS";
-    input {
-      leaf vce {
-        mandatory true;
-        description
-          "AID in format TNS-shelf-tnid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-show-tne {
-    description
-      "Retrieve Tunnel Endpoint data.";
-    input {
-      leaf tne {
-        mandatory true;
-        description
-          "AID in format TNE-shelf-slot-port-tnid";
-        type ciena-6500-types:aid;
-      }
-      leaf display {
-        type ciena-6500-types:IDENT;
-        description
-          "Display the AID of the TNE ";
-      }
-    }
-    output {
-      list output {
-        leaf tne {
-          type ciena-6500-types:IDENT;
-          description
-            "TNE aid";
-        }
-        leaf if-label {
-          type ciena-6500-types:INT {
-            range "0..4096";
-          }
-          description
-            "Interfacing Label at NNI port";
-        }
-        leaf dir {
-          type enumeration {
-            enum "TXRX";
-          }
-          description
-            "Direction.";
-        }
-        leaf detailed-om-stats {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Indicates if OMs are enabled for the Tunnel Endpoints associated with the Tunnel Segment.";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS";
-            enum "OOS-MA";
-          }
-          description
-            "Primary State of the TNE";
-        }
-      }
-    }
-  }
-  rpc l2services-disable-tne {
-    description
-      "Set ADMIN state for TNE to OOS.";
-    input {
-      leaf tne {
-        mandatory true;
-        description
-          "AID in format TNE-shelf-slot-port-tnid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-enable-tne {
-    description
-      "Set ADMIN state for TNE to IS.";
-    input {
-      leaf tne {
-        mandatory true;
-        description
-          "AID in format TNE-shelf-slot-port-tnid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-show-port-scheduler-profile-default {
-    description
-      "Retrieve the default scheduler profile. (Deprecated)";
-    input {
-      leaf sch-prf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf type {
-        type enumeration {
-          enum "L2SS";
-          enum "L2SSPDH";
-          enum "20GL2SS";
-        }
-        description
-          "layer 2 card types";
-      }
-    }
-    output {
-      list output {
-        leaf sch-prf {
-          type ciena-6500-types:IDENT;
-          description
-            "Scheduler profile AID";
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the profile being created";
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2SSPDH";
-            enum "20GL2SS";
-          }
-          description
-            "layer 2 card types";
-        }
-      }
-    }
-  }
-  rpc l2services-show-queue-group-default {
-    description
-      "Retrieve the default queue group profile.";
-    input {
-      leaf q-grp {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf type {
-        type enumeration {
-          enum "L2SS";
-          enum "L2SSPDH";
-          enum "20GL2SS";
-          enum "L2MOTR";
-          enum "FLEXMOTR";
-        }
-        mandatory true;
-        description
-          "layer 2 card types.";
-      }
-    }
-    output {
-      list output {
-        leaf q-grp {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "Queue group profile AID";
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2SSPDH";
-            enum "20GL2SS";
-            enum "L2MOTR";
-            enum "FLEXMOTR";
-          }
-          mandatory true;
-          description
-            "layer 2 card types.";
-        }
-      }
-    }
-  }
-  rpc l2services-show-evpl-virtual-circuit-endpoint-xconn {
-    description
-      "Retrieve provisioned EVPL connection(s)";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format VCE-shelf-slot-port-vcid";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format VCE-shelf-slot-port-vcid";
-        type ciena-6500-types:aid;
-      }
-      leaf ckt-id {
-        type ciena-6500-types:STRING;
-        description
-          "Connection Identifier - 64 characters max.";
-      }
-    }
-    output {
-      list output {
-        leaf fromaid {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf toaid {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf conn-type {
-          type enumeration {
-            enum "2WAY" {
-              description
-                "Bidirectional Connection";
-            }
-          }
-          description
-            "Connection Type: Used for specifying one or two way connections";
-        }
-        leaf svid {
-          type ciena-6500-types:INT {
-            range "1..4094";
-          }
-          description
-            "The SVID number";
-        }
-        leaf ckt-id {
-          type ciena-6500-types:STRING;
-          description
-            "Connection Identifier - 64 characters max.";
-        }
-      }
-    }
-  }
-  rpc l2services-disable-eth-oam-maintenance-endpoint {
-    description
-      "Set ADMIN state for Maintenance EndPoint to OOS";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-enable-eth-oam-maintenance-endpoint {
-    description
-      "Set ADMIN state for Maintenance EndPoint to IS";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-show-eth-oam-maintenance-endpoint {
-    description
-      "Retrieve Maintenance EndPoint";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mdlevelfilter {
-        type ciena-6500-types:INT {
-          range "0..7";
-        }
-        description
-          "Filter the MEPs by the level of their parent MD object.";
-      }
-      leaf attachto {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the port, VCE or VCS to use for filtering the results. For port or VCE AIDs, only MEPs attached to this port or VCE will be displayed. For VCS AIDs only MEPs attached to VCEs on the VCS will be displayed.";
-      }
-    }
-    output {
-      list output {
-        leaf mep {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf type {
-          type enumeration {
-            enum "PORT";
-            enum "UP";
-            enum "DOWN";
-          }
-          description
-            "The MEP type or direction";
-        }
-        leaf attachto {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the port, VCE or VCS to use for filtering the results. For port or VCE AIDs, only MEPs attached to this port or VCE will be displayed. For VCS AIDs only MEPs attached to VCEs on the VCS will be displayed.";
-        }
-        leaf ccm-iphb {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The internal value (IPHB) mapped by the Transmit COS Profile (TXCOSPRF) to the priority and discard eligible bits setting of the CCMs generated by this MEP.";
-        }
-        leaf primary-vid {
-          type ciena-6500-types:IDENT;
-          description
-            "The primary VID to use for CCMs generated by this MEP. For PORT MEPs, this is the VID (0..4096), for UP and DOWN MEPs this is the VCEMAP AID.";
-        }
-        leaf ais {
-          type enumeration {
-            enum "DISABLE";
-            enum "ENABLE";
-          }
-          description
-            "Defines whether or not this MEP will generate ETH-AIS messages.";
-        }
-        leaf ais-level {
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "The MD level of ETH-AIS messages generated by this MEP.";
-        }
-        leaf ais-interval {
-          type enumeration {
-            enum "1S";
-            enum "1MIN";
-          }
-          description
-            "The rate at which ETH-AIS messages are sent by this MEP";
-        }
-        leaf ais-iphb {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The internal value (IPHB) mapped by the Transmit COS Profile (TXCOSPRF) to the priority and discard eligible bits setting of the ETH-AIS messages generated by this MEP.";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS";
-            enum "OOS-MA";
-          }
-          description
-            "Primary State of the MEP";
-        }
-      }
-    }
-  }
-  rpc l2services-show-eth-oam-maintenance-intermediate-point {
-    description
-      "Retrieve Maintenance Intermediate Point";
-    input {
-      leaf mip {
-        mandatory true;
-        description
-          "AID in format MIP-shelf-slot-mdid-maid";
-        type ciena-6500-types:aid;
-      }
-      leaf attachto {
-        type enumeration {
-          enum "VCS-shelf-vcid";
-        }
-        description
-          "Filter the MIP results by the VCS that they are attached to.";
-      }
-    }
-    output {
-      list output {
-        leaf mip {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf attachto {
-          type enumeration {
-            enum "VCS-shelf-vcid";
-          }
-          description
-            "Filter the MIP results by the VCS that they are attached to.";
-        }
-      }
-    }
-  }
-  rpc l2services-operate-eth-oam-loopback-maintenance-endpoint {
-    description
-      "Initiate a Loopback (LBM) session from a MEP";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-      leaf target {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Destination of the LBMs.";
-      }
-      leaf tx-count {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..1000";
-        }
-        description
-          "Number of LBMs to be transmitted.";
-      }
-      leaf iphb {
-        default "10";
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The priority and discard eligible bits setting of the LBMs generated by this MEP.";
-      }
-      leaf length {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..1024";
-        }
-        description
-          "Length of message to transmit (the LBM will be padded out to this length).";
-      }
-      leaf pattern {
-        type ciena-6500-types:STRING;
-        description
-          "The pattern to be included in the LBM messages.";
-      }
-    }
-  }
-  rpc l2services-release-eth-oam-loopback-maintenance-endpoint {
-    description
-      "Cancel any active LBM session on this MEP";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc l2services-show-eth-oam-trace-maintenance-endpoint {
-    description
-      "Initiate a Link Trace session from a MEP.";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-      leaf target {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "Destination of the LTMs: either a MAC address or a RMEP AID .";
-      }
-      leaf ttl {
-        default "64";
-        type ciena-6500-types:INT {
-          range "2..255";
-        }
-        description
-          "Time To Live specifies the number of CFM-aware hops.";
-      }
-      leaf iphb {
-        default "10";
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The priority and discard eligible bits setting of the LTMs generated by this MEP.";
-      }
-    }
-    output {
-      list output {
-        leaf mep {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf hop {
-          type ciena-6500-types:INT {
-            range "2..255";
-          }
-          description
-            "Number of CFM-aware hops to the node that send this LTR.";
-        }
-        leaf seqno {
-          type ciena-6500-types:INT;
-          description
-            "The sequence number of the LTR messages received.";
-        }
-        leaf fwd {
-          type enumeration {
-            enum "TRUE";
-            enum "FALSE";
-          }
-          description
-            "Indicates whether or not the LTM was forwarded by the node that send this LTR.";
-        }
-        leaf mgmt-fmt {
-          type enumeration {
-            enum "UNKNOWN";
-            enum "CHASSIS";
-            enum "IFALIAS";
-            enum "PORTCOMP";
-            enum "MACADDR";
-            enum "NWADDR";
-            enum "IFNAME";
-            enum "LOCASSIGN";
-          }
-          description
-            "The format the MGMTNAME parameter is being displayed. If the LTR did not contain the Sender ID TLV this parameter will be omitted. The LTRs send by 6500 nodes will be displayed as string.";
-        }
-        leaf mfmt-name {
-          type ciena-6500-types:STRING;
-          description
-            "The chassis name on the LTR Sender ID TLV. If the LTR did not contain the Sender ID TLV this parameter will be omitted. The chassis name of the 6500 nodes will contain the node TID and the shelf number.";
-        }
-        leaf mgmt-addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "The management address on the LTR Sender ID TLV. If the LTR did not contain the management address this parameter will be omitted. The management address for the 6500 nodes will be the shelf IP address.(Format: n.n.n.n)";
-        }
-        leaf last-egress {
-          type ciena-6500-types:STRING;
-          description
-            "The MAC address of the egress port that forwarded the LTM to this node sending the LTR.";
-        }
-        leaf next-egress {
-          type ciena-6500-types:STRING;
-          description
-            "The MAC address of the egress port that the LTM was forwarded.";
-        }
-        leaf ingress-mac {
-          type ciena-6500-types:STRING;
-          description
-            "The MAC address of the port that the LTM was received. This information is obtained from the Reply Ingress TLV.";
-        }
-        leaf ingress-fmt {
-          type enumeration {
-            enum "UNKNOWN";
-            enum "IFALIAS";
-            enum "PORTCOMP";
-            enum "MACADDR";
-            enum "NWADDR";
-            enum "IFNAME";
-            enum "AGENTCKT";
-            enum "LOCASSIGN";
-          }
-          description
-            "The format the INGRESSNAME parameter is being displayed. If the LTR did not contain the Sender ID TLV this parameter will be omitted. The LTRs send by 6500 nodes will be displayed as string.";
-        }
-        leaf ingress-name {
-          type ciena-6500-types:STRING;
-          description
-            "The name of the port that the LBM was forwarded. This information is obtained from the Reply Ingress TLV. The 6500 nodes will send the string representing the port AID.";
-        }
-        leaf egress-mac {
-          type ciena-6500-types:STRING;
-          description
-            "The MAC address of the port that the LBM was forwarded. This information is obtained from the Reply Egress TLV.";
-        }
-        leaf egress-fmt {
-          type enumeration {
-            enum "UNKNOWN";
-            enum "IFALIAS";
-            enum "PORTCOMP";
-            enum "MACADDR";
-            enum "NWADDR";
-            enum "IFNAME";
-            enum "AGENTCKT";
-            enum "LOCASSIGN";
-          }
-          description
-            "The format of the EGRESSNAME parameter is displayed.";
-        }
-        leaf egress-name {
-          type ciena-6500-types:STRING;
-          description
-            "The name of the port that the LBM was received. This information is obtained from the Reply Egress TLV. The 6500 nodes will send the string representing the port AID.";
-        }
-      }
-    }
-  }
-  rpc l2services-show-eth-oam-misconfig-maintenance-endpoint {
-    description
-      "Check for possible Misconfigurations in Layer 2 Provisioning";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-      leaf mode {
-        type enumeration {
-          enum "CCMTX";
-          enum "CCMRX";
-        }
-        description
-          "Specifies type of misconfiguration to check for.";
-      }
-      leaf num-tags {
-        type ciena-6500-types:INT {
-          range "0..3";
-        }
-        description
-          "The number of tags in the frame to check.";
-      }
-      leaf loc-label-1 {
-        type ciena-6500-types:INT {
-          range "0..4095";
-        }
-        description
-          "The VID in the outermost frame.";
-      }
-      leaf loc-label-2 {
-        type ciena-6500-types:INT {
-          range "0..4095";
-        }
-        description
-          "The VID in the second frame.";
-      }
-      leaf loc-label-3 {
-        type ciena-6500-types:INT {
-          range "0..4095";
-        }
-        description
-          "The VID in the third frame.";
-      }
-      leaf loc-ex-priority-1 {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The pbits+cfi in the outermost frame.";
-      }
-      leaf loc-ex-priority-2 {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The pbits+cfi in the second frame.";
-      }
-      leaf loc-ex-priority-3 {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The pbits+cfi in the third frame.";
-      }
-    }
-    output {
-      list output {
-        leaf mep {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf mode {
-          type enumeration {
-            enum "CCMTX";
-            enum "CCMRX";
-          }
-          description
-            "Specifies type of misconfiguration to check for.";
-        }
-        leaf num-tags {
-          type ciena-6500-types:INT {
-            range "0..3";
-          }
-          description
-            "The number of tags in the frame to check.";
-        }
-        leaf loc-label-1 {
-          type ciena-6500-types:INT {
-            range "0..4095";
-          }
-          description
-            "The VID in the outermost frame.";
-        }
-        leaf loc-label-2 {
-          type ciena-6500-types:INT {
-            range "0..4095";
-          }
-          description
-            "The VID in the second frame.";
-        }
-        leaf loc-label-3 {
-          type ciena-6500-types:INT {
-            range "0..4095";
-          }
-          description
-            "The VID in the third frame.";
-        }
-        leaf loc-ex-priority-1 {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The pbits+cfi in the outermost frame.";
-        }
-        leaf loc-ex-priority-2 {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The pbits+cfi in the second frame.";
-        }
-        leaf loc-ex-priority-3 {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The pbits+cfi in the third frame.";
-        }
-        leaf out-vce {
-          type ciena-6500-types:IDENT;
-          description
-            "AID of the VCE that CCMs will be sent out. VCE-shelf-slot-port-vcid";
-        }
-        leaf-list info {
-          type ciena-6500-types:STRING;
-          description
-            "String listing any potential problems identified with the current provisioning.";
-        }
-      }
-    }
-  }
-  rpc l2services-disable-lcas {
-    description
-      "Remove an LCAS member from an LCAS group";
-    input {
-      leaf lcas {
-        mandatory true;
-        description
-          "AID in format STS1-shelf-slot-port-sts, STS3C-shelf-slot-port-sts, VT1-shelf-slot-port-sts-vtg-vt, VT2-shelf-slot-port-sts-vtg-vt, DS1WAN-shelf-slot-port-channel, E1WAN-shelf-slot-port-channel";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:LCASAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-    }
-  }
-  rpc l2services-enable-lcas {
-    description
-      "Restore an LCAS member to an LCAS group";
-    input {
-      leaf lcas {
-        mandatory true;
-        description
-          "AID in format STS1-shelf-slot-port-sts, STS3C-shelf-slot-port-sts, VT1-shelf-slot-port-sts-vtg-vt, VT2-shelf-slot-port-sts-vtg-vt, DS1WAN-shelf-slot-port-channel, E1WAN-shelf-slot-port-channel";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:LCASAIDTYPE;
-        mandatory true;
-        description
-          "Type of AID";
-      }
-    }
-  }
-  container l2services {
-    container bw-profile {
-      list config {
-        key "bw-prf";
-        config true;
-        leaf bw-prf {
-          mandatory true;
-          description
-            "AID in format BWPRF-shelf-profileNo, BWPRF-shelf-profileNo2";
-          type ciena-6500-types:aid;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          mandatory true;
-          description
-            "Name of the profile being created";
-          config true;
-        }
-        leaf cirunits {
-          type ciena-6500-enums:BWPRF_CIR_EIR_UNITS;
-          mandatory true;
-          description
-            "Units in which Committed Info Rate is specified";
-          config true;
-        }
-        leaf commited-info-rate {
-          type ciena-6500-types:INT {
-            range "0..100";
-          }
-          mandatory true;
-          description
-            "Committed Info Rate. For units of 64 kbps, range is 0 - 32; for units of 1 Mbps, range is 0 - 99; for units of 10 Mbps, range is 0 or 10 - 100; for units of 100 Mbps, range is 0 or 10 - 100.";
-          config true;
-        }
-        leaf tc {
-          type ciena-6500-types:INT {
-            range "0..1200";
-          }
-          mandatory true;
-          description
-            "Committed Burst Duration. If CIRUNITS is 100 Mbps, TC is measured in units of 100 usecs; if CIRUNITS is anything else, TC is measured in units of 1 msec.";
-          config true;
-        }
-        leaf eirunits {
-          type ciena-6500-enums:BWPRF_CIR_EIR_UNITS;
-          mandatory true;
-          description
-            "Units in which Excess Info Rate is specified";
-          config true;
-        }
-        leaf eir {
-          type ciena-6500-types:INT {
-            range "0..100";
-          }
-          mandatory true;
-          description
-            "Excess Info Rate. For units of 64 kbps, range is 0 - 32; for units of 1 Mbps, range is 0 - 99; for units of 10 Mbps, range is 0 or 10 - 100; for units of 100 Mbps, range is 0 or 10 - 100.";
-          config true;
-        }
-        leaf te {
-          type ciena-6500-types:INT {
-            range "0..1200";
-          }
-          mandatory true;
-          description
-            "Excess Burst Duration. If EIRUNITS is 100 Mbps, TE is measured in units of 100 usecs; if EIRUNITS is anything else, TE is measured in units of 1 msec.";
-          config true;
-        }
-        leaf ovsr {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..50";
-          }
-          description
-            "Over-Subscription Ratio.";
-          config true;
-        }
-        leaf policer {
-          type ciena-6500-enums:BWPRF_POLICER;
-          description
-            "Policer Model. Which RFC number models the traffic policing behaviour.";
-          config true;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..1966080";
-          }
-          description
-            "Number of entities using this profile";
-          config false;
-        }
-        leaf cbs {
-          type ciena-6500-types:INT {
-            range "0..9100";
-          }
-          description
-            "Maximum committed MTU allowed by this profile";
-          config false;
-        }
-        leaf ebs {
-          type ciena-6500-types:INT {
-            range "0..9100";
-          }
-          description
-            "Maximum excess MTU allowed by this profile";
-          config false;
-        }
-      }
-      list default {
-        key "bw-prf";
-        config true;
-        leaf bw-prf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf, BWPRF-shelf-profileNo2";
-          type ciena-6500-types:aid;
-        }
-        leaf cos {
-          type enumeration {
-            enum "ST";
-            enum "BR";
-            enum "PL";
-            enum "PR";
-            enum "NT";
-            enum "CR";
-            enum "NW";
-            enum "SL";
-            enum "GD";
-          }
-          description
-            "Classes of Service Domain to return the default profile. The default is to return the default profile of all classes(Mandatory for edit operations)";
-          config true;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the default profile";
-          config false;
-        }
-      }
-    }
-    container dm-profile {
-      list config {
-        key "dm-prf";
-        config true;
-        leaf dm-prf {
-          mandatory true;
-          description
-            "AID in format DMPRF-shelf-profileNo";
-          type ciena-6500-types:aid;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          mandatory true;
-          description
-            "Name of the profile being created";
-          config true;
-        }
-        leaf tx1 {
-          type ciena-6500-types:INT;
-          description
-            "0 ~ 15, 255(Discarded). Transmit Standard Yellow priority map. Value ranges from 0b0000 (STANDARD GREEN) to 0b1111 (CRITICAL YELLOW)";
-          config true;
-        }
-        leaf tx4 {
-          default "4";
-          type ciena-6500-types:INT;
-          description
-            "0 ~ 15, 255(Discarded). Transmit Silver Green priority map";
-          config true;
-        }
-        leaf tx5 {
-          default "5";
-          type ciena-6500-types:INT;
-          description
-            "0 ~ 15, 255(Discarded). Transmit Silver Yellow priority map";
-          config true;
-        }
-        leaf tx6 {
-          default "6";
-          type ciena-6500-types:INT;
-          description
-            "0 ~ 15, 255(Discarded). Transmit Gold Green priority map";
-          config true;
-        }
-        leaf tx7 {
-          default "7";
-          type ciena-6500-types:INT;
-          description
-            "0 ~ 15, 255(Discarded). Transmit Gold Yellow priority map";
-          config true;
-        }
-        leaf tx10 {
-          default "10";
-          type ciena-6500-types:INT;
-          description
-            "0 ~ 15, 255(Discarded). Transmit Premium Green priority map";
-          config true;
-        }
-        leaf tx12 {
-          default "12";
-          type ciena-6500-types:INT;
-          description
-            "0 ~ 15, 255(Discarded). Transmit Network Green priority map";
-          config true;
-        }
-        leaf rx0 {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Standard Green priority map";
-          config true;
-        }
-        leaf rx1 {
-          default "1";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Standard Yellow priority map";
-          config true;
-        }
-        leaf rx2 {
-          default "2";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Bronze Green priority map ";
-          config true;
-        }
-        leaf rx3 {
-          default "3";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Bronze Yellow priority map ";
-          config true;
-        }
-        leaf rx4 {
-          default "4";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Silver Green priority map ";
-          config true;
-        }
-        leaf rx5 {
-          default "5";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Silver Yellow priority map ";
-          config true;
-        }
-        leaf rx6 {
-          default "6";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Gold Green priority map ";
-          config true;
-        }
-        leaf rx7 {
-          default "7";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Gold Yellow priority map ";
-          config true;
-        }
-        leaf rx8 {
-          default "8";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Platinum Green priority map ";
-          config true;
-        }
-        leaf rx9 {
-          default "9";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Platinum Yellow priority map ";
-          config true;
-        }
-        leaf rx10 {
-          default "10";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Premium Green priority map ";
-          config true;
-        }
-        leaf rx11 {
-          default "11";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Premium Yellow priority map";
-          config true;
-        }
-        leaf rx12 {
-          default "12";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Network Green priority map ";
-          config true;
-        }
-        leaf rx13 {
-          default "13";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Network Yellow priority map";
-          config true;
-        }
-        leaf rx14 {
-          default "14";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Critical Green priority map ";
-          config true;
-        }
-        leaf rx15 {
-          default "15";
-          type ciena-6500-types:INT;
-          description
-            "0..15, 255(Discard). Receive Critical Yellow priority map";
-          config true;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..720";
-          }
-          description
-            " Number of VCEs ports using this profile";
-          config false;
-        }
-        leaf tx0 {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value standard green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx2 {
-          type ciena-6500-types:INT;
-          description
-            " 0-15,16 = DSCD (Discarded) . Transmit Bronze Green priority map. Value ranges from 0b0000 (STANDARD YELLOW) to 0b1111 (CRITICAL GREEN)";
-          config true;
-        }
-        leaf tx3 {
-          type ciena-6500-types:INT;
-          description
-            " 0-15,16 = DSCD (Discarded) . Transmit Bronze Yellow priority map. Value ranges from 0b0000 (STANDARD YELLOW) to 0b1111 (CRITICAL GREEN)";
-          config true;
-        }
-        leaf tx8 {
-          type ciena-6500-types:INT;
-          description
-            " 0-15,16 = DSCD (Discarded) . Transmit Platinum Green priority map";
-          config true;
-        }
-        leaf tx9 {
-          type ciena-6500-types:INT;
-          description
-            " 0-15,16 = DSCD (Discarded) . Transmit Platinum Yellow priority map";
-          config true;
-        }
-        leaf tx11 {
-          default "11";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value premium yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx13 {
-          default "13";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value network yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx14 {
-          default "14";
-          type ciena-6500-types:INT;
-          description
-            " 0-15,16 = DSCD (Discarded) . Transmit Critical Green priority map";
-          config true;
-        }
-        leaf tx15 {
-          default "15";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value critical yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-      }
-      list default {
-        key "dm-prf";
-        config true;
-        leaf dm-prf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf, DMPRF-shelf-profileNo";
-          type ciena-6500-types:aid;
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2RPR";
-          }
-          default "L2SS";
-          description
-            "layer 2 equipment type";
-          config true;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the profile being created";
-          config false;
-        }
-      }
-    }
-    container endpoint {
-      list count {
-        key "slot";
-        config false;
-        leaf slot {
-          mandatory true;
-          description
-            "AID in format SLOT-shelf-slot";
-          type ciena-6500-types:aid;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..16384";
-          }
-          description
-            "Number of segment endpoints provisioned";
-          config false;
-        }
-        leaf max-count {
-          type ciena-6500-types:INT {
-            range "0..16384";
-          }
-          description
-            "The maximum number of segment endpoints supported by the system";
-          config false;
-        }
-      }
-    }
-    container eth-oam {
-      container defects1 {
-        list maintenance-endpoint {
-          key "mep";
-          config false;
-          leaf mep {
-            mandatory true;
-            description
-              "AID in format MEP-shelf-slot-mdid-maid-mepid";
-            type ciena-6500-types:aid;
-          }
-          leaf xcon {
-            type enumeration {
-              enum "Y";
-              enum "N";
-              enum "U";
-            }
-            description
-              "Indicates if the MEP has the XCON defect condition.";
-            config false;
-          }
-          leaf xconmdlevel {
-            type ciena-6500-types:INT {
-              range "0..7";
-            }
-            description
-              "MD level from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf xconmdformat {
-            type ciena-6500-types:INT {
-              range "0..255";
-            }
-            description
-              "Content of the MD Name Format field from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf xconmdlen {
-            type ciena-6500-types:INT {
-              range "0..50";
-            }
-            description
-              "Content of the MD Name Length field from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf xconmdname {
-            type ciena-6500-types:STRING;
-            description
-              "Content of the MD Name field from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf xconmaformat {
-            type ciena-6500-types:INT {
-              range "0..255";
-            }
-            description
-              "Content of the MA Name Format field from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf xconmalen {
-            type ciena-6500-types:INT {
-              range "0..50";
-            }
-            description
-              "Content of the MA Name Length field from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf xconmaname {
-            type ciena-6500-types:STRING;
-            description
-              "Content of the MA Name field from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf xconmepid {
-            type ciena-6500-types:INT {
-              range "0..65535";
-            }
-            description
-              "Content of the MEP ID field from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf xconsamac {
-            type ciena-6500-types:IDENT;
-            description
-              "SA MAC from the CCM packet that caused the current XCON defect against this MEP.";
-            config false;
-          }
-          leaf err {
-            type enumeration {
-              enum "Y";
-              enum "N";
-              enum "U";
-            }
-            description
-              "Indicates if the MEP has the ERR defect condition.";
-            config false;
-          }
-          leaf errmepid {
-            type ciena-6500-types:INT {
-              range "0..8191";
-            }
-            description
-              "Content of the MEP ID field from the CCM packet that caused the current ERR defect against this MEP.";
-            config false;
-          }
-          leaf errccmint {
-            type ciena-6500-types:INT {
-              range "0..7";
-            }
-            description
-              "Content of the CCMINT field from the CCM packet that caused the current ERR defect against this MEP.";
-            config false;
-          }
-          leaf errsamac {
-            type ciena-6500-types:IDENT;
-            description
-              "SA MAC from the CCM packet that caused the current ERR defect against this MEP.";
-            config false;
-          }
-        }
-      }
-      container defects2 {
-        list maintenance-endpoint {
-          key "mep";
-          config false;
-          leaf mep {
-            mandatory true;
-            description
-              "AID in format MEP-shelf-slot-mdid-maid-mepid";
-            type ciena-6500-types:aid;
-          }
-          leaf rmep {
-            type ciena-6500-types:IDENT;
-            description
-              "The AID of the RMEP against which the MEP defects are being reported.";
-            config false;
-          }
-          leaf timeout {
-            type enumeration {
-              enum "Y";
-              enum "N";
-              enum "U";
-            }
-            description
-              "Indicates if the MEP has the TIMEOUT defect condition.";
-            config false;
-          }
-          leaf rdi {
-            type enumeration {
-              enum "Y";
-              enum "N";
-              enum "U";
-            }
-            description
-              "Indicates if the MEP has the RDI defect condition.";
-            config false;
-          }
-          leaf status {
-            type enumeration {
-              enum "Y";
-              enum "N";
-              enum "U";
-            }
-            description
-              "Indicates if the MEP has the STATUS defect condition.";
-            config false;
-          }
-          leaf statusport {
-            type enumeration {
-              enum "NOTLV";
-              enum "BLOCKED";
-              enum "UP";
-            }
-            description
-              "The Port Status in the packet that triggered the STATUS defect.";
-            config false;
-          }
-          leaf statusif {
-            type enumeration {
-              enum "NOTLV";
-              enum "UP";
-              enum "DOWN";
-              enum "TEST";
-              enum "UNKNOWN";
-              enum "DORMANT";
-              enum "NOTPRESENT";
-              enum "LOWERDOWN";
-            }
-            description
-              "The Interface Status in the packet that triggered the STATUS defect.";
-            config false;
-          }
-        }
-      }
-      container loopback {
-        list maintenance-endpoint {
-          key "mep";
-          config false;
-          leaf mep {
-            mandatory true;
-            description
-              "AID in format MEP-shelf-slot-mdid-maid-mepid";
-            type ciena-6500-types:aid;
-          }
-          leaf status {
-            type enumeration {
-              enum "INPROGRESS";
-              enum "ABORTED";
-              enum "COMPLETED";
-              enum "NOTSTARTED";
-              enum "UNKNOWN";
-            }
-            description
-              "Status of the LBM session.";
-            config false;
-          }
-          leaf target {
-            type ciena-6500-types:IDENT;
-            description
-              "Destination of the LBMs: either a MAC address or a RMEP AID .";
-            config false;
-          }
-          leaf min-rtd {
-            type ciena-6500-types:INT {
-              range "0..5000";
-            }
-            description
-              "Minimum LBM -- LBR Round Trip delay (in us).";
-            config false;
-          }
-          leaf max-rtd {
-            type ciena-6500-types:INT {
-              range "0..5000";
-            }
-            description
-              "Maximum LBM -- LBR Round Trip delay (in us).";
-            config false;
-          }
-          leaf avg-rtd {
-            type ciena-6500-types:INT {
-              range "0..5000";
-            }
-            description
-              "Average LBM -- LBR Round Trip delay (in us).";
-            config false;
-          }
-          leaf lbmtx {
-            type ciena-6500-types:INT {
-              range "0..1000";
-            }
-            description
-              "Number of LBMs transmitted so far during this LBM session.";
-            config false;
-          }
-          leaf lbrrx {
-            type ciena-6500-types:INT {
-              range "0..1000";
-            }
-            description
-              "Number of LBRs received so far during this LBM session.";
-            config false;
-          }
-          leaf misorder {
-            type ciena-6500-types:INT {
-              range "0..1000";
-            }
-            description
-              "Number of mis-ordered LBRs received.";
-            config false;
-          }
-        }
-      }
-      container misconfig {
-        list maintenance-endpoint {
-          key "mep";
-          config false;
-          leaf mep {
-            mandatory true;
-            description
-              "AID in format MEP-shelf-slot-mdid-maid-mepid";
-            type ciena-6500-types:aid;
-          }
-          leaf mode {
-            type enumeration {
-              enum "CCMTX";
-              enum "CCMRX";
-            }
-            description
-              "Specifies type of misconfiguration to check for.";
-            config false;
-          }
-          leaf num-tags {
-            type ciena-6500-types:INT {
-              range "0..3";
-            }
-            description
-              "The number of tags in the frame to check.";
-            config false;
-          }
-          leaf loc-label-1 {
-            type ciena-6500-types:INT {
-              range "0..4095";
-            }
-            description
-              "The VID in the outermost frame.";
-            config false;
-          }
-          leaf loc-label-2 {
-            type ciena-6500-types:INT {
-              range "0..4095";
-            }
-            description
-              "The VID in the second frame.";
-            config false;
-          }
-          leaf loc-label-3 {
-            type ciena-6500-types:INT {
-              range "0..4095";
-            }
-            description
-              "The VID in the third frame.";
-            config false;
-          }
-          leaf loc-ex-priority-1 {
-            type ciena-6500-types:INT {
-              range "0..15";
-            }
-            description
-              "The pbits+cfi in the outermost frame.";
-            config false;
-          }
-          leaf loc-ex-priority-2 {
-            type ciena-6500-types:INT {
-              range "0..15";
-            }
-            description
-              "The pbits+cfi in the second frame.";
-            config false;
-          }
-          leaf loc-ex-priority-3 {
-            type ciena-6500-types:INT {
-              range "0..15";
-            }
-            description
-              "The pbits+cfi in the third frame.";
-            config false;
-          }
-          leaf out-vce {
-            type ciena-6500-types:IDENT;
-            description
-              "AID of the VCE that CCMs will be sent out. VCE-shelf-slot-port-vcid";
-            config false;
-          }
-          leaf-list info {
-            type ciena-6500-types:STRING;
-            description
-              "String listing any potential problems identified with the current provisioning.";
-            config false;
-          }
-        }
-      }
-      list maintenance-domain {
-        key "maint-domain";
-        config true;
-        leaf maint-domain {
-          mandatory true;
-          description
-            "AID in format MD-shelf-slot-mdid";
-          type ciena-6500-types:aid;
-        }
-        leaf level {
-          default "7";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Maintenance Domain Level";
-          config true;
-        }
-        leaf nameformat {
-          type enumeration {
-            enum "STRING";
-            enum "NULL";
-          }
-          default "STRING";
-          description
-            "The format of the Maintenance Domain NAME";
-          config true;
-        }
-        leaf name {
-          type ciena-6500-types:STRING;
-          description
-            "The name of the Maintenance Domain, entered as a quoted string of 1..43 characters. Only used if the NAMEFORMAT is not NULL";
-          config true;
-        }
-      }
-      list maintenance-association {
-        key "maint-assoc";
-        config true;
-        leaf maint-assoc {
-          mandatory true;
-          description
-            "AID in format MA-shelf-slot-mdid-maid";
-          type ciena-6500-types:aid;
-        }
-        leaf nameformat {
-          type enumeration {
-            enum "STRING";
-            enum "INTEGER";
-          }
-          default "STRING";
-          description
-            "The format of the Maintenance Association NAME";
-          config true;
-        }
-        leaf name {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "The name of the Maintenance Association, entered as either a quoted string of 1..45 characters or an integer 0..65535, depending on the NAMEFORMAT";
-          config true;
-        }
-        leaf ccmint {
-          type enumeration {
-            enum "100MS";
-            enum "1S";
-            enum "10S";
-            enum "1MIN";
-            enum "10MIN";
-          }
-          default "1S";
-          description
-            "The rate at which CCMs are transmitted by MEPs in this MA";
-          config true;
-        }
-      }
-      list maintenance-endpoint {
-        key "mep";
-        config true;
-        leaf mep {
-          mandatory true;
-          description
-            "AID in format MEP-shelf-slot-mdid-maid-mepid";
-          type ciena-6500-types:aid;
-        }
-        leaf type {
-          type enumeration {
-            enum "PORT";
-            enum "UP";
-            enum "DOWN";
-          }
-          mandatory true;
-          description
-            "The MEP type or direction";
-          config true;
-        }
-        leaf attachto {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "The AID of the port or VCE that the MEP is attached to.";
-          config true;
-        }
-        leaf ccm-iphb {
-          default "10";
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The priority and discard eligible bits setting of the CCMs generated by this MEP.";
-          config true;
-        }
-        leaf primary-vid {
-          type ciena-6500-types:IDENT;
-          description
-            "The primary VID to use for CCMs generated by this MEP. For PORT MEPs, this is the VID (0..4096), for UP and DOWN MEPs this is the VCEMAP AID. Default is PRIMARYVID is 4096 for PORT MEPs, or the only VCEMAP on the VCE for UP or DOWN MEPs";
-          config true;
-        }
-        leaf ais {
-          type enumeration {
-            enum "DISABLE";
-            enum "ENABLE";
-          }
-          default "DISABLE";
-          description
-            "Defines whether or not this MEP will generate ETH-AIS messages.";
-          config true;
-        }
-        leaf ais-level {
-          default "7";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "The MD level of ETH-AIS messages generated by this MEP.";
-          config true;
-        }
-        leaf ais-interval {
-          type enumeration {
-            enum "1S";
-            enum "1MIN";
-          }
-          default "1S";
-          description
-            "The rate at which ETH-AIS messages are sent by this MEP";
-          config true;
-        }
-        leaf ais-iphb {
-          default "10";
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The priority and discard eligible bits setting of the ETH-AIS messages generated by this MEP.";
-          config true;
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS";
-            enum "OOS-MA";
-          }
-          default "IS";
-          description
-            "Primary State of the MEP";
-          config true;
-        }
-      }
-      list maintenance-remote-endpoint {
-        key "rem-mep";
-        config false;
-        leaf rem-mep {
-          mandatory true;
-          description
-            "AID in format RMEP-shelf-slot-mdid-maid-mepid";
-          type ciena-6500-types:aid;
-        }
-        leaf mac-addr {
-          type ciena-6500-types:STRING;
-          description
-            "The MAC address of the RMEP";
-          config false;
-        }
-      }
-      list maintenance-intermediate-point {
-        key "mip";
-        config true;
-        leaf mip {
-          mandatory true;
-          description
-            "AID in format MIP-shelf-slot-mdid-maid";
-          type ciena-6500-types:aid;
-        }
-        leaf attachto {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "The AID of the VCS that the MIP is attached to.";
-          config true;
-        }
-      }
-    }
-    container evpl-virtual-circuit-endpoint {
-      list xconn {
-        key "fromaid toaid";
-        config true;
-        leaf fromaid {
-          mandatory true;
-          description
-            "AID in format VCE-shelf-slot-port-vcid";
-          type ciena-6500-types:aid;
-        }
-        leaf toaid {
-          mandatory true;
-          description
-            "AID in format VCE-shelf-slot-port-vcid";
-          type ciena-6500-types:aid;
-        }
-        leaf conn-type {
-          type enumeration {
-            enum "1WAY" {
-              description
-                "Unidirectional Connection";
-            }
-            enum "2WAY" {
-              description
-                "Bidirectional Connection";
-            }
-          }
-          default "2WAY";
-          description
-            "Connection Type: Used for specifying one or two way connections. Only 2WAY is supported";
-          config true;
-        }
-        leaf svid {
-          type ciena-6500-types:INT {
-            range "1..4094";
-          }
-          description
-            "The SVID number, mandatory if VCID of the aid is greater than 4094, otherwise SVID=VCID if not specified ";
-          config true;
-        }
-        leaf ckt-id {
-          type ciena-6500-types:STRING;
-          description
-            "Connection Identifier - 64 characters max.";
-          config true;
-        }
-      }
-    }
-    container fdb {
-      list table {
-        key "fdb";
-        config false;
-        leaf fdb {
-          mandatory true;
-          description
-            "AID in format FDB-shelf-slot";
-          type ciena-6500-types:aid;
-        }
-        leaf fwd-db-id {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "FDB ID";
-          config false;
-        }
-        leaf mac {
-          type ciena-6500-types:IDENT;
-          description
-            "MAC pertaining to this entry";
-          config false;
-        }
-        leaf port {
-          type ciena-6500-types:STRING;
-          description
-            "Port AID on this node that this entry was learnt on.";
-          config false;
-        }
-        leaf vc-pid {
-          type ciena-6500-types:INT {
-            range "1..16777215";
-          }
-          description
-            "VC Label.";
-          config false;
-        }
-        leaf next-hop-mac {
-          type ciena-6500-types:IDENT;
-          description
-            "Station on this RPR ring that this MAC came from.";
-          config false;
-        }
-        leaf next-hop-port-index {
-          type ciena-6500-types:IDENT;
-          description
-            "Port Index on NEXTHOPMAC that this MAC came from.";
-          config false;
-        }
-        leaf remote-host-mac {
-          type ciena-6500-types:STRING;
-          description
-            "MAC of the destination node in the network that hosts MAC";
-          config false;
-        }
-        leaf remote-host-ip {
-          type ciena-6500-types:IDENT;
-          description
-            "IP Address of the destination node in the network that hosts MAC.";
-          config false;
-        }
-        leaf status {
-          type enumeration {
-            enum "STATIC";
-            enum "LEARNED";
-            enum "FILTERED";
-            enum "P2P";
-            enum "PBT";
-            enum "SHARED_STATIC";
-            enum "SHARED_FILTERED";
-          }
-          description
-            "Indicates whether entry is LEARNED, learned on P2P segment or STATICally provisioned for forwarding, FILTERED, PBT, SHARED_STATIC, SHARED_FILTERED, for shared static FDB entries..";
-          config false;
-        }
-      }
-      list count {
-        key "fdb";
-        config false;
-        leaf fdb {
-          mandatory true;
-          description
-            "AID in format FDB-shelf-slot";
-          type ciena-6500-types:aid;
-        }
-        leaf fwd-db-id {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "FDB ID";
-          config false;
-        }
-        leaf fdb-count {
-          type ciena-6500-types:INT {
-            range "0..147456";
-          }
-          description
-            "Count of entries in the FDB";
-          config false;
-        }
-      }
-      list static-entry {
-        key "fdb-static";
-        config true;
-        leaf fdb-static {
-          mandatory true;
-          description
-            "AID in format FDBSTATIC-shelf-slot-entryNo";
-          type ciena-6500-types:aid;
-        }
-        leaf fwd-db-id {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          mandatory true;
-          description
-            "FDB ID";
-          config true;
-        }
-        leaf vc-pid {
-          type ciena-6500-types:INT {
-            range "1..16777215";
-          }
-          description
-            "VC Label.";
-          config true;
-        }
-        leaf mac {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "MAC pertaining to this entry";
-          config true;
-        }
-        leaf port {
-          type ciena-6500-types:STRING;
-          description
-            "Port AID on this node that this entry is being created for.";
-          config true;
-        }
-        leaf next-hop-mac {
-          type ciena-6500-types:IDENT;
-          description
-            "Station on this RPR ring that packets for this MAC are to be sent to";
-          config true;
-        }
-        leaf next-hop-port-index {
-          type ciena-6500-types:IDENT;
-          description
-            "Port Index on NEXTHOPMAC that packets for this MAC are to be sent to.";
-          config true;
-        }
-        leaf status {
-          type enumeration {
-            enum "STATIC";
-            enum "FILTERED";
-          }
-          description
-            "Indicates whether this entry is to be FILTERED.";
-          config true;
-        }
-      }
-    }
-    container map {
-      list count {
-        key "slot";
-        config false;
-        leaf slot {
-          mandatory true;
-          description
-            "AID in format SLOT-shelf-slot";
-          type ciena-6500-types:aid;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..16384";
-          }
-          description
-            "Number of maps provisioned";
-          config false;
-        }
-        leaf max-count {
-          type ciena-6500-types:INT {
-            range "0..16384";
-          }
-          description
-            "The maximum number of maps supported by the system";
-          config false;
-        }
-      }
-    }
-    container port-scheduler {
-      list config {
-        key "prt-sched";
-        config true;
-        leaf prt-sched {
-          mandatory true;
-          description
-            "AID in format PRTSCHED-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf gdwt {
-          type ciena-6500-types:INT {
-            range "0..63";
-          }
-          description
-            "The amount of scheduler weight to be assigned to the Gold Class of Service for excess egress bandwidth.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf slwt {
-          type ciena-6500-types:INT {
-            range "0..63";
-          }
-          description
-            "The amount of scheduler weight to be assigned to the Silver Class of Service for excess egress bandwidth.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf stwt {
-          type ciena-6500-types:INT {
-            range "0..63";
-          }
-          description
-            "The amount of scheduler weight to be assigned to the Standard Class of Service for excess egress bandwidth. Default is 1 for ETH port, 0 for WAN port(Mandatory for edit operations)";
-          config true;
-        }
-        leaf crcir {
-          type ciena-6500-types:INT {
-            range "0..10000";
-          }
-          description
-            "The committed rate of Critical Class of Service bandwidth";
-          config true;
-        }
-        leaf nwcir {
-          type ciena-6500-types:INT {
-            range "0..10000";
-          }
-          description
-            "The committed rate of Critical Class of Service bandwidth. (DEPRECATED)(Mandatory for edit operations)";
-          config true;
-        }
-        leaf prcir {
-          type ciena-6500-types:INT {
-            range "0..10000";
-          }
-          description
-            "The committed rate of Premium Class of Service bandwidth.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf gdcir {
-          type ciena-6500-types:INT {
-            range "0..10000";
-          }
-          description
-            "The committed rate of Gold Class of Service bandwidth.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf gdsleir {
-          type ciena-6500-types:INT {
-            range "0..10000";
-          }
-          description
-            "The Excess rate of Gold+Silver Class of Service bandwidth allowed.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf slcir {
-          type ciena-6500-types:INT {
-            range "0..10000";
-          }
-          description
-            "The committed rate of Silver Class of Service bandwidth.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf steir {
-          type ciena-6500-types:INT {
-            range "0..10000";
-          }
-          description
-            "The Maximum rate of Standard Class of Service bandwidth allowed.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf portmax {
-          type ciena-6500-types:INT {
-            range "100..10000";
-          }
-          description
-            "The maximum bandwidth of this port(Mandatory for edit operations)";
-          config true;
-        }
-      }
-      list profile {
-        key "sch-prf";
-        config true;
-        leaf sch-prf {
-          mandatory true;
-          description
-            "AID in format SCHPRF-shelf-profileNo, SCHPRF-shelf-profileNo2";
-          type ciena-6500-types:aid;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          mandatory true;
-          description
-            "Name of the profile being created";
-          config true;
-        }
-        leaf stwt {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          mandatory true;
-          description
-            "Weight of Standard Class of Service";
-          config true;
-        }
-        leaf brwt {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          description
-            "Weight of Bronze Class of Service";
-          config true;
-        }
-        leaf slwt {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          mandatory true;
-          description
-            "Weight of Silver Class of Service(Mandatory for edit operations)";
-          config true;
-        }
-        leaf gdwt {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          mandatory true;
-          description
-            "Weight of Gold Class of Service(Mandatory for edit operations)";
-          config true;
-        }
-        leaf plwt {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          description
-            "Weight of Platinum Class of Service";
-          config true;
-        }
-        leaf prwt {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          description
-            "Weight of Premium Class of Service";
-          config true;
-        }
-        leaf ntwt {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          description
-            "Weight of Network Class of Service";
-          config true;
-        }
-        leaf crwt {
-          type ciena-6500-types:INT {
-            range "1..63";
-          }
-          description
-            "Weight of Critical Class of Service";
-          config true;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..720";
-          }
-          description
-            "Number of queue groups using this profile";
-          config false;
-        }
-      }
-      list profile-default {
-        key "sch-prf";
-        config true;
-        leaf sch-prf {
-          mandatory true;
-          description
-            "AID in format SCHPRF-shelf-profileNo3, SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2SSPDH";
-            enum "20GL2SS";
-          }
-          description
-            "layer 2 card types(Mandatory for edit operations)";
-          config true;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the profile being created";
-          config false;
-        }
-      }
-    }
-    container queue-group {
-      list config {
-        key "q-grp";
-        config true;
-        leaf q-grp {
-          mandatory true;
-          description
-            "AID in format QGRP-shelf-qgrpId";
-          type ciena-6500-types:aid;
-        }
-        leaf schprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Schedule profile used on this QGRP";
-          config true;
-        }
-        leaf crdprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Drop profile for Critical CR COS used on this QGRP";
-          config true;
-        }
-        leaf crsc {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Scalar value for Critical CR COS.";
-          config true;
-        }
-        leaf ntdprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Drop profile for Network NT COS used on this QGRP";
-          config true;
-        }
-        leaf ntsc {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Scalar value for Network NT COS.";
-          config true;
-        }
-        leaf prdprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Drop profile for Premium PR COS used on this QGRP";
-          config true;
-        }
-        leaf prsc {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Scalar value for Premium PR COS.";
-          config true;
-        }
-        leaf pldprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Drop profile for Platinum PL COS used on this QGRP";
-          config true;
-        }
-        leaf plsc {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Scalar value for Platinum PL COS.";
-          config true;
-        }
-        leaf gddprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Drop profile for Gold GD COS used on this QGRP";
-          config true;
-        }
-        leaf gdsc {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Scalar value for Gold GD COS.";
-          config true;
-        }
-        leaf sldprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Drop profile for Silver SL COS used on this QGRP";
-          config true;
-        }
-        leaf slsc {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Scalar value for Silver SL COS.";
-          config true;
-        }
-        leaf brdprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Drop profile for Bronze BR COS used on this QGRP";
-          config true;
-        }
-        leaf brsc {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Scalar value for Bronze BR COS.";
-          config true;
-        }
-        leaf stdprf {
-          type ciena-6500-types:IDENT;
-          description
-            "Drop profile for Standard ST COS used on this QGRP";
-          config true;
-        }
-        leaf stsc {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Scalar value for Standard ST COS";
-          config true;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..3888";
-          }
-          description
-            "Number of references to this profile";
-          config false;
-        }
-      }
-      list default {
-        key "q-grp";
-        config true;
-        leaf q-grp {
-          mandatory true;
-          description
-            "AID in format QGRP-shelf-qgrpId";
-          type ciena-6500-types:aid;
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2SSPDH";
-            enum "20GL2SS";
-            enum "L2MOTR";
-            enum "FLEXMOTR";
-          }
-          description
-            "layer 2 card types.(Mandatory for edit operations)";
-          config true;
-        }
-      }
-    }
-    container raps-endpoint {
-      list config {
-        key "rne";
-        config true;
-        leaf rne {
-          mandatory true;
-          description
-            "AID in format RNE-shelf-slot-port-ringid";
-          type ciena-6500-types:aid;
-        }
-        leaf hold-off {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0 | 100 | 200..10000";
-          }
-          description
-            "Holdoff time is a length of time (in milliseconds) between noticing a failure and reporting the failure.";
-          config true;
-        }
-        leaf maint-endpoint {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of a MEP for 802.1ag G8032 protection switching.";
-          config true;
-        }
-      }
-      list count {
-        key "rne";
-        config false;
-        leaf rne {
-          mandatory true;
-          description
-            "AID in format RNE-shelf-slot-port-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf rne-count {
-          type ciena-6500-types:INT {
-            range "0..256";
-          }
-          description
-            "# of Ring Port (RNE) provisioned";
-          config false;
-        }
-      }
-    }
-    container raps-ringlet {
-      list config {
-        key "rls";
-        config true;
-        leaf rls {
-          mandatory true;
-          description
-            "AID in format RLS-shelf-slot-ringid-grpid";
-          type ciena-6500-types:aid;
-        }
-        leaf raps-vid {
-          type ciena-6500-types:INT {
-            range "1..4094";
-          }
-          mandatory true;
-          description
-            "VID of the R-APS messages";
-          config true;
-        }
-        leaf raps-style {
-          type enumeration {
-            enum "RING";
-            enum "SUBRING";
-          }
-          mandatory true;
-          description
-            "It indicates whether or not the ringlet is an enclosed loop(Mandatory for edit operations)";
-          config true;
-        }
-        leaf rpl-port {
-          type ciena-6500-types:STRING;
-          description
-            "It indicates if one of ring ports on this node is the RPL owner for the ringlet.";
-          config true;
-        }
-        leaf state {
-          type enumeration {
-            enum "INIT" {
-              description
-                "The node is either being added newly to the E-SPRing, or the node is coming out of a cold state.";
-            }
-            enum "IDLE" {
-              description
-                "The node preceives the E-SPRing to be in a CLOSED state.";
-            }
-            enum "PROTECTED" {
-              description
-                "The node perceives the E-SPRing to be in a OPEN state.";
-            }
-            enum "PENDING" {
-              description
-                "The node is attempting to CLOSE the E-SPRing.The Guard Time is active in this state.";
-            }
-            enum "RECOVERY";
-            enum "UNKNOWN" {
-              description
-                "Unable to retrieve the information from the node at this time.";
-            }
-          }
-          description
-            "It indicates the state of the Ringlet";
-          config false;
-        }
-      }
-      list count {
-        key "rls";
-        config false;
-        leaf rls {
-          mandatory true;
-          description
-            "AID in format RLS-shelf-slot-ringid-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf rls-count {
-          type ciena-6500-types:INT {
-            range "0..256";
-          }
-          description
-            "# of ringlets (RLS) provisioned";
-          config false;
-        }
-      }
-    }
-    container raps-ringlet-port {
-      list config {
-        key "rle";
-        config true;
-        leaf rle {
-          mandatory true;
-          description
-            "AID in format RLE-shelf-slot-port-ringid-grpid";
-          type ciena-6500-types:aid;
-        }
-        leaf raps-role {
-          type enumeration {
-            enum "TANDEM";
-            enum "TERM";
-          }
-          default "TANDEM";
-          description
-            "It indicates the port role on the ringlet topology";
-          config true;
-        }
-        leaf block {
-          type enumeration {
-            enum "NOTBLOCKED";
-            enum "BLOCKED";
-            enum "UNKNOWN";
-          }
-          description
-            "Blocking Status";
-          config false;
-        }
-        leaf vce-avail {
-          type enumeration {
-            enum "TRUE";
-            enum "FALSE";
-            enum "UNKNOWN";
-          }
-          description
-            "VCEAVAIL Status";
-          config false;
-        }
-      }
-      list count {
-        key "rle";
-        config false;
-        leaf rle {
-          mandatory true;
-          description
-            "AID in format RLE-shelf-slot-port-ringid-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf rle-count {
-          type ciena-6500-types:INT {
-            range "0..256";
-          }
-          description
-            "# of Ringlet Port (RLE) provisioned";
-          config false;
-        }
-      }
-    }
-    container raps-segment {
-      list config {
-        key "rns";
-        config true;
-        leaf rns {
-          mandatory true;
-          description
-            "AID in format RNS-shelf-slot-ringid";
-          type ciena-6500-types:aid;
-        }
-        leaf wtr {
-          type string {
-            length "10..720";
-          }
-          description
-            "Time (secs) to restore ring after notification of fault recovery. Values 10-720 with increments of 10 or INFINITE. Default is 300.";
-          config true;
-        }
-        leaf guard {
-          default "500";
-          type ciena-6500-types:INT {
-            range "10 | 20 | 30..2000";
-          }
-          description
-            "Time (milliseconds) that R-APS msgs will be ignored after fault cleared";
-          config true;
-        }
-      }
-      list count {
-        key "rns";
-        config false;
-        leaf rns {
-          mandatory true;
-          description
-            "AID in format RNS-shelf-slot-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf rns-count {
-          type ciena-6500-types:INT {
-            range "0..256";
-          }
-          description
-            "# of rings (RNS) provisioned";
-          config false;
-        }
-      }
-    }
-    container rx-cos-profile {
-      list config {
-        key "rx-cos-prf";
-        config true;
-        leaf rx-cos-prf {
-          mandatory true;
-          description
-            "AID in format RXCOSPRF-shelf-profileNo";
-          type ciena-6500-types:aid;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          mandatory true;
-          description
-            "Name of the profile being created";
-          config true;
-        }
-        leaf rx0 {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 0000 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx1 {
-          default "1";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 0001 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx2 {
-          default "2";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 0010 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx3 {
-          default "3";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 0011 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx4 {
-          default "4";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 0100 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx5 {
-          default "5";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 0101 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx6 {
-          default "6";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 0110 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx7 {
-          default "7";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 0111 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx8 {
-          default "8";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 1000 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx9 {
-          default "9";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 1001 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx10 {
-          default "10";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 1010 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx11 {
-          default "11";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 1011 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx12 {
-          default "12";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 1100 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx13 {
-          default "13";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 1101 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx14 {
-          default "14";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 1110 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf rx15 {
-          default "15";
-          type ciena-6500-types:INT;
-          description
-            "Map a packet's PBITS+CFI/DE with value 1111 to an IPHB value. Possible values vary from 0 (standard green) up to 15 (critical yellow) and 255 (discard).";
-          config true;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..6500";
-          }
-          description
-            "Number of references to this profile";
-          config false;
-        }
-        leaf rx-cos-profile {
-          type ciena-6500-types:IDENT;
-          description
-            "Profile to use as model for profile being created.";
-          config true;
-        }
-      }
-      list default {
-        key "rx-cos-prf";
-        config true;
-        leaf rx-cos-prf {
-          mandatory true;
-          description
-            "AID in format RXCOSPRF-shelf-profileNo, SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2RPR";
-            enum "20GL2SS";
-            enum "L2MOTR";
-            enum "FLEXMOTR";
-          }
-          default "L2SS";
-          description
-            "Layer 2 equipment type";
-          config true;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the default profile";
-          config false;
-        }
-      }
-    }
-    container segment {
-      list count {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf, SLOT-shelf-slot";
-          type ciena-6500-types:aid;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..49152";
-          }
-          description
-            "Number of segments provisioned";
-          config false;
-        }
-        leaf max-count {
-          type ciena-6500-types:INT {
-            range "0..49152";
-          }
-          description
-            "The maximum number of segments supported by the system";
-          config false;
-        }
-      }
-    }
-    container tunnel-endpoint {
-      list count {
-        key "tne";
-        config false;
-        leaf tne {
-          mandatory true;
-          description
-            "AID in format TNE-shelf-slot-port-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf tne-count {
-          type ciena-6500-types:INT {
-            range "0..98304";
-          }
-          description
-            "# of TNE provisioned on a given shelf";
-          config false;
-        }
-      }
-    }
-    container tunnel-endpoint-map {
-      list config {
-        key "tne-map";
-        config true;
-        leaf tne-map {
-          mandatory true;
-          description
-            "AID in format TNEMAP-shelf-slot-port-tnid-mapid, TNEMAP-slot-port-tnid-mapid";
-          type ciena-6500-types:aid;
-        }
-        leaf access {
-          type enumeration {
-            enum "FILTER";
-            enum "ALLOW";
-          }
-          mandatory true;
-          description
-            "Indicates if the map filters packets or allows/remaps the IFLABEL based on the VCDPID.";
-          config true;
-        }
-        leaf vc-pid {
-          type ciena-6500-types:INT {
-            range "0..16777215";
-          }
-          mandatory true;
-          description
-            "The virtual circuit to be filtered or allowed/mapped.";
-          config true;
-        }
-        leaf tndpid {
-          type ciena-6500-types:INT {
-            range "0..4096";
-          }
-          description
-            "Outer provider label.";
-          config true;
-        }
-        leaf encaptype {
-          type enumeration {
-            enum "OEL2";
-          }
-          description
-            "Indicates the encapsulation technology that the virtual circuit is using.";
-          config true;
-        }
-        leaf rprdistalg {
-          type enumeration {
-            enum "DISABLE";
-            enum "PREFMBR";
-          }
-          default "DISABLE";
-          description
-            "Indicates which, if any, traffic distribution algorithm will be used for RPR ports.";
-          config true;
-        }
-        leaf rprprefmbr {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "The index of the Preferred Member to be used for RPR traffic distribution.";
-          config true;
-        }
-      }
-      list count {
-        key "tne-map";
-        config false;
-        leaf tne-map {
-          mandatory true;
-          description
-            "AID in format TNEMAP-shelf-slot-port-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf tne-map-count {
-          type ciena-6500-types:INT {
-            range "0..98304";
-          }
-          description
-            "number of TNEMAPs";
-          config false;
-        }
-      }
-    }
-    container tunnel-segment {
-      list count {
-        key "tns";
-        config false;
-        leaf tns {
-          mandatory true;
-          description
-            "AID in format TNS-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf tns-count {
-          type ciena-6500-types:INT {
-            range "0..49152";
-          }
-          description
-            "# of TNS provisioned on a given shelf";
-          config false;
-        }
-      }
-    }
-    container tx-cos-profile {
-      list config {
-        key "tx-cos-prf";
-        config true;
-        leaf tx-cos-prf {
-          mandatory true;
-          description
-            "AID in format TXCOSPRF-shelf-profileNo";
-          type ciena-6500-types:aid;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          mandatory true;
-          description
-            "Name of the profile being created";
-          config true;
-        }
-        leaf tx0 {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value standard green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx1 {
-          default "1";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value standard yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx2 {
-          default "2";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value bronze green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx3 {
-          default "3";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value bronze yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx4 {
-          default "4";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value silver green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx5 {
-          default "5";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value silver yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx6 {
-          default "6";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value gold green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx7 {
-          default "7";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value gold yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx8 {
-          default "8";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value platinum green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx9 {
-          default "9";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value platinum yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx10 {
-          default "10";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value premium green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx11 {
-          default "11";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value premium yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx12 {
-          default "12";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value network green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx13 {
-          default "13";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value network yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx14 {
-          default "14";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value critical green to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf tx15 {
-          default "15";
-          type ciena-6500-types:INT;
-          description
-            "Map IPHB value critical yellow to PBIT + CFI/DE. Possible values vary from 0 (0000) up to 15 (1111) and 255 (discard).";
-          config true;
-        }
-        leaf inuse-count {
-          type ciena-6500-types:INT {
-            range "0..6500";
-          }
-          description
-            "Number of references to this profile";
-          config false;
-        }
-      }
-      list default {
-        key "tx-cos-prf";
-        config true;
-        leaf tx-cos-prf {
-          mandatory true;
-          description
-            "AID in format TXCOSPRF-shelf-profileNo, SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf type {
-          type enumeration {
-            enum "L2SS";
-            enum "L2RPR";
-            enum "20GL2SS";
-            enum "L2MOTR";
-            enum "FLEXMOTR";
-          }
-          description
-            "Layer 2 equipment type";
-          config true;
-        }
-        leaf name {
-          type string {
-            length "1..20";
-          }
-          description
-            "Name of the default profile";
-          config false;
-        }
-      }
-    }
-    container virtual-circuit-endpoint {
-      list count {
-        key "vce";
-        config false;
-        leaf vce {
-          mandatory true;
-          description
-            "AID in format VCE-shelf-slot-port-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf vce-count {
-          type ciena-6500-types:INT {
-            range "0..49152";
-          }
-          description
-            "# of VCE provisioned";
-          config false;
-        }
-      }
-    }
-    container virtual-circuit-endpoint-map {
-      list config {
-        key "vce-map";
-        config true;
-        leaf vce-map {
-          mandatory true;
-          description
-            "AID in format VCEMAP-shelf-slot-port-vcid-mapNo";
-          type ciena-6500-types:aid;
-        }
-        leaf dir {
-          type enumeration {
-            enum "TX" {
-              description
-                "On the egress, modify the outgoing packet";
-            }
-            enum "RX" {
-              description
-                "On the ingress, classify the received packet";
-            }
-            enum "TXADDRXDEL" {
-              description
-                "On the ingress, classify the received packet and on the egress, modify the outgoing packet";
-            }
-          }
-          mandatory true;
-          description
-            "Direction to which this MAP applies";
-          config true;
-        }
-        leaf access {
-          type enumeration {
-            enum "ALLOW" {
-              description
-                "Allow the specified packet";
-            }
-            enum "FILTER" {
-              description
-                "Filter the specified packet. It cannot be used in a TX or a TXADDRXDEL VCEMAP";
-            }
-          }
-          mandatory true;
-          description
-            "Indicates whether to allow or filter the specified packet";
-          config true;
-        }
-        leaf tags-to-match {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1 | 2";
-          }
-          description
-            "Number of tags to be classified or modified";
-          config true;
-        }
-        leaf loc-label-1 {
-          type ciena-6500-types:INT {
-            range "0..4098";
-          }
-          description
-            "First level or outer local customer VID";
-          config true;
-        }
-        leaf loc-tag-action-1 {
-          type enumeration {
-            enum "ADD" {
-              description
-                "Add LOCLBL1 to tag1(This value can be used in create operation)";
-            }
-            enum "MODPRIO" {
-              description
-                "Modify priority only(This value can be used in create operation)";
-            }
-            enum "NONE" {
-              description
-                "Do nothing(This value can be used in create operation)";
-            }
-            enum "MODPRI" {
-              description
-                "Modify priority only";
-            }
-          }
-          default "NONE";
-          description
-            "Action to the local tag1. It is for TX only";
-          config true;
-        }
-        leaf loc-priority-source-1 {
-          type enumeration {
-            enum "EXPLCT" {
-              description
-                "Use explicit priority value specified in LOCEXPRIO1";
-            }
-            enum "REMTAG1" {
-              description
-                "Use remote tag1 priority";
-            }
-            enum "REMTAG2" {
-              description
-                "Use remote tag2 priority";
-            }
-            enum "COSPRF" {
-              description
-                "Use CoS profile";
-            }
-          }
-          default "REMTAG1";
-          description
-            "Indicates where to take the priority bit for local tag1. It is for TX only";
-          config true;
-        }
-        leaf loc-ex-priority-1 {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "Static provisioned priority value for local tag1 when LOCPRIOSRC1=EXPLCT. It is a 4-bit value, with the first 3 bits as priority and the last bit as CFI. For example, a value of 5, or 0101 impilies priority is 2, and the CFI is 1";
-          config true;
-        }
-        leaf loc-label-2 {
-          type enumeration {
-            enum "(0-4095, 4098)";
-          }
-          description
-            "Second level local customer VID It is for TX and RX";
-          config true;
-        }
-        leaf loc-tag-action-2 {
-          type enumeration {
-            enum "ADD" {
-              description
-                "Add LOCLBL2 to tag2(This value can be used in create operation)";
-            }
-            enum "MODPRIO" {
-              description
-                "Modify priority only(This value can be used in create operation)";
-            }
-            enum "NONE" {
-              description
-                "Do nothing(This value can be used in create operation)";
-            }
-            enum "MODPRI" {
-              description
-                "Modify priority only";
-            }
-          }
-          default "NONE";
-          description
-            "Action to the local tag2. It is for TX only";
-          config true;
-        }
-        leaf loc-priority-source-2 {
-          type enumeration {
-            enum "EXPLCT" {
-              description
-                "Use explicit priority value specified in LOCEXPRIO2";
-            }
-            enum "REMTAG1" {
-              description
-                "Use remote tag1 priority";
-            }
-            enum "REMTAG2" {
-              description
-                "Use remote tag2 priority";
-            }
-            enum "COSPRF" {
-              description
-                "Use CoS profile";
-            }
-          }
-          default "REMTAG1";
-          description
-            "Indicates where to take the priority bit for local tag2. It is for TX only";
-          config true;
-        }
-        leaf loc-ex-priority-2 {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "Static provisioned priority value for local tag2 when LOCPRIOSRC2=EXPLCT. It is a 4-bit value, with the first 3 bits as priority and the last bit as CFI. For example, a value of 5, or 0101 impilies priority is 2, and the CFI is 1.";
-          config true;
-        }
-        leaf rem-tags-to-delete {
-          default "1";
-          type ciena-6500-types:INT {
-            range "0..2";
-          }
-          description
-            "Number of tags to be deleted. It is for TX only";
-          config true;
-        }
-        leaf rx-prio-src {
-          type enumeration {
-            enum "LOCTAG1" {
-              description
-                "Take pbit from local tag1 for classification";
-            }
-            enum "LOCTAG2" {
-              description
-                "Take pbit from local tag2 for classification";
-            }
-            enum "NONE" {
-              description
-                "Only applicable for untagged packet";
-            }
-          }
-          default "LOCTAG1";
-          description
-            "Indicates where to look for the pbit for classification, whether tag1 or tag2. It is for RX only";
-          config true;
-        }
-        leaf rx-prio-mask {
-          type string {
-            length "8";
-          }
-          description
-            "Priority mask for classification. It indicates which pbit patterns are included for the classification. The least significant bit corresponds to pattern=000, and the most significant bit to pattern=111. The value 0 for RXPRIOMASK should be used for untagged VCEMAPs. RXPRIOMASK is for RX only attribute.";
-          config true;
-        }
-        leaf loc-tag-eth-1 {
-          type enumeration {
-            enum "0";
-            enum "8100";
-            enum "9100";
-            enum "88A8";
-          }
-          description
-            "Ethernet type of the local first level or outer tag (tag1). It is for TX, and TXADDRXDEL maps.";
-          config true;
-        }
-        leaf loc-tag-eth-2 {
-          type enumeration {
-            enum "0";
-            enum "8100";
-            enum "9100";
-            enum "88A8";
-          }
-          description
-            "Ethernet type of the local second level or inner tag (tag2). It is for TX only.";
-          config true;
-        }
-        leaf rem-label-1 {
-          type ciena-6500-types:INT {
-            range "0..4098";
-          }
-          description
-            "First level or outer remote customer tag, It is for TX only";
-          config false;
-        }
-        leaf rem-label-2 {
-          type ciena-6500-types:INT {
-            range "0..4098";
-          }
-          description
-            "Second level remote customer tag It is for TX only";
-          config false;
-        }
-        leaf remlbl1 {
-          type enumeration {
-            enum "(0-4095, 4098)";
-          }
-          description
-            "First level or outer remote customer tag, It is for TX only";
-          config true;
-        }
-        leaf remlbl2 {
-          type enumeration {
-            enum "(0-4095, 4098)";
-          }
-          description
-            "Second level remote customer tag It is for TX only";
-          config true;
-        }
-      }
-      list count {
-        key "vce-map";
-        config false;
-        leaf vce-map {
-          mandatory true;
-          description
-            "AID in format VCEMAP-shelf-slot-port-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf vce-map-count {
-          type ciena-6500-types:INT {
-            range "0..98304";
-          }
-          description
-            "number of VCEMAPs";
-          config false;
-        }
-      }
-    }
-    container virtual-circuit-segment {
-      list count {
-        key "vcs";
-        config false;
-        leaf vcs {
-          mandatory true;
-          description
-            "AID in format VCS-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf vcs-count {
-          type ciena-6500-types:INT {
-            range "0..49152";
-          }
-          description
-            "# of VCS provisioned on a given shelf";
-          config false;
-        }
-      }
-    }
-    list cf-profile {
-      key "cf-prf";
-      config false;
-      leaf cf-prf {
-        mandatory true;
-        description
-          "AID in format CFPRF-shelf-profileNo";
-        type ciena-6500-types:aid;
-      }
-      leaf name {
-        type string {
-          length "1..20";
-        }
-        description
-          "20-char profile name";
-        config false;
-      }
-      leaf garp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "GARP protocol";
-        config false;
-      }
-      leaf gmrp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "GMRP protocol";
-        config false;
-      }
-      leaf all-bridge {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "ALLBRIDGE";
-        config false;
-      }
-      leaf rsrvd {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "RSRVD";
-        config false;
-      }
-      leaf stp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "STP protocol";
-        config false;
-      }
-      leaf rstp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "RSTP protocol";
-        config false;
-      }
-      leaf mstp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "MSTP protocol";
-        config false;
-      }
-      leaf cisco-stp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "Cisco STP";
-        config false;
-      }
-      leaf lacp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "LACP protocol";
-        config false;
-      }
-      leaf eth-first-mile-oam {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "Ethernet first mile OAM";
-        config false;
-      }
-      leaf lldp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "LLDP protocol";
-        config false;
-      }
-      leaf slow-protocol {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "Slow protocol";
-        config false;
-      }
-      leaf authnctn {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "Authentication";
-        config false;
-      }
-      leaf sonmp {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "SONMP protocol";
-        config false;
-      }
-      leaf laist {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "LAIST protocol";
-        config false;
-      }
-      leaf la-marker {
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "La Marker";
-        config false;
-      }
-      leaf inuse-count {
-        type ciena-6500-types:INT {
-          range "0..720";
-        }
-        description
-          " Number of ports using this profile";
-        config false;
-      }
-    }
-    list raps-ringnode {
-      key "rnode";
-      config false;
-      leaf rnode {
-        mandatory true;
-        description
-          "AID in format RNODE-shelf-slot";
-        type ciena-6500-types:aid;
-      }
-      leaf id {
-        type string {
-          length "0..12";
-        }
-        description
-          "The ID is a MAC address that uniquely identifies the node";
-        config false;
-      }
-    }
-    list vcs {
-      key "vcs";
-      config true;
-      leaf vcs {
-        mandatory true;
-        description
-          "AID in format VCS-shelf-vcid";
-        type ciena-6500-types:aid;
-      }
-      leaf protocol {
-        type enumeration {
-          enum "ETH";
-        }
-        default "ETH";
-        description
-          "Type of traffic carried in VC. (DEPRECATED)";
-        config true;
-      }
-      leaf encap {
-        type enumeration {
-          enum "SVLAN";
-        }
-        default "SVLAN";
-        description
-          "Type of encapsulation. (DEPRECATED)";
-        config true;
-      }
-      leaf datatype {
-        type enumeration {
-          enum "CUSTDATA";
-          enum "CUSTMGMT";
-          enum "MGMT";
-        }
-        default "CUSTDATA";
-        description
-          "Type of data carried";
-        config true;
-      }
-      leaf topo {
-        type enumeration {
-          enum "P2P";
-          enum "M2M";
-        }
-        default "P2P";
-        description
-          "Network Topology";
-        config true;
-      }
-      leaf-list cos-supported {
-        type ciena-6500-enums:CLASS_OF_SERVICE_DOMAIN;
-        description
-          "Class of service supported in Virtual Circuit";
-        config true;
-      }
-      leaf max-transmit-unit {
-        type enumeration {
-          enum "1600";
-          enum "9100";
-        }
-        default "1600";
-        description
-          "Maximum Ethernet frame size supported.";
-        config true;
-      }
-      leaf q-grp {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1 | 2";
-        }
-        description
-          "The queue group to be used by this VCS (1 or 2). The actual queue group profile is indicated by the attribute QGRP1 and QGRP2 of the facility.";
-        config true;
-      }
-      leaf rgrp {
-        type ciena-6500-types:STRING;
-        description
-          "ESPRING ring group (RGRP) associated to the VCS";
-        config true;
-      }
-      leaf fwd-db-id {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        mandatory true;
-        description
-          "The Forwarding Database ID associated to the VCS";
-        config true;
-      }
-      leaf ckt-id {
-        type ciena-6500-types:STRING;
-        description
-          "Connection Identifier - 48 characters max.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS";
-          enum "OOS-MA";
-        }
-        default "IS";
-        description
-          "Primary State of the VCS";
-        config true;
-      }
-    }
-    list vce {
-      key "vce";
-      config true;
-      leaf vce {
-        mandatory true;
-        description
-          "AID in format VCE-shelf-slot-port-vcid";
-        type ciena-6500-types:aid;
-      }
-      leaf cos-p-0 {
-        type ciena-6500-enums:CLASS_OF_SERVICE;
-        description
-          "Provider CoS for this customer p-bit. (DEPRECATED)";
-        config true;
-      }
-      leaf cos-p-1 {
-        type ciena-6500-enums:CLASS_OF_SERVICE;
-        description
-          "Provider CoS for this customer p-bit. (DEPRECATED)";
-        config true;
-      }
-      leaf cos-p-2 {
-        type ciena-6500-enums:CLASS_OF_SERVICE;
-        description
-          "Provider CoS for this customer p-bit. (DEPRECATED)";
-        config true;
-      }
-      leaf cos-p-3 {
-        type ciena-6500-enums:CLASS_OF_SERVICE;
-        description
-          "Provider CoS for this customer p-bit. (DEPRECATED)";
-        config true;
-      }
-      leaf cos-p-4 {
-        type ciena-6500-enums:CLASS_OF_SERVICE;
-        description
-          "Provider CoS for this customer p-bit. (DEPRECATED)";
-        config true;
-      }
-      leaf cos-p-5 {
-        type ciena-6500-enums:CLASS_OF_SERVICE;
-        description
-          "Provider CoS for this customer p-bit. (DEPRECATED)";
-        config true;
-      }
-      leaf cos-p-6 {
-        type ciena-6500-enums:CLASS_OF_SERVICE;
-        description
-          "Provider CoS for this customer p-bit. (DEPRECATED)";
-        config true;
-      }
-      leaf cos-p-7 {
-        type ciena-6500-enums:CLASS_OF_SERVICE;
-        description
-          "Provider CoS for this customer p-bit. (DEPRECATED)";
-        config true;
-      }
-      leaf if-label {
-        type ciena-6500-types:INT {
-          range "0..4096";
-        }
-        description
-          "Interfacing Label at NNI port. If Stack VLAN is used, the VLAN # is entered here. (DEPRECATED)";
-        config true;
-      }
-      leaf if-encap {
-        type enumeration {
-          enum "SVLAN";
-        }
-        default "SVLAN";
-        description
-          "Interfacing Encap at NNI port. (DEPRECATED)";
-        config true;
-      }
-      leaf dir {
-        type enumeration {
-          enum "TXRX";
-        }
-        default "TXRX";
-        description
-          "Direction. (DEPRECATED)";
-        config true;
-      }
-      leaf critical-bw {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Critical.";
-        config true;
-      }
-      leaf nw-bw {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Network. (DEPRECATED)";
-        config true;
-      }
-      leaf nt-bw {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Network";
-        config true;
-      }
-      leaf platinum-bw-profile {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Platinum";
-        config true;
-      }
-      leaf prbw {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Premium";
-        config true;
-      }
-      leaf gold-bw {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Gold";
-        config true;
-      }
-      leaf silver-bw {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Silver";
-        config true;
-      }
-      leaf br-bw {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Bronze";
-        config true;
-      }
-      leaf standard-bw {
-        type ciena-6500-types:IDENT;
-        description
-          "The AID of the Bandwidth profile being used for Standard";
-        config true;
-      }
-      leaf detailed-om-stats {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "Indicates if OMs are enabled for the Endpoints associated with the Segment.";
-        config true;
-      }
-      leaf dist-algorithm {
-        type enumeration {
-          enum "DISABLE";
-          enum "PREFMBR";
-        }
-        default "DISABLE";
-        description
-          "Indicates which, if any, traffic distribution algorithm will be used.";
-        config true;
-      }
-      leaf dist-pre-fmbr {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "The index of the Preferred Member to be used for steering.";
-        config true;
-      }
-      leaf protection {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Indicates whether to use RPR protection path in the event of failure";
-        config true;
-      }
-      leaf tx-cos-prf {
-        type ciena-6500-types:IDENT;
-        description
-          "The TXCOSPRF to use for this VCE. (TXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf rx-cos-profile {
-        type ciena-6500-types:IDENT;
-        description
-          "The RXCOSPRF to use for this VCE. (RXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS";
-          enum "OOS-MA";
-        }
-        default "IS";
-        description
-          "Primary State of the VCE";
-        config true;
-      }
-    }
-    list tns {
-      key "tns";
-      config true;
-      leaf tns {
-        mandatory true;
-        description
-          "AID in format TNS-shelf-tnid";
-        type ciena-6500-types:aid;
-      }
-      leaf topo {
-        type enumeration {
-          enum "P2P";
-          enum "M2M";
-        }
-        default "M2M";
-        description
-          "Network Topology";
-        config true;
-      }
-      leaf cossup {
-        type enumeration {
-          enum "INHERIT";
-        }
-        default "INHERIT";
-        description
-          "Class of Service Supported";
-        config true;
-      }
-      leaf fwd-db-id {
-        type ciena-6500-types:INT {
-          range "0..16383";
-        }
-        description
-          "The Forwarding Database ID associated to the TNS";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS";
-          enum "OOS-MA";
-        }
-        default "IS";
-        description
-          "Primary State of the TNS";
-        config true;
-      }
-    }
-    list tne {
-      key "tne";
-      config true;
-      leaf tne {
-        mandatory true;
-        description
-          "AID in format TNE-shelf-slot-port-tnid";
-        type ciena-6500-types:aid;
-      }
-      leaf if-label {
-        type ciena-6500-types:INT {
-          range "0..4096";
-        }
-        mandatory true;
-        description
-          "Interfacing Label at NNI port";
-        config true;
-      }
-      leaf dir {
-        type enumeration {
-          enum "TXRX";
-        }
-        default "TXRX";
-        description
-          "Direction.";
-        config true;
-      }
-      leaf detailed-om-stats {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "Indicates if OMs are enabled for the Tunnel Endpoints associated with the Tunnel Segment.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS";
-          enum "OOS-MA";
-        }
-        default "IS";
-        description
-          "Primary State of the TNE";
-        config true;
-      }
-    }
-    list drop-profile {
-      key "drop-prf";
-      config true;
-      leaf drop-prf {
-        mandatory true;
-        description
-          "AID in format DROPPRF-shelf-profileNo";
-        type ciena-6500-types:aid;
-      }
-      leaf q-length {
-        type enumeration {
-          enum "1..1000";
-        }
-        mandatory true;
-        description
-          "The queue length for the drop profile.";
-        config true;
-      }
-      leaf min-drop-profile-0 {
-        type enumeration {
-          enum "0..100";
-        }
-        mandatory true;
-        description
-          "The Min DP0";
-        config true;
-      }
-      leaf max-drop-profile-0 {
-        type enumeration {
-          enum "1..100";
-        }
-        mandatory true;
-        description
-          "The Max DP0";
-        config true;
-      }
-      leaf min-drop-profile-1 {
-        type enumeration {
-          enum "0..100";
-        }
-        mandatory true;
-        description
-          "The Min DP1";
-        config true;
-      }
-      leaf max-drop-profile-1 {
-        type enumeration {
-          enum "1..100";
-        }
-        mandatory true;
-        description
-          "The Max DP1";
-        config true;
-      }
-      leaf inuse-count {
-        type ciena-6500-types:INT {
-          range "0..552";
-        }
-        description
-          "Total counts for the drop profile being referenced.";
-        config false;
-      }
-    }
-    list vcat {
-      key "wan";
-      config false;
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf rate {
-        type enumeration {
-          enum "STS1";
-          enum "STS3C";
-          enum "STS12C";
-          enum "STS24C";
-          enum "STS48C";
-          enum "STS192C";
-          enum "VT1";
-          enum "VT2";
-          enum "VT6";
-          enum "NONE";
-        }
-        description
-          "Unit rate of the member payload.";
-        config false;
-      }
-      leaf tsqn {
-        type ciena-6500-types:INT {
-          range "0..63";
-        }
-        description
-          "Transmit Sequence Number. Values in range 0...63, and also INVALID (when the TSQN detected in HW is outside that range), UNKNOWN (if the TSQN value cannot be retrieved due to HW problems or facility faults), and NA (when no TSQN is expected, for example in case of an Egress- only WAN path).";
-        config false;
-      }
-      leaf lcas-tx-status {
-        type enumeration {
-          enum "ACTIVE" {
-            description
-              "The value of the Tx LCAS CTRL field is NORM or EOS";
-          }
-          enum "ADDING" {
-            description
-              "The value of the Tx LCAS CTRL field is ADD";
-          }
-          enum "IDLE" {
-            description
-              "The value of the Tx LCAS CTRL field IDLE";
-          }
-          enum "DONOTUSE" {
-            description
-              "The value of the Tx LCAS CTRL field DNU";
-          }
-          enum "NONLCAS" {
-            description
-              "The value of the Tx LCAS CTRL field is FIXED(=0)";
-          }
-          enum "INVALID" {
-            description
-              "The value of the Tx LCAS CTRL field is anything other than NORM, EOS, ADD, IDKE, DNU, or FIXED";
-          }
-          enum "UNKNOWN" {
-            description
-              "The LCAS status values could not be retrieved from the CP due to HW error for LCASRXSTATUS, or no valid LCAS CTRL word is received";
-          }
-        }
-        description
-          "Transmit traffic LCAS status. For non-LCAS group members, status displays NONLCAS.";
-        config false;
-      }
-      leaf rsqn {
-        type ciena-6500-types:INT {
-          range "0..63";
-        }
-        description
-          "Receive Sequence Number. Values in range 0...63, and also INVALID (when the RSQN detected in HW is outside that range), UNKNOWN (if the RSQN value cannot be retrieved due to HW problems or facility faults), and NA (when no RSQN is expected, for example in case of an Ingress-only WAN path).";
-        config false;
-      }
-      leaf lcas-rx-status {
-        type enumeration {
-          enum "ACTIVE" {
-            description
-              "The value of the Rx LCAS CTRL field is NORM or EOS";
-          }
-          enum "ADDING" {
-            description
-              "The value of the Rx LCAS CTRL field is ADD";
-          }
-          enum "IDLE" {
-            description
-              "The value of the Rx LCAS CTRL field IDLE";
-          }
-          enum "DONOTUSE" {
-            description
-              "The value of the Rx LCAS CTRL field DNU";
-          }
-          enum "NONLCAS" {
-            description
-              "The value of the Rx LCAS CTRL field is FIXED(=0)";
-          }
-          enum "INVALID" {
-            description
-              "The value of the Rx LCAS CTRL field is anything other than NORM, EOS, ADD, IDKE, DNU, or FIXED";
-          }
-          enum "UNKNOWN" {
-            description
-              "The LCAS status values could not be retrieved from the CP due to HW error for LCASRXSTATUS, or no valid LCAS CTRL word is received";
-          }
-        }
-        description
-          "Receive traffic LCAS status. For non-LCAS group members, status displays NONLCAS.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-licensing.yang b/models/ciena-6500-licensing.yang
deleted file mode 100644
index 5ebeb16da50bee8230e9c965380c15f6329ce283..0000000000000000000000000000000000000000
--- a/models/ciena-6500-licensing.yang
+++ /dev/null
@@ -1,466 +0,0 @@
-module ciena-6500-licensing {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-licensing";
-  prefix licensing;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's licensing object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container licensing
-           list feature
-           - Added leaf: capacity-remainder
-           list server
-             leaf Primary-status
-               type enumeration
-               - Removed enum: TIME_IS_OUT_OF_SYNC
-               - Added enum: TIME_OUT_OF_SYNC
-               - Added enum: NORMAL_SRV_BELOW_RECOM_VER
-             leaf Secondary-status
-               type enumeration
-               - Added enum: NORMAL_SRV_BELOW_RECOM_VER
-         rpc licensing-show-feature
-           output
-             list output
-             - Added leaf: capacity-remainder";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: licensing-show-feature
-       - Added rpc: licensing-audit-server
-       - Added container: licensing";
-  }
-
-  rpc licensing-show-feature {
-    description
-      "Retrieve license data on the node";
-    input {
-      leaf license {
-        mandatory true;
-        description
-          "AID in format LICENSE-shelf-id, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf feature-filter {
-        type ciena-6500-types:STRING;
-        description
-          "Query information for a specific feature. Aid should be ALL, no aid or SHELF-shelf-ALL while this filter is being set.This filter allows for returning information about a feature that is not currently licensed on the shelf when the feature name is known (for policy information).";
-      }
-    }
-    output {
-      list output {
-        leaf license {
-          type ciena-6500-types:IDENT;
-          description
-            "License AID";
-        }
-        leaf feature {
-          type ciena-6500-types:STRING;
-          description
-            "Feature name";
-        }
-        leaf licensed {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Total number of licenses consumed on this shelf";
-        }
-        leaf arrears {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Total number of licenses in arrears on this shelf";
-        }
-        leaf description {
-          type ciena-6500-types:STRING;
-          description
-            "Feature description";
-        }
-        leaf policy {
-          type enumeration {
-            enum "DEFAULT" {
-              description
-                "Default Policy";
-            }
-            enum "PREAUTH" {
-              description
-                "Preauth policy";
-            }
-            enum "STRICT" {
-              description
-                "Strict policy";
-            }
-            enum "COMMISSIONING" {
-              description
-                "Commissioning Policy";
-            }
-            enum "PREAUTH_NOALARM" {
-              description
-                "Preauth No Alarm Policy";
-            }
-            enum "COMMISSIONING_NOALARM" {
-              description
-                "Commissioning No Alarm Policy";
-            }
-            enum "-" {
-              description
-                "-";
-            }
-            enum "SHELF_PREAUTH" {
-              description
-                "Shelf Preauth Policy";
-            }
-            enum "SHELF_STRICT" {
-              description
-                "Shelf Strict Policy";
-            }
-          }
-          description
-            "Policy setting for the listed feature (can be Strict or Preauth)";
-        }
-        leaf order-code {
-          type ciena-6500-types:STRING;
-          description
-            "Order code(s) that were used to order the listed feature";
-        }
-        leaf capacity-remainder {
-          type ciena-6500-types:STRING;
-          description
-            "The remaining capacity that can be used before another license is required";
-        }
-      }
-    }
-  }
-  rpc licensing-audit-server {
-    description
-      "Operates audit for licensing";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container licensing {
-    list feature {
-      key "license";
-      config false;
-      leaf license {
-        mandatory true;
-        description
-          "AID in format LICENSE-shelf-id, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf feature {
-        type ciena-6500-types:STRING;
-        description
-          "Feature name";
-        config false;
-      }
-      leaf licensed {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "Total number of licenses consumed on this shelf";
-        config false;
-      }
-      leaf arrears {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "Total number of licenses in arrears on this shelf";
-        config false;
-      }
-      leaf description {
-        type ciena-6500-types:STRING;
-        description
-          "Feature description";
-        config false;
-      }
-      leaf policy {
-        type enumeration {
-          enum "DEFAULT" {
-            description
-              "Default Policy";
-          }
-          enum "PREAUTH" {
-            description
-              "Preauth policy";
-          }
-          enum "STRICT" {
-            description
-              "Strict policy";
-          }
-          enum "COMMISSIONING" {
-            description
-              "Commissioning Policy";
-          }
-          enum "PREAUTH_NOALARM" {
-            description
-              "Preauth No Alarm Policy";
-          }
-          enum "COMMISSIONING_NOALARM" {
-            description
-              "Commissioning No Alarm Policy";
-          }
-          enum "-" {
-            description
-              "-";
-          }
-          enum "SHELF_PREAUTH" {
-            description
-              "Shelf Preauth Policy";
-          }
-          enum "SHELF_STRICT" {
-            description
-              "Shelf Strict Policy";
-          }
-        }
-        description
-          "Policy setting for the listed feature (can be Strict or Preauth)";
-        config false;
-      }
-      leaf order-code {
-        type ciena-6500-types:STRING;
-        description
-          "Order code(s) that were used to order the listed feature";
-        config false;
-      }
-      leaf capacity-remainder {
-        type ciena-6500-types:STRING;
-        description
-          "The remaining capacity that can be used before another license is required";
-        config false;
-      }
-    }
-    list server {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf primary-ip {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Primary license server IP address";
-        config true;
-      }
-      leaf server-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        mandatory true;
-        description
-          "Port number";
-        config true;
-      }
-      leaf secondary-ip {
-        type ciena-6500-types:STRING;
-        description
-          "Secondary license server IP address";
-        config true;
-      }
-      leaf proxy-ip {
-        type ciena-6500-types:STRING;
-        description
-          "Proxy server IP address";
-        config true;
-      }
-      leaf proxy-port {
-        default "8080";
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Proxy port number";
-        config true;
-      }
-      leaf protocol {
-        type enumeration {
-          enum "HTTP" {
-            description
-              "HTTPS protocol";
-          }
-          enum "HTTPS" {
-            description
-              "HTTP protocol";
-          }
-        }
-        default "HTTP";
-        description
-          "Protocol Type";
-        config true;
-      }
-      leaf proxy {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Proxy server is off.";
-          }
-          enum "ON" {
-            description
-              "Proxy server is on.";
-          }
-        }
-        default "OFF";
-        description
-          "Proxy server ON/OFF. Default=OFF.";
-        config true;
-      }
-      leaf audit-time {
-        type ciena-6500-types:TIME;
-        description
-          "Scheduled audit time. The format will be \"HH-MM\"";
-        config true;
-      }
-      leaf Primary-status {
-        type enumeration {
-          enum "COMMISSIONING" {
-            description
-              "No license server provisioned.";
-          }
-          enum "NORMAL" {
-            description
-              "License server is provisioned.";
-          }
-          enum "CONNECTION_FAILURE" {
-            description
-              "License server is provisioned but can not be contacted.";
-          }
-          enum "TLS_NETWORK_FAILURE" {
-            description
-              "TLS Network failure.";
-          }
-          enum "TLS_X509_PARSING_ERROR" {
-            description
-              "TLS X509 parsing error.";
-          }
-          enum "TLS_NO_CIPHER_MATCH" {
-            description
-              "TLS no cipher match.";
-          }
-          enum "TLS_PROTOCOL_VERSION_ERROR" {
-            description
-              "TLS protocol version error.";
-          }
-          enum "TLS_X509_BAD_CERTIFICATE" {
-            description
-              "TLS X509 bad certificate.";
-          }
-          enum "TLS_X509_CERTIFICATE_EXPIRED" {
-            description
-              "TLS X509 certificate expired.";
-          }
-          enum "TLS_X509_CERTIFICATE_VALID_IN_FUTURE" {
-            description
-              "TLS X509 certificate valid in future.";
-          }
-          enum "DISABLED" {
-            description
-              "License server is disabled.";
-          }
-          enum "TIME_OUT_OF_SYNC" {
-            description
-              "Time is Out Of Sync between Client and License Server.";
-          }
-          enum "NORMAL_SRV_BELOW_RECOM_VER" {
-            description
-              "License server below recommended version.";
-          }
-        }
-        description
-          "Primary license server status.";
-        config false;
-      }
-      leaf Secondary-status {
-        type enumeration {
-          enum "COMMISSIONING" {
-            description
-              "No license server provisioned.";
-          }
-          enum "NORMAL" {
-            description
-              "License server is provisioned.";
-          }
-          enum "CONNECTION_FAILURE" {
-            description
-              "License server is provisioned but can not be contacted.";
-          }
-          enum "TLS_NETWORK_FAILURE" {
-            description
-              "TLS Network failure.";
-          }
-          enum "TLS_X509_PARSING_ERROR" {
-            description
-              "TLS X509 parsing error.";
-          }
-          enum "TLS_NO_CIPHER_MATCH" {
-            description
-              "TLS no cipher match.";
-          }
-          enum "TLS_PROTOCOL_VERSION_ERROR" {
-            description
-              "TLS protocol version error.";
-          }
-          enum "TLS_X509_BAD_CERTIFICATE" {
-            description
-              "TLS X509 bad certificate.";
-          }
-          enum "TLS_X509_CERTIFICATE_EXPIRED" {
-            description
-              "TLS X509 certificate expired.";
-          }
-          enum "TLS_X509_CERTIFICATE_VALID_IN_FUTURE" {
-            description
-              "TLS X509 certificate valid in future.";
-          }
-          enum "DISABLED" {
-            description
-              "License server is disabled.";
-          }
-          enum "TIME_IS_OUT_OF_SYNC" {
-            description
-              "License server is provisioned but time is different.";
-          }
-          enum "NORMAL_SRV_BELOW_RECOM_VER" {
-            description
-              "License server below recommended version.";
-          }
-        }
-        description
-          "Secondary license server status.";
-        config false;
-      }
-      leaf last-exchange {
-        type ciena-6500-types:TIME;
-        description
-          "Last time shelf licenses were refreshed from server. The format is \"yyyy-mm-dd-hh:mm:ss\"";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-line-diag.yang b/models/ciena-6500-line-diag.yang
deleted file mode 100644
index c2650352986716f31e2ef5383ddcfc442b045dd5..0000000000000000000000000000000000000000
--- a/models/ciena-6500-line-diag.yang
+++ /dev/null
@@ -1,1039 +0,0 @@
-module ciena-6500-line-diag {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-line-diag";
-  prefix line-diag;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's line-diag object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container line-diag
-           container otdr
-             list trace
-               leaf byte-stream
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..128 
-         rpc line-diag-show-otdr-trace
-           output
-             list output
-               leaf byte-stream
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..128 ";
-  }
-  revision 2018-02-23 {
-    description
-      "6500 Release 12.25 DF
-         rpc line-diag-show-otdr-trace
-           output
-             list output
-               leaf byte-stream
-               - Changed type from string to ciena-6500-types:STRING
-         container line-diag
-           container otdr
-             list trace
-               leaf byte-stream
-               - Changed type from string to ciena-6500-types:STRING";
-  }
-  revision 2100-01-01 {
-    description
-      "6500 Release 12.21 
-         rpc line-diag-show-otdr-trace
-           output
-             list output
-               leaf byte-stream
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..128 
-         container line-diag
-           container otdr
-             list trace
-               leaf byte-stream
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..128 ";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container line-diag
-           list telemetry
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: line-diag-set-config
-         rpc line-diag-start-otdr-trace
-           input
-           - Removed leaf: telemetry
-           - Added leaf: otdrcfg
-           - Added leaf: gonogoreq
-             leaf trace-type
-             - Added default: LONG 
-             - Changed type from enumeration to ciena-6500-enums:trace_type
-         rpc line-diag-stop-otdr-trace
-           input
-           - Removed leaf: telemetry
-           - Added leaf: otdrcfg
-           - Added leaf: trace-type
-         rpc line-diag-set-baseline-otdr-trace
-           input
-           - Removed leaf: telemetry
-           - Added leaf: otdrcfg
-             leaf trace-type
-             - Added default: LONG 
-             - Changed type from enumeration to ciena-6500-enums:trace_type
-         rpc line-diag-show-otdr-trace
-           input
-           - Removed leaf: telemetry
-           - Added leaf: otdrcfg
-             leaf trace-type
-             - Changed type from enumeration to ciena-6500-enums:trace_type
-             leaf url
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..256 
-           output
-           - Removed leaf: byte-stream
-           - Added list: output
-         rpc line-diag-show-events
-           input
-           - Removed leaf: telemetry
-           - Removed leaf: tracetag
-           - Added leaf: otdrcfg
-           - Added leaf: trace-tag
-             leaf trace-type
-             - Changed type from enumeration to ciena-6500-enums:trace_type
-           output
-           - Removed leaf: aid
-           - Removed leaf: trace-date
-           - Removed leaf: trace-time
-           - Removed leaf: event-type
-           - Removed leaf: distance
-           - Removed leaf: event-value
-           - Removed leaf: trace-type
-           - Removed leaf: tracetag
-           - Added list: output
-         container line-diag
-         - Added list: config
-         - Added list: events
-           container otdr
-           - Added list: trace
-             list traces
-             - Changed key from telemetry to otdrcfg
-             - Removed leaf: telemetry
-             - Added leaf: otdrcfg
-               leaf trace-type
-               - Changed type from enumeration to ciena-6500-enums:trace_type
-           list telemetry
-             leaf telemetry
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTfac to enumeration
-               type enumeration
-               - Added enum: AINS
-               - Added enum: AINS-DEA
-               - Added enum: BRIDGED
-               - Added enum: SWITCHED
-               - Added enum: ROLL
-               - Added enum: ACT
-               - Added enum: IDLE
-               - Added enum: STBYS
-               - Added enum: WRK
-               - Added enum: ERRANL
-               - Added enum: PSI
-               - Added enum: FLT
-               - Added enum: MEA
-               - Added enum: TSTF
-               - Added enum: UEQ
-               - Added enum: SGEO
-               - Added enum: DISCD
-               - Added enum: LPBK
-               - Added enum: TS
-               - Added enum: FAF
-               - Added enum: STBYH
-               - Added enum: WRKRX
-               - Added enum: WRKTX
-               - Added enum: PRTCL
-               - Added enum: UAS
-               - Added enum: NOSITE
-               - Added enum: NOAM
-               - Added enum: MON
-               - Added enum: MSC
-               - Added enum: PROTECTED
-               - Added enum: MT
-               - Added enum: DSBLD
-               - Added enum: INHIP
-               - Added enum: L2DSBLD
-               - Added enum: TSGEN
-               - Added enum: TSMON
-             leaf-list fiber-type
-             - Changed config from true to false
-             leaf measure-time
-             - Changed config from true to false
-             leaf pulse-rate-short
-             - Changed config from true to false
-             leaf distance-short
-             - Changed config from true to false
-             leaf pulse-rate-long
-             - Changed config from true to false
-             leaf distance-long
-             - Changed config from true to false
-             leaf loss-single
-             - Changed config from true to false
-             leaf loss-all
-             - Changed config from true to false
-             leaf reflection-single
-             - Changed config from true to false
-             leaf reflection-all
-             - Changed config from true to false
-             leaf total-fiber-loss
-             - Changed config from true to false";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added container: line-diag
-       - Added rpc: line-diag-disable-telemetry
-       - Added rpc: line-diag-enable-telemetry
-       - Added rpc: line-diag-start-otdr-trace
-       - Added rpc: line-diag-stop-otdr-trace
-       - Added rpc: line-diag-set-baseline-otdr-trace
-       - Added rpc: line-diag-show-otdr-trace
-       - Added rpc: line-diag-show-events";
-  }
-
-  rpc line-diag-disable-telemetry {
-    description
-      "Remove a TELEMETRY facility from service";
-    input {
-      leaf telemetry {
-        mandatory true;
-        description
-          "AID in format TELEMETRY-shelf-slot-port, TELEMETRY-shelf-slot-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Remove facility from Maintenance State";
-      }
-    }
-  }
-  rpc line-diag-enable-telemetry {
-    description
-      "Restore a TELEMETRY facility to service";
-    input {
-      leaf telemetry {
-        mandatory true;
-        description
-          "AID in format TELEMETRY-shelf-slot-port, TELEMETRY-shelf-slot-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc line-diag-set-config {
-    description
-      "Edit OTDRCFG facility";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list fiber-type {
-        type ciena-6500-enums:adj_fiber;
-        description
-          "Fibre type.";
-      }
-      leaf measure-time {
-        type ciena-6500-types:INT;
-        description
-          "Acquisition Time for the OTDR Trace (s)";
-      }
-      leaf pulse-short {
-        type ciena-6500-types:INT;
-        description
-          "Pulse Rate for Short Distance OTDR Trace (ns)";
-      }
-      leaf distance-short {
-        type ciena-6500-types:INT;
-        description
-          "Span Length for Short Distance OTDR Trace (m)";
-      }
-      leaf pulse-long {
-        type ciena-6500-types:INT;
-        description
-          "Pulse Rate for Long Distance OTDR Trace (ns)";
-      }
-      leaf distance-long {
-        type ciena-6500-types:INT;
-        description
-          "Span Length for Long Distance for OTDR Trace (m)";
-      }
-      leaf distance-office {
-        type ciena-6500-types:INT;
-        description
-          "Span Length for Office Distance for OTDR Trace (m)";
-      }
-      leaf pulse-office {
-        type ciena-6500-types:INT;
-        description
-          "Pulse Rate for Office Distance OTDR Trace (ns)";
-      }
-      leaf event-range {
-        type ciena-6500-types:STRING;
-        description
-          "OTDR Event Range (m)";
-      }
-      leaf loss-single {
-        type ciena-6500-types:STRING;
-        description
-          "Loss per event for OTDR Trace (dB)";
-      }
-      leaf loss-all {
-        type ciena-6500-types:STRING;
-        description
-          "Loss for all events for OTDR Trace (dB)";
-      }
-      leaf refl-single {
-        type ciena-6500-types:STRING;
-        description
-          "Reflection for a single event for OTDR Trace (dB)";
-      }
-      leaf refl-all {
-        type ciena-6500-types:STRING;
-        description
-          "Reflection for all events for OTDR Trace (dB)";
-      }
-      leaf sst {
-        type ciena-6500-enums:SSTAINS;
-        description
-          "Identify the secondary state's auto-inservice state";
-      }
-    }
-  }
-  rpc line-diag-start-otdr-trace {
-    description
-      "Operate OTDR Measurement: Instructs a network element to start the OTDR Measurement";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf trace-type {
-        type ciena-6500-enums:trace_type;
-        default "LONG";
-        description
-          "The type of trace to be measured";
-      }
-      leaf gonogoreq {
-        type enumeration {
-          enum "YES";
-        }
-        description
-          "Trigger Go/NoGo decision manually";
-      }
-    }
-  }
-  rpc line-diag-stop-otdr-trace {
-    description
-      "Stop the ongoing OTDR Measurement";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf trace-type {
-        type enumeration {
-          enum "LONG" {
-            description
-              "LONG Trace";
-          }
-          enum "SHORT" {
-            description
-              "SHORT Trace ";
-          }
-        }
-        mandatory true;
-        description
-          "The type of trace to be measured:long or short(Param is applicable only on T-Series shelf.)";
-      }
-    }
-  }
-  rpc line-diag-set-baseline-otdr-trace {
-    description
-      "Instructs a network element to tag the current SOR file specified with the TRACE TYPE as BASELINE";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf trace-type {
-        type ciena-6500-enums:trace_type;
-        default "LONG";
-        description
-          "The type of trace to be measured";
-      }
-    }
-  }
-  rpc line-diag-show-otdr-trace {
-    description
-      "Retrieve the SOR (Standard OTDR Record) file specified by the TRACETYPE and TRACETAG parameters, and transfer it to the external server located at the specified URL or output it as a byte stream in TL1";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf trace-type {
-        type ciena-6500-enums:trace_type;
-        description
-          "The type of trace to be measured";
-      }
-      leaf trace-tag {
-        type enumeration {
-          enum "BSLN" {
-            description
-              "SOR file tagged as baseline";
-          }
-          enum "CURRENT" {
-            description
-              "Current SOR file";
-          }
-        }
-        description
-          "Baseline or the current SOR file";
-      }
-      leaf url {
-        type string {
-          length "0..256";
-        }
-        description
-          "The url's format is: [protocol://][user[:password]@]host[:port]/directory-path. Supported protocols: FTP, SFTP. The URL must be enclosed in quotes ie. URL=\"SFTP://...\". If the host is an IPv6 address, it must be enclosed in square brackets [].";
-      }
-    }
-    output {
-      list output {
-        leaf byte-stream {
-          type string {
-            length "0..128";
-          }
-          description
-            "SOR file as a byte stream in TL1";
-        }
-      }
-    }
-  }
-  rpc line-diag-show-events {
-    description
-      "List all the events corresponding to the given OTDR Trace";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf trace-type {
-        type ciena-6500-enums:trace_type;
-        description
-          "The type of trace to be measured";
-      }
-      leaf trace-tag {
-        type enumeration {
-          enum "BSLN" {
-            description
-              "OTDR trace tagged as baseline";
-          }
-          enum "CURRENT" {
-            description
-              "Current OTDR trace";
-          }
-        }
-        description
-          "Baseline or the current OTDR trace";
-      }
-    }
-    output {
-      list output {
-        leaf otdrcfg {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf trace-date {
-          type ciena-6500-types:STRING;
-          description
-            "The date of the OTDR trace";
-        }
-        leaf trace-time {
-          type ciena-6500-types:STRING;
-          description
-            "The time of the OTDR trace";
-        }
-        leaf event-type {
-          type ciena-6500-types:STRING;
-          description
-            "The type of event";
-        }
-        leaf distance {
-          type ciena-6500-types:INT;
-          description
-            "The distance in meters";
-        }
-        leaf event-value {
-          type ciena-6500-types:STRING;
-          description
-            "The dB value of the event";
-        }
-        leaf trace-type {
-          type ciena-6500-enums:trace_type;
-          description
-            "The type of trace to be measured";
-        }
-        leaf trace-tag {
-          type enumeration {
-            enum "BSLN" {
-              description
-                "OTDR trace tagged as baseline";
-            }
-            enum "CURRENT" {
-              description
-                "Current OTDR trace";
-            }
-          }
-          description
-            "Baseline or the current OTDR trace";
-        }
-      }
-    }
-  }
-  container line-diag {
-    container otdr {
-      list trace {
-        key "otdrcfg";
-        config false;
-        leaf otdrcfg {
-          mandatory true;
-          description
-            "AID in format OTDRCFG-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf byte-stream {
-          type string {
-            length "0..128";
-          }
-          description
-            "SOR file as a byte stream in TL1";
-          config false;
-        }
-      }
-      list traces {
-        key "otdrcfg";
-        config false;
-        leaf otdrcfg {
-          mandatory true;
-          description
-            "AID in format OTDRCFG-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf file-name {
-          type ciena-6500-types:STRING;
-          description
-            "The name of the SOR file";
-          config false;
-        }
-        leaf trace-tag {
-          type enumeration {
-            enum "BSLN" {
-              description
-                "SOR file tagged as baseline";
-            }
-            enum "CURRENT" {
-              description
-                "Current SOR file";
-            }
-          }
-          description
-            "The tag of the SOR (Standard OTDR Record) file: CURRENT or BASELINE";
-          config false;
-        }
-        leaf trace-type {
-          type ciena-6500-enums:trace_type;
-          description
-            "The type of trace to be measured";
-          config false;
-        }
-      }
-    }
-    list telemetry {
-      key "telemetry";
-      config true;
-      leaf telemetry {
-        mandatory true;
-        description
-          "AID in format TELEMETRY-shelf-slot-port, TELEMETRY-shelf-slot-ALL, TELEMETRY-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf los-thresh {
-        type ciena-6500-types:STRING;
-        description
-          "Telemetry Gain Loss Threshold (dBm)";
-        config true;
-      }
-      leaf targ-telem-power {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Power of the Telemetry Gain Signal (dBm)";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in edit operation)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in edit operation)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state's auto-inservice state";
-        config true;
-      }
-      leaf-list fiber-type {
-        type ciena-6500-enums:adj_fiber;
-        description
-          "Fiber type.";
-        config false;
-      }
-      leaf-list disc-fiber-type {
-        type ciena-6500-enums:adj_fiber;
-        description
-          "Discovered Fiber type.";
-        config false;
-      }
-      leaf measure-time {
-        type ciena-6500-types:INT;
-        description
-          "Acquisition Time for the OTDR Trace (s)";
-        config false;
-      }
-      leaf pulse-rate-short {
-        type ciena-6500-types:INT;
-        description
-          "Pulse Duration for Short Distance OTDR Trace (ns)";
-        config false;
-      }
-      leaf distance-short {
-        type ciena-6500-types:INT;
-        description
-          "Span Length for Short Distance OTDR Trace (m)";
-        config false;
-      }
-      leaf pulse-rate-long {
-        type ciena-6500-types:INT;
-        description
-          "Pulse Duration for Long Distance OTDR Trace (us)";
-        config false;
-      }
-      leaf distance-long {
-        type ciena-6500-types:INT;
-        description
-          "Span Length for Long Distance OTDR Trace (m)";
-        config false;
-      }
-      leaf loss-single {
-        type ciena-6500-types:STRING;
-        description
-          "Loss per event for go/no-go decision for OTDR Trace (dB)";
-        config false;
-      }
-      leaf loss-all {
-        type ciena-6500-types:STRING;
-        description
-          "Loss for all events for go/no-go decision for OTDR Trace (dB)";
-        config false;
-      }
-      leaf reflection-single {
-        type ciena-6500-types:STRING;
-        description
-          "Reflection for a single event for go/no-go decision for OTDR Trace (dB)";
-        config false;
-      }
-      leaf reflection-all {
-        type ciena-6500-types:STRING;
-        description
-          "Reflection for all events for go/no-go decision for OTDR Trace (dBm)";
-        config false;
-      }
-      leaf total-fiber-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Total fiber loss for go/no-go decision for OTDR Trace (dBm)";
-        config false;
-      }
-      leaf fiber-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Slope of the OTDR trace in db/km";
-        config false;
-      }
-      leaf total-reflection {
-        type ciena-6500-types:STRING;
-        description
-          "Total Reflection in first 20 km of the fiber connected to the CP (dB)";
-        config false;
-      }
-      leaf total-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Total Loss in first 20 km of the fiber connected to the CP (dB)";
-        config false;
-      }
-      leaf mode {
-        type enumeration {
-          enum "OTDR" {
-            description
-              "Facility is in OTDR mode";
-          }
-          enum "TELEMETRYSIGNALON" {
-            description
-              "Facility is in Telemetry mode with Telemetry Signal turned ON";
-          }
-          enum "TELEMETRYSIGNALOFF" {
-            description
-              "Facility is in Telemetry mode with Telemetry Signal turned OFF";
-          }
-          enum "BUSY" {
-            description
-              "The facility is busy at the moment.";
-          }
-          enum "UNKNOWN" {
-            description
-              "The facility mode is not available at the moment.";
-          }
-        }
-        description
-          "Mode the Facility is operating in";
-        config false;
-      }
-      leaf signal-power {
-        type ciena-6500-types:STRING;
-        description
-          "Measured Telemetry Tx/OTDR Tx Signal Power (dBm)";
-        config false;
-      }
-      leaf rx-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Measured Telemetry Rx/OTDR Rx Signal Power (dBm)";
-        config false;
-      }
-      leaf span-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Span Loss";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "AINS time left \"HH-MM\"";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary state";
-        config false;
-      }
-    }
-    list config {
-      key "otdrcfg";
-      config false;
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port, OTDRCFG-shelf-slot-ALL, OTDRCFG-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list fiber-type {
-        type ciena-6500-enums:adj_fiber;
-        description
-          "Fiber type.";
-        config false;
-      }
-      leaf-list disc-fiber-type {
-        type ciena-6500-enums:adj_fiber;
-        description
-          "Discovered Fiber type.";
-        config false;
-      }
-      leaf-list trace-status {
-        type ciena-6500-enums:OTDRTRACESTATUS;
-        description
-          "OTDR Trace Status";
-        config false;
-      }
-      leaf measure-time {
-        type ciena-6500-types:INT;
-        description
-          "Acquisition Time for the OTDR Trace (s)";
-        config false;
-      }
-      leaf pulse-short {
-        type ciena-6500-types:INT;
-        description
-          "Pulse Duration for Short Distance OTDR Trace (ns)";
-        config false;
-      }
-      leaf distance-short {
-        type ciena-6500-types:INT;
-        description
-          "Span Length for Short Distance OTDR Trace (m)";
-        config false;
-      }
-      leaf pulse-long {
-        type ciena-6500-types:INT;
-        description
-          "Pulse Duration for Long Distance OTDR Trace (us)";
-        config false;
-      }
-      leaf distance-long {
-        type ciena-6500-types:INT;
-        description
-          "Span Length for Long Distance OTDR Trace (m)";
-        config false;
-      }
-      leaf distance-office {
-        type ciena-6500-types:INT;
-        description
-          "Span Length for Office Distance for OTDR Trace (m)";
-        config false;
-      }
-      leaf pulse-office {
-        type ciena-6500-types:INT;
-        description
-          "Pulse Rate for OFFICE Distance OTDR Trace (ns)";
-        config false;
-      }
-      leaf event-range {
-        type ciena-6500-types:STRING;
-        description
-          "OTDR Event Range (m)";
-        config false;
-      }
-      leaf discovered-event-range {
-        type ciena-6500-types:INT;
-        description
-          "Discovered OTDR Event Range (m)";
-        config false;
-      }
-      leaf loss-single {
-        type ciena-6500-types:STRING;
-        description
-          "Loss per event for OTDR Trace (dB)";
-        config false;
-      }
-      leaf loss-all {
-        type ciena-6500-types:STRING;
-        description
-          "Loss for all events for OTDR Trace (dB)";
-        config false;
-      }
-      leaf refl-single {
-        type ciena-6500-types:STRING;
-        description
-          "Reflection for a single event for OTDR Trace (dB)";
-        config false;
-      }
-      leaf refl-all {
-        type ciena-6500-types:STRING;
-        description
-          "Reflection for all events for OTDR Trace (dBm)";
-        config false;
-      }
-      leaf total-fiber-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Total fiber loss for OTDR Trace (dBm)";
-        config false;
-      }
-      leaf fiber-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Slope of the OTDR trace in db/km";
-        config false;
-      }
-      leaf total-reflection {
-        type ciena-6500-types:STRING;
-        description
-          "Total Reflection in first 20 km of the fiber connected to the CP (dB)";
-        config false;
-      }
-      leaf total-loss {
-        type ciena-6500-types:STRING;
-        description
-          "Total Loss in first 20 km of the fiber connected to the CP (dB)";
-        config false;
-      }
-      leaf signal-power {
-        type ciena-6500-types:STRING;
-        description
-          "Measured OTDRCFG Signal Power (dBm)";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:STRING;
-        description
-          "OTDR Wavelength";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary state";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:SSTfac;
-        description
-          "Identify the secondary state";
-        config false;
-      }
-    }
-    list events {
-      key "otdrcfg";
-      config false;
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf trace-date {
-        type ciena-6500-types:STRING;
-        description
-          "The date of the OTDR trace";
-        config false;
-      }
-      leaf trace-time {
-        type ciena-6500-types:STRING;
-        description
-          "The time of the OTDR trace";
-        config false;
-      }
-      leaf event-type {
-        type ciena-6500-types:STRING;
-        description
-          "The type of event";
-        config false;
-      }
-      leaf distance {
-        type ciena-6500-types:INT;
-        description
-          "The distance in meters";
-        config false;
-      }
-      leaf event-value {
-        type ciena-6500-types:STRING;
-        description
-          "The dB value of the event";
-        config false;
-      }
-      leaf trace-type {
-        type ciena-6500-enums:trace_type;
-        description
-          "The type of trace to be measured";
-        config false;
-      }
-      leaf trace-tag {
-        type enumeration {
-          enum "BSLN" {
-            description
-              "OTDR trace tagged as baseline";
-          }
-          enum "CURRENT" {
-            description
-              "Current OTDR trace";
-          }
-        }
-        description
-          "Baseline or the current OTDR trace";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-network.yang b/models/ciena-6500-network.yang
deleted file mode 100644
index 48866168de5ec6750c0ecb850224e9ec01cf25b8..0000000000000000000000000000000000000000
--- a/models/ciena-6500-network.yang
+++ /dev/null
@@ -1,544 +0,0 @@
-module ciena-6500-network {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-network";
-  prefix network;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's network object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container network
-           container adjacency
-             list all
-             - Added leaf: rx-sys-desc
-             - Added leaf: rx-sys-name
-             - Added leaf: rx-chassis-id
-             - Added leaf: rx-mgmtaddr-ipv4
-             - Added leaf: rx-port-id
-             - Added leaf: rx-port-desc";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container network
-           container adjacency
-             list all
-               leaf rx-actual
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..110 ";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: network-operate-round-trip-delay
-       - Added rpc: network-release-round-trip-delay
-       - Added rpc: network-delete-adjacency-manual
-         container network
-         - Added container: adjacency
-           list round-trip-delay
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf tx
-               type ciena-6500-types:INT
-               - Added range: 0..16000 
-             leaf interval
-               type ciena-6500-types:INT
-               - Added range: 1..600 
-             leaf minrtd
-               type ciena-6500-types:INT
-               - Added range: 0..5000000 
-             leaf maxrtd
-               type ciena-6500-types:INT
-               - Added range: 0..5000000 
-             leaf avgrtd
-               type ciena-6500-types:INT
-               - Added range: 0..5000000 
-             leaf lastrtd
-               type ciena-6500-types:INT
-               - Added range: 0..5000000 
-             leaf txcount
-               type ciena-6500-types:INT
-               - Added range: 1..4294967295 
-             leaf rxcount
-               type ciena-6500-types:INT
-               - Added range: 1..4294967295 
-             leaf estimateddistance
-               type ciena-6500-types:INT
-               - Added range: 1..4294967295 
-             leaf unilatency
-               type ciena-6500-types:INT
-               - Added range: 1..2500000 
-             leaf baseline_minrtd
-               type ciena-6500-types:INT
-               - Added range: 0..5000000 
-             leaf baseline_maxrtd
-               type ciena-6500-types:INT
-               - Added range: 0..5000000 
-             leaf baseline_avgrtd
-               type ciena-6500-types:INT
-               - Added range: 0..5000000 
-             leaf baseline_txcount
-               type ciena-6500-types:INT
-               - Added range: 1..16000 
-             leaf baseline_rxcount
-               type ciena-6500-types:INT
-               - Added range: 1..16000 
-             leaf baseline_estimateddistance
-               type ciena-6500-types:INT
-               - Added range: 1..4294967295 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container network
-           list round-trip-delay
-             leaf aid
-             - Removed mandatory
-             - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: network";
-  }
-
-  rpc network-operate-round-trip-delay {
-    description
-      "Initiate a Round Trip Delay (RTD) session from a facility";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port, OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTMFLEX-shelf-slot-port, OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf interval {
-        default "5";
-        type ciena-6500-types:INT {
-          range "1..600";
-        }
-        description
-          "The interval (in seconds) of measurement messages to be sent out";
-      }
-      leaf tx {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..16000";
-        }
-        description
-          "The number of messages to be transmitted";
-      }
-      leaf baseline {
-        type enumeration {
-          enum "NOACTION" {
-            description
-              "Do not change baseline";
-          }
-          enum "CAPTURE" {
-            description
-              "Save RTD results upon completion";
-          }
-        }
-        default "NOACTION";
-        description
-          "Baseline action to be performed";
-      }
-    }
-  }
-  rpc network-release-round-trip-delay {
-    description
-      "Cancel any active RTD session on this facility";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port, OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTMFLEX-shelf-slot-port, OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc network-delete-adjacency-manual {
-    description
-      "Delete a manual autodiscovery entry for an interface.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OTM2-shelf-slot-port, PTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf layer {
-        type ciena-6500-enums:AD_LAYER;
-        mandatory true;
-        description
-          "The autodiscovery layer. Supported values are SECT and LINE for OCn, OTU for OTM2 and PTP for PTP.";
-      }
-    }
-  }
-  container network {
-    container adjacency {
-      list manual {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OTM2-shelf-slot-port, PTP-shelf-slot-port, OC3-shelf-slot-ALL, OC12-shelf-slot-ALL, OC48-shelf-slot-ALL, OC192-shelf-slot-ALL, OTM2-shelf-slot-ALL, PTP-shelf-slot-ALL, PTP-shelf-ALL, SHELF-shelf, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf layer {
-          type ciena-6500-enums:AD_LAYER;
-          mandatory true;
-          description
-            "The autodiscovery layer. Supported values are SECT and LINE for OCn, OTU for OTM2 and PTP for PTP.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf rx-reliability {
-          type ciena-6500-enums:AD_RELIABILITY;
-          mandatory true;
-          description
-            "The state of the RX autodiscovery tag. The reccommended value is RELIABLE.";
-          config true;
-        }
-        leaf tx-tag {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "The manual entry for the TX autodiscovery tag. This must be a network-wide unique string.";
-          config true;
-        }
-        leaf rx-actual {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "The manual entry for the Rx autodiscovery tag (RX_ACTUAL). This must be a network-wide unique string.";
-          config true;
-        }
-      }
-      list all {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf aid-format {
-          type ciena-6500-types:STRING;
-          description
-            "Format of the aid; TYP-SH-SL-PRT.";
-          config false;
-        }
-        leaf layer {
-          type ciena-6500-enums:AD_LAYER;
-          description
-            "Autodiscovery layer.";
-          config false;
-        }
-        leaf tx-version {
-          type ciena-6500-types:STRING;
-          description
-            "Autodiscovery transmit version.";
-          config false;
-        }
-        leaf tx-tag {
-          type ciena-6500-types:STRING;
-          description
-            "Autodiscovery tag to transmit. This network-wide unique string is automatically generated by the NE.";
-          config false;
-        }
-        leaf rx-version {
-          type ciena-6500-types:STRING;
-          description
-            "Autodiscovery receive version.";
-          config false;
-        }
-        leaf rx-actual {
-          type string {
-            length "0..110";
-          }
-          description
-            "Received autodiscovery tag.";
-          config false;
-        }
-        leaf rx-expected {
-          type ciena-6500-types:STRING;
-          description
-            "Expected tag to be received from far-end.";
-          config false;
-        }
-        leaf reconfig {
-          type enumeration {
-            enum "DISABLE";
-            enum "ENABLE";
-          }
-          description
-            "Reconfigure state of the facility.";
-          config false;
-        }
-        leaf rx-reliability {
-          type ciena-6500-enums:AD_RELIABILITY;
-          description
-            "State of the received autodiscovery tag (RX_ACTUAL).";
-          config false;
-        }
-        leaf mechanism {
-          type ciena-6500-enums:AD_MECHANISM;
-          description
-            "Autodiscovery tag transmission mechanism.";
-          config false;
-        }
-        leaf tx-mgmt-addr {
-          type ciena-6500-types:STRING;
-          description
-            "IPV6 Management Address transmitted to far-end.";
-          config false;
-        }
-        leaf rx-mgmtaddr {
-          type ciena-6500-types:STRING;
-          description
-            "IPV6 Management Address received from far-end.";
-          config false;
-        }
-        leaf rx-sys-desc {
-          type string {
-            length "0..255";
-          }
-          description
-            "System Description received from far-end.";
-          config false;
-        }
-        leaf rx-sys-name {
-          type string {
-            length "0..255";
-          }
-          description
-            "System Name received from far-end.";
-          config false;
-        }
-        leaf rx-chassis-id {
-          type string {
-            length "0..150";
-          }
-          description
-            "Chassis Identification received from far-end.";
-          config false;
-        }
-        leaf rx-mgmtaddr-ipv4 {
-          type string {
-            length "0..150";
-          }
-          description
-            "IPV4 Management Address received from far-end.";
-          config false;
-        }
-        leaf rx-port-id {
-          type string {
-            length "0..255";
-          }
-          description
-            "Port Identification received from far-end.";
-          config false;
-        }
-        leaf rx-port-desc {
-          type string {
-            length "0..255";
-          }
-          description
-            "Port Description received from far-end.";
-          config false;
-        }
-      }
-    }
-    list round-trip-delay {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port, OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTMFLEX-shelf-slot-port, OSC-shelf-slot-port, OSC-shelf-slot-ALL, OSC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf status {
-        type enumeration {
-          enum "INPROGRESS";
-          enum "ABORTED";
-          enum "COMPLETED";
-          enum "NOTSTARTED";
-          enum "UNKNOWN";
-          enum "PENDING";
-        }
-        description
-          "Status of the RTD session.";
-        config false;
-      }
-      leaf tx {
-        type ciena-6500-types:INT {
-          range "0..16000";
-        }
-        description
-          "The number of the messages to be sent, the value from the original request of OPR-RTD.";
-        config false;
-      }
-      leaf interval {
-        type ciena-6500-types:INT {
-          range "1..600";
-        }
-        description
-          "The interval (in seconds) of the measurement message being sent, the value from the original request of OPR-RTD.";
-        config false;
-      }
-      leaf minrtd {
-        type ciena-6500-types:INT {
-          range "0..5000000";
-        }
-        description
-          "Minimum Round Trip Delay (in microseconds).";
-        config false;
-      }
-      leaf maxrtd {
-        type ciena-6500-types:INT {
-          range "0..5000000";
-        }
-        description
-          "Maximum Round Trip Delay (in microseconds).";
-        config false;
-      }
-      leaf avgrtd {
-        type ciena-6500-types:INT {
-          range "0..5000000";
-        }
-        description
-          "Average Round Trip Delay (in microseconds).";
-        config false;
-      }
-      leaf lastrtd {
-        type ciena-6500-types:INT {
-          range "0..5000000";
-        }
-        description
-          "Last Round Trip Delay (in microseconds).";
-        config false;
-      }
-      leaf starttx {
-        type ciena-6500-types:STRING;
-        description
-          "The time stamp of the first message sent.";
-        config false;
-      }
-      leaf lastrx {
-        type ciena-6500-types:STRING;
-        description
-          "The time stamp of the last message received.";
-        config false;
-      }
-      leaf txcount {
-        type ciena-6500-types:INT {
-          range "1..4294967295";
-        }
-        description
-          "The number of transmit messages sent so far.";
-        config false;
-      }
-      leaf rxcount {
-        type ciena-6500-types:INT {
-          range "1..4294967295";
-        }
-        description
-          "The number of reply messages received so far.";
-        config false;
-      }
-      leaf estimateddistance {
-        type ciena-6500-types:INT {
-          range "1..4294967295";
-        }
-        description
-          "The estimated distance (in meters).";
-        config false;
-      }
-      leaf unilatency {
-        type ciena-6500-types:INT {
-          range "1..2500000";
-        }
-        description
-          "The unidirectional latency (in microseconds).";
-        config false;
-      }
-      leaf baseline_minrtd {
-        type ciena-6500-types:INT {
-          range "0..5000000";
-        }
-        description
-          "Minimum round trip delay (in microseconds) of the baseline RTD measurement.";
-        config false;
-      }
-      leaf baseline_maxrtd {
-        type ciena-6500-types:INT {
-          range "0..5000000";
-        }
-        description
-          "Maximum Round Trip Delay (in microseconds) of the baseline RTD measurement.";
-        config false;
-      }
-      leaf baseline_avgrtd {
-        type ciena-6500-types:INT {
-          range "0..5000000";
-        }
-        description
-          "Average Round Trip Delay (in microseconds) of the baseline RTD measurement.";
-        config false;
-      }
-      leaf baseline_starttx {
-        type ciena-6500-types:STRING;
-        description
-          "Time stamp of the first message sent in the baseline RTD measurement.";
-        config false;
-      }
-      leaf baseline_lastrx {
-        type ciena-6500-types:STRING;
-        description
-          "Time stamp of the last message received in the baseline RTD measurement.";
-        config false;
-      }
-      leaf baseline_txcount {
-        type ciena-6500-types:INT {
-          range "1..16000";
-        }
-        description
-          "Number of transmit messages sent in the baseline RTD measurement.";
-        config false;
-      }
-      leaf baseline_rxcount {
-        type ciena-6500-types:INT {
-          range "1..16000";
-        }
-        description
-          "Number of reply messages received in the baseline RTD measurement.";
-        config false;
-      }
-      leaf baseline_estimateddistance {
-        type ciena-6500-types:INT {
-          range "1..4294967295";
-        }
-        description
-          "Estimated distance (in meters) of the baseline RTD measurement.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-notifications.yang b/models/ciena-6500-notifications.yang
deleted file mode 100644
index a9b39771fe449e4408836fff49bbf67051915d95..0000000000000000000000000000000000000000
--- a/models/ciena-6500-notifications.yang
+++ /dev/null
@@ -1,507 +0,0 @@
-module ciena-6500-notifications {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-notifications";
-  prefix notifications;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's events object for the 6500 platform";
-
-  revision 2018-03-04 {
-    description
-      "6500 Release 12.30
-        notification notif
-          leaf CommandString
-          - length increased from 1..80 to 1..512";
-  }
-  revision 2015-01-01 {
-    description
-      "Initial revision.";
-  }
-
-  typedef TMPER {
-    type enumeration {
-      enum "15-MIN";
-      enum "1-DAY";
-      enum "1-UNT";
-    }
-  }
-
-  typedef ALMTYPE {
-    type enumeration {
-      enum "AIRCOMPR" {
-        description
-          "Air compressor failure";
-      }
-      enum "AIRCOND" {
-        description
-          "Air conditioning failure";
-      }
-      enum "AIRDRYR" {
-        description
-          "Air dryer failure";
-      }
-      enum "BATDSCHRG" {
-        description
-          "Battery discharging";
-      }
-      enum "BATTERY" {
-        description
-          "Battery failure";
-      }
-      enum "CLFAN" {
-        description
-          "Cooling fan failure";
-      }
-      enum "ENGINE" {
-        description
-          "Engine failure";
-      }
-      enum "ENGOPRG" {
-        description
-          "Engine operating";
-      }
-      enum "EXPLGS" {
-        description
-          "Explosive gas";
-      }
-      enum "FIRDETR" {
-        description
-          "Fire detector failure";
-      }
-      enum "FIRE" {
-        description
-          "Fire";
-      }
-      enum "FLOOD" {
-        description
-          "Flood";
-      }
-      enum "FUSE" {
-        description
-          "Fuse failure";
-      }
-      enum "GEN" {
-        description
-          "Generator failure";
-      }
-      enum "HIAIR" {
-        description
-          "High airflow";
-      }
-      enum "HIHUM" {
-        description
-          "High humidity";
-      }
-      enum "HITEMP" {
-        description
-          "High temperature";
-      }
-      enum "HIWTR" {
-        description
-          "High water";
-      }
-      enum "INTRUDER" {
-        description
-          "Intrusion";
-      }
-      enum "LWBATVG" {
-        description
-          "Low battery voltage";
-      }
-      enum "LWFUEL" {
-        description
-          "Low fuel";
-      }
-      enum "LWHUM" {
-        description
-          "Low humidity";
-      }
-      enum "LWPRES" {
-        description
-          "Low cable pressure";
-      }
-      enum "LWTEMP" {
-        description
-          "Low temperature";
-      }
-      enum "LWWTR" {
-        description
-          "Low water";
-      }
-      enum "MISC" {
-        description
-          "Miscellaneous";
-      }
-      enum "OPENDR" {
-        description
-          "Open door";
-      }
-      enum "PUMP" {
-        description
-          "Pump failure";
-      }
-      enum "POWER" {
-        description
-          "Commercial power failure";
-      }
-      enum "PWR-48" {
-        description
-          "48-V power supply failure";
-      }
-      enum "RECT" {
-        description
-          "Rectifier failure";
-      }
-      enum "RECTHI" {
-        description
-          "Rectifier high voltage";
-      }
-      enum "RECTLO" {
-        description
-          "Rectifier low voltage";
-      }
-      enum "SMOKE" {
-        description
-          "Smoke";
-      }
-      enum "TOXICGAS" {
-        description
-          "Toxic gas";
-      }
-      enum "VENTN" {
-        description
-          "Ventilation system failure";
-      }
-    }
-  }
-
-  typedef NTFCNCDE_CL {
-    type enumeration {
-      enum "CL" {
-        description
-          "Clear";
-      }
-      enum "CR" {
-        description
-          "Critical";
-      }
-      enum "MJ" {
-        description
-          "Major";
-      }
-      enum "MN" {
-        description
-          "Minor";
-      }
-    }
-  }
-
-  notification notif {
-    leaf atag-seq {
-      type string {
-        length "1..21";
-      }
-      description
-        "Autonomous Event Sequence Number";
-    }
-    leaf msg-type {
-      type string {
-        length "1..32";
-      }
-      description
-        "Autonomous Event Message Type";
-    }
-    leaf sub-type {
-      type string {
-        length "1..32";
-      }
-      description
-        "Autonomous Event Message Subtype";
-    }
-    leaf timestamp {
-      type string {
-        length "1..32";
-      }
-    }
-    leaf date {
-      type string {
-        length "1..10";
-      }
-      description
-        "Occurence Date for the particular event";
-    }
-    leaf time {
-      type string {
-        length "1..10";
-      }
-      description
-        "Occurrence Time for the event";
-    }
-    leaf ctag {
-      type string {
-        length "1..6";
-      }
-      description
-        "ctag of command";
-    }
-    leaf priority {
-      type string {
-        length "1..32";
-      }
-      description
-        "Log Priority";
-    }
-    leaf failure-string {
-      type string {
-        length "1..32";
-      }
-      description
-        "Failure info";
-    }
-    leaf status {
-      type string {
-        length "1..32";
-      }
-      description
-        "Status of logged event";
-    }
-    leaf path {
-      type string {
-        length "1..128";
-      }
-      description
-        "Command Path";
-    }
-    leaf action {
-      type string {
-        length "1..32";
-      }
-      description
-        "Command Action";
-    }
-    leaf dbchgseq {
-      type string {
-        length "1..32";
-      }
-      description
-        "Database Change Sequence Number";
-    }
-    leaf userid {
-      type string {
-        length "1..32";
-      }
-      description
-        "The user's identifier";
-    }
-    leaf aid {
-      type string {
-        length "1..80";
-      }
-      description
-        "Access Identifier";
-    }
-    leaf ntfcncde {
-      type NTFCNCDE_CL;
-      description
-        "Notification Code: The severity code for the message";
-    }
-    leaf almtype {
-      type ALMTYPE;
-      description
-        "The alarm type for the environmental alarm";
-    }
-    leaf almmsg {
-      type string {
-        length "1..40";
-      }
-      description
-        "This is the text string (40 chars max) associated with the environmental input, assigned by the user with a SET-ATTR-ENV command";
-    }
-    leaf year {
-      type uint32;
-      description
-        "Year of occurance of event";
-    }
-    leaf dgn-type {
-      type string {
-        length "1..80";
-      }
-      description
-        "An identifier which is used to provide the following definitions for Preside: 10 digit unique Alarm Id, 4 digit M3100 Probable Cause, 4 digit documentation index";
-    }
-    leaf mode {
-      type ciena-6500-enums:MODE;
-      description
-        "Mode of port, if applicable";
-    }
-    leaf condtype {
-      type string {
-        length "1..80";
-      }
-      description
-        "The condition type for an alarm or a reported event";
-    }
-    leaf condeff {
-      type string {
-        length "1..32";
-      }
-      description
-        "The effect caused by the alarm condition";
-    }
-    leaf locn {
-      type ciena-6500-enums:LOCN;
-      description
-        "Location";
-    }
-    leaf dirn {
-      type ciena-6500-enums:AlmDIRN;
-      description
-        "Direction of the event relative to the AID";
-    }
-    leaf monval {
-      type string {
-        length "1..80";
-      }
-      description
-        "The value of the monitored PM parameter";
-    }
-    leaf thlev {
-      type string {
-        length "1..80";
-      }
-      description
-        "Threshold level";
-    }
-    leaf tmper {
-      type TMPER;
-      description
-        "Accumulation time period of data";
-    }
-    leaf conddescr {
-      type string {
-        length "1..80";
-      }
-      description
-        "Condition description giving a textual outline of the event";
-    }
-    leaf fic {
-      type string {
-        length "1..80";
-      }
-      description
-        "Frame Identification Code";
-    }
-    leaf wavelength {
-      type string {
-        length "1..80";
-      }
-      description
-        "Wavelength (nm).This is the wavelength associated with the AID";
-    }
-    leaf bay-num {
-      type uint32;
-      description
-        "Bay Number where the shelf is located";
-    }
-    leaf phys-shelf {
-      type uint32;
-      description
-        "physical shelf number within a bay";
-    }
-    leaf subnet-name {
-      type string {
-        length "1..36";
-      }
-      description
-        "Subnet name";
-    }
-    leaf additional-info {
-      type string {
-        length "1..80";
-      }
-      description
-        "Addiotional-info";
-    }
-    leaf clfi {
-      type string {
-        length "1..64";
-      }
-      description
-        "Common Language Facility Identifier.Customer provisionable label for a facility";
-    }
-    leaf card-type {
-      type string {
-        length "1..80";
-      }
-      description
-        "Card Type";
-    }
-    leaf sig-layer {
-      type string {
-        length "1..80";
-      }
-      description
-        "Signal Layer";
-    }
-    leaf label {
-      type string {
-        length "1..80";
-      }
-      description
-        "Label";
-    }
-    leaf name {
-      type string {
-        length "1..80";
-      }
-      description
-        "Name";
-    }
-    leaf textmsg {
-      type string {
-        length "1..80";
-      }
-      description
-        "Instant Text Message";
-    }
-    leaf ser {
-      type string {
-        length "1..25";
-      }
-      description
-        "Serial Number";
-    }
-    leaf pec {
-      type string {
-        length "1..8";
-      }
-      description
-        "Product Equipment Code";
-    }
-    leaf aidtype {
-      type ciena-6500-enums:ALMPRVAIDTYPE;
-      description
-        "AID Type";
-    }
-    leaf srveff {
-      type ciena-6500-enums:SRVEFF;
-      description
-        "The effect on service caused by the standing or alarm condition";
-    }
-    leaf CommandString {
-      type string {
-        length "1..512";
-      }
-      description
-        "Unsupported TL1 Command";
-    }
-    anyxml data;
-  }
-}
diff --git a/models/ciena-6500-ntp.yang b/models/ciena-6500-ntp.yang
deleted file mode 100644
index 0786112572f7c90cf4f36b8a9ffa7d4ad5f1e4f9..0000000000000000000000000000000000000000
--- a/models/ciena-6500-ntp.yang
+++ /dev/null
@@ -1,196 +0,0 @@
-module ciena-6500-ntp {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-ntp";
-  prefix ntp;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's ntp object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         container ntp
-           container client
-             container mode
-               leaf polling-interval
-               - Added default: 60 
-                 type ciena-6500-types:INT
-                 - Added range: 10 | 20 | 30..1440 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container ntp
-           container client
-             container mode
-             - Added leaf: aid
-             container servers
-             - Added leaf: aid
-               leaf ser-address-1
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 
-               leaf ser-address-2
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 
-               leaf ser-address-3
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 
-               leaf ser-address-4
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 
-               leaf ser-address-5
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 
-               leaf tod
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 
-               leaf last-sync
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 
-               leaf next-sync
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 
-               leaf detected-offset
-               - Changed type from ciena-6500-types:STRING to string
-                 type string
-                 - Added length: 0..100 ";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: ntp
-       - Added rpc: ntp-sync-client";
-  }
-
-  rpc ntp-sync-client {
-    description
-      "Manually request the NE to attempt to reference its internal clock to one of its provisioned external time servers.";
-  }
-  container ntp {
-    container client {
-      container mode {
-        config true;
-        leaf sync {
-          type enumeration {
-            enum "ACTIVE";
-            enum "INACTIVE";
-          }
-          description
-            "Switch on/off remote TOD Sync.(Mandatory for edit operations)";
-          config true;
-        }
-        leaf polling-interval {
-          default "60";
-          type ciena-6500-types:INT {
-            range "10 | 20 | 30..1440";
-          }
-          description
-            "Polling interval from 10 minutes to 24 hours, in 10-min increments, default being 60 minutes.";
-          config true;
-        }
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "shelf aid";
-          config false;
-        }
-      }
-      container servers {
-        config true;
-        leaf ser-address-1 {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config true;
-        }
-        leaf ser-address-2 {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config true;
-        }
-        leaf ser-address-3 {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config true;
-        }
-        leaf ser-address-4 {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config true;
-        }
-        leaf ser-address-5 {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config true;
-        }
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "shelf aid";
-          config false;
-        }
-        leaf tod {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config false;
-        }
-        leaf last-sync {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config false;
-        }
-        leaf next-sync {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config false;
-        }
-        leaf detected-offset {
-          type string {
-            length "0..100";
-          }
-          description
-            "";
-          config false;
-        }
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-om.yang b/models/ciena-6500-om.yang
deleted file mode 100644
index 53f84b920591be7cfc3da1f6a4fe00dffc3a09ab..0000000000000000000000000000000000000000
--- a/models/ciena-6500-om.yang
+++ /dev/null
@@ -1,5802 +0,0 @@
-module ciena-6500-om {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-om";
-  prefix om;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's om object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Added rpc: om-init-cbrttp
-       - Added rpc: om-show-cbrttp-counts
-         container om
-         - Added container: cbrttp";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         rpc om-init-eth-
-           input
-             leaf om-type
-             - Added default: ALL 
-         rpc om-show-eth-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-flex-
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-flex-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-reset-wan
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-wan-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-lag
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-lag
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-cos
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-cos
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-reset-eth10g
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-eth10g-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-eth100
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-eth100-count
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-reset-ethn
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-ethn-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-rpr
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-rpr-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-rle
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-rle-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-mep
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-mep-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-mip
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-mip-counts
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-init-ettp
-           input
-             leaf omtype
-             - Added default: ALL 
-         rpc om-show-ettp-counts
-           input
-             leaf omtype
-             - Added default: ALL ";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: om-init-eth-
-       - Added rpc: om-show-eth-counts
-       - Added rpc: om-init-flex-
-       - Added rpc: om-show-flex-counts
-       - Added rpc: om-show-wan-counts
-       - Added rpc: om-init-lag
-       - Added rpc: om-show-lag
-       - Added rpc: om-init-cos
-       - Added rpc: om-show-cos
-       - Added rpc: om-show-eth10g-counts
-       - Added rpc: om-init-eth100
-       - Added rpc: om-show-eth100-count
-       - Added rpc: om-show-ethn-counts
-       - Added rpc: om-init-rpr
-       - Added rpc: om-show-rpr-counts
-       - Added rpc: om-init-vce
-       - Added rpc: om-init-tne
-       - Added rpc: om-init-rle
-       - Added rpc: om-show-rle-counts
-       - Added rpc: om-init-mep
-       - Added rpc: om-show-mep-counts
-       - Added rpc: om-init-mip
-       - Added rpc: om-show-mip-counts
-       - Added rpc: om-init-ettp
-       - Added rpc: om-show-ettp-counts
-         rpc om-reset-ethn
-           input
-             leaf-list omtype
-             - Changed type from enumeration to ciena-6500-enums:ETHN_OMTYPE
-         container om
-         - Added container: eth
-         - Added container: eth100
-         - Added container: ettp
-         - Added container: mep
-         - Added container: mip
-         - Added container: rle
-         - Added container: rpr
-         - Added container: tne
-         - Added container: vce
-         - Added list: lag
-         - Added list: cos
-           container eth10g
-             list counts
-             - Removed leaf: aidtype
-               leaf eth10g
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf inframes
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframes
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf fcserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf defertrans
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frtoolongs
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frtooshorts
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf jab
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frag
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inpausefr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf incfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf symbolerr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf internalmacrxerr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outpausefr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf internalmactxerr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inframeserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inframesdiscds
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf indfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inoctets
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inoctetserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframeserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframesdiscds
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outoctets
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outoctetserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf infiltfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outfiltfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inpeercfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf intuncfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf indcfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf infrgrnc
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inoctgrnc
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inmacdadfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf internalerrdfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-           container ethn
-             list counts
-               leaf ethn
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf fcserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frtoolongs
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frtooshorts
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf symbolerr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inpausefr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outpausefr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inframes
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inframeserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inframesdiscds
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf indfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inoctets
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframes
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframeserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframesdiscds
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outoctets
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frag
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf jab
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-           container flex
-             list counts
-             - Changed key from flex to aid
-             - Removed leaf: flex
-             - Added leaf: aid
-               leaf fcserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frtoolongs
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf symbolerr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inpausefr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outpausefr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frtooshorts
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf frag
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf jab
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inframes
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inframeserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inframesdiscds
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf inoctets
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf indfr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframes
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframeserr
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outframesdiscds
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-               leaf outoctets
-                 type ciena-6500-types:INT
-                 - Added range: 0..4294967295 
-           container wan
-             list counts
-               leaf wanfacility
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Added container: om
-       - Added rpc: om-reset-wan
-       - Added rpc: om-reset-eth10g
-       - Added rpc: om-reset-ethn";
-  }
-
-  rpc om-init-eth- {
-    description
-      "Initialize Operation Measurement - Ethernet: this command is used to clear the 64-bit operational measurement counters for Ethernet client ports.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf om-type {
-        default "ALL";
-        type ciena-6500-enums:ETH_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-eth-counts {
-    description
-      "Retrieve Operation Measurement - Ethernet: this command retrieves the 64-bit operational mesaurement counters for Ethernet client ports.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:ETH_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf eth {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "AID type";
-        }
-        leaf align-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are not an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf fcs-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf single-collision-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by exactly one collision";
-        }
-        leaf multi-collision-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by more than one collision";
-        }
-        leaf sqe-test-err {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that the SQE test error message is generated by the PLS sublayer for a particular interface";
-        }
-        leaf defer-transmission {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the first transmission attempt on a particular interface is delayed because the medium is busy";
-        }
-        leaf late-collision {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that a collision is detected on a particular interface later than 512 bit-times into the transmission of a packet";
-        }
-        leaf excess-collision {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of excessive collisions";
-        }
-        leaf internal-mac-receive-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of an internal MAC sublayer transmit error";
-        }
-        leaf carrier-sense-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that the carrier sense condition was lost or never asserted when attempting to transmit a frame on a particular interface";
-        }
-        leaf frames-too-long {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-        }
-        leaf internal-mac-transmit-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which reception on a particular interface fails because of an internal MAC sublayer receive error";
-        }
-        leaf symbol-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-        }
-        leaf in-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-        }
-        leaf out-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-        }
-        leaf frames-too-short {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-        }
-        leaf in-mac-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet control frames received (T/L = 0x8808), whether they are discarded (PASSCTRL=DISABLE) or not (PASSCTRL=ENABLE)";
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-        }
-        leaf in-frames-discard {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-        }
-        leaf in-octet-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of octets received in errored frames";
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received with no FCS errors that are discarded";
-        }
-        leaf in-discard-filter-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received that are discarded due to filtering";
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-        }
-        leaf out-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-        }
-        leaf out-discard-frames-congestion {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-        }
-        leaf out-octet-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-        }
-        leaf out-filter-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames discarded on transmission due to filtering";
-        }
-        leaf in-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total control frames received.";
-        }
-        leaf in-peer-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total peered control frames received.";
-        }
-        leaf in-tunnel-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total tunnelled control frames received.";
-        }
-        leaf in-discard-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total control frames received and discarded.";
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total ETH frames discarded";
-        }
-        leaf hec-discard-frame {
-          type ciena-6500-types:INT;
-          description
-            "Received frames discarded due to HEC error";
-        }
-        leaf in-frame-conform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Conforming Layer 2 traffic frames received.";
-        }
-        leaf in-octet-conform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Conforming Layer 2 traffic frames received.";
-        }
-        leaf in-frame-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Non Conforming Layer 2 traffic frames received.";
-        }
-        leaf in-octet-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Non Conforming Layer 2 traffic frames received.";
-        }
-        leaf in-frame-gross-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Grossly Non Conforming Layer 2 traffic frames received.";
-        }
-        leaf in-octet-gross-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Grossly Non Conforming Layer 2 traffic frames received.";
-        }
-        leaf remote-in-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total frames received on the remote ETH client port.";
-        }
-        leaf remote-in-frames-error {
-          type ciena-6500-types:INT;
-          description
-            "Total ETH frames received with FCS errors on the remote ETH client port.";
-        }
-        leaf remote-in-octets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMES on the remote ETH client port.";
-        }
-        leaf remote-out-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total ETH frames transmitted on the remote ETH client port.";
-        }
-        leaf remote-out-frames-discards {
-          type ciena-6500-types:INT;
-          description
-            "Total Egress direction frames discarded due to congestion & FIFO overflow on the remote ETH client port.";
-        }
-        leaf remote-out-octets {
-          type ciena-6500-types:INT;
-          description
-            "Octets in frames counted by OUTFRAMES on the remote ETH client port.";
-        }
-        leaf remote-fcs-error {
-          type ciena-6500-types:INT;
-          description
-            "Frames of valid length with LAN FCS errors on the remote ETH client port.";
-        }
-        leaf remote-in-multicast-broadcast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast and broadcast frames received on the remote ETH client port.";
-        }
-        leaf remote-in-frames-jumbo {
-          type ciena-6500-types:INT;
-          description
-            "Total jumbo frames received on the remote ETH client port.";
-        }
-        leaf remote-out-multicast-broadcast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast and broadcast frames transmitted on the remote ETH client port.";
-        }
-        leaf remote-out-frames-jumbo {
-          type ciena-6500-types:INT;
-          description
-            "Total jumbo frames transmitted on the remote ETH client port.";
-        }
-      }
-    }
-  }
-  rpc om-init-flex- {
-    description
-      "Initialize Operation Measurement - Flex: this command is used to clear the 64-bit operational measurement counters for Flex client ports.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:FLEX_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-flex-counts {
-    description
-      "Retrieve Operation Measurement - Flex: this command retrieves the 64-bit operational mesaurement counters for Flex client ports.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:FLEX_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "FLEX";
-          }
-          description
-            "AID type";
-        }
-        leaf fcserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf frtoolongs {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-        }
-        leaf symbolerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-        }
-        leaf inpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-        }
-        leaf outpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-        }
-        leaf frtooshorts {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-        }
-        leaf inframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-        }
-        leaf inframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-        }
-        leaf inframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf inoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-        }
-        leaf indfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received with no FCS errors that are discarded";
-        }
-        leaf outframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-        }
-        leaf outframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-        }
-        leaf outframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf outoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-        }
-        leaf outdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-        }
-      }
-    }
-  }
-  rpc om-reset-wan {
-    description
-      "Initialize Operational Measurement: This command allows user to initialize one or more operational measurement counters associated with specific entities in the NE.";
-    input {
-      leaf wanfacility {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:WAN_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-wan-counts {
-    description
-      "Retrieve Operational Measurement: This command allows you to retrieve one or more operational measurement counters associated with specific entities in the NE.";
-    input {
-      leaf wanfacility {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:WAN_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf wanfacility {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "WANfacility";
-          }
-          description
-            "AID type";
-        }
-        leaf inframes {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received";
-        }
-        leaf inframeserr {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received with errors";
-        }
-        leaf indfr {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received with no FCS errors that are discarded";
-        }
-        leaf inoctets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMES";
-        }
-        leaf inoctetserr {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMESERR";
-        }
-        leaf ttldfr {
-          type ciena-6500-types:INT;
-          description
-            "Total received frames discarded due to zero (0) Time To Live (TTL)";
-        }
-        leaf frtooshorts {
-          type ciena-6500-types:INT;
-          description
-            "Frames discarded with less than allowable octet count with correct FCS.";
-        }
-        leaf frtoolongs {
-          type ciena-6500-types:INT;
-          description
-            "Frames discarded that exceed allowable MTU with a valid FCS";
-        }
-        leaf hecdfr {
-          type ciena-6500-types:INT;
-          description
-            "Received frames discarded due to HEC error";
-        }
-        leaf fcserr {
-          type ciena-6500-types:INT;
-          description
-            "Receive frames discarded due to FCS error";
-        }
-        leaf ssudfr {
-          type ciena-6500-types:INT;
-          description
-            "Received frames discarded that were Self Source Unicast frames.";
-        }
-        leaf pmdafr {
-          type ciena-6500-types:INT;
-          description
-            "Received frames (PHY to MAC) that were aborted by the PMD.";
-        }
-        leaf badfr {
-          type ciena-6500-types:INT;
-          description
-            "Received frames discarded due to an incorrect or unrecognized Source Address.";
-        }
-        leaf bpdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total received frames discarded due to Parity Error.";
-        }
-        leaf scfffr {
-          type ciena-6500-types:INT;
-          description
-            "Total received (PHY to MAC) errored SCFF frames discarded, with bad parity, bad SCf, or both.";
-        }
-        leaf outframes {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames transmitted";
-        }
-        leaf outdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total Egress direction WAN frames discarded";
-        }
-        leaf outoctets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in OUTFRAMES";
-        }
-        leaf infiltfr {
-          type ciena-6500-types:INT;
-          description
-            "Total frames received that are discarded due to filtering";
-        }
-        leaf outfiltfr {
-          type ciena-6500-types:INT;
-          description
-            "Total frames discarded on transmission due to filtering";
-        }
-        leaf inpeercfr {
-          type ciena-6500-types:INT;
-          description
-            "Total peered control frames received";
-        }
-        leaf intuncfr {
-          type ciena-6500-types:INT;
-          description
-            "Total tunneled control frames received";
-        }
-        leaf indcfr {
-          type ciena-6500-types:INT;
-          description
-            "Total control frames received and discarded";
-        }
-        leaf infrcnf {
-          type ciena-6500-types:INT;
-          description
-            "Total Conforming Layer 2 traffic frames received";
-        }
-        leaf infrnc {
-          type ciena-6500-types:INT;
-          description
-            "Total Non-conforming frames received";
-        }
-        leaf inoctnc {
-          type ciena-6500-types:INT;
-          description
-            "Total octet count of Non-Conforming Layer 2 traffic frames received";
-        }
-        leaf inoctcnf {
-          type ciena-6500-types:INT;
-          description
-            "Total octet count of Conforming Layer 2 traffic frames received";
-        }
-        leaf infrgrnc {
-          type ciena-6500-types:INT;
-          description
-            "Total Non Conforming Layer 2 traffic frames received";
-        }
-        leaf inoctgrnc {
-          type ciena-6500-types:INT;
-          description
-            "Total octet count of Grossly Non Conforming Layer 2 traffic frames received";
-        }
-        leaf internalerrdfr {
-          type ciena-6500-types:INT;
-          description
-            "In Frames: Data Error";
-        }
-        leaf inmacdadfr {
-          type ciena-6500-types:INT;
-          description
-            "In Frames: MAC Dropped";
-        }
-        leaf outframeserr {
-          type ciena-6500-types:INT;
-          description
-            "ICounts the total number of frames that could not be transmitted because of errors";
-        }
-      }
-    }
-  }
-  rpc om-init-lag {
-    description
-      "Initialize Operational Measurement: This command allows user to initialize one or more operational measurement counters associated with specific entities in the NE.";
-    input {
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:LAG_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-lag {
-    description
-      "Initialize Operational Measurement: This command allows user to initialize one or more operational measurement counters associated with specific entities in the NE.";
-    input {
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:LAG_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf lag {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "WANfacility";
-          }
-          description
-            "AID type";
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received";
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received with errors";
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received with no FCS errors that are discarded";
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMES";
-        }
-        leaf in-octet-error {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMESERR";
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames transmitted";
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total Egress direction WAN frames discarded";
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in OUTFRAMES";
-        }
-      }
-    }
-  }
-  rpc om-init-cos {
-    description
-      "Initialize Operational Measurement: This command allows user to initialize one or more operational measurement counters associated with specific entities in the NE.";
-    input {
-      leaf cos {
-        mandatory true;
-        description
-          "AID in format COSST-shelf-slot-port, COSBR-shelf-slot-port, COSSL-shelf-slot-port, COSGD-shelf-slot-port, COSPL-shelf-slot-port, COSPR-shelf-slot-port, COSNW-shelf-slot-port, COSCR-shelf-slot-port, COSA-shelf-slot-port, COSBC-shelf-slot-port, COSBE-shelf-slot-port, COSC-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:COS_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-cos {
-    description
-      "Retrieve Operational Measurement: This command allows you to retrieve one or more operational measurement counters associated with specific entities in the NE.";
-    input {
-      leaf cos {
-        mandatory true;
-        description
-          "AID in format COSST-shelf-slot-port, COSBR-shelf-slot-port, COSSL-shelf-slot-port, COSGD-shelf-slot-port, COSPL-shelf-slot-port, COSPR-shelf-slot-port, COSNW-shelf-slot-port, COSCR-shelf-slot-port, COSA-shelf-slot-port, COSBC-shelf-slot-port, COSBE-shelf-slot-port, COSC-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:COS_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf cos {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "WANfacility";
-          }
-          description
-            "AID type";
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received";
-        }
-        leaf in-frames-discard {
-          type ciena-6500-types:INT;
-          description
-            "Total frames discarded due to over subscription";
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMES";
-        }
-        leaf in-frame-nonconform {
-          type ciena-6500-types:INT;
-          description
-            "Total non-conforming frames received";
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT;
-          description
-            "Total incoming frames discarded for all reasons";
-        }
-        leaf in-discard-octet {
-          type ciena-6500-types:INT;
-          description
-            "Total of bytes in INDFR";
-        }
-        leaf in-unicast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total Unicast frames received";
-        }
-        leaf in-multicast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total Multicast frames received";
-        }
-        leaf in-unicast-octets {
-          type ciena-6500-types:INT;
-          description
-            "Count of bytes contained in INUCFR";
-        }
-        leaf in-multicast-octets {
-          type ciena-6500-types:INT;
-          description
-            "Count of bytes contained in INMCFR";
-        }
-        leaf in-anycast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total Unicast, Multicast, Broadcast frames received.";
-        }
-        leaf in-anycast-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total Unicast, Multicast, Broadcast octets in INACFR.";
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total frames transmitted";
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total bytes in OUTFRAMES";
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-        }
-        leaf out-discard-conform-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total outgoing conforming frames discarded";
-        }
-        leaf out-discard-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total bytes OUTDFR";
-        }
-        leaf utl {
-          type ciena-6500-types:INT;
-          description
-            "Average percentage (Queue) Utilization";
-        }
-        leaf utilization-max {
-          type ciena-6500-types:INT;
-          description
-            "Maximum/Peak percentage (Queue) Utilization";
-        }
-        leaf out-unicast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total Unicast frames transmitted.";
-        }
-        leaf outunicast-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total bytes in OUTUCFR.";
-        }
-        leaf out-multicast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total Multicast frames transmitted.";
-        }
-        leaf out-multicast-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total bytes in OUTMCFR.";
-        }
-        leaf out-anycast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total Unicast, Multicast, Broadcast frames transmitted.";
-        }
-        leaf out-anycast-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total Unicast, Multicast, Broadcast octets in OUTACFR.";
-        }
-        leaf passthrough-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total Unicast, Multicast, Broadcast span passthrough frames transmitted.";
-        }
-        leaf passthrough-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total Unicast, Multicast, Broadcast span passthrough octets in PTACFR.";
-        }
-        leaf passthrough-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total bytes in OUTUCFR.";
-        }
-      }
-    }
-  }
-  rpc om-reset-eth10g {
-    description
-      "Initialize Operation Measurement ? Ethernet10: this command is used to clear the 64-bit operational measurement counters for Ethernet 10Gb Facilities.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:OMTYPE;
-        description
-          "Operational measurement parameter";
-      }
-    }
-  }
-  rpc om-show-eth10g-counts {
-    description
-      "Retrieve Operation Measurement ? Ethernet10: this command retrieves the 64-bit operational measurement counters for Ethernet10Gb ports.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:OMTYPE;
-        description
-          "Monitored parameter";
-      }
-    }
-    output {
-      list output {
-        leaf eth10g {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf inframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-        }
-        leaf outframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-        }
-        leaf fcserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf defertrans {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the first transmission attempt on a particular interface is delayed because the medium is busy";
-        }
-        leaf frtoolongs {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-        }
-        leaf frtooshorts {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-        }
-        leaf inpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-        }
-        leaf incfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total control frames received.";
-        }
-        leaf symbolerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-        }
-        leaf internalmacrxerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of an internal MAC sublayer transmit error";
-        }
-        leaf outpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-        }
-        leaf internalmactxerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which reception on a particular interface fails because of an internal MAC sublayer receive error";
-        }
-        leaf inframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-        }
-        leaf inframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf indfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-        }
-        leaf inoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-        }
-        leaf inoctetserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of octets received in errored frames";
-        }
-        leaf outframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-        }
-        leaf outframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf outdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-        }
-        leaf outoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-        }
-        leaf outoctetserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Octets in frames counted by OUTFRAMESERR";
-        }
-        leaf infiltfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received that are discarded due to filtering";
-        }
-        leaf outfiltfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames discarded on transmission due to filtering";
-        }
-        leaf inpeercfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total peered control frames received.";
-        }
-        leaf intuncfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total tunnelled control frames received.";
-        }
-        leaf indcfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total control frames received and discarded.";
-        }
-        leaf infrgrnc {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Grossly Non Conforming Layer 2 traffic frames received.";
-        }
-        leaf inoctgrnc {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Grossly Non Conforming Layer 2 traffic frames received.";
-        }
-        leaf inmacdadfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "";
-        }
-        leaf internalerrdfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "";
-        }
-      }
-    }
-  }
-  rpc om-init-eth100 {
-    description
-      "Initialise Operation Measurement - Ethernet: this command is used to clear the 64-bit operational measurement counters for Ethernet client ports.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:ETH100_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-eth100-count {
-    description
-      "Retrieve Operation Measurement - Ethernet: this command retrieves the 64-bit operational mesaurement counters for Ethernet client ports.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:ETH100_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf ethn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "AID type";
-        }
-        leaf align-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are not an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf fcs-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf single-collision-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by exactly one collision";
-        }
-        leaf multi-collision-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by more than one collision";
-        }
-        leaf sqe-test-err {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that the SQE test error message is generated by the PLS sublayer for a particular interface";
-        }
-        leaf defer-transmission {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the first transmission attempt on a particular interface is delayed because the medium is busy";
-        }
-        leaf late-collision {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that a collision is detected on a particular interface later than 512 bit-times into the transmission of a packet";
-        }
-        leaf excess-collision {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of excessive collisions";
-        }
-        leaf internal-mac-receive-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of an internal MAC sublayer transmit error";
-        }
-        leaf carrier-sense-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that the carrier sense condition was lost or never asserted when attempting to transmit a frame on a particular interface";
-        }
-        leaf frames-too-long {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-        }
-        leaf internal-mac-transmit-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which reception on a particular interface fails because of an internal MAC sublayer receive error";
-        }
-        leaf symbol-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-        }
-        leaf in-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-        }
-        leaf out-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-        }
-        leaf frames-too-short {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-        }
-        leaf auto-negotiation-cycles {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet control frames received (T/L = 0x8808), whether they are discarded (PASSCTRL=DISABLE) or not (PASSCTRL=ENABLE)";
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-        }
-        leaf in-frames-discard {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-        }
-        leaf in-octet-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of octets received in errored frames";
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-        }
-        leaf out-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-        }
-        leaf out-discard-frames-congestion {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf in-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-        }
-        leaf out-octet-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-        }
-      }
-    }
-  }
-  rpc om-reset-ethn {
-    description
-      "Initialise Operation Measurement - Ethernet: this command is used to clear the 64-bit operational measurement counters for Ethernet client ports.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:ETHN_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-ethn-counts {
-    description
-      "Retrieve Operation Measurement - Ethernet: this command retrieves the 64-bit operational mesaurement counters for Ethernet client ports.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:ETHN_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf ethn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "AID type";
-        }
-        leaf fcserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf frtoolongs {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-        }
-        leaf frtooshorts {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-        }
-        leaf symbolerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-        }
-        leaf inpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-        }
-        leaf outpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-        }
-        leaf inframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-        }
-        leaf inframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-        }
-        leaf inframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf indfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-        }
-        leaf inoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-        }
-        leaf outframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-        }
-        leaf outframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-        }
-        leaf outframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf outoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-        }
-        leaf outdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-        }
-      }
-    }
-  }
-  rpc om-init-rpr {
-    description
-      "This command allows user to initialize one or more operational measurement counters associated with the RPR Client port.";
-    input {
-      leaf rpr {
-        mandatory true;
-        description
-          "AID in format RPR-shelf-slot-rprid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:RPR_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-rpr-counts {
-    description
-      "This command allows user to retrieve one or more operational measurement counters associated with the internal RPR port.";
-    input {
-      leaf rpr {
-        mandatory true;
-        description
-          "AID in format RPR-shelf-slot-rprid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:RPR_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf rpr {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "RPR";
-          }
-          description
-            "AID type";
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received on RPR Client port including INFRAMESERR and INDFR.";
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received with errors (CRC)";
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received that are discarded for reasons other than CRC errors. This includes short or oversized frames.";
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by more than one collision";
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames transmitted to RPR spans.";
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Egress direction frames discarded.";
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Count of Bytes contained in OUTFRAMES.";
-        }
-        leaf in-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Control frames received.";
-        }
-        leaf in-echo-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ECHO frames received.";
-        }
-        leaf in-org-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ORG frames received.";
-        }
-        leaf in-atd-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ATD frames received";
-        }
-        leaf in-topology-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total topology frames received.";
-        }
-        leaf out-echo-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ECHO frames transmitted.";
-        }
-        leaf out-org-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ORG frames transmitted.";
-        }
-        leaf out-tx-frames-discarded {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ATD frames transmitted.";
-        }
-        leaf out-topology-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total topology frames transmitted.";
-        }
-      }
-    }
-  }
-  rpc om-init-vce {
-    description
-      "This command allows user to initialize one or more operational measurement counters associated with specific entities in the NE.";
-    input {
-      leaf vce {
-        mandatory true;
-        description
-          "AID in format VCE-shelf-slot-port-vcid, VCE-shelf-slot-port-ALL, VCEA-shelf-slot-port-vcid, VCEBC-shelf-slot-port-vcid, VCEBE-shelf-slot-port-vcid, VCEC-shelf-slot-port-vcid, VCEST-shelf-slot-port-vcid, VCESL-shelf-slot-port-vcid, VCEGD-shelf-slot-port-vcid, VCEPR-shelf-slot-port-vcid, VCENW-shelf-slot-port-vcid, VCEBR-shelf-slot-port-vcid, VCECR-shelf-slot-port-vcid, VCEPL-shelf-slot-port-vcid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc om-init-tne {
-    description
-      "This command allows user to initialize one or more operational measurement counters associated with specific entities in the NE.";
-    input {
-      leaf tne {
-        mandatory true;
-        description
-          "AID";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc om-init-rle {
-    description
-      "This command allows user to initialize one or all operational measurement counters associated with Ringlet port in the NE.";
-    input {
-      leaf rle {
-        mandatory true;
-        description
-          "AID in format -shelf-slot-port-Ringid-Grpid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:RLE_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-rle-counts {
-    description
-      "This command allows user to retrieve one or all operational measurement counters associated with Ringlet port in the NE.";
-    input {
-      leaf rle {
-        mandatory true;
-        description
-          "AID in format -shelf-slot-port-Ringid-Grpid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:RLE_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf rle {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "RLEGroupAid";
-          }
-          description
-            "AID type";
-        }
-        leaf source-fim {
-          type ciena-6500-types:INT;
-          description
-            "Fault Indication Message Originated from the Ringlet.";
-        }
-        leaf source-rim {
-          type ciena-6500-types:INT;
-          description
-            "Recovery Indication Message Originated from the Ringlet.";
-        }
-        leaf source-ok {
-          type ciena-6500-types:INT;
-          description
-            "OK Message Originated from the Ringlet.";
-        }
-        leaf receive-fault-ind-msg {
-          type ciena-6500-types:INT;
-          description
-            "Fault Indication Message received to Ringlet.";
-        }
-        leaf receive-rim {
-          type ciena-6500-types:INT;
-          description
-            "Recovery Indication Message received to Ringlet.";
-        }
-        leaf receive-ok {
-          type ciena-6500-types:INT;
-          description
-            "OK Message received to Ringlet.";
-        }
-        leaf receive-my-fim {
-          type ciena-6500-types:INT;
-          description
-            "Fault Indication Message received to Ringlet that was sent from the same Ringlet.";
-        }
-        leaf receive-my-rim {
-          type ciena-6500-types:INT;
-          description
-            "Recovery Indication Message received to Ringlet that was sent from the same Ringlet.";
-        }
-        leaf receive-my-ok {
-          type ciena-6500-types:INT;
-          description
-            "OK Indication Message received to Ringlet that was sent from the same Ringlet.";
-        }
-        leaf relay-fim {
-          type ciena-6500-types:INT;
-          description
-            "Fault Indication Message received from other Ringlet and forward it next Ringlet.";
-        }
-        leaf relay-rim {
-          type ciena-6500-types:INT;
-          description
-            "Recovery Indication Message received from other Ringlet and forward it next Ringlet.";
-        }
-        leaf relay-ok {
-          type ciena-6500-types:INT;
-          description
-            "OK Indication Message received from other Ringlet and forward it next Ringlet.";
-        }
-        leaf unk-rid {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when receiving messages for a ring that has not been configured.";
-        }
-        leaf unk-vid {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when receiving message for a ringlet that has not been configured on the ring.";
-        }
-        leaf network-loop {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when receiving a message we sourced on the port it was source on.";
-        }
-        leaf invalid-req {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when ring APS message code was not FIM, RIM or OK.";
-        }
-        leaf invalid-control-frame {
-          type ciena-6500-types:INT;
-          description
-            "This parameter is updated when a frame is received which does not conform to the eSpring standard. Examples of this could be invalid etherType, invalid daMac or something else in the future.";
-        }
-        leaf small-pdu {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when the size of the ring APS message did not meet the minimum PDU size.";
-        }
-      }
-    }
-  }
-  rpc om-init-mep {
-    description
-      "This command allows user to initialize all operational measurement counters for a CFM MEP object in the NE.";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type enumeration {
-          enum "ALL" {
-            description
-              "Reset is only supported for all CFM MEP OM counters.";
-          }
-        }
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-mep-counts {
-    description
-      "This command allows user to retrieve one or all operational measurement counters for a CFM MEP object in the NE.";
-    input {
-      leaf mep {
-        mandatory true;
-        description
-          "AID in format MEP-shelf-slot-mdid-maid-mepid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:MEP_OMTYPE_RTRV;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf mep {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "MEPAid";
-          }
-          description
-            "AID type";
-        }
-        leaf out-loopback-req-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Message transmitted.";
-        }
-        leaf in-frame-loopback-req {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Message received.";
-        }
-        leaf out-loopback-resp-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Response transmitted.";
-        }
-        leaf in-frame-loopback-resp {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Response received..";
-        }
-        leaf out-link-trace-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Message transmitted.";
-        }
-        leaf in-frame-link-trace {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Message received.";
-        }
-        leaf out-link-trace-resp-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Response transmitted.";
-        }
-        leaf in-frame-link-trace-resp {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Response received.";
-        }
-        leaf receive-my-ok {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Connectivity Check Message transmitted.";
-        }
-        leaf in-frame-ccm {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Connectivity Check Message received.";
-        }
-        leaf in-frame-ccm-incorrect {
-          type ciena-6500-types:INT;
-          description
-            "Total CCM Connectivity Check Message received with incorrect MD or MAID.";
-        }
-        leaf in-frame-ccm-err {
-          type ciena-6500-types:INT;
-          description
-            "Total CCM Connectivity Check Message received with incorrect Interval, MEPID, or SA MAC.";
-        }
-        leaf in-frame-ccm-status {
-          type ciena-6500-types:INT;
-          description
-            "Total CCM Connectivity Check Message received with Remote MEPs reporting incorrect Interface Status or Port Status TLV.";
-        }
-        leaf in-frame-ccm-rdi {
-          type ciena-6500-types:INT;
-          description
-            "Total CCM Connectivity Check Message received with RDI field set to 1.";
-        }
-        leaf out-ais-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total count of AIS messages sent from MEP.";
-        }
-        leaf in-frame-ais {
-          type ciena-6500-types:INT;
-          description
-            "Total count of AIS messages received by this MEP.";
-        }
-      }
-    }
-  }
-  rpc om-init-mip {
-    description
-      "This command allows user to initialize all operational measurement counters for a CFM MIP object in the NE.";
-    input {
-      leaf mip {
-        mandatory true;
-        description
-          "AID in format MIP-shelf-slot-mdid-maid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type enumeration {
-          enum "ALL" {
-            description
-              "Reset is only supported for all CFM MIP OM counters.";
-          }
-        }
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-mip-counts {
-    description
-      "This command allows user to retrieve one or all operational measurement counters for a CFM MIP object in the NE.";
-    input {
-      leaf mip {
-        mandatory true;
-        description
-          "AID in format MIP-shelf-slot-mdid-maid";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:MIP_OMTYPE_RTRV;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf mip {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "MIPAid";
-          }
-          description
-            "AID type";
-        }
-        leaf in-frame-loopback-req {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Message received.";
-        }
-        leaf out-loopback-resp-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Response transmitted.";
-        }
-        leaf out-link-trace-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Message transmitted.";
-        }
-        leaf in-frame-link-trace {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Message received.";
-        }
-        leaf out-link-trace-resp-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Response transmitted.";
-        }
-      }
-    }
-  }
-  rpc om-init-ettp {
-    description
-      "Initialise Operation Measurement - Ethernet: this command is used to clear the 64-bit operational measurement counters for Ethernet client ports.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:ETTP_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-ettp-counts {
-    description
-      "Retrieve Operation Measurement - Ethernet: this command retrieves the 64-bit operational mesaurement counters for Ethernet client ports.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:ETTP_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf ettp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETTP";
-          }
-          description
-            "AID type";
-        }
-        leaf fcs-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf frames-too-long {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-        }
-        leaf frames-too-short {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-        }
-        leaf symbol-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-        }
-        leaf in-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-        }
-        leaf out-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-        }
-        leaf in-frames-discard {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-        }
-        leaf out-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-        }
-        leaf out-discard-frames-congestion {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-        }
-      }
-    }
-  }
-  rpc om-init-cbrttp {
-    description
-      "Initialise Operation Measurement - FLEX?: this command is used to clear the 64-bit operational measurement counters for Ethernet client ports.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:CBRTTP_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-  }
-  rpc om-show-cbrttp-counts {
-    description
-      "Retrieve Operation Measurement - FLEX?: this command retrieves the 64-bit operational mesaurement counters for Ethernet client ports.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf omtype {
-        default "ALL";
-        type ciena-6500-enums:CBRTTP_OMTYPE;
-        description
-          "Operational Measurement";
-      }
-    }
-    output {
-      list output {
-        leaf cbrttp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "CBRTTP";
-          }
-          description
-            "AID type";
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-        }
-        leaf out-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-        }
-        leaf fcs-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-        }
-        leaf frames-too-short {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-        }
-        leaf frames-too-long {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-        }
-        leaf in-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-        }
-        leaf symbol-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-        }
-        leaf out-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-        }
-      }
-    }
-  }
-  container om {
-    container cbrttp {
-      list counts {
-        key "cbrttp";
-        config false;
-        leaf cbrttp {
-          mandatory true;
-          description
-            "AID in format CBRTTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "CBRTTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-          config false;
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-          config false;
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-          config false;
-        }
-        leaf out-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-          config false;
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf fcs-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-          config false;
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-          config false;
-        }
-        leaf frames-too-short {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-          config false;
-        }
-        leaf frames-too-long {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-          config false;
-        }
-        leaf in-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf symbol-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-          config false;
-        }
-        leaf out-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-          config false;
-        }
-      }
-    }
-    container eth {
-      list counts {
-        key "eth";
-        config false;
-        leaf eth {
-          mandatory true;
-          description
-            "AID in format ETH-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf align-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are not an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf fcs-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf single-collision-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by exactly one collision";
-          config false;
-        }
-        leaf multi-collision-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by more than one collision";
-          config false;
-        }
-        leaf sqe-test-err {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that the SQE test error message is generated by the PLS sublayer for a particular interface";
-          config false;
-        }
-        leaf defer-transmission {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the first transmission attempt on a particular interface is delayed because the medium is busy";
-          config false;
-        }
-        leaf late-collision {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that a collision is detected on a particular interface later than 512 bit-times into the transmission of a packet";
-          config false;
-        }
-        leaf excess-collision {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of excessive collisions";
-          config false;
-        }
-        leaf internal-mac-receive-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of an internal MAC sublayer transmit error";
-          config false;
-        }
-        leaf carrier-sense-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that the carrier sense condition was lost or never asserted when attempting to transmit a frame on a particular interface";
-          config false;
-        }
-        leaf frames-too-long {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-          config false;
-        }
-        leaf internal-mac-transmit-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which reception on a particular interface fails because of an internal MAC sublayer receive error";
-          config false;
-        }
-        leaf symbol-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-          config false;
-        }
-        leaf in-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf out-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf frames-too-short {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-          config false;
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-          config false;
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-          config false;
-        }
-        leaf in-mac-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet control frames received (T/L = 0x8808), whether they are discarded (PASSCTRL=DISABLE) or not (PASSCTRL=ENABLE)";
-          config false;
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-          config false;
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-          config false;
-        }
-        leaf in-frames-discard {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf in-octet-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of octets received in errored frames";
-          config false;
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received with no FCS errors that are discarded";
-          config false;
-        }
-        leaf in-discard-filter-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received that are discarded due to filtering";
-          config false;
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-          config false;
-        }
-        leaf out-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-          config false;
-        }
-        leaf out-discard-frames-congestion {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf out-octet-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-          config false;
-        }
-        leaf out-filter-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames discarded on transmission due to filtering";
-          config false;
-        }
-        leaf in-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total control frames received.";
-          config false;
-        }
-        leaf in-peer-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total peered control frames received.";
-          config false;
-        }
-        leaf in-tunnel-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total tunnelled control frames received.";
-          config false;
-        }
-        leaf in-discard-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total control frames received and discarded.";
-          config false;
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total ETH frames discarded";
-          config false;
-        }
-        leaf hec-discard-frame {
-          type ciena-6500-types:INT;
-          description
-            "Received frames discarded due to HEC error";
-          config false;
-        }
-        leaf in-frame-conform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-octet-conform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-frame-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-octet-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-frame-gross-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Grossly Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-octet-gross-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Grossly Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf remote-in-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total frames received on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-in-frames-error {
-          type ciena-6500-types:INT;
-          description
-            "Total ETH frames received with FCS errors on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-in-octets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMES on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-out-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total ETH frames transmitted on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-out-frames-discards {
-          type ciena-6500-types:INT;
-          description
-            "Total Egress direction frames discarded due to congestion & FIFO overflow on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-out-octets {
-          type ciena-6500-types:INT;
-          description
-            "Octets in frames counted by OUTFRAMES on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-fcs-error {
-          type ciena-6500-types:INT;
-          description
-            "Frames of valid length with LAN FCS errors on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-in-multicast-broadcast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast and broadcast frames received on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-in-frames-jumbo {
-          type ciena-6500-types:INT;
-          description
-            "Total jumbo frames received on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-out-multicast-broadcast-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast and broadcast frames transmitted on the remote ETH client port.";
-          config false;
-        }
-        leaf remote-out-frames-jumbo {
-          type ciena-6500-types:INT;
-          description
-            "Total jumbo frames transmitted on the remote ETH client port.";
-          config false;
-        }
-      }
-    }
-    container eth100 {
-      list count {
-        key "ethn";
-        config false;
-        leaf ethn {
-          mandatory true;
-          description
-            "AID in format ETH100-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf align-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are not an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf fcs-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf single-collision-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by exactly one collision";
-          config false;
-        }
-        leaf multi-collision-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by more than one collision";
-          config false;
-        }
-        leaf sqe-test-err {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that the SQE test error message is generated by the PLS sublayer for a particular interface";
-          config false;
-        }
-        leaf defer-transmission {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the first transmission attempt on a particular interface is delayed because the medium is busy";
-          config false;
-        }
-        leaf late-collision {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that a collision is detected on a particular interface later than 512 bit-times into the transmission of a packet";
-          config false;
-        }
-        leaf excess-collision {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of excessive collisions";
-          config false;
-        }
-        leaf internal-mac-receive-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of an internal MAC sublayer transmit error";
-          config false;
-        }
-        leaf carrier-sense-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of times that the carrier sense condition was lost or never asserted when attempting to transmit a frame on a particular interface";
-          config false;
-        }
-        leaf frames-too-long {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-          config false;
-        }
-        leaf internal-mac-transmit-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which reception on a particular interface fails because of an internal MAC sublayer receive error";
-          config false;
-        }
-        leaf symbol-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-          config false;
-        }
-        leaf in-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf out-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf frames-too-short {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-          config false;
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-          config false;
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-          config false;
-        }
-        leaf auto-negotiation-cycles {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet control frames received (T/L = 0x8808), whether they are discarded (PASSCTRL=DISABLE) or not (PASSCTRL=ENABLE)";
-          config false;
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-          config false;
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-          config false;
-        }
-        leaf in-frames-discard {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf in-octet-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of octets received in errored frames";
-          config false;
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-          config false;
-        }
-        leaf out-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-          config false;
-        }
-        leaf out-discard-frames-congestion {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf in-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-          config false;
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf out-octet-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-          config false;
-        }
-      }
-    }
-    container eth10g {
-      list counts {
-        key "eth10g";
-        config false;
-        leaf eth10g {
-          mandatory true;
-          description
-            "AID in format ETH10G-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf inframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-          config false;
-        }
-        leaf outframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-          config false;
-        }
-        leaf fcserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf defertrans {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the first transmission attempt on a particular interface is delayed because the medium is busy";
-          config false;
-        }
-        leaf frtoolongs {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-          config false;
-        }
-        leaf frtooshorts {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-          config false;
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-          config false;
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-          config false;
-        }
-        leaf inpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf incfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total control frames received.";
-          config false;
-        }
-        leaf symbolerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-          config false;
-        }
-        leaf internalmacrxerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which the transmission on a particular interface fails because of an internal MAC sublayer transmit error";
-          config false;
-        }
-        leaf outpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf internalmactxerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames for which reception on a particular interface fails because of an internal MAC sublayer receive error";
-          config false;
-        }
-        leaf inframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-          config false;
-        }
-        leaf inframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf indfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-          config false;
-        }
-        leaf inoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf inoctetserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of octets received in errored frames";
-          config false;
-        }
-        leaf outframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-          config false;
-        }
-        leaf outframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf outdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-          config false;
-        }
-        leaf outoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf outoctetserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Octets in frames counted by OUTFRAMESERR";
-          config false;
-        }
-        leaf infiltfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received that are discarded due to filtering";
-          config false;
-        }
-        leaf outfiltfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames discarded on transmission due to filtering";
-          config false;
-        }
-        leaf inpeercfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total peered control frames received.";
-          config false;
-        }
-        leaf intuncfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total tunnelled control frames received.";
-          config false;
-        }
-        leaf indcfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total control frames received and discarded.";
-          config false;
-        }
-        leaf infrgrnc {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Grossly Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf inoctgrnc {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Grossly Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf inmacdadfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "";
-          config false;
-        }
-        leaf internalerrdfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "";
-          config false;
-        }
-      }
-    }
-    container ethn {
-      list counts {
-        key "ethn";
-        config false;
-        leaf ethn {
-          mandatory true;
-          description
-            "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf fcserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf frtoolongs {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-          config false;
-        }
-        leaf frtooshorts {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-          config false;
-        }
-        leaf symbolerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-          config false;
-        }
-        leaf inpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf outpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf inframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-          config false;
-        }
-        leaf inframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-          config false;
-        }
-        leaf inframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf indfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-          config false;
-        }
-        leaf inoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf outframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-          config false;
-        }
-        leaf outframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-          config false;
-        }
-        leaf outframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf outoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf outdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-          config false;
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-          config false;
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-          config false;
-        }
-      }
-    }
-    container ettp {
-      list counts {
-        key "ettp";
-        config false;
-        leaf ettp {
-          mandatory true;
-          description
-            "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf fcs-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf frames-too-long {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-          config false;
-        }
-        leaf frames-too-short {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-          config false;
-        }
-        leaf symbol-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-          config false;
-        }
-        leaf in-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf out-pause-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-          config false;
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-          config false;
-        }
-        leaf in-frames-discard {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-          config false;
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-          config false;
-        }
-        leaf out-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-          config false;
-        }
-        leaf out-discard-frames-congestion {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-          config false;
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Applicable only for LAN/FC, where is it the number of 10B_ERR code transmitted. Value is always zero for LAN/ETH, WAN/GFP-F, WAN/POS and WAN/GFP-T.";
-          config false;
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-          config false;
-        }
-      }
-    }
-    container flex {
-      list counts {
-        key "aid";
-        config false;
-        leaf aid {
-          mandatory true;
-          description
-            "AID in format FLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "FLEX";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf fcserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that are an integral number of octets in length and do not pass the FCS check";
-          config false;
-        }
-        leaf frtoolongs {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received on a particular interface that exceed the maximum permitted frame size";
-          config false;
-        }
-        leaf symbolerr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of GMII data reception errors";
-          config false;
-        }
-        leaf inpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames received with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf outpausefr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of MAC control frames transmitted with an opcode indicating a PAUSE frame";
-          config false;
-        }
-        leaf frtooshorts {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of frames received that are smaller than the permitted 64-byte frame size";
-          config false;
-        }
-        leaf frag {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too short (<64 bytes) with an FCS error";
-          config false;
-        }
-        leaf jab {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of Ethernet frames too long (>MTU) with an FCS error";
-          config false;
-        }
-        leaf inframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames received on that interface (including errored frames)";
-          config false;
-        }
-        leaf inframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of errored frames received on that interface";
-          config false;
-        }
-        leaf inframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf inoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of received octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf indfr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received with no FCS errors that are discarded";
-          config false;
-        }
-        leaf outframes {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted frames on that interface (including errored frames)";
-          config false;
-        }
-        leaf outframeserr {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that could not be transmitted because of errors";
-          config false;
-        }
-        leaf outframesdiscds {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of frames that were chosen to be discarded even though no errors had been detected to prevent their delivery";
-          config false;
-        }
-        leaf outoctets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the total number of transmitted octets (includes octets from both OK and errored frames)";
-          config false;
-        }
-        leaf outdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total TX frames discarded";
-          config false;
-        }
-      }
-    }
-    container mep {
-      list counts {
-        key "mep";
-        config false;
-        leaf mep {
-          mandatory true;
-          description
-            "AID in format MEP-shelf-slot-mdid-maid-mepid";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "MEPAid";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf out-loopback-req-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Message transmitted.";
-          config false;
-        }
-        leaf in-frame-loopback-req {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Message received.";
-          config false;
-        }
-        leaf out-loopback-resp-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Response transmitted.";
-          config false;
-        }
-        leaf in-frame-loopback-resp {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Response received..";
-          config false;
-        }
-        leaf out-link-trace-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Message transmitted.";
-          config false;
-        }
-        leaf in-frame-link-trace {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Message received.";
-          config false;
-        }
-        leaf out-link-trace-resp-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Response transmitted.";
-          config false;
-        }
-        leaf in-frame-link-trace-resp {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Response received.";
-          config false;
-        }
-        leaf receive-my-ok {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Connectivity Check Message transmitted.";
-          config false;
-        }
-        leaf in-frame-ccm {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Connectivity Check Message received.";
-          config false;
-        }
-        leaf in-frame-ccm-incorrect {
-          type ciena-6500-types:INT;
-          description
-            "Total CCM Connectivity Check Message received with incorrect MD or MAID.";
-          config false;
-        }
-        leaf in-frame-ccm-err {
-          type ciena-6500-types:INT;
-          description
-            "Total CCM Connectivity Check Message received with incorrect Interval, MEPID, or SA MAC.";
-          config false;
-        }
-        leaf in-frame-ccm-status {
-          type ciena-6500-types:INT;
-          description
-            "Total CCM Connectivity Check Message received with Remote MEPs reporting incorrect Interface Status or Port Status TLV.";
-          config false;
-        }
-        leaf in-frame-ccm-rdi {
-          type ciena-6500-types:INT;
-          description
-            "Total CCM Connectivity Check Message received with RDI field set to 1.";
-          config false;
-        }
-        leaf out-ais-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total count of AIS messages sent from MEP.";
-          config false;
-        }
-        leaf in-frame-ais {
-          type ciena-6500-types:INT;
-          description
-            "Total count of AIS messages received by this MEP.";
-          config false;
-        }
-      }
-    }
-    container mip {
-      list counts {
-        key "mip";
-        config false;
-        leaf mip {
-          mandatory true;
-          description
-            "AID in format MIP-shelf-slot-mdid-maid";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "MIPAid";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf in-frame-loopback-req {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Message received.";
-          config false;
-        }
-        leaf out-loopback-resp-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM LoopBack Response transmitted.";
-          config false;
-        }
-        leaf out-link-trace-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Message transmitted.";
-          config false;
-        }
-        leaf in-frame-link-trace {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Message received.";
-          config false;
-        }
-        leaf out-link-trace-resp-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total CFM Link Trace Response transmitted.";
-          config false;
-        }
-      }
-    }
-    container rle {
-      list counts {
-        key "rle";
-        config false;
-        leaf rle {
-          mandatory true;
-          description
-            "AID in format -shelf-slot-port-Ringid-Grpid";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "RLEGroupAid";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf source-fim {
-          type ciena-6500-types:INT;
-          description
-            "Fault Indication Message Originated from the Ringlet.";
-          config false;
-        }
-        leaf source-rim {
-          type ciena-6500-types:INT;
-          description
-            "Recovery Indication Message Originated from the Ringlet.";
-          config false;
-        }
-        leaf source-ok {
-          type ciena-6500-types:INT;
-          description
-            "OK Message Originated from the Ringlet.";
-          config false;
-        }
-        leaf receive-fault-ind-msg {
-          type ciena-6500-types:INT;
-          description
-            "Fault Indication Message received to Ringlet.";
-          config false;
-        }
-        leaf receive-rim {
-          type ciena-6500-types:INT;
-          description
-            "Recovery Indication Message received to Ringlet.";
-          config false;
-        }
-        leaf receive-ok {
-          type ciena-6500-types:INT;
-          description
-            "OK Message received to Ringlet.";
-          config false;
-        }
-        leaf receive-my-fim {
-          type ciena-6500-types:INT;
-          description
-            "Fault Indication Message received to Ringlet that was sent from the same Ringlet.";
-          config false;
-        }
-        leaf receive-my-rim {
-          type ciena-6500-types:INT;
-          description
-            "Recovery Indication Message received to Ringlet that was sent from the same Ringlet.";
-          config false;
-        }
-        leaf receive-my-ok {
-          type ciena-6500-types:INT;
-          description
-            "OK Indication Message received to Ringlet that was sent from the same Ringlet.";
-          config false;
-        }
-        leaf relay-fim {
-          type ciena-6500-types:INT;
-          description
-            "Fault Indication Message received from other Ringlet and forward it next Ringlet.";
-          config false;
-        }
-        leaf relay-rim {
-          type ciena-6500-types:INT;
-          description
-            "Recovery Indication Message received from other Ringlet and forward it next Ringlet.";
-          config false;
-        }
-        leaf relay-ok {
-          type ciena-6500-types:INT;
-          description
-            "OK Indication Message received from other Ringlet and forward it next Ringlet.";
-          config false;
-        }
-        leaf unk-rid {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when receiving messages for a ring that has not been configured.";
-          config false;
-        }
-        leaf unk-vid {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when receiving message for a ringlet that has not been configured on the ring.";
-          config false;
-        }
-        leaf network-loop {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when receiving a message we sourced on the port it was source on.";
-          config false;
-        }
-        leaf invalid-req {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when ring APS message code was not FIM, RIM or OK.";
-          config false;
-        }
-        leaf invalid-control-frame {
-          type ciena-6500-types:INT;
-          description
-            "This parameter is updated when a frame is received which does not conform to the eSpring standard. Examples of this could be invalid etherType, invalid daMac or something else in the future.";
-          config false;
-        }
-        leaf small-pdu {
-          type ciena-6500-types:INT;
-          description
-            "This parameter updated when the size of the ring APS message did not meet the minimum PDU size.";
-          config false;
-        }
-      }
-    }
-    container rpr {
-      list counts {
-        key "rpr";
-        config false;
-        leaf rpr {
-          mandatory true;
-          description
-            "AID in format RPR-shelf-slot-rprid";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "RPR";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf in-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received on RPR Client port including INFRAMESERR and INDFR.";
-          config false;
-        }
-        leaf in-frames-error {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received with errors (CRC)";
-          config false;
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames received that are discarded for reasons other than CRC errors. This includes short or oversized frames.";
-          config false;
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Counts the number of successfully transmitted frames on a particular interface for which transmission is inhibited by more than one collision";
-          config false;
-        }
-        leaf out-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total frames transmitted to RPR spans.";
-          config false;
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Egress direction frames discarded.";
-          config false;
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Count of Bytes contained in OUTFRAMES.";
-          config false;
-        }
-        leaf in-control-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Control frames received.";
-          config false;
-        }
-        leaf in-echo-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ECHO frames received.";
-          config false;
-        }
-        leaf in-org-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ORG frames received.";
-          config false;
-        }
-        leaf in-atd-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ATD frames received";
-          config false;
-        }
-        leaf in-topology-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total topology frames received.";
-          config false;
-        }
-        leaf out-echo-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ECHO frames transmitted.";
-          config false;
-        }
-        leaf out-org-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ORG frames transmitted.";
-          config false;
-        }
-        leaf out-tx-frames-discarded {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total ATD frames transmitted.";
-          config false;
-        }
-        leaf out-topology-frames {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total topology frames transmitted.";
-          config false;
-        }
-      }
-    }
-    container tne {
-      container counts {
-        config false;
-        leaf tne {
-          mandatory true;
-          description
-            "AID";
-          type ciena-6500-types:aid;
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT;
-          description
-            "Total frames received from RPR ring with errors that were discarded for any other reason.";
-          config false;
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total bytes received: ok, errored and discarded.";
-          config false;
-        }
-        leaf in-unicast-eir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total unicast EIR frames received from RPR ring.";
-          config false;
-        }
-        leaf in-multicast-broadcast-eir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast + broadcast EIR frames received from RPR ring.";
-          config false;
-        }
-        leaf in-unicast-cir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total unicast CIR frames received from RPR ring.";
-          config false;
-        }
-        leaf in-multicast-broadcast-cir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast + broadcast CIR frames received from RPR ring.";
-          config false;
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total egress frames discarded for any reason including overflow.";
-          config false;
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total successful egress bytes transmitted.";
-          config false;
-        }
-        leaf out-unicast-eir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total unicast EIR frames transmitted to RPR ring.";
-          config false;
-        }
-        leaf out-multicast-broadcast-eir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast + broadcast EIR frames transmitted to RPR ring.";
-          config false;
-        }
-        leaf out-unicast-cir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total unicast CIR frames transmitted.";
-          config false;
-        }
-        leaf out-multicast-broadcast-cir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast + broadcast CIR frames transmitted.";
-          config false;
-        }
-      }
-    }
-    container vce {
-      list counts {
-        key "vce";
-        config false;
-        leaf vce {
-          mandatory true;
-          description
-            "AID in format VCE-shelf-slot-port-vcid, VCE-shelf-slot-port-ALL, VCEA-shelf-slot-port-vcid, VCEBC-shelf-slot-port-vcid, VCEBE-shelf-slot-port-vcid, VCEC-shelf-slot-port-vcid, VCEST-shelf-slot-port-vcid, VCESL-shelf-slot-port-vcid, VCEGD-shelf-slot-port-vcid, VCEPR-shelf-slot-port-vcid, VCENW-shelf-slot-port-vcid, VCEBR-shelf-slot-port-vcid, VCECR-shelf-slot-port-vcid, VCEPL-shelf-slot-port-vcid";
-          type ciena-6500-types:aid;
-        }
-        leaf in-discard-frame {
-          type ciena-6500-types:INT;
-          description
-            "Total frames received from RPR ring with errors that were discarded for any other reason.";
-          config false;
-        }
-        leaf in-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total bytes received: ok, errored and discarded.";
-          config false;
-        }
-        leaf in-unicast-eir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total unicast EIR frames received from RPR ring.";
-          config false;
-        }
-        leaf in-multicast-broadcast-eir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast + broadcast EIR frames received from RPR ring.";
-          config false;
-        }
-        leaf in-unicast-cir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total unicast CIR frames received from RPR ring.";
-          config false;
-        }
-        leaf in-multicast-broadcast-cir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast + broadcast CIR frames received from RPR ring.";
-          config false;
-        }
-        leaf out-discard-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total egress frames discarded for any reason including overflow.";
-          config false;
-        }
-        leaf out-octets {
-          type ciena-6500-types:INT;
-          description
-            "Total successful egress bytes transmitted.";
-          config false;
-        }
-        leaf out-unicast-eir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total unicast EIR frames transmitted to RPR ring.";
-          config false;
-        }
-        leaf out-multicast-broadcast-eir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast + broadcast EIR frames transmitted to RPR ring.";
-          config false;
-        }
-        leaf out-unicast-cir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total unicast CIR frames transmitted.";
-          config false;
-        }
-        leaf out-multicast-broadcast-cir-frames {
-          type ciena-6500-types:INT;
-          description
-            "Total multicast + broadcast CIR frames transmitted.";
-          config false;
-        }
-        leaf in-frame-conform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-octet-conform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-frame-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-octet-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-frame-gross-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total Grossly Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-        leaf in-octet-gross-nonconform {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Total octet count of Grossly Non Conforming Layer 2 traffic frames received.";
-          config false;
-        }
-      }
-    }
-    container wan {
-      list counts {
-        key "wanfacility";
-        config false;
-        leaf wanfacility {
-          mandatory true;
-          description
-            "AID in format WAN-shelf-slot-port, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "WANfacility";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf inframes {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received";
-          config false;
-        }
-        leaf inframeserr {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received with errors";
-          config false;
-        }
-        leaf indfr {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames received with no FCS errors that are discarded";
-          config false;
-        }
-        leaf inoctets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMES";
-          config false;
-        }
-        leaf inoctetserr {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in INFRAMESERR";
-          config false;
-        }
-        leaf ttldfr {
-          type ciena-6500-types:INT;
-          description
-            "Total received frames discarded due to zero (0) Time To Live (TTL)";
-          config false;
-        }
-        leaf frtooshorts {
-          type ciena-6500-types:INT;
-          description
-            "Frames discarded with less than allowable octet count with correct FCS.";
-          config false;
-        }
-        leaf frtoolongs {
-          type ciena-6500-types:INT;
-          description
-            "Frames discarded that exceed allowable MTU with a valid FCS";
-          config false;
-        }
-        leaf hecdfr {
-          type ciena-6500-types:INT;
-          description
-            "Received frames discarded due to HEC error";
-          config false;
-        }
-        leaf fcserr {
-          type ciena-6500-types:INT;
-          description
-            "Receive frames discarded due to FCS error";
-          config false;
-        }
-        leaf ssudfr {
-          type ciena-6500-types:INT;
-          description
-            "Received frames discarded that were Self Source Unicast frames.";
-          config false;
-        }
-        leaf pmdafr {
-          type ciena-6500-types:INT;
-          description
-            "Received frames (PHY to MAC) that were aborted by the PMD.";
-          config false;
-        }
-        leaf badfr {
-          type ciena-6500-types:INT;
-          description
-            "Received frames discarded due to an incorrect or unrecognized Source Address.";
-          config false;
-        }
-        leaf bpdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total received frames discarded due to Parity Error.";
-          config false;
-        }
-        leaf scfffr {
-          type ciena-6500-types:INT;
-          description
-            "Total received (PHY to MAC) errored SCFF frames discarded, with bad parity, bad SCf, or both.";
-          config false;
-        }
-        leaf outframes {
-          type ciena-6500-types:INT;
-          description
-            "Total WAN frames transmitted";
-          config false;
-        }
-        leaf outdfr {
-          type ciena-6500-types:INT;
-          description
-            "Total Egress direction WAN frames discarded";
-          config false;
-        }
-        leaf outoctets {
-          type ciena-6500-types:INT;
-          description
-            "Count of Bytes contained in OUTFRAMES";
-          config false;
-        }
-        leaf infiltfr {
-          type ciena-6500-types:INT;
-          description
-            "Total frames received that are discarded due to filtering";
-          config false;
-        }
-        leaf outfiltfr {
-          type ciena-6500-types:INT;
-          description
-            "Total frames discarded on transmission due to filtering";
-          config false;
-        }
-        leaf inpeercfr {
-          type ciena-6500-types:INT;
-          description
-            "Total peered control frames received";
-          config false;
-        }
-        leaf intuncfr {
-          type ciena-6500-types:INT;
-          description
-            "Total tunneled control frames received";
-          config false;
-        }
-        leaf indcfr {
-          type ciena-6500-types:INT;
-          description
-            "Total control frames received and discarded";
-          config false;
-        }
-        leaf infrcnf {
-          type ciena-6500-types:INT;
-          description
-            "Total Conforming Layer 2 traffic frames received";
-          config false;
-        }
-        leaf infrnc {
-          type ciena-6500-types:INT;
-          description
-            "Total Non-conforming frames received";
-          config false;
-        }
-        leaf inoctnc {
-          type ciena-6500-types:INT;
-          description
-            "Total octet count of Non-Conforming Layer 2 traffic frames received";
-          config false;
-        }
-        leaf inoctcnf {
-          type ciena-6500-types:INT;
-          description
-            "Total octet count of Conforming Layer 2 traffic frames received";
-          config false;
-        }
-        leaf infrgrnc {
-          type ciena-6500-types:INT;
-          description
-            "Total Non Conforming Layer 2 traffic frames received";
-          config false;
-        }
-        leaf inoctgrnc {
-          type ciena-6500-types:INT;
-          description
-            "Total octet count of Grossly Non Conforming Layer 2 traffic frames received";
-          config false;
-        }
-        leaf internalerrdfr {
-          type ciena-6500-types:INT;
-          description
-            "In Frames: Data Error";
-          config false;
-        }
-        leaf inmacdadfr {
-          type ciena-6500-types:INT;
-          description
-            "In Frames: MAC Dropped";
-          config false;
-        }
-        leaf outframeserr {
-          type ciena-6500-types:INT;
-          description
-            "ICounts the total number of frames that could not be transmitted because of errors";
-          config false;
-        }
-      }
-    }
-    list lag {
-      key "lag";
-      config false;
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type enumeration {
-          enum "WANfacility";
-        }
-        description
-          "AID type";
-        config false;
-      }
-      leaf in-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total WAN frames received";
-        config false;
-      }
-      leaf in-frames-error {
-        type ciena-6500-types:INT;
-        description
-          "Total WAN frames received with errors";
-        config false;
-      }
-      leaf in-discard-frame {
-        type ciena-6500-types:INT;
-        description
-          "Total WAN frames received with no FCS errors that are discarded";
-        config false;
-      }
-      leaf in-octets {
-        type ciena-6500-types:INT;
-        description
-          "Count of Bytes contained in INFRAMES";
-        config false;
-      }
-      leaf in-octet-error {
-        type ciena-6500-types:INT;
-        description
-          "Count of Bytes contained in INFRAMESERR";
-        config false;
-      }
-      leaf out-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total WAN frames transmitted";
-        config false;
-      }
-      leaf out-discard-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total Egress direction WAN frames discarded";
-        config false;
-      }
-      leaf out-octets {
-        type ciena-6500-types:INT;
-        description
-          "Count of Bytes contained in OUTFRAMES";
-        config false;
-      }
-    }
-    list cos {
-      key "cos";
-      config false;
-      leaf cos {
-        mandatory true;
-        description
-          "AID in format COSST-shelf-slot-port, COSBR-shelf-slot-port, COSSL-shelf-slot-port, COSGD-shelf-slot-port, COSPL-shelf-slot-port, COSPR-shelf-slot-port, COSNW-shelf-slot-port, COSCR-shelf-slot-port, COSA-shelf-slot-port, COSBC-shelf-slot-port, COSBE-shelf-slot-port, COSC-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type enumeration {
-          enum "WANfacility";
-        }
-        description
-          "AID type";
-        config false;
-      }
-      leaf in-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total WAN frames received";
-        config false;
-      }
-      leaf in-frames-discard {
-        type ciena-6500-types:INT;
-        description
-          "Total frames discarded due to over subscription";
-        config false;
-      }
-      leaf in-octets {
-        type ciena-6500-types:INT;
-        description
-          "Count of Bytes contained in INFRAMES";
-        config false;
-      }
-      leaf in-frame-nonconform {
-        type ciena-6500-types:INT;
-        description
-          "Total non-conforming frames received";
-        config false;
-      }
-      leaf in-discard-frame {
-        type ciena-6500-types:INT;
-        description
-          "Total incoming frames discarded for all reasons";
-        config false;
-      }
-      leaf in-discard-octet {
-        type ciena-6500-types:INT;
-        description
-          "Total of bytes in INDFR";
-        config false;
-      }
-      leaf in-unicast-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total Unicast frames received";
-        config false;
-      }
-      leaf in-multicast-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total Multicast frames received";
-        config false;
-      }
-      leaf in-unicast-octets {
-        type ciena-6500-types:INT;
-        description
-          "Count of bytes contained in INUCFR";
-        config false;
-      }
-      leaf in-multicast-octets {
-        type ciena-6500-types:INT;
-        description
-          "Count of bytes contained in INMCFR";
-        config false;
-      }
-      leaf in-anycast-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total Unicast, Multicast, Broadcast frames received.";
-        config false;
-      }
-      leaf in-anycast-octets {
-        type ciena-6500-types:INT;
-        description
-          "Total Unicast, Multicast, Broadcast octets in INACFR.";
-        config false;
-      }
-      leaf out-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total frames transmitted";
-        config false;
-      }
-      leaf out-octets {
-        type ciena-6500-types:INT;
-        description
-          "Total bytes in OUTFRAMES";
-        config false;
-      }
-      leaf out-discard-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total TX frames discarded";
-        config false;
-      }
-      leaf out-discard-conform-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total outgoing conforming frames discarded";
-        config false;
-      }
-      leaf out-discard-octets {
-        type ciena-6500-types:INT;
-        description
-          "Total bytes OUTDFR";
-        config false;
-      }
-      leaf utl {
-        type ciena-6500-types:INT;
-        description
-          "Average percentage (Queue) Utilization";
-        config false;
-      }
-      leaf utilization-max {
-        type ciena-6500-types:INT;
-        description
-          "Maximum/Peak percentage (Queue) Utilization";
-        config false;
-      }
-      leaf out-unicast-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total Unicast frames transmitted.";
-        config false;
-      }
-      leaf outunicast-octets {
-        type ciena-6500-types:INT;
-        description
-          "Total bytes in OUTUCFR.";
-        config false;
-      }
-      leaf out-multicast-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total Multicast frames transmitted.";
-        config false;
-      }
-      leaf out-multicast-octets {
-        type ciena-6500-types:INT;
-        description
-          "Total bytes in OUTMCFR.";
-        config false;
-      }
-      leaf out-anycast-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total Unicast, Multicast, Broadcast frames transmitted.";
-        config false;
-      }
-      leaf out-anycast-octets {
-        type ciena-6500-types:INT;
-        description
-          "Total Unicast, Multicast, Broadcast octets in OUTACFR.";
-        config false;
-      }
-      leaf passthrough-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total Unicast, Multicast, Broadcast span passthrough frames transmitted.";
-        config false;
-      }
-      leaf passthrough-octets {
-        type ciena-6500-types:INT;
-        description
-          "Total Unicast, Multicast, Broadcast span passthrough octets in PTACFR.";
-        config false;
-      }
-      leaf passthrough-discard-frames {
-        type ciena-6500-types:INT;
-        description
-          "Total bytes in OUTUCFR.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-optmons.yang b/models/ciena-6500-optmons.yang
deleted file mode 100644
index f51d47a70efa896ba277fa90f7ec848a2a4de9c0..0000000000000000000000000000000000000000
--- a/models/ciena-6500-optmons.yang
+++ /dev/null
@@ -1,485 +0,0 @@
-module ciena-6500-optmons {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-optmons";
-  prefix optmons;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's optmons object for the 6500 platform";
-
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container optmons
-           list optmon
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         rpc optmons-operate-prot-switch
-           input
-             leaf sc
-             - Added default: MAN 
-             - Changed type from ciena-6500-enums:SwitchCommandPG to ciena-6500-enums:SwitchCommandPG_defaultMAN
-         container optmons
-           list optmon
-             leaf optmon
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf los-thres
-             - Changed type from ciena-6500-types:INT to ciena-6500-types:STRING
-             leaf also-disabled
-             - Added default: FALSE 
-             leaf pst
-             - Changed type from ciena-6500-enums:PSTfac_RTRV to enumeration
-               type enumeration
-               - Added enum: IS
-               - Added enum: OOS-MA
-               - Added enum: IS-ANR
-               - Added enum: OOS-AU
-               - Added enum: OOS-AUMA
-               - Added enum: OOS-MAANR
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTfac to enumeration
-               type enumeration
-               - Added enum: AINS
-               - Added enum: AINS-DEA
-               - Added enum: BRIDGED
-               - Added enum: SWITCHED
-               - Added enum: ROLL
-               - Added enum: ACT
-               - Added enum: IDLE
-               - Added enum: STBYS
-               - Added enum: WRK
-               - Added enum: ERRANL
-               - Added enum: PSI
-               - Added enum: FLT
-               - Added enum: MEA
-               - Added enum: TSTF
-               - Added enum: UEQ
-               - Added enum: SGEO
-               - Added enum: DISCD
-               - Added enum: LPBK
-               - Added enum: TS
-               - Added enum: FAF
-               - Added enum: STBYH
-               - Added enum: WRKRX
-               - Added enum: WRKTX
-               - Added enum: PRTCL
-               - Added enum: UAS
-               - Added enum: NOSITE
-               - Added enum: NOAM
-               - Added enum: MON
-               - Added enum: MSC
-               - Added enum: PROTECTED
-               - Added enum: MT
-               - Added enum: DSBLD
-               - Added enum: INHIP
-               - Added enum: L2DSBLD
-               - Added enum: TSGEN
-               - Added enum: TSMON
-             leaf monitor-loss
-             - Changed type from ciena-6500-types:INT to ciena-6500-types:DECIMAL
-           list prot-group
-             leaf wrkgaid
-             - Added mandatory: true 
-             leaf protaid
-             - Added mandatory: true 
-             leaf prot-scheme
-             - Added default: 1PLUS1 
-             - Changed type from ciena-6500-enums:PG_PS to ciena-6500-enums:PG_PS_default1PLUS1
-             leaf wait-to-restore
-             - Added default: 5-MIN 
-             - Changed type from ciena-6500-enums:WTR_OPS to ciena-6500-enums:WTR_OPS_default_5MIN
-             leaf detect-guard-time
-             - Added default: 0-MSEC 
-             - Changed type from ciena-6500-enums:TDG to ciena-6500-enums:TDG_default_0SEC
-             leaf revertive
-             - Added default: N 
-             - Changed type from ciena-6500-enums:PG_RVRTV to ciena-6500-enums:PG_RVRTV_defaultN
-             leaf rem-standard
-             - Added default: G8731 
-             leaf loss-pwr
-             - Added default: N 
-             - Changed type from ciena-6500-enums:BOOL_Y_N to enumeration
-               type enumeration
-               - Added enum: Y
-               - Added enum: N
-           list prot-switch
-             leaf optmon
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container optmons
-           list optmon
-           - Changed key from aid to optmon
-           - Removed leaf: aid
-           - Added leaf: optmon
-             leaf pst
-             - Changed type from ciena-6500-enums:PSTfac to ciena-6500-enums:PSTfac_RTRV
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTAINSMT_bits to ciena-6500-enums:SSTfac
-           list prot-group
-           - Changed key from aid to wrkgaid protaid
-           - Removed leaf: aid
-           - Added leaf: ttops
-           - Added leaf: wrkgaid
-             leaf revertive
-             - Changed type from ciena-6500-types:BOOLEAN to ciena-6500-enums:PG_RVRTV
-             leaf loss-pwr
-             - Changed type from ciena-6500-types:BOOLEAN to ciena-6500-enums:BOOL_Y_N
-             leaf protaid
-             - Removed config
-           list prot-switch
-           - Added key: optmon 
-           - Added leaf: optmon
-         rpc optmons-disable-optmon
-           input
-           - Removed leaf: aid
-           - Added leaf: optmon
-         rpc optmons-enable-optmon
-           input
-           - Changed leaf from aid to optmon
-             leaf optmon
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         rpc optmons-operate-prot-switch
-           input
-           - Added leaf: optmon
-         rpc optmons-release-prot-switch
-           input
-           - Added leaf: optmon";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: optmons
-       - Added rpc: optmons-disable-optmon
-       - Added rpc: optmons-enable-optmon
-       - Added rpc: optmons-operate-prot-switch
-       - Added rpc: optmons-release-prot-switch";
-  }
-
-  rpc optmons-disable-optmon {
-    description
-      "Removes the Facility from Service.";
-    input {
-      leaf optmon {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-slot-portSsubport, OPTMON-shelf-slotSsubslot-port, OPTMON-shelf-slotSsubslot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Remove facility from Maintenance State";
-      }
-    }
-  }
-  rpc optmons-enable-optmon {
-    description
-      "Restores the Facility back to Service.";
-    input {
-      leaf optmon {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-slot-portSsubport, OPTMON-shelf-slotSsubslot-port, OPTMON-shelf-slotSsubslot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc optmons-operate-prot-switch {
-    description
-      "Operate Protection Switch: This command instructs the NE to perform a protection switch.";
-    input {
-      leaf optmon {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandPG_defaultMAN;
-        default "MAN";
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc optmons-release-prot-switch {
-    description
-      "Release Protection Switch: This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-rr command and are active on the entity specified.";
-    input {
-      leaf optmon {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container optmons {
-    list optmon {
-      key "optmon";
-      config true;
-      leaf optmon {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-slot-portSsubport, OPTMON-shelf-slotSsubslot-port, OPTMON-shelf-slotSsubslot-portSsubport, OPTMON-shelf-ALL, OPTMON-shelf-slot-ALL, OPTMON-shelf-slotSsubslot-ALL, OPTMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf los-thres {
-        type ciena-6500-types:STRING;
-        description
-          "Loss of Signal Threshold";
-        config true;
-      }
-      leaf also-disabled {
-        default "FALSE";
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Indicate if Auto-Shutoff is disabled.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf port-label {
-        type ciena-6500-types:STRING;
-        description
-          "Port Label";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf monitor-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Monitor Loss";
-        config false;
-      }
-    }
-    list prot-group {
-      key "wrkgaid protaid";
-      config true;
-      leaf wrkgaid {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf protaid {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf prot-scheme {
-        type ciena-6500-enums:PG_PS_default1PLUS1;
-        default "1PLUS1";
-        description
-          "Indicates the protection scheme to be used.";
-        config true;
-      }
-      leaf wait-to-restore {
-        type ciena-6500-enums:WTR_OPS_default_5MIN;
-        default "5-MIN";
-        description
-          "Wait-to-restore period in minutes";
-        config true;
-      }
-      leaf detect-guard-time {
-        type ciena-6500-enums:TDG_default_0SEC;
-        default "0-MSEC";
-        description
-          "Detection Guard Time (supported on SDHJ only) ";
-        config true;
-      }
-      leaf revertive {
-        type ciena-6500-enums:PG_RVRTV_defaultN;
-        default "N";
-        description
-          "Revertive switching mode enabled?";
-        config true;
-      }
-      leaf rem-standard {
-        type ciena-6500-enums:ProtStandardOTMn;
-        default "G8731";
-        description
-          "Standard used on the remote equipment";
-        config true;
-      }
-      leaf loss-pwr {
-        type enumeration {
-          enum "Y";
-          enum "N";
-        }
-        default "N";
-        description
-          "Loss of Power Supply mode";
-        config true;
-      }
-      leaf ttops {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Transponder Triggered Switching Mode Enabled";
-        config true;
-      }
-      leaf ps-dirn {
-        type enumeration {
-          enum "UNI" {
-            description
-              "Unidirectional";
-          }
-          enum "BI" {
-            description
-              "Bidirectional";
-          }
-        }
-        description
-          "Protection Switch Direction.Default=UNI.";
-        config false;
-      }
-    }
-    list prot-switch {
-      key "optmon";
-      config false;
-      leaf optmon {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sw-status {
-        type ciena-6500-enums:SwitchStatusPG;
-        description
-          "Switch Status.";
-        config false;
-      }
-      leaf sw-end {
-        type enumeration {
-          enum "LOCAL" {
-            description
-              "The switch is initiated by the local network element.";
-          }
-        }
-        description
-          "Switch End.";
-        config false;
-      }
-      leaf sw-reason {
-        type ciena-6500-enums:SwitchReasonOPS;
-        description
-          "Reason for auto switch.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-oscs.yang b/models/ciena-6500-oscs.yang
deleted file mode 100644
index dcc7a1b0196ffc5a2e655ebf525e6942df152dfb..0000000000000000000000000000000000000000
--- a/models/ciena-6500-oscs.yang
+++ /dev/null
@@ -1,204 +0,0 @@
-module ciena-6500-oscs {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-oscs";
-  prefix oscs;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's oscs object for the 6500 platform";
-
-  revision 2018-02-23 {
-    description
-      "6500 Release 12.25 DF
-         container oscs
-           list osc
-           - Added leaf: comm-state";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         container oscs
-           list osc
-           - Added leaf: dm-enable
-           - Added leaf: dmcount
-           - Added leaf: dmdistance
-             leaf osc
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf sd-th
-               type ciena-6500-types:INT
-               - Added range: 4..10 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container oscs
-           list osc
-           - Changed key from aid to osc
-           - Removed leaf: aid
-           - Added leaf: osc
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTfac_bits to ciena-6500-enums:SSTfac
-         rpc oscs-disable-osc
-           input
-           - Changed leaf from aid to osc
-             leaf osc
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         rpc oscs-enable-osc
-           input
-           - Changed leaf from aid to osc
-             leaf osc
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: oscs
-       - Added rpc: oscs-disable-osc
-       - Added rpc: oscs-enable-osc";
-  }
-
-  rpc oscs-disable-osc {
-    description
-      "Remove the OSC Facility from service.";
-    input {
-      leaf osc {
-        mandatory true;
-        description
-          "AID in format OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc oscs-enable-osc {
-    description
-      "Restore the OSC Facility to service.";
-    input {
-      leaf osc {
-        mandatory true;
-        description
-          "AID in format OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container oscs {
-    list osc {
-      key "osc";
-      config true;
-      leaf osc {
-        mandatory true;
-        description
-          "AID in format OSC-shelf-slot-port, OSC-shelf-ALL, OSC-shelf-slot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf rx-path-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "The Received Span Loss in dB.";
-        config true;
-      }
-      leaf sd-th {
-        type ciena-6500-types:INT {
-          range "4..10";
-        }
-        description
-          "";
-        config true;
-      }
-      leaf dm-enable {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specify if delay measurement is enable.";
-        config true;
-      }
-      leaf comm-state {
-        type enumeration {
-          enum "OFF" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "ON" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "UNKNOWN" {
-            description
-              "(This value can be used in edit operation)";
-          }
-        }
-        description
-          "Specify if communication state is on or off.";
-        config true;
-      }
-      leaf tx-pow {
-        type ciena-6500-types:DECIMAL;
-        description
-          "OSC Tx launch power in dBm.";
-        config false;
-      }
-      leaf tx-wavelength {
-        type ciena-6500-types:DECIMAL;
-        description
-          "The OSC wavelength in nm.";
-        config false;
-      }
-      leaf span-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "The OSC Span Loss in dB.";
-        config false;
-      }
-      leaf est-ber {
-        type ciena-6500-types:STRING;
-        description
-          "The Estimated BER .";
-        config false;
-      }
-      leaf receive-pow {
-        type ciena-6500-types:STRING;
-        description
-          "The OSC receive power in dB.";
-        config false;
-      }
-      leaf dmcount {
-        type ciena-6500-types:STRING;
-        description
-          "Value of delay measurement in micro seconds.";
-        config false;
-      }
-      leaf dmdistance {
-        type ciena-6500-types:DECIMAL;
-        description
-          "The estimated one way distance in kilometers.";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary state";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:SSTfac;
-        description
-          "Identify the secondary state";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-osrp.yang b/models/ciena-6500-osrp.yang
deleted file mode 100644
index d186281ac84fb2cafb8b47c54f6ee86ffb5281f9..0000000000000000000000000000000000000000
--- a/models/ciena-6500-osrp.yang
+++ /dev/null
@@ -1,6240 +0,0 @@
-module ciena-6500-osrp {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-osrp";
-  prefix osrp;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's osrp object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container osrp
-           list node
-           - Added leaf: flt-holdoff-timer
-           list dtl
-           - Added leaf: dtl-ccmode
-           - Added leaf: dtl-uuid
-           - Added leaf: txinfo-data
-           list casc-dtl
-           - Added leaf: dtl-uuid
-           list dtl-set
-           - Added leaf: dtl-uuid
-           list non-viable-dtl-set
-           - Added leaf: dtl-uuid
-           list snc
-           - Added leaf: ccmode
-           - Added leaf: mrccmode
-           - Added leaf: dtl-uuid
-           list snc-group
-           - Added leaf: ccmode
-           - Added leaf: mrccmode
-           - Added leaf: dtl-uuid
-         rpc osrp-show-snc
-           output
-             list output
-             - Added leaf: ccmode
-             - Added leaf: mrccmode
-             - Added leaf: dtl-uuid";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         rpc osrp-show-remote-link-metrics
-           output
-             list output
-               leaf grid-type
-                 type enumeration
-                 - Added enum: LFLEX744
-         rpc osrp-show-snc
-           output
-             list output
-               leaf frequency
-                 type decimal64
-                 - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-               leaf min-freq
-                 type decimal64
-                 - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-               leaf max-freq
-                 type decimal64
-                 - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-         container osrp
-           list link-metrics
-             leaf grid-type
-               type enumeration
-               - Added enum: LFLEX744
-           list remote-link-metrics
-             leaf grid-type
-               type enumeration
-               - Added enum: LFLEX744
-           list dtl
-             leaf min-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-             leaf max-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-           list snc
-             leaf frequency
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-             leaf min-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-             leaf max-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-           list snc-group
-             leaf min-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-             leaf max-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Removed rpc: osrp-show-diag-snc
-       - Removed rpc: osrp-show-ee-diag-snc
-       - Removed rpc: osrp-show-route-snc
-       - Removed rpc: osrp-show-diag-snc-group
-       - Removed rpc: osrp-show-route-snc-group
-       - Removed rpc: osrp-show-diag-corouted-snc
-       - Removed rpc: osrp-show-route-corouted-snc
-       - Added rpc: osrp-show-remote-node
-       - Added rpc: osrp-show-line
-       - Added rpc: osrp-show-remote-link
-       - Added rpc: osrp-show-remote-link-metrics
-       - Added rpc: osrp-show-snc
-       - Added rpc: osrp-show-snc-route
-       - Added rpc: osrp-show-corouted-snc-route
-         rpc osrp-add-member-corouted-snc
-           input
-             leaf generic-end-point
-             - Added default: NO 
-             leaf remote-interop
-             - Added default: OTHER 
-             leaf remote-ttp-mux
-             - Added default: NONE 
-             leaf snc
-             - Added mandatory: true 
-             leaf tcm
-               type ciena-6500-types:INT
-               - Added range: 0..6 
-             leaf trib-port
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..32 
-         rpc osrp-delete-member-corouted-snc
-           input
-             leaf snc
-             - Added mandatory: true 
-         container osrp
-         - Added list: line-ovpn
-         - Added list: line-snc
-         - Added list: link-snc
-         - Added list: snc-diag
-         - Added list: snc-ee-diag
-         - Added list: snc-route
-         - Added list: snc-group-diag
-         - Added list: snc-group-route
-         - Added list: corouted-snc-diag
-         - Added list: corouted-snc-route
-         - Added list: todrprofile
-         - Added list: lag
-           list config
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf node-name
-             - Added mandatory: true 
-             leaf node-id
-             - Added mandatory: true 
-             leaf tl1-ip-addr
-             - Added mandatory: true 
-             leaf type
-             - Added default: DERIVED 
-               type enumeration
-               - Added enum: DERIVED
-             leaf udp-port
-             - Added default: 51001 
-               type ciena-6500-types:INT
-               - Added range: 51001..52000 
-           list node
-           - Added leaf: otu2ebwt
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf bw-thresh-mode
-             - Added default: MANUAL 
-             leaf holdoff-timer
-               type ciena-6500-types:INT
-               - Added range: 0..3600000 
-             leaf osrp-line-tcm-level
-               type ciena-6500-types:INT
-               - Added range: 1..6 
-             leaf osrp-snc-tcm-level
-               type ciena-6500-types:INT
-               - Added range: 1..6 
-             leaf tod-revert-period
-               type ciena-6500-types:INT
-               - Added range: 5..300 
-             leaf timed-revert
-               type ciena-6500-types:INT
-               - Added range: 300..86400 
-             leaf snic-timer
-               type ciena-6500-types:INT
-               - Added range: 0..150 
-             leaf oob-local-port
-               type ciena-6500-types:INT
-               - Added range: 51001..52000 
-           list remote-node
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list line
-           - Added leaf: hold-off
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf common-id
-               type ciena-6500-types:INT
-               - Added range: 1..65534 
-             leaf oob-common-id
-               type ciena-6500-types:INT
-               - Added range: 1..65534 
-             leaf delay
-               type ciena-6500-types:INT
-               - Added range: 1..200000 
-             leaf line-type
-               type enumeration
-               - Added enum: OTU2E
-             leaf remote-common-id
-               type ciena-6500-types:INT
-               - Added range: 1..65534 
-             leaf remote-delay
-               type ciena-6500-types:INT
-               - Added range: 1..200000 
-             leaf remote-osrp-link-id
-               type ciena-6500-types:INT
-               - Added range: 1..4194303 
-             leaf ovpn-id-count
-               type ciena-6500-types:INT
-               - Added range: 0..10 
-             leaf-list ovpn-ids
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf-list ovpn-link-ids
-               type ciena-6500-types:INT
-               - Added range: 1..4194303 
-             leaf-list ovpn-bw
-               type ciena-6500-types:INT
-               - Added range: 1..80 
-             leaf-list remote-ovpn-ids
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf-list remote-ovpn-bw
-               type ciena-6500-types:INT
-               - Added range: 1..80 
-             leaf base-ovpn-id
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf total-bw
-               type ciena-6500-types:INT
-               - Added range: 0..80 
-             leaf avail-base-bw
-               type ciena-6500-types:INT
-               - Added range: 0..80 
-           list link
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf adm-weight
-             - Added default: 5040 
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf constraint-flood-enabled
-             - Added default: NO 
-             leaf label
-               type string
-               - Changed length from 0..40 to 0..64
-             leaf oob-enable
-             - Added default: NO 
-             leaf oob-rmt-node-id
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf oob-rmt-udp-port
-               type ciena-6500-types:INT
-               - Added range: 51001..52000 
-             leaf-list prot-bundle-ids
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf ovpn-id
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf odu0-bw-thresh
-               type ciena-6500-types:INT
-               - Added range: 0..16000 
-             leaf odu1-bw-thresh
-               type ciena-6500-types:INT
-               - Added range: 0..16000 
-             leaf odu2-bw-thresh
-               type ciena-6500-types:INT
-               - Added range: 0..16000 
-             leaf odu2e-bw-thresh
-               type ciena-6500-types:INT
-               - Added range: 0..16000 
-             leaf odu3-bw-thresh
-               type ciena-6500-types:INT
-               - Added range: 0..16000 
-             leaf odu4-bw-thresh
-               type ciena-6500-types:INT
-               - Added range: 0..16000 
-             leaf bw-thresh-mode
-             - Added default: MANUAL 
-             leaf holdback-signal-degrade-thresh
-             - Added default: 9 
-               type ciena-6500-types:INT
-               - Added range: 5..12 
-             leaf manual-delay
-               type ciena-6500-types:INT
-               - Added range: 1..200000 
-             leaf link-max-delay
-               type ciena-6500-types:INT
-               - Added range: 0..200000 
-             leaf remote-adm-weight
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf-list remote-prot-bundle-ids
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf remote-link-max-delay
-               type ciena-6500-types:INT
-               - Added range: 0..200000 
-             leaf remote-link-id
-               type ciena-6500-types:INT
-               - Added range: 0..4194303 
-             leaf remote-ovpn-id
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf-list child-virt-links
-               type ciena-6500-types:INT
-               - Added range: 0..4194303 
-           list link-metrics
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf adm-weight
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf adv-bw
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..512 
-             leaf rhp-adv-bw
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..512 
-             leaf remote-adm-weight
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf transfer-delay
-               type ciena-6500-types:INT
-               - Added range: 0..200000 
-           list remote-link
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf adm-weight
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf label
-               type string
-               - Changed length from 0..40 to 0..64
-             leaf linkmaxdelay
-               type ciena-6500-types:INT
-               - Added range: 0..200000 
-             leaf orig-link-id
-               type ciena-6500-types:INT
-               - Added range: 1..25438 
-             leaf ovpnid
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf-list pbids
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf remote-adm-weight
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf-list remote-prot-bundle-ids
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf remote-link-max-delay
-               type ciena-6500-types:INT
-               - Added range: 0..200000 
-             leaf remote-link-id
-               type ciena-6500-types:INT
-               - Added range: 1..4194303 
-             leaf remote-label
-               type string
-               - Changed length from 0..40 to 0..64
-             leaf remote-ovpn-id
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-           list remote-link-metrics
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf adm-weight
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf adv-bw
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..512 
-             leaf rhp-adv-bw
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..512 
-             leaf orig-link-id
-               type ciena-6500-types:INT
-               - Added range: 1..25438 
-             leaf remote-adm-weight
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf transfer-delay
-               type ciena-6500-types:INT
-               - Added range: 0..200000 
-           list dtl
-           - Added leaf: min-freq
-           - Added leaf: max-freq
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf dtl-data
-             - Added mandatory: true 
-             leaf dtl-type
-             - Added default: NONE 
-             leaf term-node-name
-             - Added mandatory: true 
-           list casc-dtl
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf casc-dtl-data
-             - Added mandatory: true 
-             leaf casc-dtl-type
-             - Added default: NONE 
-           list dtl-set
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf wrk-dtl
-             - Added mandatory: true 
-           list non-viable-dtl-set
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list snc
-           - Added leaf: datapath-fault-action
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf absol-route-diversity
-             - Added default: OFF 
-             leaf backoff-period
-               type ciena-6500-types:INT
-               - Added range: 1..30 
-             leaf datapath-fault-alm-time
-             - Added default: 15 
-               type ciena-6500-types:INT
-               - Added range: 0..30 
-             leaf local-end-point
-             - Added mandatory: true 
-             leaf max-adm-weight
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..1310700 
-             leaf max-delay
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..4000000 
-             leaf mesh-rest
-             - Added default: ON 
-             leaf takeover
-             - Added default: NO 
-             leaf prot-type
-             - Added mandatory: true 
-             leaf regroom
-             - Added default: ON 
-             leaf remote-end-point
-             - Added mandatory: true 
-             leaf remote-node
-             - Added mandatory: true 
-             leaf remote-ctp-path-term
-             - Added default: NO 
-             - Changed type from ciena-6500-enums:BOOL_YES_NO to enumeration
-               type enumeration
-               - Added enum: YES
-               - Added enum: NO
-             leaf remote-ttp-mux
-             - Added default: NONE 
-             leaf trib-port
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..32 
-             leaf tcm
-               type ciena-6500-types:INT
-               - Added range: 0..6 
-             leaf tod-revert-holdback-enabled
-             - Added default: YES 
-             leaf tod-revert-period
-               type ciena-6500-types:INT
-               - Added range: 5..300 
-             leaf revert-time
-             - Added default: 300 
-               type ciena-6500-types:INT
-               - Added range: 300..86400 
-             leaf type
-             - Added mandatory: true 
-             leaf remote-interop
-             - Added default: OTHER 
-             leaf grouped
-             - Added default: NO 
-             leaf frequency
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf min-freq
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf max-freq
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf prot-max-adm-weight
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..1310700 
-             leaf prot-max-delay
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..4000000 
-             leaf generic-end-point
-             - Added default: NO 
-             - Changed type from ciena-6500-enums:BOOL_YES_NO to enumeration
-               type enumeration
-               - Added enum: YES
-               - Added enum: NO
-             leaf snc-integrity-check
-             - Added default: OFF 
-             leaf release-on-client-fail
-             - Added default: DISABLED 
-             leaf release-on-client-fail-holdoff
-             - Added default: ALARM 
-             leaf mode
-             - Added default: OTN 
-             leaf pst
-             - Changed type from ciena-6500-enums:PSTfac_NOANR to enumeration
-               type enumeration
-               - Added enum: IS
-               - Added enum: OOS-MA
-               - Added enum: OOS-AU
-               - Added enum: OOS-AUMA
-             leaf snc-ep-state
-               type enumeration
-               - Added enum: ORIG_LOCK_PENDING
-             leaf release-on-client-fail-holdon
-               type ciena-6500-types:INT
-               - Added range: 5 
-             leaf validate
-             - Added default: NO 
-           list snc-group
-           - Added leaf: absol-route-diversity
-           - Added leaf: bckop
-           - Added leaf: mesh-rest
-           - Added leaf: type
-           - Added leaf: contiguous
-           - Added leaf: max-snc-spacing
-           - Added leaf: nv-dtl-set-name
-           - Added leaf: peer-origin
-           - Added leaf: peer-sncg
-           - Added leaf: rvrt-time
-           - Added leaf: sncglinetype
-           - Added leaf: time-to-revert
-           - Added leaf: ckt-id
-           - Added leaf: route-operation
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf dtl-excl
-             - Added default: NO 
-             leaf remote-node
-             - Added mandatory: true 
-             leaf max-adm-weight
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..1310700 
-             leaf min-freq
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf max-freq
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf min-freq-db
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0..4800.000 
-             leaf max-freq-db
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0..4800.000 
-             leaf prot-type
-             - Added default: UNPROTECTED_HIGH 
-             leaf pst
-             - Changed type from ciena-6500-enums:PST_SNCG to enumeration
-               type enumeration
-               - Added enum: IS
-               - Added enum: OOS-MA
-               - Added enum: IS-ANR
-               - Added enum: OOS-AU
-             leaf sncg-end-point-state
-               type enumeration
-               - Added enum: ORIG_LOCK_PENDING
-             leaf validate
-             - Added default: NO 
-           list corouted-snc
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf backoff-period
-               type ciena-6500-types:INT
-               - Added range: 1..30 
-             leaf max-adm-weight
-               type ciena-6500-types:INT
-               - Added range: 0..1310700 
-             leaf max-delay
-               type ciena-6500-types:INT
-               - Added range: 0..4000000 
-             leaf ovpn-id
-               type ciena-6500-types:INT
-               - Added range: 0..255 
-             leaf prot-max-adm-weight
-               type ciena-6500-types:INT
-               - Added range: 0..1310700 
-             leaf prot-max-delay
-               type ciena-6500-types:INT
-               - Added range: 0..4000000 
-             leaf tod-revert-period
-               type ciena-6500-types:INT
-               - Added range: 5..300 
-             leaf revert-time
-               type ciena-6500-types:INT
-               - Added range: 300..86400 
-             leaf num-members
-               type ciena-6500-types:INT
-               - Added range: 1..10 ";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added container: osrp
-       - Added rpc: osrp-disable-line
-       - Added rpc: osrp-enable-line
-       - Added rpc: osrp-disable-snc
-       - Added rpc: osrp-enable-snc
-       - Added rpc: osrp-show-diag-snc
-       - Added rpc: osrp-clear-diag-snc
-       - Added rpc: osrp-show-ee-diag-snc
-       - Added rpc: osrp-show-route-snc
-       - Added rpc: osrp-disable-snc-group
-       - Added rpc: osrp-enable-snc-group
-       - Added rpc: osrp-show-diag-snc-group
-       - Added rpc: osrp-clear-diag-snc-group
-       - Added rpc: osrp-show-route-snc-group
-       - Added rpc: osrp-disable-corouted-snc
-       - Added rpc: osrp-enable-corouted-snc
-       - Added rpc: osrp-show-diag-corouted-snc
-       - Added rpc: osrp-clear-diag-corouted-snc
-       - Added rpc: osrp-add-member-corouted-snc
-       - Added rpc: osrp-delete-member-corouted-snc
-       - Added rpc: osrp-show-route-corouted-snc";
-  }
-
-  rpc osrp-show-remote-node {
-    description
-      "Retrieve remote OSRP nodes.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPRMTNODES-shelf-id, OSRPRMTNODES0-shelf-id, OSRPRMTNODES0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mbrfilter {
-        type string {
-          length "1..40";
-        }
-        description
-          "Specifies OSRP node retrieval filter values.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf local {
-          type enumeration {
-            enum "NEIGHBOR";
-            enum "REMOTE";
-          }
-          description
-            "Locality of the remote node.";
-        }
-        leaf neighbor-peer-node-state {
-          type enumeration {
-            enum "NP_DOWN";
-            enum "NEGOTIATING";
-            enum "EXCHANGE";
-            enum "LOADING";
-            enum "FULL";
-            enum "NOT_APPL";
-          }
-          description
-            "State of the FSM (Finite State Machine) for the neighboring peer node, with respect to the node where this command is issued.";
-        }
-        leaf osrp-blocked-node-oper-st {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "Operational state of the blocked node.";
-        }
-        leaf osrp-node-id {
-          type string {
-            length "44";
-          }
-          description
-            "OSRP node ID.";
-        }
-        leaf osrp-node-name {
-          type string {
-            length "1..40";
-          }
-          description
-            "OSRP node name.";
-        }
-        leaf osrp-node-type {
-          type enumeration {
-            enum "UNKNOWN";
-            enum "CD";
-            enum "CI";
-            enum "5410";
-            enum "5430";
-            enum "6500_32";
-            enum "6500_14";
-            enum "6500_7";
-            enum "6500_2";
-            enum "6500";
-            enum "6500_CS";
-            enum "6500_T_24";
-            enum "6500_T_12";
-            enum "6500_T_6";
-            enum "6500_T";
-          }
-          description
-            "OSRP node type.";
-        }
-        leaf tl1-ip-addr {
-          type ciena-6500-types:IPADDR;
-          description
-            "The IP address OSRP floods through the network.(Format: n.n.n.n)";
-        }
-        leaf retain-home-path-capability {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specifies if the Retain Home Path capability is available.";
-        }
-        leaf make-before-break {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Specifies if the Make Before Break capability is available.";
-        }
-        leaf ovpn-capability {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Specifies if OVPN enhancement capability is enabled.";
-        }
-      }
-    }
-  }
-  rpc osrp-disable-line {
-    description
-      "Place a local OSRP line into an out-of-service state for maintenance.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPLINE-shelf-slot-port, OSRPLINE0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-enable-line {
-    description
-      "Restore a local OSRP line from a maintenance out-of-service state.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPLINE-shelf-slot-port, OSRPLINE0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-show-line {
-    description
-      "Retrieve local OSRP lines.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPLINE-shelf-slot-port, OSRPLINE0-shelf-id, OSRPLINE-shelf-ALL, OSRPLINE0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mbrfilter {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies OSRP line retrieval filter.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf bw-lockout-enabled {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Specifies if bandwidth lockout is enabled locally for the OSRP line.";
-        }
-        leaf common-id {
-          type ciena-6500-types:INT {
-            range "0..65534";
-          }
-          description
-            "Common identifier of the OSRP line.";
-        }
-        leaf hold-off {
-          type ciena-6500-types:INT {
-            range "0..5000";
-          }
-          description
-            "";
-        }
-        leaf delay {
-          type ciena-6500-types:INT {
-            range "1..200000";
-          }
-          description
-            "Indicates the physical (measured) delay in milliseconds for the OSRP line.";
-        }
-        leaf ignore-faults {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Specifies if faults are to be ignored for this OSRP line.";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "Label for the OSRP line.";
-        }
-        leaf line-type {
-          type enumeration {
-            enum "OTU4";
-            enum "OTU2";
-            enum "OTU2E";
-            enum "OTU3";
-            enum "OTU3E2";
-            enum "FTTP";
-            enum "OC3";
-            enum "OC12";
-            enum "OC48";
-            enum "OC192";
-            enum "OMS";
-          }
-          description
-            "The physical line type.";
-        }
-        leaf oob-common-id {
-          type ciena-6500-types:INT {
-            range "1..65534";
-          }
-          description
-            "Common ID for out-of-band connectivity.";
-        }
-        leaf osrp-link {
-          type ciena-6500-types:aid;
-          description
-            "Local OSRP link in which this OSRP line is being aggregated.";
-        }
-        leaf local-supp-tp {
-          type ciena-6500-types:STRING;
-          description
-            "Local supporting termination point indicating the physical port of the termination point of the line.";
-        }
-        leaf remote-bw-lockout-enabled {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Specifies the remote bandwidth lockout value.";
-        }
-        leaf remote-supp-tp {
-          type ciena-6500-types:STRING;
-          description
-            "Remote supporting termination point indicating the physical port of the termination point of the line.";
-        }
-        leaf remote-common-id {
-          type ciena-6500-types:INT {
-            range "1..65534";
-          }
-          description
-            "Common ID of the remote line.";
-        }
-        leaf remote-delay {
-          type ciena-6500-types:INT {
-            range "1..200000";
-          }
-          description
-            "Measured delay value on the remote line (in microseconds).";
-        }
-        leaf remote-label {
-          type string {
-            length "0..40";
-          }
-          description
-            "Label of the remote line.";
-        }
-        leaf remote-node-name {
-          type string {
-            length "1..40";
-          }
-          description
-            "Name of the remote node.";
-        }
-        leaf remote-osrp-link-id {
-          type ciena-6500-types:INT {
-            range "1..4194303";
-          }
-          description
-            "ID of the remote OSRP link in which the remote line is aggregated.";
-        }
-        leaf remote-pst {
-          type ciena-6500-enums:PSTfac;
-          description
-            "Primary state of the remote line.";
-        }
-        leaf remote-state {
-          type enumeration {
-            enum "UNBLOCKED";
-            enum "BLOCKED";
-          }
-          description
-            "Specifies the current state of the remote OSRP line.";
-        }
-        leaf span-loss-exceeded-action {
-          type enumeration {
-            enum "OOS" {
-              description
-                "All non-permanent SNCs using the OSRP line are deleted or mesh restored. The OSRP line will no longer be used for establishing new SNCs.";
-            }
-            enum "BLOCK" {
-              description
-                "The SNCs using the OSRP line are not impacted. The OSRP line will no longer be used for establishing new SNCs.";
-            }
-            enum "NONE" {
-              description
-                "Do nothing.";
-            }
-          }
-          description
-            "Specifies the behavior on SPANLOSSEXCEEDED. This parameter is only applicable to photonics.";
-        }
-        leaf state {
-          type enumeration {
-            enum "UNBLOCKED";
-            enum "BLOCKED";
-          }
-          description
-            "Specifies the current state of the local OSRP line.";
-        }
-        leaf ovpn-id-count {
-          type ciena-6500-types:INT {
-            range "0..10";
-          }
-          description
-            "The number of Optical Virtual Private Networks which this line belongs to.";
-        }
-        leaf-list ovpn-ids {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "The Optical Virtual Private Network ID list";
-        }
-        leaf-list ovpn-link-ids {
-          type ciena-6500-types:INT {
-            range "1..4194303";
-          }
-          description
-            "The OSRPLINK ID list which corresponds to the OVPN ID list.";
-        }
-        leaf-list ovpn-bw {
-          type ciena-6500-types:INT {
-            range "1..80";
-          }
-          description
-            "The bandwidth list that corresponds to the OVPN ID list";
-        }
-        leaf-list remote-ovpn-ids {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "The Remote Optical Virtual Private Network ID list";
-        }
-        leaf-list remote-ovpn-bw {
-          type ciena-6500-types:INT {
-            range "1..80";
-          }
-          description
-            "The remote bandwidth list that corresponds to the OVPN ID list";
-        }
-        leaf base-ovpn-id {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "The base OVPN ID of the base link.";
-        }
-        leaf total-bw {
-          type ciena-6500-types:INT {
-            range "0..80";
-          }
-          description
-            "The total bandwidth this line was provisioned with.";
-        }
-        leaf avail-base-bw {
-          type ciena-6500-types:INT {
-            range "0..80";
-          }
-          description
-            "The available bandwidth this line has left on the base link.";
-        }
-        leaf tod-rhb-sdc-ln-time {
-          type ciena-6500-types:STRING;
-          description
-            "Specifies date and time when OSRP line became available for TODR reversion";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_NOANR;
-          description
-            "Primary state of the OSRP line.";
-        }
-      }
-    }
-  }
-  rpc osrp-show-remote-link {
-    description
-      "Retrieve remote OSRP links.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPRMTLINKS-shelf-id, OSRPRMTLINKS0-shelf-id, OSRPRMTLINKS0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mbrfilter {
-        type string {
-          length "1..64";
-        }
-        description
-          "Specifies OSRP link retrieval filter values.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf adm-weight {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Administrative weight which specifies the level of importance given to the OSRP link.";
-        }
-        leaf direction {
-          type enumeration {
-            enum "OUTGOING";
-            enum "INCOMING";
-          }
-          description
-            "The direction, with respect to the advertising node, where the parameters in the metrics apply.";
-        }
-        leaf hstate {
-          type enumeration {
-            enum "NOTAPPLICABLE";
-            enum "DOWN";
-            enum "ATTEMPT";
-            enum "ONEWAYINSIDE";
-            enum "TWOWAYINSIDE";
-            enum "ONEWAYOUTSIDE";
-            enum "TWOWAYOUTSIDE";
-            enum "COMMONOUTSIDE";
-          }
-          description
-            "State of the Hello protocol finite state machine.";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "Label of the OSRP link.";
-        }
-        leaf linkmaxdelay {
-          type ciena-6500-types:INT {
-            range "0..200000";
-          }
-          description
-            "Indicates the worst delay in microseconds of any OSRP line aggregated in the link.";
-        }
-        leaf orig-link-id {
-          type ciena-6500-types:INT {
-            range "1..25438";
-          }
-          description
-            "ID of the link from the origination node.";
-        }
-        leaf orig-node-id {
-          type string {
-            length "44";
-          }
-          description
-            "Node ID of the originating node.";
-        }
-        leaf orig-node-name {
-          type string {
-            length "1..40";
-          }
-          description
-            "Name of the originating node.";
-        }
-        leaf ovpnid {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "Optical Virtual Private Network ID.";
-        }
-        leaf-list pbids {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "List of up to 20 protection bundles to which the OSRP link belongs.";
-        }
-        leaf remote-adm-weight {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Administrative weight associated with this OSRP link's remote side.";
-        }
-        leaf-list remote-prot-bundle-ids {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "List of up to 20 protection bundles to which the OSRP link remote side belongs.";
-        }
-        leaf remote-link-max-delay {
-          type ciena-6500-types:INT {
-            range "0..200000";
-          }
-          description
-            "The max delay associated with the remote OSRP link.";
-        }
-        leaf remote-node-id {
-          type string {
-            length "44";
-          }
-          description
-            "Node ID of the remote link.";
-        }
-        leaf remote-node-name {
-          type string {
-            length "1..40";
-          }
-          description
-            "Name of the remote node.";
-        }
-        leaf remote-link-id {
-          type ciena-6500-types:INT {
-            range "1..4194303";
-          }
-          description
-            "ID of the remote link.";
-        }
-        leaf remote-label {
-          type string {
-            length "0..64";
-          }
-          description
-            "Label of the remote link.";
-        }
-        leaf remote-ovpn-id {
-          type ciena-6500-types:INT {
-            range "0..255";
-          }
-          description
-            "The Optical Virtual Private Network ID of the remote end.";
-        }
-      }
-    }
-  }
-  rpc osrp-show-remote-link-metrics {
-    description
-      "Retrieve remote OSRP link metrics.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPRMTLINKS-shelf-id, OSRPRMTLINKS0-shelf-id, OSRPRMTLINKS0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mbrfilter {
-        type string {
-          length "1..64";
-        }
-        description
-          "Specifies OSRP link retrieval filter values.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf adm-weight {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Administrative weight which specifies the level of importance given to the OSRP link.";
-        }
-        leaf adv-bw {
-          type string {
-            length "1..512";
-          }
-          description
-            "The link's advertised bandwidth (available, advertised, and maximum bandwidth) for Normal usage.";
-        }
-        leaf rhp-adv-bw {
-          type string {
-            length "1..512";
-          }
-          description
-            "The link's advertised bandwidth (advertised, and maximum bandwidth) for RHP usage.";
-        }
-        leaf adv-wl {
-          type string {
-            length "11..192";
-          }
-          description
-            "A hexadecimal number which represents the current wavelength availability associated with the OSRP link.";
-        }
-        leaf grid-type {
-          type enumeration {
-            enum "C100G44";
-            enum "C50G88";
-            enum "C50G96";
-            enum "CFLEX768";
-            enum "LFLEX744";
-          }
-          description
-            "Grid type of the OSRP link.";
-        }
-        leaf orig-link-id {
-          type ciena-6500-types:INT {
-            range "1..25438";
-          }
-          description
-            "ID of the link from the origination node.";
-        }
-        leaf orig-node-name {
-          type string {
-            length "1..40";
-          }
-          description
-            "Name of the originating node.";
-        }
-        leaf remote-adm-weight {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "Administrative weight associated with this OSRP link's remote side.";
-        }
-        leaf remote-prot-type {
-          type enumeration {
-            enum "UNPROTECTED";
-            enum "APS";
-          }
-          description
-            "Protection types supported for this service class' OSRP link from remote side.";
-        }
-        leaf sup-prot-type {
-          type enumeration {
-            enum "UNPROTECTED";
-            enum "APS";
-          }
-          description
-            "Protection types supported for this service class.";
-        }
-        leaf transfer-delay {
-          type ciena-6500-types:INT {
-            range "0..200000";
-          }
-          description
-            "Indicates the worst delay in microseconds of any OSRP line aggregated in the remote link.";
-        }
-      }
-    }
-  }
-  rpc osrp-disable-snc {
-    description
-      "Place a Subnetwork Connection into an out-of-service state for maintenance.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC-shelf-id, SNC0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-enable-snc {
-    description
-      "Restore a Subnetwork Connection from a maintenance out-of-service state.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC-shelf-id, SNC0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-show-snc {
-    description
-      "Retrieve Subnetwork Connections originating and terminating on the node.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC-shelf-id, SNC0-shelf-id, SNC-shelf-ALL, SNC0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mbrfilter {
-        type string {
-          length "4..70";
-        }
-        description
-          "Specifies SNC retrieval filter values.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf absol-route-diversity {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Specify if Absolute Route Diversity (ARD) is enabled.";
-        }
-        leaf backoff-period {
-          type ciena-6500-types:INT {
-            range "1..30";
-          }
-          description
-            "Back-off period for retrying SNC setup (in seconds).";
-        }
-        leaf bit-rate {
-          type string {
-            length "0..19";
-          }
-          description
-            "Define the bit rate of flex.";
-        }
-        leaf cktid {
-          type string {
-            length "29..70";
-          }
-          description
-            "Circuit identifier tagged against cross-connections created for this SNC.";
-        }
-        leaf cost-criteria {
-          type ciena-6500-enums:EnumCostCriteria;
-          description
-            "The cost criteria applicable for this connection. This is applicable for the originating end SNC only.";
-        }
-        leaf grouped {
-          type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-          description
-            "Specifies, Is SNC part of SNCG. It is an optional attribute and Default value would be NO. value =YES/NO";
-        }
-        leaf corouted-snc {
-          type ciena-6500-types:aid;
-          description
-            "Specifies the Co-Routed SNC if which this SNC is a member.";
-        }
-        leaf datapath-fault-alm-time {
-          type ciena-6500-types:INT {
-            range "0..30";
-          }
-          description
-            "Specifies in minutes how long to wait before raising the SNC datapath fault alarm.";
-        }
-        leaf dtl-excl {
-          type ciena-6500-enums:EnumDTLEXCL_SNC;
-          description
-            "Specifies whether to exclusively use the DTL set specified by DTLSN.";
-        }
-        leaf dtl-set-name {
-          type ciena-6500-types:aid;
-          description
-            "DTL set to be used for this SNC.";
-        }
-        leaf end-pt-size {
-          type ciena-6500-enums:EnumENDPTSIZE_SNC;
-          description
-            "End-point size type for the SNC.";
-        }
-        leaf frequency {
-          type decimal64 {
-            range "186.325000..190.975000 | 191.325000..196.125000";
-            fraction-digits 6;
-          }
-          description
-            "Specifies the explicit centre frequency to use for the service. The value 0 (default) means the system will select the frequency. All SNCs in an SNCG must all be explicit or all must be implicit.";
-        }
-        leaf datapath-fault-action {
-          type enumeration {
-            enum "MR";
-            enum "ALARM";
-          }
-          description
-            "Indicates whether an ALARM will be raised or MR will be done on SNC Datapath Fault.Default is ALARM";
-        }
-        leaf min-freq {
-          type decimal64 {
-            range "186.325000..190.975000 | 191.325000..196.125000";
-            fraction-digits 6;
-          }
-          description
-            "Constrain the frequency allocated lower bound (in THz)";
-        }
-        leaf max-freq {
-          type decimal64 {
-            range "186.325000..190.975000 | 191.325000..196.125000";
-            fraction-digits 6;
-          }
-          description
-            "Constrain the frequency allocated upper bound (in THz)";
-        }
-        leaf incarnation {
-          type ciena-6500-types:INT;
-          description
-            "Indicates the SNC Incarnation Number.";
-        }
-        leaf home-dtl-act {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Indicates if the home DTL is currently active.";
-        }
-        leaf home-dtl-avail {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Indicates if the home DTL is currently available.";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "Label of this object.";
-        }
-        leaf local-end-point {
-          type ciena-6500-types:STRING;
-          description
-            "Local end-point of this SNC.";
-        }
-        leaf max-adm-weight {
-          type ciena-6500-types:INT {
-            range "0..1310700";
-          }
-          description
-            "SONET/SDH and Photonics: Maximum admin weight allowed for this connection. OTN:Maximum admin weight allowed for the home path.";
-        }
-        leaf max-delay {
-          type ciena-6500-types:INT {
-            range "0..4000000";
-          }
-          description
-            "Maximum delay allowed for the home path (in microseconds).";
-        }
-        leaf mesh-rest {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Indicates if mesh-restoration is enabled for this SNC.";
-        }
-        leaf takeover {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Indicates the current cross-connection takeover specification value for this SNC.";
-        }
-        leaf name {
-          type string {
-            length "0..40";
-          }
-          description
-            "Name of this SNC.";
-        }
-        leaf nv-dtl-set-name {
-          type ciena-6500-types:aid;
-          description
-            "Non-viable DTL set to be used for this SNC.";
-        }
-        leaf origin-drop-side-prot-state {
-          type enumeration {
-            enum "HIGH_ORDER";
-            enum "UNPROTECTED";
-          }
-          description
-            "Specifies drop side protection state for the SNC on the originating node.";
-        }
-        leaf origin-net-side-prot-state {
-          type enumeration {
-            enum "HIGH_ORDER";
-            enum "UNPROTECTED";
-          }
-          description
-            "Specifies network side protection state for the SNC on the originating node.";
-        }
-        leaf peer-origin {
-          type string {
-            length "1..40";
-          }
-          description
-            "The peer originating node name specifies the node name from which the peer SNC originates.";
-        }
-        leaf peer-snc {
-          type ciena-6500-types:STRING;
-          description
-            "Identifies the peered SNC on this local node or on the node specified in parameter PEERORIGIN.";
-        }
-        leaf priority {
-          type ciena-6500-enums:EnumPRIORITY;
-          description
-            "Priority level of this SNC connection.";
-        }
-        leaf prot-type {
-          type ciena-6500-enums:EnumPRTT_SNC;
-          description
-            "The protection type parameter indicates the service class of protection for the SNC.";
-        }
-        leaf assoc-sncg {
-          type ciena-6500-types:aid;
-          description
-            "Specifies Associated SNCG aid";
-        }
-        leaf regroom {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Indicates if re-groom operation can be performed on this SNC.";
-        }
-        leaf resizable {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Indicates if the ODUFlex connection has the capability to be resized.";
-        }
-        leaf remote-end-point {
-          type ciena-6500-types:STRING;
-          description
-            "Remote end-point of this SNC.";
-        }
-        leaf wvl-grid {
-          type string {
-            length "0..96";
-          }
-          description
-            "A hexadecimal number representing the vector of wavelengths that can be used by this SNC.";
-        }
-        leaf remote-end-point-type {
-          type ciena-6500-enums:EnumRMTEPTYPE_SNC;
-          description
-            "Indicates the type of end-point specified in RMTEP.";
-        }
-        leaf remote-node {
-          type string {
-            length "1..40";
-          }
-          description
-            "Specifies the name of the remote end node on which the SNC terminates.";
-        }
-        leaf remote-path-protection {
-          type ciena-6500-enums:EnumRMTPATHPROTECTION;
-          description
-            "Indicates what path protection is enabled on the terminating drop side of this SNC.";
-        }
-        leaf remote-time-slot {
-          type string {
-            length "1..192";
-          }
-          description
-            "Timeslot to use when creating the remote end-point.";
-        }
-        leaf remote-ctp-path-term {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Determines whether remote CTP is path terminating or not";
-        }
-        leaf remote-ttp-mux {
-          type ciena-6500-enums:osrp_rmtttpmux;
-          description
-            "Describes the multiplex structure and payload type for the far end TTP in accordance with ITU-T G.709";
-        }
-        leaf rvrt-state {
-          type ciena-6500-enums:rvrtState;
-          description
-            "Specifies the reversion state of the connection";
-        }
-        leaf trib-port {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "Tributary port for creating line side CTPs";
-        }
-        leaf revert-timer {
-          type ciena-6500-enums:EnumRVRTT;
-          description
-            "Specifies whether the connection is to revert to the original route after a delay (SNC_DELAY), the connection is not to revert to the original route (SNC_NO_REVERT), or if the connection is to revert at a certain time(SNC_TIMEOFDAY).";
-        }
-        leaf snc-ep-state {
-          type enumeration {
-            enum "ORIG_DOWN";
-            enum "ORIG_CREATING";
-            enum "ORIG_STARTING";
-            enum "ORIG_PROTECTING";
-            enum "ORIG_WORKING";
-            enum "ORIG_RECOVERING";
-            enum "ORIG_MBB_ACTIVE";
-            enum "ORIG_MBB_SWITCH";
-            enum "ORIG_PENDING";
-            enum "ORIG_LOCK_PENDING";
-            enum "TERM_DOWN";
-            enum "TERM_WAITING";
-            enum "TERM_WORKING_CONNECTED";
-            enum "DEGRADED";
-          }
-          description
-            "SNC-specific state information for the end-point.";
-        }
-        leaf snc-line-type {
-          type enumeration {
-            enum "WORKING";
-            enum "PROTECT";
-          }
-          description
-            "Identifiers if this SNC is the working or protecting leg of an SNCP.";
-        }
-        leaf tcm {
-          type ciena-6500-types:INT {
-            range "0..6";
-          }
-          description
-            "Override the system default SNC TCM.";
-        }
-        leaf termin-drop-side-prot-state {
-          type enumeration {
-            enum "HIGH_ORDER";
-            enum "UNPROTECTED";
-          }
-          description
-            "Specifies drop side protection state for the SNC on the terminating node.";
-        }
-        leaf termin-net-side-prot-state {
-          type enumeration {
-            enum "HIGH_ORDER";
-            enum "UNPROTECTED";
-          }
-          description
-            "Specifies network side protection state for the SNC on the terminating node.";
-        }
-        leaf tod-revert-holdback-enabled {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Specifies if time of day reversion holdback is enabled.";
-        }
-        leaf tod-revert-holdback-period {
-          type ciena-6500-types:TIME;
-          description
-            "Specifies the time of day reversion holdback period.";
-        }
-        leaf tod-revert-time {
-          type ciena-6500-types:TIME;
-          description
-            "Specifies the time of day when to do reversion to the home path (home path must be available).";
-        }
-        leaf tod-revert-period {
-          type ciena-6500-types:INT {
-            range "5..300";
-          }
-          description
-            "Specifies the time range (in minutes) when it's acceptable to do the TODR (home route must be available during this window), otherwise wait 24 hours to try again.";
-        }
-        leaf-list tod-revert-prof-list {
-          type ciena-6500-types:aid;
-          description
-            "List of time of day reversion profiles that are associated with this SNC";
-        }
-        leaf tolerance {
-          type string {
-            length "0..19";
-          }
-          description
-            "Define the tolerance in ppm of oduflex before an LOF is declared.";
-        }
-        leaf revert-time {
-          type ciena-6500-types:INT {
-            range "300..86400";
-          }
-          description
-            "Amount of time for a connection to be reverted to the original route (sec).";
-        }
-        leaf type {
-          type ciena-6500-enums:EnumSNCTYPE;
-          description
-            "Type of this SNC, dynamic or permanent.";
-        }
-        leaf retain-home-path-capability {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specifies if the Retain Home Path capability is available.";
-        }
-        leaf home-path-preempt {
-          type ciena-6500-enums:EnumHPPREEMPT;
-          description
-            "Specifies the Home Path Preempt capability definition.";
-        }
-        leaf-list primary-ovpn-ids {
-          type string {
-            length "1..15";
-          }
-          description
-            "The primary optical virtual private network ID list";
-        }
-        leaf secondary-ovpn-ids {
-          type string {
-            length "1..15";
-          }
-          description
-            "The secondary optical virtual private network ID list";
-        }
-        leaf generic-end-point {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specifies whether Generic End Point (GEP) method is allowed.";
-        }
-        leaf cost-crit-admin-weight {
-          type ciena-6500-enums:EnumCostCriteriaSetting;
-          description
-            "The cost criteria setting for admin weight. ";
-        }
-        leaf cost-crit-delay {
-          type ciena-6500-enums:EnumCostCriteriaSetting;
-          description
-            "The cost criteria setting for delay of the home path.";
-        }
-        leaf prot-cost-crit-adm-weight {
-          type ciena-6500-enums:EnumCostCriteriaSetting;
-          description
-            "The protect cost criteria admin weight setting. ";
-        }
-        leaf prot-cost-crit-delay {
-          type ciena-6500-enums:EnumCostCriteriaSetting;
-          description
-            "The protect cost criteria delay setting.";
-        }
-        leaf prot-max-adm-weight {
-          type ciena-6500-types:INT {
-            range "0..1310700";
-          }
-          description
-            "Maximum admin weight allowed for the protect path.";
-        }
-        leaf prot-max-delay {
-          type ciena-6500-types:INT {
-            range "0..4000000";
-          }
-          description
-            "Maximum delay allowed for the protect path.";
-        }
-        leaf rev-fail-count {
-          type ciena-6500-types:INT;
-          description
-            "Specifies the number of windows during which Time of Day Reversion has failed.";
-        }
-        leaf snc-integrity-check {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Specifies if the SNC Integrity Check capability is enabled or disabled.";
-        }
-        leaf snic-valid-path-detected {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Specifies if a valid path signal was detected for this SNC.";
-        }
-        leaf remote-interop {
-          type ciena-6500-enums:EnumRMTINTEROP;
-          description
-            "The required interoperation equipment type of the remote node. This parameter is only applicable to OTN.";
-        }
-        leaf prot-diversity-type {
-          type ciena-6500-enums:divtype;
-          description
-            "This indicates the required deversity type.";
-        }
-        leaf release-on-client-fail {
-          type enumeration {
-            enum "DISABLED";
-            enum "PORT";
-            enum "PAYLOAD";
-          }
-          description
-            "Specifies the Release on Client Failure capability";
-        }
-        leaf release-on-client-fail-holdoff {
-          type enumeration {
-            enum "IMMEDIATE";
-            enum "ALARM";
-          }
-          description
-            "Specifies the Release on Client Failure hold off";
-        }
-        leaf release-on-client-fail-holdon {
-          type ciena-6500-types:INT {
-            range "5";
-          }
-          description
-            "Specifies the Release on Client Failure hold on in seconds";
-        }
-        leaf mode {
-          type enumeration {
-            enum "OTN";
-            enum "PKTRSRVD";
-            enum "PKTNORSRVD";
-          }
-          description
-            "Specifies the SNC mode";
-        }
-        leaf ccmode {
-          type enumeration {
-            enum "DTLMODE";
-            enum "MODE1";
-            enum "MODE2";
-            enum "MODE3";
-          }
-          description
-            "Specify the capacity change mode(CCMODE)";
-        }
-        leaf mrccmode {
-          type enumeration {
-            enum "DTLMODE";
-            enum "MODE1";
-            enum "MODE2";
-            enum "MODE3";
-          }
-          description
-            "Specify the mesh restorations capacity change mode(MRCCMODE)";
-        }
-        leaf dtl-uuid {
-          type string {
-            length "36";
-          }
-          description
-            "A string of 32 Hexadecimal Digits in five groups seperated by hypens in the form xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx for a total of 36 charatcters, representing the Universally Unique Identifier of the object.";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_NOANR;
-          description
-            "Primary state of the SNC.";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "SGEO" {
-              description
-                "Supporting Group Entity Outage: The SNC is not fully operational because one or more supporting entities (e.g. DOC channel) is not operational.";
-            }
-            enum "FLT" {
-              description
-                "Fault: The SNC is faulted and an alarm has been raised.";
-            }
-          }
-          description
-            "Secondary state of the SNC. This parameter is only applicable to photonics.";
-        }
-      }
-    }
-  }
-  rpc osrp-clear-diag-snc {
-    description
-      "Clear Subnetwork Connection diagnostics on the originating node.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC-shelf-id, SNC0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-show-snc-route {
-    description
-      "Retrieve Subnetwork Connection routes on the originating node.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC-shelf-id, SNC0-shelf-id, SNC-shelf-ALL, SNC0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf member-filter {
-        type enumeration {
-          enum "WORKING";
-          enum "PROTECTION";
-          enum "HOME";
-        }
-        description
-          "Specifies the type of route to be retrieved.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf route-type {
-          type enumeration {
-            enum "WORKING";
-            enum "PROTECTION";
-            enum "HOME";
-          }
-          description
-            "Specifies the type of route.";
-        }
-        leaf adv-wl {
-          type string {
-            length "11..96";
-          }
-          description
-            "A hexadecimal number which represents the current wavelength availability.";
-        }
-        leaf dtl {
-          type string {
-            length "3..949";
-          }
-          description
-            "Indicates the entire DTL route for the specified SNC excluding the terminating node.";
-        }
-        leaf term-node-name {
-          type string {
-            length "1..40";
-          }
-          description
-            "The OSRP node name of where the SNC terminates.";
-        }
-        leaf assoc-fail-hop {
-          type string {
-            length "3..45";
-          }
-          description
-            "The associated hop whose failure should trigger the use of the DTLDATA.";
-        }
-        leaf dtl-cost {
-          type ciena-6500-types:INT {
-            range "1..4000000";
-          }
-          description
-            "Indicates the DTL cost.";
-        }
-        leaf dtl-name {
-          type string {
-            length "0..12";
-          }
-          description
-            "The DTL AID associated with this protection path";
-        }
-      }
-    }
-  }
-  rpc osrp-disable-snc-group {
-    description
-      "Place a Subnetwork Connection Group into an out-of-service maintenance state";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNCG0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-enable-snc-group {
-    description
-      "Restore a Subnetwork Connection Group from a maintenance out-of-service state in to an in-service state";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNCG0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-clear-diag-snc-group {
-    description
-      "Clear Subnetwork Connection Group diagnostics on the originating node.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNCG0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-disable-corouted-snc {
-    description
-      "Place a Co-Routed Subnetwork Connection into an out-of-service maintenance state";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-enable-corouted-snc {
-    description
-      "Place a Co-Routed Subnetwork Connection into an in-service maintenance state.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-clear-diag-corouted-snc {
-    description
-      "Clear Co-Routed Subnetwork Connection diagnostics on the originating node.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc osrp-add-member-corouted-snc {
-    description
-      "Add a member to a Co-Routed Subnetwork Connection.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id";
-        type ciena-6500-types:aid;
-      }
-      leaf generic-end-point {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        default "NO";
-        description
-          "Specifies whether Generic End Point (GEP) method is allowed on the originating end of the new SNC being added to the CRSNC.";
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label of the new SNC being added to the CRSNC group.";
-      }
-      leaf local-end-point {
-        type ciena-6500-types:STRING;
-        description
-          "Local end-point of the new SNC being added to the CRSNC group.";
-      }
-      leaf name {
-        type string {
-          length "0..40";
-        }
-        description
-          "Name of the new SNC being added to the CRSNC group.";
-      }
-      leaf remote-end-point {
-        type ciena-6500-types:STRING;
-        description
-          "Remote end-point of the new SNC being added to the CRSNC group.";
-      }
-      leaf remote-end-point-type {
-        type ciena-6500-enums:EnumRMTEPTYPE_CRSNC;
-        description
-          "Indicates the type of remote end-point for the new SNC being added to the CRSNC group.";
-      }
-      leaf remote-interop {
-        type ciena-6500-enums:EnumRMTINTEROP;
-        default "OTHER";
-        description
-          "The required interoperation equipment type of the remote node for the new SNC being added to the CRSNC.";
-      }
-      leaf remote-timeslot {
-        type string {
-          length "1..32";
-        }
-        description
-          "Timeslot to use when creating the remote end-point of the new SNC being added to the CRSNC group.";
-      }
-      leaf remote-ttp-mux {
-        type ciena-6500-enums:osrp_rmtttpmux;
-        default "NONE";
-        description
-          "Describes the multiplex structure and payload type for the far end TTP of the new SNC being added to the CRSNC, in accordance with ITU-T G.709";
-      }
-      leaf snc {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "AID of SNC being added to the CRSNC group.";
-      }
-      leaf tcm {
-        type ciena-6500-types:INT {
-          range "0..6";
-        }
-        description
-          "Override the system default TCM for the new SNC being added to the CRSNC.";
-      }
-      leaf trib-port {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..32";
-        }
-        description
-          "Tributary port for creating line side CTPs for the new SNC being added to the CRSNC group";
-      }
-      leaf remote-ctp-path-term {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Determines whether remote CTP is path terminating or not";
-      }
-    }
-  }
-  rpc osrp-delete-member-corouted-snc {
-    description
-      "Delete a member from a Co-Routed Subnetwork Connection.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id";
-        type ciena-6500-types:aid;
-      }
-      leaf snc {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "AID of SNC being deleted from the CRSNC group.";
-      }
-    }
-  }
-  rpc osrp-show-corouted-snc-route {
-    description
-      "Retrieve Co-Routed Subnetwork Connection routes on the originating node.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id, CRSNC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mbr-filter {
-        type enumeration {
-          enum "WORKING";
-          enum "PROTECTION";
-          enum "HOME";
-        }
-        description
-          "Specifies the type of route to be retrieved.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf route-type {
-          type enumeration {
-            enum "WORKING";
-            enum "PROTECTION";
-            enum "HOME";
-          }
-          description
-            "Specifies the type of route.";
-        }
-        leaf dtl {
-          type string {
-            length "3..949";
-          }
-          description
-            "Indicates the entire DTL route for the specified CRSNC excluding the terminating node.";
-        }
-        leaf term-node-name {
-          type string {
-            length "1..40";
-          }
-          description
-            "The OSRP node name of where the CRSNC terminates.";
-        }
-        leaf as-fail-hop {
-          type string {
-            length "3..45";
-          }
-          description
-            "The associated hop whose failure should trigger the use of the DTLDATA.";
-        }
-        leaf dtl-cost {
-          type ciena-6500-types:INT {
-            range "1..4000000";
-          }
-          description
-            "Indicates the DTL cost.";
-        }
-        leaf dtl-name {
-          type string {
-            length "0..12";
-          }
-          description
-            "The DTL AID associated with this path.";
-        }
-      }
-    }
-  }
-  container osrp {
-    list config {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRP-shelf-id, OSRP0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-      leaf node-name {
-        type string {
-          length "1..20";
-        }
-        mandatory true;
-        description
-          "An OSRP node name that is unique across the OSRP network.";
-        config true;
-      }
-      leaf node-id {
-        type string {
-          length "4";
-        }
-        mandatory true;
-        description
-          "A node ID that is unique across the OSRP network.";
-        config true;
-      }
-      leaf tl1-ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "The IP address OSRP floods through the network.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf type {
-        type enumeration {
-          enum "DERIVED" {
-            description
-              "The type of CONTROL plane to be configured is derived from the type of XC/CTM equipment currently configured on the shelf.";
-          }
-          enum "OTN" {
-            description
-              "For RTRV only";
-          }
-          enum "SONET" {
-            description
-              "For RTRV only";
-          }
-          enum "SDH" {
-            description
-              "For RTRV only";
-          }
-          enum "PHOTONIC" {
-            description
-              "Photonic CONTROL plane is to be configured.";
-          }
-          enum "PROV" {
-            description
-              "Photonic CONTROL plane in Provisioning only mode is to be configured.";
-          }
-        }
-        default "DERIVED";
-        description
-          "Specifies the type of CONTROL plane to be configured.";
-        config true;
-      }
-      leaf udp-port {
-        default "51001";
-        type ciena-6500-types:INT {
-          range "51001..52000";
-        }
-        description
-          "Local UDP port for out-of-band connectivity.";
-        config true;
-      }
-      leaf oob-ip-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "The OOB Signaling IP address of the CONTROL plane, which OSPF floods through the Ethernet network(s): in-band management VLAN interfaces and COLAN interface.(Format: n.n.n.n)";
-        config false;
-      }
-    }
-    list node {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPNODE-shelf-id, OSRPNODE0-shelf-id, OSRPNODE-shelf-ALL, OSRPNODE0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf bw-thresh-mode {
-        type ciena-6500-enums:bwthrmode;
-        default "MANUAL";
-        description
-          "The global default value of bandwidth threshold mode.";
-        config true;
-      }
-      leaf holdoff-timer {
-        type ciena-6500-types:INT {
-          range "0..3600000";
-        }
-        description
-          "Specifies low priority connection release hold-off time in milliseconds.";
-        config true;
-      }
-      leaf flt-holdoff-timer {
-        type ciena-6500-types:INT {
-          range "10000..900000";
-        }
-        description
-          "Specifies Fault release hold-off time in milliseconds.";
-        config true;
-      }
-      leaf low-prio-holdoff-feature {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if low priority connections hold-off release when a line goes down.";
-        config true;
-      }
-      leaf low-prio-holdoff-ctrl-line-state {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies the control behavior for releasing low priority connections after the hold-off timer expiry by checking the line state.";
-        config true;
-      }
-      leaf osrp-blocked-node-admin-st {
-        type enumeration {
-          enum "UNLOCKED";
-          enum "LOCKED";
-        }
-        description
-          "Specifies the blocked node feature's administrative state.";
-        config true;
-      }
-      leaf osrp-blocked-node-feature {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if node blocking is allowed.";
-        config true;
-      }
-      leaf otu2-bw-thresh {
-        type string {
-          length "60..91";
-        }
-        description
-          "Node level global default values of Bandwidth Threshold for OTU2 line type.It will be used to initialize OSRPLINK Bandwidth Threshold Values whenever BWTHRMODE is set to Manual. ";
-        config true;
-      }
-      leaf otu2ebwt {
-        type string {
-          length "60..91";
-        }
-        description
-          "Node level global default values of Bandwidth Threshold for OTU2E line type.It will be used to initialize OSRPLINK Bandwidth Threshold Values whenever BWTHRMODE is set to Manual. ";
-        config true;
-      }
-      leaf otu3-bw-thresh {
-        type string {
-          length "77..112";
-        }
-        description
-          "Node level global default values of Bandwidth Threshold for OTU3 line type.It will be used to initialize OSRPLINK Bandwidth Threshold Values whenever BWTHRMODE is set to Manual. ";
-        config true;
-      }
-      leaf otu3e2-bw-thresh {
-        type string {
-          length "77..112";
-        }
-        description
-          "Node level global default values of Bandwidth Threshold for OTU3E2 line type. It will be used to initialize OSRPLINK Bandwidth Threshold Values whenever BWTHRMODE is set to Manual. ";
-        config true;
-      }
-      leaf otu4-bw-thresh {
-        type string {
-          length "86..124";
-        }
-        description
-          "Node level global default values of Bandwidth Threshold for OTU4 line type.It will be used to initialize OSRPLINK Bandwidth Threshold Values whenever BWTHRMODE is set to Manual. ";
-        config true;
-      }
-      leaf osrp-line-tcm-level {
-        type ciena-6500-types:INT {
-          range "1..6";
-        }
-        description
-          "OSRP line default TCM.";
-        config true;
-      }
-      leaf osrp-snc-tcm-level {
-        type ciena-6500-types:INT {
-          range "1..6";
-        }
-        description
-          "OSRP SNC default TCM.";
-        config true;
-      }
-      leaf revert-timer {
-        type ciena-6500-enums:EnumRVRTT;
-        description
-          "Specifies whether the connection is to revert to the original route after a delay (SNC_DELAY), the connection is not to revert to the original route (SNC_NO_REVERT), or if the connection is to revert at a certain time(SNC_TIMEOFDAY).";
-        config true;
-      }
-      leaf tod-revert-time {
-        type ciena-6500-types:TIME;
-        description
-          "Specifies the time of day when to do reversion to the home path (home path must be available).";
-        config true;
-      }
-      leaf tod-revert-period {
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Specifies the time range (in minutes) when it's acceptable to do the TODR (home route must be available during this window), otherwise wait 24 hours to try again.";
-        config true;
-      }
-      leaf timed-revert {
-        type ciena-6500-types:INT {
-          range "300..86400";
-        }
-        description
-          "Amount of time for a connection to be reverted to the original route (sec).";
-        config true;
-      }
-      leaf make-before-break {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if the Make Before Break capability is available. ";
-        config true;
-      }
-      leaf retain-home-path-capability {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if the Retain Home Path capability is available.";
-        config true;
-      }
-      leaf tod-revert-holdback {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if time of day reversion holdback is enabled.This value will be used as a default value for the attribute TODRHBEN of a new created SNC ";
-        config true;
-      }
-      leaf tod-revert-holdback-period {
-        type ciena-6500-types:TIME;
-        description
-          "Specifies the time of day reversion holdback period.";
-        config true;
-      }
-      leaf snc-integrity-check {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        description
-          "Specifies if the SNC Integrity Check capability is enabled or disabled.";
-        config true;
-      }
-      leaf snic-timer {
-        type ciena-6500-types:INT {
-          range "0..150";
-        }
-        description
-          "Specifies the SNIC timer value in seconds.";
-        config true;
-      }
-      leaf inhibit-path-events {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if SNC path events are inhibited or not";
-        config true;
-      }
-      leaf oob-ip-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "The OOB Signaling IP address of the CONTROL plane.(Format: n.n.n.n)";
-        config false;
-      }
-      leaf oob-local-port {
-        type ciena-6500-types:INT {
-          range "51001..52000";
-        }
-        description
-          "Local UDP port for out-of-band connectivity.";
-        config false;
-      }
-      leaf osrp-blocked-node-oper-st {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "Operational state of the blocked node.";
-        config false;
-      }
-      leaf osrp-node-id {
-        type string {
-          length "44";
-        }
-        description
-          "OSRP node ID.";
-        config false;
-      }
-      leaf osrp-node-name {
-        type string {
-          length "1..20";
-        }
-        description
-          "OSRP node name.";
-        config false;
-      }
-      leaf osrp-node-type {
-        type enumeration {
-          enum "UNKNOWN";
-          enum "CD";
-          enum "CI";
-          enum "5410";
-          enum "5430";
-          enum "6500_32";
-          enum "6500_14";
-          enum "6500_7";
-          enum "6500_2";
-          enum "6500";
-          enum "6500_CS";
-          enum "6500_T_24";
-          enum "6500_T_12";
-          enum "6500_T_6";
-          enum "6500_T";
-        }
-        description
-          "OSRP node type.";
-        config false;
-      }
-      leaf tl1-ip-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "The IP address OSRP floods through the network.(Format: n.n.n.n)";
-        config false;
-      }
-      leaf generic-end-point {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies whether Generic End Point (GEP) method is allowed. Without GEP, user input the end point names using AID format. This is not compatible with new equipment and new standards in the future, given the user-input termination point has to be verified on the originating node. Generic End Point feature allows SNC to be provisioned backward compatible with existing network elements within the same Control Plane Network and future compatibility with new equipment and new standards.";
-        config false;
-      }
-      leaf ovpn-capability {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if OVPN enhancement capability is enabled.";
-        config false;
-      }
-    }
-    list remote-node {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPRMTNODES-shelf-id, OSRPRMTNODES0-shelf-id, OSRPRMTNODES0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf local {
-        type enumeration {
-          enum "NEIGHBOR";
-          enum "REMOTE";
-        }
-        description
-          "Locality of the remote node.";
-        config false;
-      }
-      leaf neighbor-peer-node-state {
-        type enumeration {
-          enum "NP_DOWN";
-          enum "NEGOTIATING";
-          enum "EXCHANGE";
-          enum "LOADING";
-          enum "FULL";
-          enum "NOT_APPL";
-        }
-        description
-          "State of the FSM (Finite State Machine) for the neighboring peer node, with respect to the node where this command is issued.";
-        config false;
-      }
-      leaf osrp-blocked-node-oper-st {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "Operational state of the blocked node.";
-        config false;
-      }
-      leaf osrp-node-id {
-        type string {
-          length "44";
-        }
-        description
-          "OSRP node ID.";
-        config false;
-      }
-      leaf osrp-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "OSRP node name.";
-        config false;
-      }
-      leaf osrp-node-type {
-        type enumeration {
-          enum "UNKNOWN";
-          enum "CD";
-          enum "CI";
-          enum "5410";
-          enum "5430";
-          enum "6500_32";
-          enum "6500_14";
-          enum "6500_7";
-          enum "6500_2";
-          enum "6500";
-          enum "6500_CS";
-          enum "6500_T_24";
-          enum "6500_T_12";
-          enum "6500_T_6";
-          enum "6500_T";
-        }
-        description
-          "OSRP node type.";
-        config false;
-      }
-      leaf tl1-ip-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "The IP address OSRP floods through the network.(Format: n.n.n.n)";
-        config false;
-      }
-      leaf retain-home-path-capability {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if the Retain Home Path capability is available.";
-        config false;
-      }
-      leaf make-before-break {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if the Make Before Break capability is available.";
-        config false;
-      }
-      leaf ovpn-capability {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if OVPN enhancement capability is enabled.";
-        config false;
-      }
-    }
-    list line {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPLINE-shelf-slot-port, OSRPLINE0-shelf-id, OSRPLINE-shelf-ALL, OSRPLINE0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf bw-lockout-enabled {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if bandwidth lockout is enabled locally for the OSRP line.";
-        config true;
-      }
-      leaf common-id {
-        type ciena-6500-types:INT {
-          range "1..65534";
-        }
-        description
-          "Common identifier of the OSRP line.";
-        config true;
-      }
-      leaf hold-off {
-        type ciena-6500-types:INT {
-          range "0..5000";
-        }
-        description
-          "Holdoff for the OSRP line.";
-        config true;
-      }
-      leaf ignore-faults {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if faults are to be ignored for this OSRP line.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..40";
-        }
-        description
-          "Label for the OSRP line.";
-        config true;
-      }
-      leaf oob-common-id {
-        type ciena-6500-types:INT {
-          range "1..65534";
-        }
-        description
-          "Common ID for out-of-band connectivity.";
-        config true;
-      }
-      leaf osrp-link {
-        type ciena-6500-types:aid;
-        description
-          "Local OSRP link in which this OSRP line is being aggregated.";
-        config true;
-      }
-      leaf span-loss-exceeded-action {
-        type enumeration {
-          enum "OOS" {
-            description
-              "All non-permanent SNCs using the OSRP line are deleted or mesh restored. The OSRP line will no longer be used for establishing new SNCs.";
-          }
-          enum "BLOCK" {
-            description
-              "The SNCs using the OSRP line are not impacted. The OSRP line will no longer be used for establishing new SNCs.";
-          }
-          enum "NONE" {
-            description
-              "Do nothing.";
-          }
-        }
-        description
-          "Specifies the behavior on SPANLOSSEXCEEDED. This parameter is only applicable to photonics.";
-        config true;
-      }
-      leaf delay {
-        type ciena-6500-types:INT {
-          range "1..200000";
-        }
-        description
-          "Indicates the physical (measured) delay in milliseconds for the OSRP line.";
-        config false;
-      }
-      leaf line-type {
-        type enumeration {
-          enum "OTU4";
-          enum "OTU2";
-          enum "OTU2E";
-          enum "OTU3";
-          enum "OTU3E2";
-          enum "FTTP";
-          enum "OC3";
-          enum "OC12";
-          enum "OC48";
-          enum "OC192";
-          enum "OMS";
-        }
-        description
-          "The physical line type.";
-        config false;
-      }
-      leaf local-supp-tp {
-        type ciena-6500-types:STRING;
-        description
-          "Local supporting termination point indicating the physical port of the termination point of the line.";
-        config false;
-      }
-      leaf remote-bw-lockout-enabled {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies the remote bandwidth lockout value.";
-        config false;
-      }
-      leaf remote-supp-tp {
-        type ciena-6500-types:STRING;
-        description
-          "Remote supporting termination point indicating the physical port of the termination point of the line.";
-        config false;
-      }
-      leaf remote-common-id {
-        type ciena-6500-types:INT {
-          range "1..65534";
-        }
-        description
-          "Common ID of the remote line.";
-        config false;
-      }
-      leaf remote-delay {
-        type ciena-6500-types:INT {
-          range "1..200000";
-        }
-        description
-          "Measured delay value on the remote line (in microseconds).";
-        config false;
-      }
-      leaf remote-label {
-        type string {
-          length "0..40";
-        }
-        description
-          "Label of the remote line.";
-        config false;
-      }
-      leaf remote-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Name of the remote node.";
-        config false;
-      }
-      leaf remote-osrp-link-id {
-        type ciena-6500-types:INT {
-          range "1..4194303";
-        }
-        description
-          "ID of the remote OSRP link in which the remote line is aggregated.";
-        config false;
-      }
-      leaf remote-pst {
-        type ciena-6500-enums:PSTfac;
-        description
-          "Primary state of the remote line.";
-        config false;
-      }
-      leaf remote-state {
-        type enumeration {
-          enum "UNBLOCKED";
-          enum "BLOCKED";
-        }
-        description
-          "Specifies the current state of the remote OSRP line.";
-        config false;
-      }
-      leaf state {
-        type enumeration {
-          enum "UNBLOCKED";
-          enum "BLOCKED";
-        }
-        description
-          "Specifies the current state of the local OSRP line.";
-        config false;
-      }
-      leaf ovpn-id-count {
-        type ciena-6500-types:INT {
-          range "0..10";
-        }
-        description
-          "The number of Optical Virtual Private Networks which this line belongs to.";
-        config false;
-      }
-      leaf-list ovpn-ids {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "The Optical Virtual Private Network ID list";
-        config false;
-      }
-      leaf-list ovpn-link-ids {
-        type ciena-6500-types:INT {
-          range "1..4194303";
-        }
-        description
-          "The OSRPLINK ID list which corresponds to the OVPN ID list.";
-        config false;
-      }
-      leaf-list ovpn-bw {
-        type ciena-6500-types:INT {
-          range "1..80";
-        }
-        description
-          "The bandwidth list that corresponds to the OVPN ID list";
-        config false;
-      }
-      leaf-list remote-ovpn-ids {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "The Remote Optical Virtual Private Network ID list";
-        config false;
-      }
-      leaf-list remote-ovpn-bw {
-        type ciena-6500-types:INT {
-          range "1..80";
-        }
-        description
-          "The remote bandwidth list that corresponds to the OVPN ID list";
-        config false;
-      }
-      leaf base-ovpn-id {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "The base OVPN ID of the base link.";
-        config false;
-      }
-      leaf total-bw {
-        type ciena-6500-types:INT {
-          range "0..80";
-        }
-        description
-          "The total bandwidth this line was provisioned with.";
-        config false;
-      }
-      leaf avail-base-bw {
-        type ciena-6500-types:INT {
-          range "0..80";
-        }
-        description
-          "The available bandwidth this line has left on the base link.";
-        config false;
-      }
-      leaf tod-rhb-sdc-ln-time {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies date and time when OSRP line became available for TODR reversion";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_NOANR;
-        description
-          "Primary state of the OSRP line.";
-        config false;
-      }
-    }
-    list line-ovpn {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPLINE-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf ovpn-id {
-        type ciena-6500-types:INT;
-        description
-          "OVPN ID of the OSRP line.(Mandatory for edit operations)";
-        config true;
-      }
-      leaf bw {
-        type ciena-6500-types:INT {
-          range "0..80";
-        }
-        description
-          "Bandwidth of the OVPN.(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    list line-snc {
-      key "osrp-line";
-      config false;
-      leaf osrp-line {
-        mandatory true;
-        description
-          "AID in format OSRPLINE-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf snc-name {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies the SNC name.";
-        config false;
-      }
-      leaf orig-node-name {
-        type ciena-6500-types:STRING;
-        description
-          "Name of the SNC originating node.";
-        config false;
-      }
-      leaf priority {
-        type ciena-6500-enums:EnumPRIORITY;
-        description
-          "Priority level of this SNC connection.";
-        config false;
-      }
-      leaf ingress-link-id {
-        type ciena-6500-types:INT {
-          range "1..4194303";
-        }
-        description
-          "ID of the ingress OSRP link.";
-        config false;
-      }
-      leaf egress-link-id {
-        type ciena-6500-types:INT {
-          range "1..4194303";
-        }
-        description
-          "ID of the egress OSRP link.";
-        config false;
-      }
-      leaf end-pt-size {
-        type ciena-6500-enums:EnumENDPTSIZE_SNC;
-        description
-          "End-point size type for the SNC.";
-        config false;
-      }
-      leaf state {
-        type ciena-6500-enums:EnumOSRPLINK_State;
-        description
-          "Indicates the state of the call";
-        config false;
-      }
-      leaf is-home-path {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies whether SNC is currently in its home path or not.";
-        config false;
-      }
-      leaf rhp-capability {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if the Retain Home Path capability is available.";
-        config false;
-      }
-      leaf ovpn-id {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "The optical virtual private network ID.";
-        config false;
-      }
-    }
-    list link {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPLINK-shelf-id, OSRPLINK0-shelf-id, OSRPLINK-shelf-ALL, OSRPLINK0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf adm-weight {
-        default "5040";
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Administrative weight which specifies the level of importance given to the OSRP link.";
-        config true;
-      }
-      leaf bw-adv-limit {
-        type enumeration {
-          enum "OOB1C_ONLY" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "OOB3C_ONLY" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "OOB12C_ONLY" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "OOB24C_ONLY" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "OOB48C_ONLY" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "OOB192C_ONLY" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "NOT_APPLICABLE" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "ODU0_AND_UP" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "ODU1_AND_UP" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "ODU2_AND_UP" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "ODU3_AND_UP" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "ODU2E_AND_UP" {
-            description
-              "(This value can be used in edit operation)";
-          }
-          enum "ODU4_AND_UP" {
-            description
-              "(This value can be used in edit operation)";
-          }
-        }
-        description
-          "Advertisement limit on an out-of-band link.";
-        config true;
-      }
-      leaf constraint-flood-enabled {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "NO";
-        description
-          "Enables or disables constraint flooding on a link.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label of the OSRP link.";
-        config true;
-      }
-      leaf oob-enable {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "NO";
-        description
-          "Specifies whether out-of-band signaling is enabled on this OSRP link.";
-        config true;
-      }
-      leaf oob-rmt-ip {
-        type ciena-6500-types:IPADDR;
-        description
-          "Remote IP address of OSRP node for out-of-band connectivity.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf oob-rmt-node-id {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Remote node ID for out-of-band connectivity.";
-        config true;
-      }
-      leaf oob-rmt-udp-port {
-        type ciena-6500-types:INT {
-          range "51001..52000";
-        }
-        description
-          "Remote UDP port for out-of-band connectivity.";
-        config true;
-      }
-      leaf-list osrp-lines {
-        type ciena-6500-types:aid;
-        description
-          "List of OSRP lines that are aggregated to make up this OSRP link.";
-        config true;
-      }
-      leaf-list prot-bundle-ids {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "List of up to 20 protection bundles to which the OSRP link belongs.";
-        config true;
-      }
-      leaf ovpn-id {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "Optical Virtual Private Network ID.";
-        config true;
-      }
-      leaf odu0-bw-thresh {
-        type ciena-6500-types:INT {
-          range "0..16000";
-        }
-        description
-          "The Bandwidth Threshold sets the maximum number of bandwidth units (here unit of ODU0) advertised for a link. It also serves as a bandwidth unit (here unit of ODU0) ceiling, over which no bandwidth updates are sent.";
-        config true;
-      }
-      leaf odu1-bw-thresh {
-        type ciena-6500-types:INT {
-          range "0..16000";
-        }
-        description
-          "The Bandwidth Threshold sets the maximum number of bandwidth units (here unit of ODU1) advertised for a link. It also serves as a bandwidth unit (here unit of ODU1) ceiling, over which no bandwidth updates are sent.";
-        config true;
-      }
-      leaf odu2-bw-thresh {
-        type ciena-6500-types:INT {
-          range "0..16000";
-        }
-        description
-          "The Bandwidth Threshold sets the maximum number of bandwidth units (here unit of ODU2) advertised for a link. It also serves as a bandwidth unit (here unit of ODU2) ceiling, over which no bandwidth updates are sent.";
-        config true;
-      }
-      leaf odu2e-bw-thresh {
-        type ciena-6500-types:INT {
-          range "0..16000";
-        }
-        description
-          "The Bandwidth Threshold sets the maximum number of bandwidth units (here unit of ODU2E) advertised for a link. It also serves as a bandwidth unit (here unit of ODU2E) ceiling, over which no bandwidth updates are sent.";
-        config true;
-      }
-      leaf odu3-bw-thresh {
-        type ciena-6500-types:INT {
-          range "0..16000";
-        }
-        description
-          "The Bandwidth Threshold sets the maximum number of bandwidth units (here unit of ODU3) advertised for a link. It also serves as a bandwidth unit (here unit of ODU3) ceiling, over which no bandwidth updates are sent.";
-        config true;
-      }
-      leaf odu4-bw-thresh {
-        type ciena-6500-types:INT {
-          range "0..16000";
-        }
-        description
-          "The Bandwidth Threshold sets the maximum number of bandwidth units (here unit of ODU4) advertised for a link. It also serves as a bandwidth unit (here unit of ODU4) ceiling, over which no bandwidth updates are sent.";
-        config true;
-      }
-      leaf odu-flex-rsz-bw-thresh {
-        type string {
-          length "1..19";
-        }
-        description
-          "The Bandwidth Threshold shows the maximum number of bandwidth units (in Bps) for Resizable ODU Flex advertised for a link.";
-        config true;
-      }
-      leaf odu-flex-nrsz-bw-thresh {
-        type string {
-          length "1..19";
-        }
-        description
-          "The Bandwidth Threshold shows the maximum number of bandwidth units (in Bps) for Non-Resizable ODU Flex advertised for a link.";
-        config true;
-      }
-      leaf bw-thresh-mode {
-        type ciena-6500-enums:bwthrmode;
-        default "MANUAL";
-        description
-          "The default setting of OSRP link bandwidth threshold mode.";
-        config true;
-      }
-      leaf holdback-signal-degrade-thresh {
-        default "9";
-        type ciena-6500-types:INT {
-          range "5..12";
-        }
-        description
-          "Holdback signal degrad threshold.";
-        config true;
-      }
-      leaf latency-discovery-enabled {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Enables or disables latency discovery.";
-        config true;
-      }
-      leaf manual-delay {
-        type ciena-6500-types:INT {
-          range "1..200000";
-        }
-        description
-          "Provisioned override delay for this OSRP link (in microseconds).";
-        config true;
-      }
-      leaf link-max-delay {
-        type ciena-6500-types:INT {
-          range "0..200000";
-        }
-        description
-          "Indicates the worst delay in microseconds of any OSRP line aggregated in the link.";
-        config false;
-      }
-      leaf hello-state {
-        type enumeration {
-          enum "NOTAPPLICABLE";
-          enum "DOWN";
-          enum "ATTEMPT";
-          enum "ONEWAYINSIDE";
-          enum "TWOWAYINSIDE";
-          enum "ONEWAYOUTSIDE";
-          enum "TWOWAYOUTSIDE";
-          enum "COMMONOUTSIDE";
-        }
-        description
-          "State of the Hello protocol finite state machine.";
-        config false;
-      }
-      leaf osrp-node-type {
-        type enumeration {
-          enum "UNKNOWN";
-          enum "CD";
-          enum "CI";
-          enum "5410";
-          enum "5430";
-          enum "6500_32";
-          enum "6500_14";
-          enum "6500_7";
-          enum "6500_2";
-          enum "6500";
-          enum "6500_CS";
-          enum "6500_T_24";
-          enum "6500_T_12";
-          enum "6500_T_6";
-          enum "6500_T";
-        }
-        description
-          "OSRP node type.";
-        config false;
-      }
-      leaf remote-adm-weight {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Administrative weight associated with this OSRP link's remote side.";
-        config false;
-      }
-      leaf-list remote-prot-bundle-ids {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "List of up to 20 protection bundles to which the OSRP link remote side belongs.";
-        config false;
-      }
-      leaf remote-link-max-delay {
-        type ciena-6500-types:INT {
-          range "0..200000";
-        }
-        description
-          "The max delay associated with the remote OSRP link.";
-        config false;
-      }
-      leaf remote-node-id {
-        type string {
-          length "44";
-        }
-        description
-          "Node ID of the remote link.";
-        config false;
-      }
-      leaf remote-node-name {
-        type string {
-          length "0..40";
-        }
-        description
-          "Name of the remote node.";
-        config false;
-      }
-      leaf remote-node-type {
-        type enumeration {
-          enum "UNKNOWN";
-          enum "CD";
-          enum "CI";
-          enum "5410";
-          enum "5430";
-          enum "6500_32";
-          enum "6500_14";
-          enum "6500_7";
-          enum "6500_2";
-          enum "6500";
-          enum "6500_CS";
-          enum "6500_T_24";
-          enum "6500_T_12";
-          enum "6500_T_6";
-          enum "6500_T";
-        }
-        description
-          "Remote OSRP node type.";
-        config false;
-      }
-      leaf remote-label {
-        type string {
-          length "0..40";
-        }
-        description
-          "Label of the remote link.";
-        config false;
-      }
-      leaf remote-link-id {
-        type ciena-6500-types:INT {
-          range "0..4194303";
-        }
-        description
-          "ID of the remote link.";
-        config false;
-      }
-      leaf is-master {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if this end of the OSRP link is the master.";
-        config false;
-      }
-      leaf remote-ovpn-id {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "The Optical Virtual Private Network ID of the remote end.";
-        config false;
-      }
-      leaf parent-link {
-        type ciena-6500-types:aid;
-        description
-          "OSRPLINK ID from which this virtual link is created.";
-        config false;
-      }
-      leaf-list child-virt-links {
-        type ciena-6500-types:INT {
-          range "0..4194303";
-        }
-        description
-          "A list of up to 10 virtual links which are created on this base OSRPLINK.";
-        config false;
-      }
-    }
-    list link-snc {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format OSRPLINK-shelf-id";
-        type ciena-6500-types:aid;
-      }
-      leaf snc-name {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies the SNC name.";
-        config false;
-      }
-      leaf orig-node-name {
-        type ciena-6500-types:STRING;
-        description
-          "Name of the SNC originating node.";
-        config false;
-      }
-      leaf priority {
-        type ciena-6500-enums:EnumPRIORITY;
-        description
-          "Priority level of this SNC connection.";
-        config false;
-      }
-      leaf ingress-link-id {
-        type ciena-6500-types:INT {
-          range "1..4194303";
-        }
-        description
-          "ID of the ingress OSRP link.";
-        config false;
-      }
-      leaf egress-link-id {
-        type ciena-6500-types:INT {
-          range "1..4194303";
-        }
-        description
-          "ID of the egress OSRP link.";
-        config false;
-      }
-      leaf end-pt-size {
-        type ciena-6500-enums:EnumENDPTSIZE_SNC;
-        description
-          "End-point size type for the SNC.";
-        config false;
-      }
-      leaf state {
-        type ciena-6500-enums:EnumOSRPLINK_State;
-        description
-          "Indicates the state of the call";
-        config false;
-      }
-      leaf is-home-path {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies whether SNC is currently in its home path or not.";
-        config false;
-      }
-      leaf rhp-capability {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if the Retain Home Path capability is available.";
-        config false;
-      }
-      leaf ovpn-id {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "The optical virtual private network ID.";
-        config false;
-      }
-    }
-    list link-metrics {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPLINK-shelf-id, OSRPLINK0-shelf-id, OSRPLINK-shelf-ALL, OSRPLINK0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf adm-weight {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Administrative weight which specifies the level of importance given to the OSRP link.";
-        config false;
-      }
-      leaf adv-bw {
-        type string {
-          length "1..512";
-        }
-        description
-          "The link's advertised bandwidth (available, advertised, and maximum bandwidth) for Normal usage.";
-        config false;
-      }
-      leaf rhp-adv-bw {
-        type string {
-          length "1..512";
-        }
-        description
-          "The link's advertised bandwidth (available,advertised, and maximum bandwidth) for RHP usage.";
-        config false;
-      }
-      leaf adv-wl {
-        type string {
-          length "11..192";
-        }
-        description
-          "A hexadecimal number which represents the current wavelength availability associated with the OSRP link.";
-        config false;
-      }
-      leaf grid-type {
-        type enumeration {
-          enum "C100G44";
-          enum "C50G88";
-          enum "C50G96";
-          enum "CFLEX768";
-          enum "LFLEX744";
-        }
-        description
-          "Grid type of the OSRP link.";
-        config false;
-      }
-      leaf remote-adm-weight {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Administrative weight associated with this OSRP link's remote side.";
-        config false;
-      }
-      leaf remote-prot-type {
-        type enumeration {
-          enum "UNPROTECTED";
-          enum "APS";
-        }
-        description
-          "Protection types supported for this service class' OSRP link from remote side.";
-        config false;
-      }
-      leaf sup-prot-type {
-        type enumeration {
-          enum "UNPROTECTED";
-          enum "APS";
-        }
-        description
-          "Protection types supported for this service class.";
-        config false;
-      }
-      leaf transfer-delay {
-        type ciena-6500-types:INT {
-          range "0..200000";
-        }
-        description
-          "Indicates the worst delay in microseconds of any OSRP line aggregated in the link.";
-        config false;
-      }
-    }
-    list remote-link {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPRMTLINKS-shelf-id, OSRPRMTLINKS0-shelf-id, OSRPRMTLINKS0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf adm-weight {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Administrative weight which specifies the level of importance given to the OSRP link.";
-        config false;
-      }
-      leaf direction {
-        type enumeration {
-          enum "OUTGOING";
-          enum "INCOMING";
-        }
-        description
-          "The direction, with respect to the advertising node, where the parameters in the metrics apply.";
-        config false;
-      }
-      leaf hstate {
-        type enumeration {
-          enum "NOTAPPLICABLE";
-          enum "DOWN";
-          enum "ATTEMPT";
-          enum "ONEWAYINSIDE";
-          enum "TWOWAYINSIDE";
-          enum "ONEWAYOUTSIDE";
-          enum "TWOWAYOUTSIDE";
-          enum "COMMONOUTSIDE";
-        }
-        description
-          "State of the Hello protocol finite state machine.";
-        config false;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label of the OSRP link.";
-        config false;
-      }
-      leaf linkmaxdelay {
-        type ciena-6500-types:INT {
-          range "0..200000";
-        }
-        description
-          "Indicates the worst delay in microseconds of any OSRP line aggregated in the link.";
-        config false;
-      }
-      leaf orig-link-id {
-        type ciena-6500-types:INT {
-          range "1..25438";
-        }
-        description
-          "ID of the link from the origination node.";
-        config false;
-      }
-      leaf orig-node-id {
-        type string {
-          length "44";
-        }
-        description
-          "Node ID of the originating node.";
-        config false;
-      }
-      leaf orig-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Name of the originating node.";
-        config false;
-      }
-      leaf ovpnid {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "Optical Virtual Private Network ID.";
-        config false;
-      }
-      leaf-list pbids {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "List of up to 20 protection bundles to which the OSRP link belongs.";
-        config false;
-      }
-      leaf remote-adm-weight {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Administrative weight associated with this OSRP link's remote side.";
-        config false;
-      }
-      leaf-list remote-prot-bundle-ids {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "List of up to 20 protection bundles to which the OSRP link remote side belongs.";
-        config false;
-      }
-      leaf remote-link-max-delay {
-        type ciena-6500-types:INT {
-          range "0..200000";
-        }
-        description
-          "The max delay associated with the remote OSRP link.";
-        config false;
-      }
-      leaf remote-node-id {
-        type string {
-          length "44";
-        }
-        description
-          "Node ID of the remote link.";
-        config false;
-      }
-      leaf remote-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Name of the remote node.";
-        config false;
-      }
-      leaf remote-link-id {
-        type ciena-6500-types:INT {
-          range "1..4194303";
-        }
-        description
-          "ID of the remote link.";
-        config false;
-      }
-      leaf remote-label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label of the remote link.";
-        config false;
-      }
-      leaf remote-ovpn-id {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "The Optical Virtual Private Network ID of the remote end.";
-        config false;
-      }
-    }
-    list remote-link-metrics {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OSRPRMTLINKS-shelf-id, OSRPRMTLINKS0-shelf-id, OSRPRMTLINKS0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf adm-weight {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Administrative weight which specifies the level of importance given to the OSRP link.";
-        config false;
-      }
-      leaf adv-bw {
-        type string {
-          length "1..512";
-        }
-        description
-          "The link's advertised bandwidth (available, advertised, and maximum bandwidth) for Normal usage.";
-        config false;
-      }
-      leaf rhp-adv-bw {
-        type string {
-          length "1..512";
-        }
-        description
-          "The link's advertised bandwidth (advertised, and maximum bandwidth) for RHP usage.";
-        config false;
-      }
-      leaf adv-wl {
-        type string {
-          length "11..192";
-        }
-        description
-          "A hexadecimal number which represents the current wavelength availability associated with the OSRP link.";
-        config false;
-      }
-      leaf grid-type {
-        type enumeration {
-          enum "C100G44";
-          enum "C50G88";
-          enum "C50G96";
-          enum "CFLEX768";
-          enum "LFLEX744";
-        }
-        description
-          "Grid type of the OSRP link.";
-        config false;
-      }
-      leaf orig-link-id {
-        type ciena-6500-types:INT {
-          range "1..25438";
-        }
-        description
-          "ID of the link from the origination node.";
-        config false;
-      }
-      leaf orig-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Name of the originating node.";
-        config false;
-      }
-      leaf remote-adm-weight {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Administrative weight associated with this OSRP link's remote side.";
-        config false;
-      }
-      leaf remote-prot-type {
-        type enumeration {
-          enum "UNPROTECTED";
-          enum "APS";
-        }
-        description
-          "Protection types supported for this service class' OSRP link from remote side.";
-        config false;
-      }
-      leaf sup-prot-type {
-        type enumeration {
-          enum "UNPROTECTED";
-          enum "APS";
-        }
-        description
-          "Protection types supported for this service class.";
-        config false;
-      }
-      leaf transfer-delay {
-        type ciena-6500-types:INT {
-          range "0..200000";
-        }
-        description
-          "Indicates the worst delay in microseconds of any OSRP line aggregated in the remote link.";
-        config false;
-      }
-    }
-    list dtl {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format DTL-shelf-id, DTL0-shelf-id, NONE-shelf, DTL-shelf-ALL, DTL0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf assoc-fail-hop {
-        type string {
-          length "3..45";
-        }
-        description
-          "The associated hop whose failure should trigger the use of the DTLDATA.";
-        config true;
-      }
-      leaf dtl-data {
-        type string {
-          length "3..1139";
-        }
-        mandatory true;
-        description
-          "List of OSRP hops.";
-        config true;
-      }
-      leaf dtl-type {
-        type enumeration {
-          enum "NONE";
-          enum "MANUAL_SWITCH";
-        }
-        default "NONE";
-        description
-          "Specifies the purpose of this DTL during mesh restoration or manual switch operations of an SNC.";
-        config true;
-      }
-      leaf dtl-ccmode {
-        type enumeration {
-          enum "MODE1";
-          enum "MODE2";
-          enum "MODE3";
-        }
-        default "MODE1";
-        description
-          "Specifies the capacity change modes(MODE1- Parallel add mode, MODE2- Accelerated mode and MODE3- Dead Reckoning mode) of this DTL.";
-        config true;
-      }
-      leaf term-node-name {
-        type string {
-          length "1..40";
-        }
-        mandatory true;
-        description
-          "The OSRP node name of the terminating node in the DTL.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label for the DTL.";
-        config true;
-      }
-      leaf wvl-grid {
-        type string {
-          length "0..96";
-        }
-        description
-          "A hexadecimal number representing the vector of wavelengths that can be used by connection on this DTL.";
-        config true;
-      }
-      leaf dtl-uuid {
-        type string {
-          length "36";
-        }
-        description
-          "A string of 32 Hexadecimal Digits in five groups seperated by hypens in the form xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx for a total of 36 charatcters, representing the Universally Unique Identifier of the object.";
-        config true;
-      }
-      leaf min-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Constrain the frequency allocated lower bound (in THz)";
-        config true;
-      }
-      leaf max-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Constrain the frequency allocated upper bound (in THz)";
-        config true;
-      }
-      leaf txinfo-data {
-        type string {
-          length "5..176";
-        }
-        description
-          "List of transponder characteristics(ADJ-shelf-slot-port,Transmission mode, Frequency, Minimum Dispersion, Maximum Dispersion, Lower GuardBand, Higher GuardBand, Expected Restoration Time, Link Optimization Mode) for this DTL. Where format and size of each fields are: ADJ-shelf-slot-port would be string of characters and its maximun size is 14 characters, Transmission mode would be string of integers and its size is 2 characters(range 0-99), Frequency would be string of intergers and its size is 9 characters (range 186.325000-190.975000, 191.325000-196.125000), Minimum Dispersion would be string of integers and its maximum size is 5 characters(range 0-999999), Maximum Dispersion would be string of integers and its maximum size is 5 characters(range 0-999999), Lower GuardBand would be string of integers and its maximum size is 7 characters(range 0-999999), Higher GuardBand would be string of integers and its maximum size is 8 characters(range 0-4800.000), Expected Restoration Time would be string of integers and its maximum size is 3 characters(range 0-100 seconds), Link Optimization Mode would be string of integers and its maximum size is 2 characters (range 0-99)";
-        config true;
-      }
-    }
-    list casc-dtl {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CASCDTL0-shelf-id, CASCDTL0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf asfailhop {
-        type string {
-          length "3..45";
-        }
-        description
-          "The associated hop whose failure should trigger the use of the CASCDTLDATA.";
-        config true;
-      }
-      leaf casc-dtl-data {
-        type string {
-          length "15..176";
-        }
-        mandatory true;
-        description
-          "List of OSRP DTL names and optional Regeneration Ports.";
-        config true;
-      }
-      leaf casc-dtl-type {
-        type enumeration {
-          enum "NONE";
-          enum "MANUAL_SWITCH";
-        }
-        default "NONE";
-        description
-          "Specifies the purpose of this DTL during mesh restoration or manual switch operations of an SNC.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label for the CASCDTL.";
-        config true;
-      }
-      leaf dtl-uuid {
-        type string {
-          length "36";
-        }
-        description
-          "A string of 32 Hexadecimal Digits in five groups seperated by hypens in the form xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx for a total of 36 charatcters, representing the Universally Unique Identifier of the object.";
-        config true;
-      }
-    }
-    list dtl-set {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format DTLSET-shelf-id, DTLSET0-shelf-id, NONE-shelf, DTLSET-shelf-ALL, DTLSET0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf wrk-dtl {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "Working DTL or CASCDTL route for this DTLSET.";
-        config true;
-      }
-      leaf-list prot-dtls {
-        type ciena-6500-types:aid;
-        description
-          "Specifies the protection DTL or CASCDTL list.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label for the DTLSET.";
-        config true;
-      }
-      leaf dtl-uuid {
-        type string {
-          length "36";
-        }
-        description
-          "A string of 32 Hexadecimal Digits in five groups seperated by hypens in the form xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx for a total of 36 charatcters, representing the Universally Unique Identifier of the object.";
-        config true;
-      }
-    }
-    list non-viable-dtl-set {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format NVDTLSET0-shelf-id, NONE-shelf, NVDTLSET0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list nv-dtls {
-        type ciena-6500-types:aid;
-        description
-          "Specifies a list of non-viable DTLs.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label for the non-viable DTL set.";
-        config true;
-      }
-      leaf dtl-uuid {
-        type string {
-          length "36";
-        }
-        description
-          "A string of 32 Hexadecimal Digits in five groups seperated by hypens in the form xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx for a total of 36 charatcters, representing the Universally Unique Identifier of the object.";
-        config true;
-      }
-    }
-    list snc {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC-shelf-id, SNC0-shelf-id, SNC-shelf-ALL, SNC0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf absol-route-diversity {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Indicates if Absolute Route Diversity (ARD) is enabled.";
-        config true;
-      }
-      leaf backoff-period {
-        type ciena-6500-types:INT {
-          range "1..30";
-        }
-        description
-          "Back-off period for retrying SNC setup (in seconds).";
-        config true;
-      }
-      leaf cost-criteria {
-        type ciena-6500-enums:EnumCostCriteria;
-        description
-          "The cost criteria applicable for this connection. This is applicable for the originating end SNC only.";
-        config true;
-      }
-      leaf datapath-fault-alm-time {
-        default "15";
-        type ciena-6500-types:INT {
-          range "0..30";
-        }
-        description
-          "Specifies in minutes how long to wait before raising the SNC datapath fault alarm.";
-        config true;
-      }
-      leaf dtl-excl {
-        type ciena-6500-enums:EnumDTLEXCL_SNC;
-        description
-          "Specifies whether to exclusively use the DTL set specified by DTLSN.";
-        config true;
-      }
-      leaf dtl-set-name {
-        type ciena-6500-types:aid;
-        description
-          "DTL set to be used for this SNC.";
-        config true;
-      }
-      leaf nv-dtl-set-name {
-        type ciena-6500-types:aid;
-        description
-          "Non-viable DTL set to be used for this SNC.";
-        config true;
-      }
-      leaf end-pt-size {
-        type ciena-6500-enums:EnumENDPTSIZE_SNC;
-        description
-          "End-point size type for the SNC.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label of this object.";
-        config true;
-      }
-      leaf local-end-point {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Local end-point of this SNC.";
-        config true;
-      }
-      leaf max-adm-weight {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..1310700";
-        }
-        description
-          "SONET/SDH and Photonics: Maximum admin weight allowed for this connection. OTN: Maximum admin weight allowed for the home path.";
-        config true;
-      }
-      leaf max-delay {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..4000000";
-        }
-        description
-          "Maximum delay allowed for the home path (in microseconds).";
-        config true;
-      }
-      leaf mesh-rest {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "Indicates if mesh-restoration is enabled for this SNC.";
-        config true;
-      }
-      leaf takeover {
-        type enumeration {
-          enum "YES" {
-            description
-              "(This value can be used in create operation)";
-          }
-          enum "NO" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-        }
-        default "NO";
-        description
-          "Specifies if cross-connection takeover is to be performed by the SNC.";
-        config true;
-      }
-      leaf name {
-        type string {
-          length "0..40";
-        }
-        description
-          "Name of this SNC.";
-        config true;
-      }
-      leaf origin-drop-side-prot-state {
-        type enumeration {
-          enum "HIGH_ORDER";
-          enum "UNPROTECTED";
-        }
-        description
-          "Specifies drop side protection state for the SNC on the originating node.";
-        config true;
-      }
-      leaf origin-net-side-prot-state {
-        type enumeration {
-          enum "HIGH_ORDER";
-          enum "UNPROTECTED";
-        }
-        description
-          "Specifies network side protection state for the SNC on the originating node.";
-        config true;
-      }
-      leaf peer-origin {
-        type string {
-          length "1..40";
-        }
-        description
-          "The peer originating node name specifies the node name from which the peer SNC originates.";
-        config true;
-      }
-      leaf peer-snc {
-        type ciena-6500-types:STRING;
-        description
-          "Identifies the peered SNC on this local node or on the node specified in parameter PEERORIGIN.";
-        config true;
-      }
-      leaf prot-type {
-        type ciena-6500-enums:EnumPRTT_SNC;
-        mandatory true;
-        description
-          "The protection type parameter indicates the service class of protection for the SNC.";
-        config true;
-      }
-      leaf regroom {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "Indicates if re-groom operation can be performed on this SNC.";
-        config true;
-      }
-      leaf remote-end-point {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "Remote end-point of this SNC.";
-        config true;
-      }
-      leaf remote-end-point-type {
-        type ciena-6500-enums:EnumRMTEPTYPE_SNC;
-        description
-          "Indicates the type of end-point.";
-        config true;
-      }
-      leaf remote-node {
-        type string {
-          length "1..40";
-        }
-        mandatory true;
-        description
-          "Specifies the name of the remote end node on which the SNC terminates.";
-        config true;
-      }
-      leaf wvl-grid {
-        type string {
-          length "0..96";
-        }
-        description
-          "A hexadecimal number representing the vector of wavelengths that can be used by this SNC.";
-        config true;
-      }
-      leaf remote-time-slot {
-        type string {
-          length "1..192";
-        }
-        description
-          "Timeslot to use when creating the remote end-point.";
-        config true;
-      }
-      leaf remote-ctp-path-term {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "NO";
-        description
-          "Determines whether remote CTP is path terminating or not";
-        config true;
-      }
-      leaf remote-ttp-mux {
-        type ciena-6500-enums:osrp_rmtttpmux;
-        default "NONE";
-        description
-          "Describes the multiplex structure and payload type for the far end TTP in accordance with ITU-T G.709";
-        config true;
-      }
-      leaf trib-port {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..32";
-        }
-        description
-          "Tributary port for creating line side CTPs";
-        config true;
-      }
-      leaf remote-path-protection {
-        type ciena-6500-enums:EnumRMTPATHPROTECTION;
-        description
-          "Indicates what path protection is enabled on the terminating drop side of this SNC.";
-        config true;
-      }
-      leaf revert-timer {
-        type ciena-6500-enums:EnumRVRTT;
-        description
-          "Specifies whether the connection is to revert to the original route after a delay (SNC_DELAY), the connection is not to revert to the original route (SNC_NO_REVERT), or if the connection is to revert at a certain time(SNC_TIMEOFDAY).";
-        config true;
-      }
-      leaf snc-line-type {
-        type enumeration {
-          enum "WORKING";
-          enum "PROTECT";
-        }
-        description
-          "Identifiers if this SNC is the working or protecting leg of an SNCP.";
-        config true;
-      }
-      leaf datapath-fault-action {
-        type enumeration {
-          enum "MR";
-          enum "ALARM";
-        }
-        description
-          "Indicates whether an ALARM will be raised or MR will be done on SNC Datapath Fault.Default is ALARM";
-        config true;
-      }
-      leaf tcm {
-        type ciena-6500-types:INT {
-          range "0..6";
-        }
-        description
-          "Override the system default SNC TCM.";
-        config true;
-      }
-      leaf termin-drop-side-prot-state {
-        type enumeration {
-          enum "HIGH_ORDER";
-          enum "UNPROTECTED";
-        }
-        description
-          "Specifies drop side protection state for the SNC on the terminating node.";
-        config true;
-      }
-      leaf termin-net-side-prot-state {
-        type enumeration {
-          enum "HIGH_ORDER";
-          enum "UNPROTECTED";
-        }
-        description
-          "Specifies network side protection state for the SNC on the terminating node.";
-        config true;
-      }
-      leaf tod-revert-holdback-enabled {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "YES";
-        description
-          "Specifies if time of day reversion holdback is enabled.";
-        config true;
-      }
-      leaf tod-revert-holdback-period {
-        type ciena-6500-types:TIME;
-        description
-          "Specifies the time of day reversion holdback period.";
-        config true;
-      }
-      leaf tod-revert-time {
-        type ciena-6500-types:TIME;
-        description
-          "Specifies the time of day when to do reversion to the home path (home path must be available).";
-        config true;
-      }
-      leaf tod-revert-period {
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Specifies the time range (in minutes) when it's acceptable to do the TODR (home route must be available during this window), otherwise wait 24 hours to try again.";
-        config true;
-      }
-      leaf-list tod-revert-prof-list {
-        type ciena-6500-types:aid;
-        description
-          "List of time of day reversion profiles that are associated with this SNC";
-        config true;
-      }
-      leaf revert-time {
-        default "300";
-        type ciena-6500-types:INT {
-          range "300..86400";
-        }
-        description
-          "Amount of time for a connection to be reverted to the original route (sec).";
-        config true;
-      }
-      leaf type {
-        type ciena-6500-enums:EnumSNCTYPE;
-        mandatory true;
-        description
-          "Type of this SNC, dynamic or permanent.";
-        config true;
-      }
-      leaf remote-interop {
-        type ciena-6500-enums:EnumRMTINTEROP;
-        default "OTHER";
-        description
-          "The required interoperation equipment type of the remote node. This parameter is only applicable to OTN.";
-        config true;
-      }
-      leaf grouped {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        default "NO";
-        description
-          "Specifies, Is SNC part of SNCG. It is an optional attribute and Default value would be NO. value =YES/NO";
-        config true;
-      }
-      leaf frequency {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Specifies the explicit centre frequency to use for the service. The value 0 (default) means the system will select the frequency. All SNCs in an SNCG must all be explicit or all must be implicit ";
-        config true;
-      }
-      leaf min-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Constrain the frequency allocated lower bound (in THz)";
-        config true;
-      }
-      leaf max-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Constrain the frequency allocated upper bound (in THz)";
-        config true;
-      }
-      leaf retain-home-path-capability {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if the Retain Home Path capability is available.";
-        config true;
-      }
-      leaf prot-max-adm-weight {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..1310700";
-        }
-        description
-          "Maximum admin weight allowed for the protect path.";
-        config true;
-      }
-      leaf prot-max-delay {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..4000000";
-        }
-        description
-          "Maximum delay allowed for the protect path.";
-        config true;
-      }
-      leaf cost-crit-admin-weight {
-        type ciena-6500-enums:EnumCostCriteriaSetting;
-        description
-          "The cost criteria setting for admin weight. ";
-        config true;
-      }
-      leaf cost-crit-delay {
-        type ciena-6500-enums:EnumCostCriteriaSetting;
-        description
-          "The cost criteria setting for delay of the home path.";
-        config true;
-      }
-      leaf prot-cost-crit-adm-weight {
-        type ciena-6500-enums:EnumCostCriteriaSetting;
-        description
-          "The protect cost criteria admin weight setting. ";
-        config true;
-      }
-      leaf prot-cost-crit-delay {
-        type ciena-6500-enums:EnumCostCriteriaSetting;
-        description
-          "The protect cost criteria delay setting.";
-        config true;
-      }
-      leaf-list primary-ovpn-ids {
-        type string {
-          length "1..15";
-        }
-        description
-          "The primary optical virtual private network ID list";
-        config true;
-      }
-      leaf secondary-ovpn-ids {
-        type string {
-          length "1..15";
-        }
-        description
-          "The secondary optical virtual private network ID list";
-        config true;
-      }
-      leaf generic-end-point {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "NO";
-        description
-          "Specifies whether Generic End Point (GEP) method is allowed.";
-        config true;
-      }
-      leaf snc-integrity-check {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Specifies if the SNC Integrity Check capability is enabled or disabled.";
-        config true;
-      }
-      leaf home-path-preempt {
-        type ciena-6500-enums:EnumHPPREEMPT;
-        description
-          "Specifies the Home Path Preempt capability definition.";
-        config true;
-      }
-      leaf release-on-client-fail {
-        type enumeration {
-          enum "DISABLED";
-          enum "PORT";
-          enum "PAYLOAD";
-        }
-        default "DISABLED";
-        description
-          "Specifies the Release on Client Failure capability";
-        config true;
-      }
-      leaf release-on-client-fail-holdoff {
-        type enumeration {
-          enum "IMMEDIATE";
-          enum "ALARM";
-        }
-        default "ALARM";
-        description
-          "Specifies the Release on Client Failure hold off";
-        config true;
-      }
-      leaf mode {
-        type enumeration {
-          enum "OTN" {
-            description
-              "(This value can be used in create operation)";
-          }
-          enum "PKTRSRVD" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "PKTNORSRVD" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-        }
-        default "OTN";
-        description
-          "Specifies the SNC mode";
-        config true;
-      }
-      leaf ccmode {
-        type enumeration {
-          enum "DTLMODE";
-          enum "MODE1";
-          enum "MODE2";
-          enum "MODE3";
-        }
-        default "DTLMODE";
-        description
-          "Specify the capacity change mode(CCMODE)";
-        config true;
-      }
-      leaf mrccmode {
-        type enumeration {
-          enum "DTLMODE";
-          enum "MODE1";
-          enum "MODE2";
-          enum "MODE3";
-        }
-        default "DTLMODE";
-        description
-          "Specify the mesh restorations capacity change mode(MRCCMODE)";
-        config true;
-      }
-      leaf dtl-uuid {
-        type string {
-          length "36";
-        }
-        description
-          "A string of 32 Hexadecimal Digits in five groups seperated by hypens in the form xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx for a total of 36 charatcters, representing the Universally Unique Identifier of the object.";
-        config true;
-      }
-      leaf tolerance {
-        type string {
-          length "0..19";
-        }
-        description
-          "Define the tolerance in ppm of oduflex before an LOF is declared.";
-        config true;
-      }
-      leaf bit-rate {
-        type string {
-          length "0..19";
-        }
-        description
-          "Define the bit rate of flex.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-        }
-        description
-          "Primary state of the SNC.";
-        config true;
-      }
-      leaf cktid {
-        type string {
-          length "29..70";
-        }
-        description
-          "Circuit identifier tagged against cross-connections created for this SNC.";
-        config false;
-      }
-      leaf corouted-snc {
-        type ciena-6500-types:aid;
-        description
-          "Specifies the Co-Routed SNC if which this SNC is a member.";
-        config false;
-      }
-      leaf incarnation {
-        type ciena-6500-types:INT;
-        description
-          "Indicates the SNC Incarnation Number.";
-        config false;
-      }
-      leaf home-dtl-act {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates if the home DTL is currently active.";
-        config false;
-      }
-      leaf home-dtl-avail {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates if the home DTL is currently available.";
-        config false;
-      }
-      leaf priority {
-        type ciena-6500-enums:EnumPRIORITY;
-        description
-          "Priority level of this SNC connection.";
-        config false;
-      }
-      leaf assoc-sncg {
-        type ciena-6500-types:aid;
-        description
-          "Specifies Associated SNCG aid";
-        config false;
-      }
-      leaf resizable {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates if the ODUFlex connection has the capability to be resized.";
-        config false;
-      }
-      leaf rvrt-state {
-        type ciena-6500-enums:rvrtState;
-        description
-          "Specifies the reversion state of the connection";
-        config false;
-      }
-      leaf snc-ep-state {
-        type enumeration {
-          enum "ORIG_DOWN";
-          enum "ORIG_CREATING";
-          enum "ORIG_STARTING";
-          enum "ORIG_PROTECTING";
-          enum "ORIG_WORKING";
-          enum "ORIG_RECOVERING";
-          enum "ORIG_MBB_ACTIVE";
-          enum "ORIG_MBB_SWITCH";
-          enum "ORIG_PENDING";
-          enum "ORIG_LOCK_PENDING";
-          enum "TERM_DOWN";
-          enum "TERM_WAITING";
-          enum "TERM_WORKING_CONNECTED";
-          enum "DEGRADED";
-        }
-        description
-          "SNC-specific state information for the end-point.";
-        config false;
-      }
-      leaf rev-fail-count {
-        type ciena-6500-types:INT;
-        description
-          "Specifies the number of windows during which Time of Day Reversion has failed.";
-        config false;
-      }
-      leaf snic-valid-path-detected {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        description
-          "Specifies if a valid path signal was detected for this SNC.";
-        config false;
-      }
-      leaf prot-diversity-type {
-        type ciena-6500-enums:divtype;
-        description
-          "This indicates the required deversity type.";
-        config false;
-      }
-      leaf release-on-client-fail-holdon {
-        type ciena-6500-types:INT {
-          range "5";
-        }
-        description
-          "Specifies the Release on Client Failure hold on in seconds";
-        config false;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "SGEO" {
-            description
-              "Supporting Group Entity Outage: The SNC is not fully operational because one or more supporting entities (e.g. DOC channel) is not operational.";
-          }
-          enum "FLT" {
-            description
-              "Fault: The SNC is faulted and an alarm has been raised.";
-          }
-        }
-        description
-          "Secondary state of the SNC. This parameter is only applicable to photonics.";
-        config false;
-      }
-      leaf validate {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        default "NO";
-        description
-          "Only validates the parameters, returns list of possible paths.";
-        config true;
-      }
-      leaf route-operation {
-        type ciena-6500-enums:EnumRTEOPR;
-        description
-          "Specifies the SNC route operation.";
-        config true;
-      }
-      leaf make-home-path {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Will be used along with RTEOPR to change the current path to home path.";
-        config true;
-      }
-      leaf resize-bitrate {
-        type string {
-          length "0..19";
-        }
-        description
-          "Specifies the regroomed bitrate in bits per second (bps).";
-        config true;
-      }
-    }
-    list snc-diag {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC-shelf-id, SNC0-shelf-id, SNC-shelf-ALL, SNC0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf blocked-type {
-        type enumeration {
-          enum "NODE";
-          enum "LINK";
-          enum "BUNDLE";
-          enum "UNKNOWN";
-        }
-        description
-          "Identifies the entity type that is blocked.";
-        config false;
-      }
-      leaf bundle-id {
-        type ciena-6500-types:STRING;
-        description
-          "Identifies the bundle by number.";
-        config false;
-      }
-      leaf failure-cause {
-        type ciena-6500-types:STRING;
-        description
-          "Failure cause of the SNC.";
-        config false;
-      }
-      leaf link-id {
-        type ciena-6500-types:INT {
-          range "0..25438";
-        }
-        description
-          "Identifies the ID of the blocked link.";
-        config false;
-      }
-      leaf node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Identifies the name of the blocked node.";
-        config false;
-      }
-      leaf remote-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Identifies the name of the blocked remote node.";
-        config false;
-      }
-      leaf time {
-        type ciena-6500-types:STRING;
-        description
-          "Recorded failure time.";
-        config false;
-      }
-    }
-    list snc-ee-diag {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC0-shelf-id";
-        type ciena-6500-types:aid;
-      }
-      leaf link-id {
-        type ciena-6500-types:INT {
-          range "0..25438";
-        }
-        description
-          "Identifies the OSRP link ID of the corresponding node.";
-        config false;
-      }
-      leaf node-name {
-        type string {
-          length "1..20";
-        }
-        description
-          "Identifies the name of the node the status corresponds to.";
-        config false;
-      }
-      leaf status {
-        type ciena-6500-types:STRING;
-        description
-          "Data plane status.";
-        config false;
-      }
-    }
-    list snc-route {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNC-shelf-id, SNC0-shelf-id, SNC-shelf-ALL, SNC0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf route-type {
-        type enumeration {
-          enum "WORKING";
-          enum "PROTECTION";
-          enum "HOME";
-        }
-        description
-          "Specifies the type of route.";
-        config false;
-      }
-      leaf adv-wl {
-        type string {
-          length "11..96";
-        }
-        description
-          "A hexadecimal number which represents the current wavelength availability.";
-        config false;
-      }
-      leaf dtl {
-        type string {
-          length "3..949";
-        }
-        description
-          "Indicates the entire DTL route for the specified SNC excluding the terminating node.";
-        config false;
-      }
-      leaf term-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "The OSRP node name of where the SNC terminates.";
-        config false;
-      }
-      leaf assoc-fail-hop {
-        type string {
-          length "3..45";
-        }
-        description
-          "The associated hop whose failure should trigger the use of the DTLDATA.";
-        config false;
-      }
-      leaf dtl-cost {
-        type ciena-6500-types:INT {
-          range "1..4000000";
-        }
-        description
-          "Indicates the DTL cost.";
-        config false;
-      }
-      leaf dtl-name {
-        type string {
-          length "0..12";
-        }
-        description
-          "The DTL AID associated with this protection path";
-        config false;
-      }
-    }
-    list snc-group {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNCG0-shelf-id, SNCG0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label of this object.";
-        config true;
-      }
-      leaf absol-route-diversity {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Indicates if Absolute Route Diversity (ARD) is enabled, Can only be set to ON for MR-SNCGs.";
-        config true;
-      }
-      leaf bckop {
-        type ciena-6500-types:INT {
-          range "1..30";
-        }
-        description
-          "Back-off period for retrying SNCG setup (in seconds).";
-        config true;
-      }
-      leaf dtl-excl {
-        type ciena-6500-enums:EnumDTLEXCL_SNCG;
-        default "NO";
-        description
-          "Specifies whether to exclusively use the DTL set specified by DTLSN.";
-        config true;
-      }
-      leaf dtl-set-name {
-        type ciena-6500-types:aid;
-        description
-          "DTL set to be used by all member SNCs..";
-        config true;
-      }
-      leaf mesh-rest {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "Indicates if mesh-restoration is enabled for this SNCG, Always OFF for P-SNCG.";
-        config true;
-      }
-      leaf remote-node {
-        type string {
-          length "1..40";
-        }
-        mandatory true;
-        description
-          "Specifies the name of the remote end node on which all SNC member connections terminate..";
-        config true;
-      }
-      leaf type {
-        type ciena-6500-enums:EnumSNCTYPE;
-        mandatory true;
-        description
-          "Type of this SNCG, dynamic or permanent. Set if the SNCG is permanent or DYNAMIC.";
-        config true;
-      }
-      leaf contiguous {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "YES";
-        description
-          "Single Contiguous MC Use, For Photonics values are YES | NO, Default = YES.";
-        config true;
-      }
-      leaf max-adm-weight {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..1310700";
-        }
-        description
-          "SONET/SDH and Photonics: Maximum admin weight allowed for this connection, default value is 0.";
-        config true;
-      }
-      leaf min-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Constrain the frequency allocated -lower bound (in THz).";
-        config true;
-      }
-      leaf max-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Constrain the frequency allocated -upper bound (in THz).";
-        config true;
-      }
-      leaf min-freq-db {
-        type decimal64 {
-          range "0..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Media Channel Lower Dead Band, in GHz. default value :SYS DBDFLT value";
-        config true;
-      }
-      leaf max-snc-spacing {
-        default "4800";
-        type decimal64 {
-          range "0..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Maximum allowed spectral Spacing within media channel, in GHz. default value :4800GHz";
-        config true;
-      }
-      leaf max-freq-db {
-        type decimal64 {
-          range "0..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Media Channel Upper Dead Band, in GHz.";
-        config true;
-      }
-      leaf nv-dtl-set-name {
-        type ciena-6500-types:aid;
-        description
-          "Non-viable DTL set to be used for this SNCG.";
-        config true;
-      }
-      leaf prot-type {
-        type ciena-6500-enums:EnumPRTT_SNCG;
-        default "UNPROTECTED_HIGH";
-        description
-          "The protection type parameter indicates the service class of protection for the all member SNCs.";
-        config true;
-      }
-      leaf peer-origin {
-        type string {
-          length "1..40";
-        }
-        description
-          "The peer originating node name specifies the node name from which the peer SNCG originates.";
-        config true;
-      }
-      leaf peer-sncg {
-        type ciena-6500-types:STRING;
-        description
-          "AID of the paired SNCG on this local node.";
-        config true;
-      }
-      leaf rvrt-time {
-        type ciena-6500-enums:EnumRVRTT;
-        description
-          "Specifies whether the connection is to revert to the original route after a delay (SNC_DELAY), the connection is not to revert to the original route (SNC_NO_REVERT),.";
-        config true;
-      }
-      leaf ccmode {
-        type enumeration {
-          enum "DTLMODE";
-          enum "MODE1";
-          enum "MODE2";
-          enum "MODE3";
-        }
-        default "DTLMODE";
-        description
-          "Specify the capacity change mode(CCMODE)";
-        config true;
-      }
-      leaf mrccmode {
-        type enumeration {
-          enum "DTLMODE";
-          enum "MODE1";
-          enum "MODE2";
-          enum "MODE3";
-        }
-        default "DTLMODE";
-        description
-          "Specify the mesh restorations capacity change mode(MRCCMODE)";
-        config true;
-      }
-      leaf-list snc-list {
-        type ciena-6500-types:aid;
-        description
-          "Unordered list of member SNCs. MAX SNCs we can have 16";
-        config true;
-      }
-      leaf sncglinetype {
-        type enumeration {
-          enum "WORKING";
-          enum "PROTECT";
-        }
-        description
-          "Identifiers if this SNCG is the working or protecting leg of an SNCGP.";
-        config true;
-      }
-      leaf time-to-revert {
-        default "300";
-        type ciena-6500-types:INT {
-          range "300..86400";
-        }
-        description
-          "Amount of time for a connection to be reverted to the original route (sec).";
-        config true;
-      }
-      leaf dtl-uuid {
-        type string {
-          length "36";
-        }
-        description
-          "A string of 32 Hexadecimal Digits in five groups seperated by hypens in the form xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx for a total of 36 charatcters, representing the Universally Unique Identifier of the object.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-        }
-        description
-          "Primary state of the SNCG.";
-        config true;
-      }
-      leaf ckt-id {
-        type string {
-          length "29..70";
-        }
-        description
-          "Circuit identifier tagged against cross-connections created for this SNCG.";
-        config false;
-      }
-      leaf home-dtl-act {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates if the home DTL is currently active.";
-        config false;
-      }
-      leaf home-dtl-avail {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates if the home DTL is currently available.";
-        config false;
-      }
-      leaf priority {
-        type ciena-6500-enums:EnumPRIORITY;
-        description
-          "Priority to be used by member SNC connections.";
-        config false;
-      }
-      leaf sncg-end-point-state {
-        type enumeration {
-          enum "ORIG_DOWN";
-          enum "ORIG_CREATING";
-          enum "ORIG_STARTING";
-          enum "ORIG_PROTECTING";
-          enum "ORIG_WORKING";
-          enum "ORIG_RECOVERING";
-          enum "ORIG_MBB_ACTIVE";
-          enum "ORIG_MBB_SWITCH";
-          enum "ORIG_LOCK_PENDING";
-          enum "ORIG_ERROR";
-          enum "ORIG_RESIZING";
-          enum "ORIG_VALIDATING";
-          enum "TERM_WORKING_CONNECTED";
-        }
-        description
-          "SNCG-specific state information for the end-point.";
-        config false;
-      }
-      leaf validate {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        default "NO";
-        description
-          "Only validates the parameters, returns list of possible paths.";
-        config true;
-      }
-      leaf route-operation {
-        type ciena-6500-enums:EnumRTEOPR;
-        description
-          "Specifies the SNCG route operation.";
-        config true;
-      }
-    }
-    list snc-group-diag {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNCG0-shelf-id, SNCG0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf blocked-type {
-        type enumeration {
-          enum "NODE";
-          enum "LINK";
-          enum "BUNDLE";
-          enum "UNKNOWN";
-        }
-        description
-          "Identifies the entity type that is blocked.";
-        config false;
-      }
-      leaf bundle-id {
-        type ciena-6500-types:STRING;
-        description
-          "Identifies the bundle by number.";
-        config false;
-      }
-      leaf failure-cause {
-        type ciena-6500-types:STRING;
-        description
-          "Failure cause of the SNC.";
-        config false;
-      }
-      leaf link-id {
-        type ciena-6500-types:INT {
-          range "0..25438";
-        }
-        description
-          "Identifies the ID of the blocked link.";
-        config false;
-      }
-      leaf node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Identifies the name of the blocked node.";
-        config false;
-      }
-      leaf remote-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Identifies the name of the blocked remote node.";
-        config false;
-      }
-      leaf time {
-        type ciena-6500-types:STRING;
-        description
-          "Recorded failure time.";
-        config false;
-      }
-    }
-    list snc-group-route {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SNCG0-shelf-id, SNCG0-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf route-type {
-        type enumeration {
-          enum "WORKING";
-          enum "PROTECTION";
-          enum "HOME";
-        }
-        description
-          "Specifies the type of route.";
-        config false;
-      }
-      leaf dtl {
-        type string {
-          length "3..949";
-        }
-        description
-          "Indicates the entire DTL route for the specified SNC excluding the terminating node.";
-        config false;
-      }
-      leaf term-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "The OSRP node name of where the SNC terminates.";
-        config false;
-      }
-      leaf assoc-fail-hop {
-        type string {
-          length "3..45";
-        }
-        description
-          "The associated hop whose failure should trigger the use of the DTLDATA.";
-        config false;
-      }
-      leaf dtl-cost {
-        type ciena-6500-types:INT {
-          range "1..4000000";
-        }
-        description
-          "Indicates the DTL cost.";
-        config false;
-      }
-      leaf dtl-name {
-        type string {
-          length "0..12";
-        }
-        description
-          "The DTL AID associated with this protection path";
-        config false;
-      }
-    }
-    list corouted-snc {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id, CRSNC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label of this object.";
-        config true;
-      }
-      leaf-list snc {
-        type ciena-6500-types:aid;
-        description
-          "Seed SNC for this CRSNC group.";
-        config true;
-      }
-      leaf backoff-period {
-        type ciena-6500-types:INT {
-          range "1..30";
-        }
-        description
-          "Back-off period for retrying SNC setup (in seconds).";
-        config true;
-      }
-      leaf cost-crit-adm-weight {
-        type ciena-6500-enums:EnumCostCriteriaSetting;
-        description
-          "The cost criteria setting for admin weight.";
-        config true;
-      }
-      leaf cost-crit-delay {
-        type ciena-6500-enums:EnumCostCriteriaSetting;
-        description
-          "The cost criteria setting for delay of the home path.";
-        config true;
-      }
-      leaf cost-criteria {
-        type ciena-6500-enums:EnumCostCriteria;
-        description
-          "The cost criteria applicable for all member SNC connections.";
-        config true;
-      }
-      leaf dtl-excl {
-        type ciena-6500-enums:EnumDTLEXCL_CRSNC;
-        description
-          "Specifies whether to exclusively use the DTL set specified by DTLSN.";
-        config true;
-      }
-      leaf dtl-set-name {
-        type ciena-6500-types:aid;
-        description
-          "DTL set to be used by all member SNC connections.";
-        config true;
-      }
-      leaf home-path-preempt {
-        type ciena-6500-enums:EnumHPPREEMPT;
-        description
-          "Specifies the Home Path Preempt capability definition of the SNC members.";
-        config true;
-      }
-      leaf max-adm-weight {
-        type ciena-6500-types:INT {
-          range "0..1310700";
-        }
-        description
-          "Maximum admin weight allowed for the home path.";
-        config true;
-      }
-      leaf max-delay {
-        type ciena-6500-types:INT {
-          range "0..4000000";
-        }
-        description
-          "Maximum delay allowed for the home path (in microseconds).";
-        config true;
-      }
-      leaf mesh-rest {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        description
-          "Indicates if mesh-restoration is enabled for all SNC member connections.";
-        config true;
-      }
-      leaf ovpn-id {
-        type ciena-6500-types:INT {
-          range "0..255";
-        }
-        description
-          "Optical Virtual Private Network ID.";
-        config true;
-      }
-      leaf prot-cost-crit-adm-weight {
-        type ciena-6500-enums:EnumCostCriteriaSetting;
-        description
-          "The protect cost criteria admin weight setting. ";
-        config true;
-      }
-      leaf prot-cost-crit-delay {
-        type ciena-6500-enums:EnumCostCriteriaSetting;
-        description
-          "The protect cost criteria delay setting.";
-        config true;
-      }
-      leaf prot-max-adm-weight {
-        type ciena-6500-types:INT {
-          range "0..1310700";
-        }
-        description
-          "Maximum admin weight allowed for the protect path.";
-        config true;
-      }
-      leaf prot-max-delay {
-        type ciena-6500-types:INT {
-          range "0..4000000";
-        }
-        description
-          "Maximum delay allowed for the protect path.";
-        config true;
-      }
-      leaf prot-type {
-        type ciena-6500-enums:EnumPRTT_CRSNC;
-        description
-          "The protection type parameter indicates the service class of protection for the SNC members.";
-        config true;
-      }
-      leaf regroom {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        description
-          "Indicates if re-groom operation can be performed on the SNC member connections. Value is applied to all SNC members of the group.";
-        config true;
-      }
-      leaf retain-home-path-capability {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if the Retain Home Path capability is available on the SNC member connections.";
-        config true;
-      }
-      leaf remote-node {
-        type string {
-          length "1..40";
-        }
-        description
-          "Specifies the name of the remote end node on which all SNC member connections terminate.";
-        config true;
-      }
-      leaf timed-revert {
-        type ciena-6500-enums:EnumRVRTT;
-        description
-          "Specifies whether the SNC member connections are to revert to the original route after a delay (SNC_DELAY), the connections are not to revert to the original route (SNC_NO_REVERT), or if the connections are to revert at a certain time(SNC_TIMEOFDAY).";
-        config true;
-      }
-      leaf tod-revert-holdback-enable {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specifies if time of day reversion holdback is enabled.";
-        config true;
-      }
-      leaf tod-revert-holdback-delay {
-        type ciena-6500-types:TIME;
-        description
-          "Specifies the time of day reversion holdback period.";
-        config true;
-      }
-      leaf tod-revert-time {
-        type ciena-6500-types:TIME;
-        description
-          "Specifies the time of day when to do reversion to the home path (home path must be available).";
-        config true;
-      }
-      leaf tod-revert-period {
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Specifies the time range (in minutes) when it's acceptable to do the TODR (home route must be available during this window), otherwise wait 24 hours to try again.";
-        config true;
-      }
-      leaf-list tod-revert-profile-list {
-        type ciena-6500-types:aid;
-        description
-          "List of time of day reversion profiles that are associated with this SNC";
-        config true;
-      }
-      leaf revert-time {
-        type ciena-6500-types:INT {
-          range "300..86400";
-        }
-        description
-          "Amount of time for SNC member connections to be reverted to the original route (sec).";
-        config true;
-      }
-      leaf type {
-        type ciena-6500-enums:EnumSNCTYPE;
-        description
-          "Type of the SNC members, dynamic or permanent.";
-        config true;
-      }
-      leaf end-pt-size {
-        type ciena-6500-enums:EnumENDPTSIZE_CRSNC;
-        description
-          "End-point size type for the SNC members.";
-        config false;
-      }
-      leaf home-dtl-act {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates if the home DTL is currently active.";
-        config false;
-      }
-      leaf home-dtl-avail {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates if the home DTL is currently available.";
-        config false;
-      }
-      leaf priority {
-        type ciena-6500-enums:EnumPRIORITY;
-        description
-          "Priority level of the SNC members.";
-        config false;
-      }
-      leaf remote-path-protection {
-        type ciena-6500-enums:EnumRMTPATHPROTECTION;
-        description
-          "Indicates what path protection is enabled on the terminating drop side of the SNC members.";
-        config false;
-      }
-      leaf snc-end-point-state {
-        type enumeration {
-          enum "ORIG_DOWN";
-          enum "ORIG_CREATING";
-          enum "ORIG_STARTING";
-          enum "ORIG_PROTECTING";
-          enum "ORIG_WORKING";
-          enum "ORIG_RECOVERING";
-          enum "ORIG_MBB_ACTIVE";
-          enum "ORIG_MBB_SWITCH";
-          enum "TERM_DOWN";
-          enum "TERM_WAITING";
-          enum "TERM_WORKING_CONNECTED";
-          enum "DEGRADED";
-        }
-        description
-          "SNC-related state information for the end-point.";
-        config false;
-      }
-      leaf rvrt-state {
-        type ciena-6500-enums:rvrtState;
-        description
-          "Specifies the reversion state of all the SNC member connections";
-        config false;
-      }
-      leaf rev-fail-count {
-        type ciena-6500-types:INT;
-        description
-          "Specifies the number of windows during which Time of Day Reversion has failed.";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Primary state of the CRSNC.";
-        config false;
-      }
-      leaf make-home-path {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Will be used along with RTEOPR to change the current path to home path.";
-        config true;
-      }
-      leaf num-members {
-        type ciena-6500-types:INT {
-          range "1..10";
-        }
-        description
-          "NUMMEMBERS can only be specified as part of Regroom to indicate total number of member SNC will be requested for the CRSNC. It is typically used when additional member SNCs need to be added to the CRSNC.";
-        config true;
-      }
-      leaf route-operation {
-        type ciena-6500-enums:EnumRTEOPR;
-        description
-          "Specifies the route operation to occur on all SNC member connections.";
-        config true;
-      }
-    }
-    list corouted-snc-diag {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id, CRSNC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf blocked-type {
-        type enumeration {
-          enum "NODE";
-          enum "LINK";
-          enum "BUNDLE";
-          enum "UNKNOWN";
-        }
-        description
-          "Identifies the entity type that is blocked.";
-        config false;
-      }
-      leaf bundle-id {
-        type ciena-6500-types:STRING;
-        description
-          "Identifies the bundle by number.";
-        config false;
-      }
-      leaf failure-cause {
-        type ciena-6500-types:STRING;
-        description
-          "Failure cause of the CRSNC.";
-        config false;
-      }
-      leaf link-id {
-        type ciena-6500-types:INT {
-          range "0..2048";
-        }
-        description
-          "Identifies the ID of the blocked link.";
-        config false;
-      }
-      leaf node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Identifies the name of the blocked node.";
-        config false;
-      }
-      leaf remote-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "Identifies the name of the blocked remote node.";
-        config false;
-      }
-      leaf time {
-        type ciena-6500-types:STRING;
-        description
-          "Recorded failure time.";
-        config false;
-      }
-    }
-    list corouted-snc-route {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format CRSNC-shelf-id, CRSNC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf route-type {
-        type enumeration {
-          enum "WORKING";
-          enum "PROTECTION";
-          enum "HOME";
-        }
-        description
-          "Specifies the type of route.";
-        config false;
-      }
-      leaf dtl {
-        type string {
-          length "3..949";
-        }
-        description
-          "Indicates the entire DTL route for the specified CRSNC excluding the terminating node.";
-        config false;
-      }
-      leaf term-node-name {
-        type string {
-          length "1..40";
-        }
-        description
-          "The OSRP node name of where the CRSNC terminates.";
-        config false;
-      }
-      leaf as-fail-hop {
-        type string {
-          length "3..45";
-        }
-        description
-          "The associated hop whose failure should trigger the use of the DTLDATA.";
-        config false;
-      }
-      leaf dtl-cost {
-        type ciena-6500-types:INT {
-          range "1..4000000";
-        }
-        description
-          "Indicates the DTL cost.";
-        config false;
-      }
-      leaf dtl-name {
-        type string {
-          length "0..12";
-        }
-        description
-          "The DTL AID associated with this path.";
-        config false;
-      }
-    }
-    list todrprofile {
-      key "todr-prof";
-      config true;
-      leaf todr-prof {
-        mandatory true;
-        description
-          "AID in format TODRPROF-shelf-id, TODRPROF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf name {
-        type string {
-          length "1..64";
-        }
-        mandatory true;
-        description
-          "A time of day reversion profile name that is unique across the OSRP network.";
-        config true;
-      }
-      leaf profen {
-        type ciena-6500-enums:todrprfen;
-        default "YES";
-        description
-          "This profile is enabled or not. If SNC/SNCP associated profiles are disabled, the SNC/SNCP TODR-DOW Reversion Inhibited condition will be raised and it can be cleared if at least one the associated profile is enabled";
-        config true;
-      }
-      leaf multi-day {
-        type ciena-6500-enums:todrmultiday;
-        mandatory true;
-        description
-          "This is a multiday profile or a single day profile.";
-        config true;
-      }
-      leaf sunday-todr {
-        type ciena-6500-types:TIME;
-        description
-          "Sunday start time of day reversion.";
-        config true;
-      }
-      leaf monday-todr {
-        type ciena-6500-types:TIME;
-        description
-          "Monday start time of day reversion.";
-        config true;
-      }
-      leaf tuesday-todr {
-        type ciena-6500-types:TIME;
-        description
-          "Tueday start time of day reversion.";
-        config true;
-      }
-      leaf wednesday-todr {
-        type ciena-6500-types:TIME;
-        description
-          "Wednesday start time of day reversion.";
-        config true;
-      }
-      leaf thursday-todr {
-        type ciena-6500-types:TIME;
-        description
-          "Thursday start time of day reversion.";
-        config true;
-      }
-      leaf friday-todr {
-        type ciena-6500-types:TIME;
-        description
-          "Friday start time of day reversion.";
-        config true;
-      }
-      leaf saturday-todr {
-        type ciena-6500-types:TIME;
-        description
-          "Saturday start time of day reversion.";
-        config true;
-      }
-      leaf sunday-todr-period {
-        default "20";
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Sunday time of day reversion period.";
-        config true;
-      }
-      leaf monday-todr-period {
-        default "20";
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Monday time of day reversion period.";
-        config true;
-      }
-      leaf tuesday-todr-period {
-        default "20";
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Tuesday time of day reversion period.";
-        config true;
-      }
-      leaf wednesday-todr-period {
-        default "20";
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Wednesday time of day reversion period.";
-        config true;
-      }
-      leaf thursday-todr-period {
-        default "20";
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Thursday time of day reversion period.";
-        config true;
-      }
-      leaf friday-todr-period {
-        default "20";
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Friday time of day reversion period.";
-        config true;
-      }
-      leaf saturday-todr-period {
-        default "20";
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "Saturday time of day reversion period.";
-        config true;
-      }
-      leaf sunday-enable {
-        type ciena-6500-enums:todrsunen;
-        default "NO";
-        description
-          "Specify whether the profile is enabled or not on Sunday.";
-        config true;
-      }
-      leaf monday-enable {
-        type ciena-6500-enums:todrmonen;
-        default "NO";
-        description
-          "Specify whether the profile is enabled or not on Monday.";
-        config true;
-      }
-      leaf tuesday-enable {
-        type ciena-6500-enums:todrtueen;
-        default "NO";
-        description
-          "Specify whether the profile is enabled or not on Tuesday.";
-        config true;
-      }
-      leaf wednesday-enable {
-        type ciena-6500-enums:todrweden;
-        default "NO";
-        description
-          "Specify whether the profile is enabled or not on Wednesday.";
-        config true;
-      }
-      leaf thursday-enable {
-        type ciena-6500-enums:todrthuen;
-        default "NO";
-        description
-          "Specify whether the profile is enabled or not on Thursday.";
-        config true;
-      }
-      leaf friday-enable {
-        type ciena-6500-enums:todrfrien;
-        default "NO";
-        description
-          "Specify whether the profile is enabled or not on Friday.";
-        config true;
-      }
-      leaf saturday-enable {
-        type ciena-6500-enums:todrsaten;
-        default "NO";
-        description
-          "Specify whether the profile is enabled or not on Saturday.";
-        config true;
-      }
-      leaf assigned {
-        type ciena-6500-enums:todrassign;
-        description
-          "Specify whether the profile is assigned or not.";
-        config false;
-      }
-    }
-    list lag {
-      key "osrp-lag";
-      config true;
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label for the OSRPLAG.";
-        config true;
-      }
-      leaf osrp-lag {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "aid in format OSRPLAG-shelf-id, OSRPLAG-shelf-ALL";
-      }
-      leaf-list active {
-        type ciena-6500-types:aid;
-        description
-          "List of active ETTP's that are members of the OSRP Link Aggregation Group";
-        config false;
-      }
-      leaf-list rsrvd {
-        type ciena-6500-types:aid;
-        description
-          "List of reserved ETTP's that are members of the OSRP Link Aggregation Group";
-        config false;
-      }
-      leaf snc {
-        type ciena-6500-types:aid;
-        description
-          "SNC associated with the OSRP Link Aggregation Group";
-        config false;
-      }
-      leaf hello-state {
-        type enumeration {
-          enum "NOTAPPLICABLE";
-          enum "ATTEMPT";
-          enum "ONEWAYINSIDE";
-          enum "TWOWAYINSIDE";
-        }
-        description
-          "State of the Hello protocol finite state machine.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-photonic.yang b/models/ciena-6500-photonic.yang
deleted file mode 100644
index d6d6936bfbfe6d7b627abffe60694f26bbe32c18..0000000000000000000000000000000000000000
--- a/models/ciena-6500-photonic.yang
+++ /dev/null
@@ -1,1562 +0,0 @@
-module ciena-6500-photonic {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-photonic";
-  prefix photonic;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's photonic object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container photonic
-           container topology
-             list optical-system
-               leaf topo-config
-                 type enumeration
-                 - Added enum: MULTI_LINEAR
-           list controller
-           - Added leaf: docfusethresh
-             leaf action
-               type enumeration
-               - Removed enum: DISCOVER
-         rpc photonic-show-topology-optical-system
-           output
-             list output
-               leaf topo-config
-                 type enumeration
-                 - Added enum: MULTI_LINEAR
-         rpc photonic-show-och-linkdata
-           input
-           - Removed leaf: pmd
-           - Removed leaf: pdl
-           - Removed leaf: sop
-           - Removed leaf: ber";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: photonic-show-channel
-       - Added rpc: photonic-build-network-channel
-       - Added rpc: photonic-show-topology-optical-system
-       - Added rpc: photonic-show-och-linkdata
-       - Added rpc: photonic-save-och-linkdata
-       - Added rpc: photonic-cancel-och-linkdata
-         container photonic
-         - Added container: network
-         - Added container: topology
-         - Added list: wavelength-rules
-           list controller
-             leaf docaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf doc-mode
-             - Added default: ENHANCED 
-             leaf auto-del-los-holdoff
-               type ciena-6500-types:INT
-               - Added range: 1..120 
-             leaf action
-               type enumeration
-               - Added enum: CLRLOG
-               - Added enum: DISCOVER
-               - Added enum: POWERAUDIT
-           list channel
-           - Added leaf: mod-class
-             leaf aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf ch-type
-               type enumeration
-               - Added enum: ADDABLE
-               - Added enum: DELETABLE
-           list logs
-             leaf docaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list class
-           - Added leaf: mod-class-bias-35gbaud-100g
-           - Added leaf: mod-class-bias-35gbaud-150g
-           - Added leaf: mod-class-bias-35gbaud-200g
-           - Added leaf: mod-class-bias-35gbaud-250g
-           - Added leaf: mod-class-bias-56gbaud-100g
-           - Added leaf: mod-class-bias-56gbaud-150g
-           - Added leaf: mod-class-bias-56gbaud-200g
-           - Added leaf: mod-class-bias-56gbaud-250g
-           - Added leaf: mod-class-bias-56gbaud-300g
-           - Added leaf: mod-class-bias-56gbaud-350g
-           - Added leaf: mod-class-bias-56gbaud-400g
-             leaf docaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list local-control
-           - Added leaf: ctrl-targ-pow
-           - Added leaf: och-tx-blanking-ctrl
-           - Added leaf: mcpo-mode
-           - Added leaf: ctrl-cpbl
-           - Added leaf: act-ctrl-mode
-             leaf loc
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf ref-bw-3dB
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf ref-bw-10dB
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf ref-sig-pow
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf ref-bw
-             - Changed config from false to true
-             leaf auto-mcpo
-             - Changed type from ciena-6500-types:DECIMAL to ciena-6500-types:STRING
-             leaf type
-             - Changed type from ciena-6500-types:STRING to ciena-6500-enums:loctype";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added container: photonic
-       - Added rpc: photonic-disable-controller
-       - Added rpc: photonic-enable-controller
-       - Added rpc: photonic-enable-local-control
-       - Added rpc: photonic-disable-local-control";
-  }
-
-  rpc photonic-disable-controller {
-    description
-      "Remove the DOC Facility from service.";
-    input {
-      leaf docaid {
-        mandatory true;
-        description
-          "AID in format DOC-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc photonic-enable-controller {
-    description
-      "Restore the DOC Facility from service.";
-    input {
-      leaf docaid {
-        mandatory true;
-        description
-          "AID in format DOC-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc photonic-show-channel {
-    description
-      "Retrieve DOC Channels attributes.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format NC-shelf-siteid-remshelf-rempath-wavelength, NMCLNCTP-shelf-slot-port-mcId-nmcId, DOC-shelf-instance, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ch-type {
-        type enumeration {
-          enum "ADDABLE" {
-            description
-              "Get the channels which are addable.";
-          }
-          enum "DELETABLE" {
-            description
-              "Get the channels which are deletable.";
-          }
-          enum "ADDLIST" {
-            description
-              "Get the channels which are addable.";
-          }
-          enum "DELLIST" {
-            description
-              "Get the channels which are deletable.";
-          }
-        }
-        description
-          "The type of channels to be retrieved from DOC.";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf ch-type {
-          type enumeration {
-            enum "ADDABLE" {
-              description
-                "Get the channels which are addable.";
-            }
-            enum "DELETABLE" {
-              description
-                "Get the channels which are deletable.";
-            }
-            enum "ADDLIST" {
-              description
-                "Get the channels which are addable.";
-            }
-            enum "DELLIST" {
-              description
-                "Get the channels which are deletable.";
-            }
-          }
-          description
-            "The type of channels to be retrieved from DOC.";
-        }
-        leaf channel-opt-status {
-          type ciena-6500-types:STRING;
-          description
-            "The Channel Condition.";
-        }
-        leaf channel-fault-status {
-          type ciena-6500-types:STRING;
-          description
-            "The Channel Fault Status.";
-        }
-        leaf end-to-end-condition {
-          type ciena-6500-types:STRING;
-          description
-            "The Channel End to End Condition.";
-        }
-        leaf ingress-active-flag {
-          type ciena-6500-types:STRING;
-          description
-            "The Channel Ingress Active Flag.";
-        }
-        leaf ingress {
-          type ciena-6500-types:STRING;
-          description
-            "The Ingress TID-Shelf-Path";
-        }
-        leaf egress {
-          type ciena-6500-types:STRING;
-          description
-            "The Egress TID-Shelf-Path";
-        }
-        leaf ne-trail {
-          type ciena-6500-types:STRING;
-          description
-            "The NE Trail for the channel";
-        }
-        leaf doc-trail {
-          type ciena-6500-types:STRING;
-          description
-            "Domain Trail for the Network Channel";
-        }
-        leaf doc-trail-status {
-          type ciena-6500-enums:COMPLETE_INCOMPLETE;
-          description
-            "Domain Trail for the Network Channel Status. If COMPLETE, the full domain trail is available. If INCOMPLETE, a partial domain trail is available.";
-        }
-        leaf cktid {
-          type ciena-6500-types:STRING;
-          description
-            "Circuit ID";
-        }
-        leaf domain-routing {
-          type ciena-6500-types:STRING;
-          description
-            "Channel Routing in Domain";
-        }
-        leaf est-incr-osnr {
-          type ciena-6500-types:STRING;
-          description
-            "Estimated Incremental OSNR";
-        }
-        leaf docinst {
-          type ciena-6500-types:aid;
-          description
-            "DOC AID";
-        }
-        leaf snr-bias {
-          type ciena-6500-types:DECIMAL;
-          description
-            "SNR Bias";
-        }
-        leaf mod-class {
-          type ciena-6500-enums:adjTxModClass;
-          description
-            "Modulation Class.";
-        }
-      }
-    }
-  }
-  rpc photonic-enable-local-control {
-    description
-      "Restores the LOC Facility to service.";
-    input {
-      leaf loc {
-        mandatory true;
-        description
-          "AID in format LOC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc photonic-disable-local-control {
-    description
-      "Removes the LOC Facility from service.";
-    input {
-      leaf loc {
-        mandatory true;
-        description
-          "AID in format LOC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc photonic-build-network-channel {
-    description
-      "Build the Network Channel Topology Channels.";
-    input {
-      leaf nc {
-        mandatory true;
-        description
-          "AID in format OTS-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc photonic-show-topology-optical-system {
-    description
-      "Retrieve the Optical System Topology";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf osid {
-        type string {
-          length "0..8";
-        }
-        description
-          "Optional parameter used as a filter to query the OST for a specific OSID. If OSID is not specified, OST for all OSIDs is returned. Maximum length of 8 characters.";
-      }
-    }
-    output {
-      list output {
-        leaf osid {
-          type string {
-            length "0..8";
-          }
-          description
-            "Optional parameter used as a filter to query the OST for a specific OSID. If OSID is not specified, OST for all OSIDs is returned. Maximum length of 8 characters.";
-        }
-        leaf site {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "Identifies the Shelf's Site ID";
-        }
-        leaf tid {
-          type ciena-6500-types:STRING;
-          description
-            "Identifies the Shelf's TID";
-        }
-        leaf remote-shelf {
-          type ciena-6500-types:INT {
-            range "0..254";
-          }
-          description
-            "Identifies the Shelf's Shelf ID";
-        }
-        leaf shelf-type {
-          type enumeration {
-            enum "CHA" {
-              description
-                "Channel Access";
-            }
-            enum "CCA" {
-              description
-                "Consolidated Channel Access";
-            }
-            enum "AMP" {
-              description
-                "Amplifier Shelf";
-            }
-            enum "DGE" {
-              description
-                "Dynamic Gain Equalizer";
-            }
-          }
-          description
-            "Indicates whether this is a Channel Access, Consolidated Channel Access, AMP, or DGE shelf.";
-        }
-        leaf auto-route {
-          type enumeration {
-            enum "DISABLE" {
-              description
-                "AutoRoute Disabled";
-            }
-            enum "ENABLE" {
-              description
-                "AutoRoute Enabled";
-            }
-            enum "UNDEFINED" {
-              description
-                "AutoRoute Undefined";
-            }
-          }
-          description
-            "OTS AutoRoute Status, doesn't apply to Shelftype AMP and DGE.";
-        }
-        leaf topo-config {
-          type enumeration {
-            enum "LINEAR" {
-              description
-                "The topology for the given OSID is a line";
-            }
-            enum "RING" {
-              description
-                "The topology for the given OSID is a ring.";
-            }
-            enum "MULTI_LINEAR" {
-              description
-                "The topology for the given OSID is multi line.";
-            }
-            enum "NOT_APPLICABLE" {
-              description
-                "The nodal topology is DIOADM or COADM. The node does not belong to an OSID.";
-            }
-            enum "UNKNOWN" {
-              description
-                "The topology for the given OSID is not complete.";
-            }
-          }
-          description
-            "Topology Configuration. Indicates whether the topology for this OSID is a Line or Ring or Unknown";
-        }
-        leaf topo-flex {
-          type enumeration {
-            enum "YES" {
-              description
-                "The topology for the given OSID is a flexible";
-            }
-            enum "NO" {
-              description
-                "The topology for the given OSID is a nonflexible.";
-            }
-            enum "NOT_APPLICABLE" {
-              description
-                "The nodal topology is DIOADM or COADM. The node does not belong to an OSID.";
-            }
-            enum "UNKNOWN" {
-              description
-                "The topology for the given OSID is not complete.";
-            }
-          }
-          description
-            "Topology Flexibility. Indicates whether the topology for this OSID is a flexible, nonflexible, not applicable or unknown";
-        }
-        leaf status {
-          type enumeration {
-            enum "OK" {
-              description
-                "The shelf does not have a neighbor problem.";
-            }
-            enum "PROBLEM" {
-              description
-                "This shelf has detected a topology problem.";
-            }
-          }
-          description
-            "Neighbor Status. Used to indicate a problem with one of the shelf's neighbors.";
-        }
-        leaf doc-state {
-          type ciena-6500-types:STRING;
-          description
-            "Status of DOC. N/A if this is not a DOC site";
-        }
-        leaf path {
-          type ciena-6500-types:INT {
-            range "1..254";
-          }
-          description
-            "OTS Tx Path Identifier";
-        }
-        leaf ots {
-          type ciena-6500-types:INT {
-            range "1..8";
-          }
-          description
-            "OTS ID";
-        }
-        leaf neighbor-1 {
-          type ciena-6500-types:STRING;
-          description
-            "First Neighbour";
-        }
-        leaf neighbor-2 {
-          type ciena-6500-types:STRING;
-          description
-            "Second Neighbour";
-        }
-      }
-    }
-  }
-  rpc photonic-show-och-linkdata {
-    description
-      "Collect the optical link performance data";
-    input {
-      leaf otm {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, PTP-shelf-slot-port, PTP-shelf-slot-portSsubport, PTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf interval {
-        type ciena-6500-types:INT {
-          range "10..1000";
-        }
-        description
-          "Indicating the record sampling period";
-      }
-      leaf repeatnum {
-        type ciena-6500-types:INT {
-          range "100..50000";
-        }
-        description
-          "Indicating the Number of samples per file";
-      }
-    }
-  }
-  rpc photonic-save-och-linkdata {
-    description
-      "FTP the Collection of the optical link performance data to a server";
-    input {
-      leaf otm {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, PTP-shelf-slot-port, PTP-shelf-slot-portSsubport, PTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "1..403";
-        }
-        mandatory true;
-        description
-          "Full URL to remote Directory or File (inside quotes)";
-      }
-    }
-  }
-  rpc photonic-cancel-och-linkdata {
-    description
-      "Cancel the Collection of the optical link performance data";
-    input {
-      leaf otm {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, PTP-shelf-slot-port, PTP-shelf-slot-portSsubport, PTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf clean {
-        type enumeration {
-          enum "NO" {
-            description
-              "Don't discard the latest retrieved data";
-          }
-          enum "YES" {
-            description
-              "Discard the latest retrieved data";
-          }
-        }
-        default "YES";
-        description
-          "Indicating whether to Clean the latest retrieved data";
-      }
-    }
-  }
-  container photonic {
-    container network {
-      list channel {
-        key "nc";
-        config false;
-        leaf nc {
-          mandatory true;
-          description
-            "AID in format NC-shelf-siteid-remshelf-rempath-wavelength, OTS-shelf-instance, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf nct-config {
-          type enumeration {
-            enum "LINEAR" {
-              description
-                "The topology for the given OSID is a line";
-            }
-            enum "RING" {
-              description
-                "The topology for the given OSID is a ring.";
-            }
-            enum "UNKNOWN" {
-              description
-                "The topology for the given OSID is not complete.";
-            }
-          }
-          description
-            "Topology Configuration. Indicates whether the topology for this OSID is a Line or Ring or Unknown";
-          config false;
-        }
-        leaf nct-flex {
-          type enumeration {
-            enum "FLEXIBLE" {
-              description
-                "The topology for the given OSID is flexible";
-            }
-            enum "NONFLEXIBLE" {
-              description
-                "The topology for the given OSID is nonflexible.";
-            }
-            enum "UNKNOWN" {
-              description
-                "The topology for the given OSID is not complete.";
-            }
-          }
-          description
-            "Topology Flexibility. Indicates whether the topology for this OSID is a flexible or nonflexible or unknown";
-          config false;
-        }
-        leaf nct-status {
-          type enumeration {
-            enum "COMPLETE";
-            enum "INCOMPLETE";
-            enum "DISC";
-            enum "NOTREADY";
-          }
-          description
-            "Network Status.";
-          config false;
-        }
-        leaf ch-doc-care {
-          type enumeration {
-            enum "false";
-            enum "true";
-          }
-          description
-            "Status indicating whether DOC is actively controlling the channel.";
-          config false;
-        }
-        leaf ne-trail {
-          type ciena-6500-types:STRING;
-          description
-            "NE Trail for the Network Channel.";
-          config false;
-        }
-        leaf doc-trail {
-          type ciena-6500-types:STRING;
-          description
-            "Domain Trail for the Network Channel";
-          config false;
-        }
-        leaf doc-trail-status {
-          type ciena-6500-enums:COMPLETE_INCOMPLETE;
-          description
-            "Domain Trail for the Network Channel Status. If COMPLETE, the full domain trail is available. If INCOMPLETE, a partial domain trail is available.";
-          config false;
-        }
-        leaf drops {
-          type ciena-6500-types:STRING;
-          description
-            "List of drop points for the Network Channel.";
-          config false;
-        }
-        leaf ckt-id {
-          type ciena-6500-types:STRING;
-          description
-            "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.";
-          config false;
-        }
-      }
-    }
-    container topology {
-      list optical-system {
-        config false;
-        leaf osid {
-          type string {
-            length "0..8";
-          }
-          description
-            "Optional parameter used as a filter to query the OST for a specific OSID. If OSID is not specified, OST for all OSIDs is returned. Maximum length of 8 characters.";
-          config false;
-        }
-        leaf site {
-          type ciena-6500-types:INT {
-            range "0..65535";
-          }
-          description
-            "Identifies the Shelf's Site ID";
-          config false;
-        }
-        leaf tid {
-          type ciena-6500-types:STRING;
-          description
-            "Identifies the Shelf's TID";
-          config false;
-        }
-        leaf remote-shelf {
-          type ciena-6500-types:INT {
-            range "0..254";
-          }
-          description
-            "Identifies the Shelf's Shelf ID";
-          config false;
-        }
-        leaf shelf-type {
-          type enumeration {
-            enum "CHA" {
-              description
-                "Channel Access";
-            }
-            enum "CCA" {
-              description
-                "Consolidated Channel Access";
-            }
-            enum "AMP" {
-              description
-                "Amplifier Shelf";
-            }
-            enum "DGE" {
-              description
-                "Dynamic Gain Equalizer";
-            }
-          }
-          description
-            "Indicates whether this is a Channel Access, Consolidated Channel Access, AMP, or DGE shelf.";
-          config false;
-        }
-        leaf auto-route {
-          type enumeration {
-            enum "DISABLE" {
-              description
-                "AutoRoute Disabled";
-            }
-            enum "ENABLE" {
-              description
-                "AutoRoute Enabled";
-            }
-            enum "UNDEFINED" {
-              description
-                "AutoRoute Undefined";
-            }
-          }
-          description
-            "OTS AutoRoute Status, doesn't apply to Shelftype AMP and DGE.";
-          config false;
-        }
-        leaf topo-config {
-          type enumeration {
-            enum "LINEAR" {
-              description
-                "The topology for the given OSID is a line";
-            }
-            enum "RING" {
-              description
-                "The topology for the given OSID is a ring.";
-            }
-            enum "MULTI_LINEAR" {
-              description
-                "The topology for the given OSID is multi line.";
-            }
-            enum "NOT_APPLICABLE" {
-              description
-                "The nodal topology is DIOADM or COADM. The node does not belong to an OSID.";
-            }
-            enum "UNKNOWN" {
-              description
-                "The topology for the given OSID is not complete.";
-            }
-          }
-          description
-            "Topology Configuration. Indicates whether the topology for this OSID is a Line or Ring or Unknown";
-          config false;
-        }
-        leaf topo-flex {
-          type enumeration {
-            enum "YES" {
-              description
-                "The topology for the given OSID is a flexible";
-            }
-            enum "NO" {
-              description
-                "The topology for the given OSID is a nonflexible.";
-            }
-            enum "NOT_APPLICABLE" {
-              description
-                "The nodal topology is DIOADM or COADM. The node does not belong to an OSID.";
-            }
-            enum "UNKNOWN" {
-              description
-                "The topology for the given OSID is not complete.";
-            }
-          }
-          description
-            "Topology Flexibility. Indicates whether the topology for this OSID is a flexible, nonflexible, not applicable or unknown";
-          config false;
-        }
-        leaf status {
-          type enumeration {
-            enum "OK" {
-              description
-                "The shelf does not have a neighbor problem.";
-            }
-            enum "PROBLEM" {
-              description
-                "This shelf has detected a topology problem.";
-            }
-          }
-          description
-            "Neighbor Status. Used to indicate a problem with one of the shelf's neighbors.";
-          config false;
-        }
-        leaf doc-state {
-          type ciena-6500-types:STRING;
-          description
-            "Status of DOC. N/A if this is not a DOC site";
-          config false;
-        }
-        leaf path {
-          type ciena-6500-types:INT {
-            range "1..254";
-          }
-          description
-            "OTS Tx Path Identifier";
-          config false;
-        }
-        leaf ots {
-          type ciena-6500-types:INT {
-            range "1..8";
-          }
-          description
-            "OTS ID";
-          config false;
-        }
-        leaf neighbor-1 {
-          type ciena-6500-types:STRING;
-          description
-            "First Neighbour";
-          config false;
-        }
-        leaf neighbor-2 {
-          type ciena-6500-types:STRING;
-          description
-            "Second Neighbour";
-          config false;
-        }
-      }
-    }
-    list controller {
-      key "docaid";
-      config true;
-      leaf docaid {
-        mandatory true;
-        description
-          "AID in format DOC-shelf-instance, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf doc-mode {
-        type enumeration {
-          enum "AUTOMON" {
-            description
-              "Only performs auto monitoring.";
-          }
-          enum "ENHANCED" {
-            description
-              "Enhanced mode.";
-          }
-          enum "FOREIGNLINEAUTOMON" {
-            description
-              "Foreign line auto monitoring only.";
-          }
-          enum "FOREIGNLINENHANCED" {
-            description
-              "Foreign line Enhanced mode.";
-          }
-        }
-        default "ENHANCED";
-        description
-          "Automation level of DOC.";
-        config true;
-      }
-      leaf auto-add {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "Enable Auto-Add";
-          }
-          enum "DISABLE" {
-            description
-              "Disable Auto-Add";
-          }
-        }
-        description
-          "Enables/Disables DOC's to automatically Add channels.";
-        config true;
-      }
-      leaf auto-del {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "Enable Auto-Del";
-          }
-          enum "DISABLE" {
-            description
-              "Disable Auto-Del";
-          }
-        }
-        description
-          "Enables/Disables DOC's to automatically Delete channels.";
-        config true;
-      }
-      leaf auto-del-los {
-        type ciena-6500-enums:ENABLE_DISABLE;
-        description
-          "Enables/Disables the auto-squelch feature (delete of channels with Ingress LOS alarm).";
-        config true;
-      }
-      leaf auto-del-los-holdoff {
-        type ciena-6500-types:INT {
-          range "1..120";
-        }
-        description
-          "Represents the minimum time in minute required before executing auto-squelch feature.";
-        config true;
-      }
-      leaf docfusethresh {
-        type ciena-6500-types:INT {
-          range "1..60";
-        }
-        description
-          "Represents the Re-Opt threshold before the DOC Fuse is activated. Valid range for this parameter is between 1 - 60. 1-59 represents the number of Re-Opt iterations runs after which the DOC Fuse will be blown. 60 represents the DOC Fuse feature is disabled.";
-        config true;
-      }
-      leaf gain-clamp {
-        type ciena-6500-enums:ENABLE_DISABLE;
-        description
-          "Enables/Disables Gain Clamp on AMPs.";
-        config true;
-      }
-      leaf progress-status {
-        type ciena-6500-types:STRING;
-        description
-          "Progress of current DOC operation.";
-        config false;
-      }
-      leaf command-status {
-        type enumeration {
-          enum "INACTIVE" {
-            description
-              "n/a";
-          }
-          enum "READY" {
-            description
-              "n/a";
-          }
-          enum "EXECUTING" {
-            description
-              "n/a";
-          }
-          enum "BUSY" {
-            description
-              "n/a";
-          }
-        }
-        description
-          "Command Status of DOC.";
-        config false;
-      }
-      leaf status {
-        type ciena-6500-types:STRING;
-        description
-          "Overall DOC status.";
-        config false;
-      }
-      leaf docpo {
-        type enumeration {
-          enum "DISABLE";
-        }
-        description
-          "Deprecated.";
-        config false;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In-Service";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-Service Maintenance";
-          }
-        }
-        description
-          "Identify the primary state";
-        config false;
-      }
-      leaf action {
-        type enumeration {
-          enum "STOP" {
-            description
-              "Stop channel adds and deletes.";
-          }
-          enum "CLRALM" {
-            description
-              "Clear DOC alarm.";
-          }
-          enum "RESETTCA" {
-            description
-              "Resets all Threshold Crossing Alert (TCA) Baselines for the entire domain.";
-          }
-          enum "REOPT" {
-            description
-              "re-optimize.";
-          }
-          enum "CLRLOG" {
-            description
-              "Clear DOC log.";
-          }
-          enum "POWERAUDIT" {
-            description
-              "Perform power audit.";
-          }
-        }
-        description
-          "DOC action.";
-        config true;
-      }
-    }
-    list channel {
-      key "aid";
-      config true;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format NC-shelf-siteid-remshelf-rempath-wavelength, NMCLNCTP-shelf-slot-port-mcId-nmcId, DOC-shelf-instance, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ch-type {
-        type enumeration {
-          enum "ADDABLE" {
-            description
-              "Get the channels which are addable.";
-          }
-          enum "DELETABLE" {
-            description
-              "Get the channels which are deletable.";
-          }
-          enum "ADDLIST" {
-            description
-              "Get the channels which are addable.";
-          }
-          enum "DELLIST" {
-            description
-              "Get the channels which are deletable.";
-          }
-        }
-        description
-          "The type of channels to be retrieved from DOC.";
-        config false;
-      }
-      leaf channel-opt-status {
-        type ciena-6500-types:STRING;
-        description
-          "The Channel Condition.";
-        config false;
-      }
-      leaf channel-fault-status {
-        type ciena-6500-types:STRING;
-        description
-          "The Channel Fault Status.";
-        config false;
-      }
-      leaf end-to-end-condition {
-        type ciena-6500-types:STRING;
-        description
-          "The Channel End to End Condition.";
-        config false;
-      }
-      leaf ingress-active-flag {
-        type ciena-6500-types:STRING;
-        description
-          "The Channel Ingress Active Flag.";
-        config false;
-      }
-      leaf ingress {
-        type ciena-6500-types:STRING;
-        description
-          "The Ingress TID-Shelf-Path";
-        config false;
-      }
-      leaf egress {
-        type ciena-6500-types:STRING;
-        description
-          "The Egress TID-Shelf-Path";
-        config false;
-      }
-      leaf ne-trail {
-        type ciena-6500-types:STRING;
-        description
-          "The NE Trail for the channel";
-        config false;
-      }
-      leaf doc-trail {
-        type ciena-6500-types:STRING;
-        description
-          "Domain Trail for the Network Channel";
-        config false;
-      }
-      leaf doc-trail-status {
-        type ciena-6500-enums:COMPLETE_INCOMPLETE;
-        description
-          "Domain Trail for the Network Channel Status. If COMPLETE, the full domain trail is available. If INCOMPLETE, a partial domain trail is available.";
-        config false;
-      }
-      leaf cktid {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit ID";
-        config false;
-      }
-      leaf domain-routing {
-        type ciena-6500-types:STRING;
-        description
-          "Channel Routing in Domain";
-        config false;
-      }
-      leaf est-incr-osnr {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated Incremental OSNR";
-        config false;
-      }
-      leaf docinst {
-        type ciena-6500-types:aid;
-        description
-          "DOC AID";
-        config false;
-      }
-      leaf snr-bias {
-        type ciena-6500-types:DECIMAL;
-        description
-          "SNR Bias";
-        config false;
-      }
-      leaf mod-class {
-        type ciena-6500-enums:adjTxModClass;
-        description
-          "Modulation Class.";
-        config false;
-      }
-      leaf ch-action {
-        type enumeration {
-          enum "ADD" {
-            description
-              "Add the specificed channels to DOC control.";
-          }
-          enum "DELETE" {
-            description
-              "Remove the specified channels from DOC control.";
-          }
-          enum "FORCEDEL" {
-            description
-              "Force the Removal of the specified channels from DOC control.";
-          }
-          enum "PRECHECK" {
-            description
-              "Checks the specified channels for any faults.";
-          }
-        }
-        description
-          "Channel action to be performed by DOC. (Not supported with Enhanced Provisioning Model)(Mandatory for edit operations)";
-        config true;
-      }
-      leaf edit-cos-only {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Channel Optimization State.";
-        config true;
-      }
-    }
-    list logs {
-      key "docaid";
-      config false;
-      leaf docaid {
-        mandatory true;
-        description
-          "AID in format DOC-shelf-instance, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf id {
-        type ciena-6500-types:INT;
-        description
-          "Log ID";
-        config false;
-      }
-      leaf label {
-        type ciena-6500-types:STRING;
-        description
-          "Log Label";
-        config false;
-      }
-      leaf type {
-        type enumeration {
-          enum "DOCLOCAL" {
-            description
-              "Local DOC Log";
-          }
-          enum "DOCREMOTE" {
-            description
-              "Remote DOC Log";
-          }
-          enum "NCTLOCAL" {
-            description
-              "Local NCT Log";
-          }
-          enum "NCTREMOTE" {
-            description
-              "Remote NCT Log";
-          }
-        }
-        description
-          "Type of Log";
-        config false;
-      }
-      leaf entry {
-        type ciena-6500-types:STRING;
-        description
-          "Log Entry";
-        config false;
-      }
-    }
-    list class {
-      key "docaid";
-      config true;
-      leaf docaid {
-        mandatory true;
-        description
-          "AID in format DOC-shelf-instance, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mod-class-bias-2g5 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 2.5G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-10g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 10G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-10g-ngm {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 10G eDCO (NGM) Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-40g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 40G eDC Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-40g-ulh {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 40G eDC ULH Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-100g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 100G eDC Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-100g-wl3 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 100G WaveLogic 3 eDC Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-100g-wl3-bpsk {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 100G WaveLogic 3 BPSK eDC Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-100g-wl3-8qam {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 100G WaveLogic 3 8QAM eDC Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-100g-wl3-16qam {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 100G WaveLogic 3 16QAM eDC Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-100g-wl3-4ask {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena 100G WaveLogic 3 4ASK eDC Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-custom1 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Custom 1 Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-custom2 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Custom 2 Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-custom3 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Custom 3 Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-custom4 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Custom 4 Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-custom5 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Custom 5 Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-custom6 {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Custom 6 Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-35gbaud-100g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 35GBaud 100G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-35gbaud-150g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 35GBaud 150G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-35gbaud-200g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 35GBaud 200G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-35gbaud-250g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 35GBaud 250G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-56gbaud-100g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 56GBaud 100G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-56gbaud-150g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 56GBaud 150G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-56gbaud-200g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 56GBaud 200G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-56gbaud-250g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 56GBaud 250G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-56gbaud-300g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 56GBaud 300G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-56gbaud-350g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 56GBaud 350G Modulation Class Bias.";
-        config true;
-      }
-      leaf mod-class-bias-56gbaud-400g {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Ciena WLAi 56GBaud 400G Modulation Class Bias.";
-        config true;
-      }
-    }
-    list local-control {
-      key "loc";
-      config true;
-      leaf loc {
-        mandatory true;
-        description
-          "AID in format LOC-shelf-slot-port, LOC-shelf-ALL, LOC-shelf-slot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ref-txrx-type {
-        type ciena-6500-types:STRING;
-        description
-          "Value of ADJTXRXTYPE of the TXRXPRF specifying which profile to be used to set REFBW3DB, REFBW10DB, REFSIGPOW parms of the facility.";
-        config true;
-      }
-      leaf ref-bw-3dB {
-        type ciena-6500-types:STRING;
-        description
-          "Bandwidth measured in GHz at the 3 dBm less than peak power of the transponder signal.";
-        config true;
-      }
-      leaf ref-bw-10dB {
-        type ciena-6500-types:STRING;
-        description
-          "Bandwidth measured in GHz at the 10 dBm less than peak power of the transponder signal.";
-        config true;
-      }
-      leaf ref-sig-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Power of the reference signal in dBm.";
-        config true;
-      }
-      leaf ctrl-targ-pow {
-        type ciena-6500-types:STRING;
-        description
-          "Control Target Power.";
-        config true;
-      }
-      leaf ref-bw {
-        type ciena-6500-enums:refBW;
-        description
-          "Reference Bandwidth.";
-        config true;
-      }
-      leaf och-tx-blanking-ctrl {
-        type enumeration {
-          enum "DEFAULT" {
-            description
-              "The Tx Controller will enable or disable blanking according to cross-connection provisioning.";
-          }
-          enum "ALWAYS_OFF" {
-            description
-              "The Tx Controller will always disable blanking regardless of cross-connection provisioning.";
-          }
-        }
-        default "DEFAULT";
-        description
-          "Automated Tx blanking control.";
-        config true;
-      }
-      leaf auto-mcpo {
-        type ciena-6500-types:STRING;
-        description
-          "Auto Maximum Power Output";
-        config false;
-      }
-      leaf type {
-        type ciena-6500-enums:loctype;
-        description
-          "The type based on the equipment";
-        config false;
-      }
-      leaf mcpo-mode {
-        type ciena-6500-enums:mcpomode;
-        description
-          "Maximum Controller Power Output Mode.";
-        config false;
-      }
-      leaf ctrl-cpbl {
-        type ciena-6500-enums:locctrlmode;
-        description
-          "The control mode capability which controllers associated with this card config are capable of running.";
-        config false;
-      }
-      leaf act-ctrl-mode {
-        type ciena-6500-enums:locctrlmode;
-        description
-          "The actual control mode which controllers associated with this card config are actually running.";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:LocPst;
-        description
-          "Identify the primary state";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:LocSst;
-        description
-          "Identify the secondary state";
-        config false;
-      }
-    }
-    list wavelength-rules {
-      key "ots";
-      config true;
-      leaf ots {
-        mandatory true;
-        description
-          "AID in format OTS-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-      leaf wl-range-max {
-        type ciena-6500-types:INT {
-          range "152877..156672";
-        }
-        description
-          "Maximum boundary of blocked or unblocked wavelengths. Enter wavelength value, e.g. 1565.09 as 156509(Mandatory for edit operations)";
-        config true;
-      }
-      leaf wl-range-min {
-        type ciena-6500-types:INT {
-          range "152877..156672";
-        }
-        description
-          "Minimum boundary of blocked or unblocked wavelengths. Enter wavelength value, e.g. 1530.33 as 153033(Mandatory for edit operations)";
-        config true;
-      }
-      leaf permit {
-        type ciena-6500-enums:BLOCKED_UNBLOCKED;
-        description
-          "Block or unblock wavelengths in the min and max range(Mandatory for edit operations)";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-pm.yang b/models/ciena-6500-pm.yang
deleted file mode 100644
index ecb1d10c3ca98878350bdbf37d605f554abc0591..0000000000000000000000000000000000000000
--- a/models/ciena-6500-pm.yang
+++ /dev/null
@@ -1,31907 +0,0 @@
-module ciena-6500-pm {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-pm";
-  prefix pm;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's pm object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Added rpc: pm-show-cbrttp-counts
-       - Added rpc: pm-reset-cbrttp
-       - Added rpc: pm-set-cbrttp-threshold
-       - Added rpc: pm-show-cbrttp-threshold
-       - Added rpc: pm-show-cbrttp-pmconfig
-         container pm
-         - Added container: cbrttp
-           container eth10g
-             list counts
-               leaf-list montype
-                 type enumeration
-                 - Added enum: UTLMIN-E
-                 - Added enum: UTLMAX-E
-                 - Added enum: UTLAVG-E
-           container ethn
-             list counts
-               leaf-list montype
-                 type enumeration
-                 - Added enum: UTLMIN-E
-                 - Added enum: UTLMAX-E
-                 - Added enum: UTLAVG-E
-           container ptp
-             list counts
-               leaf-list mon-type
-                 type enumeration
-                 - Added enum: OSNRMIN-OTSI
-                 - Added enum: OSNRMAX-OTSI
-                 - Added enum: OSNRAVG-OTSI
-                 - Added enum: ESNRMIN-OTSI
-                 - Added enum: ESNRMAX-OTSI
-                 - Added enum: ESNRAVG-OTSI
-                 - Added enum: CDMIN-OTSI
-                 - Added enum: CDMAX-OTSI
-                 - Added enum: CDAVG-OTSI
-                 - Added enum: PSCW-OTS
-                 - Added enum: PSCP-OTS
-                 - Added enum: PSD-OTS
-           list all
-             leaf-list mon-type
-               type enumeration
-               - Added enum: UNCFECBLK-OTU
-               - Added enum: PSD-ODU
-               - Added enum: PSCP-ODU
-               - Added enum: PSCW-ODU
-               - Added enum: FC-TCM
-               - Added enum: PSD-TCM
-               - Added enum: PSCW-TCM
-               - Added enum: PSCP-TCM
-               - Added enum: OPR-OTSI
-               - Added enum: OPT-OTSI
-               - Added enum: OPRN-OTSI
-               - Added enum: OPTN-OTSI
-               - Added enum: OPRAVG-OTSI
-               - Added enum: OPRMIN-OTSI
-               - Added enum: OPRMAX-OTSI
-               - Added enum: OPTAVG-OTSI
-               - Added enum: OPTMIN-OTSI
-               - Added enum: OPTMAX-OTSI
-               - Added enum: DGDAVG-OTSI
-               - Added enum: DGDMAX-OTSI
-               - Added enum: PDLAVG-OTSI
-               - Added enum: PDLMAX-OTSI
-               - Added enum: HCCS-OTSI
-               - Added enum: FEC-OTSI
-               - Added enum: PRFBER-OTSI
-               - Added enum: PRFBERMAX-OTSI
-               - Added enum: QMIN-OTSI
-               - Added enum: QMAX-OTSI
-               - Added enum: QAVG-OTSI
-               - Added enum: QSTDEV-OTSI
-               - Added enum: UNCFECBLK-OTSI
-               - Added enum: OSNRMIN-OTSI
-               - Added enum: OSNRMAX-OTSI
-               - Added enum: OSNRAVG-OTSI
-               - Added enum: ESNRMIN-OTSI
-               - Added enum: ESNRMAX-OTSI
-               - Added enum: ESNRAVG-OTSI
-               - Added enum: CDMIN-OTSI
-               - Added enum: CDMAX-OTSI
-               - Added enum: CDAVG-OTSI
-               - Added enum: FEC-PCS
-               - Added enum: FECCCW-PCS
-               - Added enum: FECUNCCW-PCS
-               - Added enum: HCCS-PCS
-               - Added enum: PRFBER-PCS
-               - Added enum: PRFBERMAX-PCS
-         rpc pm-show-all
-           input
-             leaf-list mon-type
-               type enumeration
-               - Added enum: UNCFECBLK-OTU
-               - Added enum: PSD-ODU
-               - Added enum: PSCP-ODU
-               - Added enum: PSCW-ODU
-               - Added enum: FC-TCM
-               - Added enum: PSD-TCM
-               - Added enum: PSCW-TCM
-               - Added enum: PSCP-TCM
-               - Added enum: OPR-OTSI
-               - Added enum: OPT-OTSI
-               - Added enum: OPRN-OTSI
-               - Added enum: OPTN-OTSI
-               - Added enum: OPRAVG-OTSI
-               - Added enum: OPRMIN-OTSI
-               - Added enum: OPRMAX-OTSI
-               - Added enum: OPTAVG-OTSI
-               - Added enum: OPTMIN-OTSI
-               - Added enum: OPTMAX-OTSI
-               - Added enum: DGDAVG-OTSI
-               - Added enum: DGDMAX-OTSI
-               - Added enum: PDLAVG-OTSI
-               - Added enum: PDLMAX-OTSI
-               - Added enum: HCCS-OTSI
-               - Added enum: FEC-OTSI
-               - Added enum: PRFBER-OTSI
-               - Added enum: PRFBERMAX-OTSI
-               - Added enum: QMIN-OTSI
-               - Added enum: QMAX-OTSI
-               - Added enum: QAVG-OTSI
-               - Added enum: QSTDEV-OTSI
-               - Added enum: UNCFECBLK-OTSI
-               - Added enum: OSNRMIN-OTSI
-               - Added enum: OSNRMAX-OTSI
-               - Added enum: OSNRAVG-OTSI
-               - Added enum: ESNRMIN-OTSI
-               - Added enum: ESNRMAX-OTSI
-               - Added enum: ESNRAVG-OTSI
-               - Added enum: CDMIN-OTSI
-               - Added enum: CDMAX-OTSI
-               - Added enum: CDAVG-OTSI
-               - Added enum: FEC-PCS
-               - Added enum: FECCCW-PCS
-               - Added enum: FECUNCCW-PCS
-               - Added enum: HCCS-PCS
-               - Added enum: PRFBER-PCS
-               - Added enum: PRFBERMAX-PCS
-           output
-             list output
-               leaf-list mon-type
-                 type enumeration
-                 - Added enum: UNCFECBLK-OTU
-                 - Added enum: PSD-ODU
-                 - Added enum: PSCP-ODU
-                 - Added enum: PSCW-ODU
-                 - Added enum: FC-TCM
-                 - Added enum: PSD-TCM
-                 - Added enum: PSCW-TCM
-                 - Added enum: PSCP-TCM
-                 - Added enum: OPR-OTSI
-                 - Added enum: OPT-OTSI
-                 - Added enum: OPRN-OTSI
-                 - Added enum: OPTN-OTSI
-                 - Added enum: OPRAVG-OTSI
-                 - Added enum: OPRMIN-OTSI
-                 - Added enum: OPRMAX-OTSI
-                 - Added enum: OPTAVG-OTSI
-                 - Added enum: OPTMIN-OTSI
-                 - Added enum: OPTMAX-OTSI
-                 - Added enum: DGDAVG-OTSI
-                 - Added enum: DGDMAX-OTSI
-                 - Added enum: PDLAVG-OTSI
-                 - Added enum: PDLMAX-OTSI
-                 - Added enum: HCCS-OTSI
-                 - Added enum: FEC-OTSI
-                 - Added enum: PRFBER-OTSI
-                 - Added enum: PRFBERMAX-OTSI
-                 - Added enum: QMIN-OTSI
-                 - Added enum: QMAX-OTSI
-                 - Added enum: QAVG-OTSI
-                 - Added enum: QSTDEV-OTSI
-                 - Added enum: UNCFECBLK-OTSI
-                 - Added enum: OSNRMIN-OTSI
-                 - Added enum: OSNRMAX-OTSI
-                 - Added enum: OSNRAVG-OTSI
-                 - Added enum: ESNRMIN-OTSI
-                 - Added enum: ESNRMAX-OTSI
-                 - Added enum: ESNRAVG-OTSI
-                 - Added enum: CDMIN-OTSI
-                 - Added enum: CDMAX-OTSI
-                 - Added enum: CDAVG-OTSI
-                 - Added enum: FEC-PCS
-                 - Added enum: FECCCW-PCS
-                 - Added enum: FECUNCCW-PCS
-                 - Added enum: HCCS-PCS
-                 - Added enum: PRFBER-PCS
-                 - Added enum: PRFBERMAX-PCS
-         rpc pm-show-threshold
-           output
-             list output
-               leaf aidtype
-               - Changed type from ciena-6500-enums:ALMAIDTYPE to ciena-6500-enums:PMAIDTYPE
-         rpc pm-show-eth10g-counts
-           input
-             leaf-list montype
-               type enumeration
-               - Added enum: UTLMIN-E
-               - Added enum: UTLMAX-E
-               - Added enum: UTLAVG-E
-           output
-             list output
-               leaf-list montype
-                 type enumeration
-                 - Added enum: UTLMIN-E
-                 - Added enum: UTLMAX-E
-                 - Added enum: UTLAVG-E
-         rpc pm-show-ethn-counts
-           input
-             leaf-list montype
-               type enumeration
-               - Added enum: UTLMIN-E
-               - Added enum: UTLMAX-E
-               - Added enum: UTLAVG-E
-           output
-             list output
-               leaf-list montype
-                 type enumeration
-                 - Added enum: UTLMIN-E
-                 - Added enum: UTLMAX-E
-                 - Added enum: UTLAVG-E
-         rpc pm-show-eth10g-threshold
-           output
-             list output
-               leaf montype
-               - Changed type from ciena-6500-enums:ETH10G_TH_MONTYPE_resp to ciena-6500-enums:ETH10G_TH_MONTYPE
-         rpc pm-show-ethn-threshold
-           output
-             list output
-               leaf montype
-               - Changed type from ciena-6500-enums:ETHN_SET_MONTYPE to ciena-6500-enums:ETHN_TH_MONTYPE
-         rpc pm-set-ethn-threshold
-           input
-             leaf-list montype
-             - Changed type from ciena-6500-enums:ETHN_SET_MONTYPE to ciena-6500-enums:ETHN_TH_MONTYPE
-         rpc pm-show-ptp-counts
-           input
-             leaf-list mon-type
-               type enumeration
-               - Added enum: OSNRMIN-OTSI
-               - Added enum: OSNRMAX-OTSI
-               - Added enum: OSNRAVG-OTSI
-               - Added enum: ESNRMIN-OTSI
-               - Added enum: ESNRMAX-OTSI
-               - Added enum: ESNRAVG-OTSI
-               - Added enum: CDMIN-OTSI
-               - Added enum: CDMAX-OTSI
-               - Added enum: CDAVG-OTSI
-               - Added enum: PSCW-OTS
-               - Added enum: PSCP-OTS
-               - Added enum: PSD-OTS
-           output
-             list output
-               leaf-list mon-type
-                 type enumeration
-                 - Added enum: OSNRMIN-OTSI
-                 - Added enum: OSNRMAX-OTSI
-                 - Added enum: OSNRAVG-OTSI
-                 - Added enum: ESNRMIN-OTSI
-                 - Added enum: ESNRMAX-OTSI
-                 - Added enum: ESNRAVG-OTSI
-                 - Added enum: CDMIN-OTSI
-                 - Added enum: CDMAX-OTSI
-                 - Added enum: CDAVG-OTSI
-                 - Added enum: PSCW-OTS
-                 - Added enum: PSCP-OTS
-                 - Added enum: PSD-OTS";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-       - Added rpc: pm-reset-sdmon";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: pm-show-raman-counts
-       - Added rpc: pm-show-voa-counts
-       - Added rpc: pm-reset-voa
-       - Added rpc: pm-set-voa-threshold
-       - Added rpc: pm-show-voa-threshold
-       - Added rpc: pm-show-optmon-counts
-       - Added rpc: pm-show-amp-counts
-       - Added rpc: pm-show-all
-       - Added rpc: pm-reset-all
-       - Added rpc: pm-set-threshold
-       - Added rpc: pm-show-threshold
-       - Added rpc: pm-abort-abort
-       - Added rpc: pm-reset-osc
-       - Added rpc: pm-reset-ec1
-       - Added rpc: pm-reset-eth
-       - Added rpc: pm-reset-eth100
-       - Added rpc: pm-reset-fiber-channel
-       - Added rpc: pm-reset-flex
-       - Added rpc: pm-show-osc-counts
-       - Added rpc: pm-show-oc3-counts
-       - Added rpc: pm-show-otm2-counts
-       - Added rpc: pm-show-otm3-counts
-       - Added rpc: pm-show-otm-counts
-       - Added rpc: pm-show-eth10g-counts
-       - Added rpc: pm-show-eth100-counts
-       - Added rpc: pm-show-ethn-counts
-       - Added rpc: pm-show-eth-counts
-       - Added rpc: pm-show-fiber-channel-counts
-       - Added rpc: pm-show-flex-counts
-       - Added rpc: pm-show-wan-counts
-       - Added rpc: pm-show-otm3-pmconfig
-       - Added rpc: pm-show-otm-pmconfig
-       - Added rpc: pm-show-ethn-pmconfig
-       - Added rpc: pm-show-osc-threshold
-       - Added rpc: pm-show-eth-threshold
-       - Added rpc: pm-show-eth100-threshold
-       - Added rpc: pm-show-fiber-channel-threshold
-       - Added rpc: pm-show-flex-threshold
-       - Added rpc: pm-set-osc-threshold
-       - Added rpc: pm-set-eth-threshold
-       - Added rpc: pm-set-eth100-threshold
-       - Added rpc: pm-set-fiber-channel-threshold
-       - Added rpc: pm-set-flex-threshold
-       - Added rpc: pm-reset-cos
-       - Added rpc: pm-show-cos
-       - Added rpc: pm-show-chmon-counts
-       - Added rpc: pm-reset-chmon
-       - Added rpc: pm-set-chmon-threshold
-       - Added rpc: pm-show-chmon-threshold
-       - Added rpc: pm-show-sdmon
-       - Added rpc: pm-show-otdrcfg-counts
-       - Added rpc: pm-reset-otdrcfg
-       - Added rpc: pm-set-otdrcfg-threshold
-       - Added rpc: pm-show-otdrcfg-threshold
-       - Added rpc: pm-show-nmcmon-counts
-       - Added rpc: pm-set-nmcmon-threshold
-       - Added rpc: pm-show-nmcmon-threshold
-       - Added rpc: pm-show-ptp-counts
-       - Added rpc: pm-reset-ptp
-       - Added rpc: pm-set-ptp-threshold
-       - Added rpc: pm-show-ptp-threshold
-       - Added rpc: pm-show-otuttp-counts
-       - Added rpc: pm-reset-otuttp
-       - Added rpc: pm-set-otuttp-threshold
-       - Added rpc: pm-show-otuttp-threshold
-       - Added rpc: pm-show-sttp-counts
-       - Added rpc: pm-reset-sttp
-       - Added rpc: pm-set-sttp-threshold
-       - Added rpc: pm-show-sttp-threshold
-       - Added rpc: pm-show-ettp-counts
-       - Added rpc: pm-reset-ettp
-       - Added rpc: pm-set-ettp-threshold
-       - Added rpc: pm-show-ettp-threshold
-       - Added rpc: pm-show-ettp-pmconfig
-       - Added rpc: pm-show-odu-counts
-       - Added rpc: pm-show-oduttp-counts
-       - Added rpc: pm-reset-odu
-       - Added rpc: pm-reset-oduttp
-       - Added rpc: pm-set-odu-threshold
-       - Added rpc: pm-set-oduttp-threshold
-       - Added rpc: pm-show-odu-threshold
-       - Added rpc: pm-show-oduttp-threshold
-       - Added rpc: pm-show-oductp-counts
-       - Added rpc: pm-reset-oductp
-       - Added rpc: pm-set-oductp-threshold
-       - Added rpc: pm-show-oductp-threshold
-       - Added rpc: pm-show-tcm-counts
-         rpc pm-reset-raman
-           input
-           - Removed leaf-list: montype
-           - Added leaf-list: mon-type
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:DIRN to ciena-6500-enums:DIRN_INPUT_PHT
-             leaf-list mondat
-             - Changed type from enumeration to ciena-6500-types:STRING
-             leaf-list montm
-             - Changed type from enumeration to ciena-6500-types:STRING
-             leaf index
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..32 
-         rpc pm-set-raman-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:DIRN to ciena-6500-enums:DIRN_INPUT_PHT
-             leaf-list tmper
-             - Changed type from enumeration to ciena-6500-enums:TMPER_TH_PHT
-         rpc pm-show-raman-threshold
-           output
-           - Removed leaf: aid
-           - Removed leaf: aidtype
-           - Removed leaf: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf-list: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         rpc pm-reset-optmon
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf montype
-             - Added default: ALL 
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:DIRN to ciena-6500-enums:DIRN_INPUT_PHT
-             leaf-list montm
-             - Changed type from enumeration to ciena-6500-types:STRING
-         rpc pm-set-optmon-threshold
-           input
-             leaf montype
-             - Added default: ALL 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:DIRN to ciena-6500-enums:DIRN_INPUT_PHT
-             leaf tmper
-             - Added default: 1-UNT 
-             - Changed type from enumeration to ciena-6500-enums:TMPER_TH_PHT
-         rpc pm-show-optmon-threshold
-           output
-           - Removed leaf: optmonaid
-           - Removed leaf: aidtype
-           - Removed leaf: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf: tmper
-           - Removed leaf-list: srcprflid
-           - Added list: output
-         rpc pm-reset-amp
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf montype
-             - Added default: ALL 
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:DIRN to ciena-6500-enums:DIRN_INPUT_PHT
-             leaf-list montm
-             - Changed type from enumeration to ciena-6500-types:STRING
-         rpc pm-set-amp-threshold
-           input
-             leaf montype
-             - Added default: ALL 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:DIRN to ciena-6500-enums:DIRN_INPUT_PHT
-             leaf tmper
-             - Added default: 1-UNT 
-             - Changed type from enumeration to ciena-6500-enums:TMPER_TH_PHT
-         rpc pm-show-amp-threshold
-           output
-           - Removed leaf: ampaid
-           - Removed leaf: aidtype
-           - Removed leaf: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf: tmper
-           - Removed leaf-list: srcprflid
-           - Added list: output
-         rpc pm-reset-oc3
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-             leaf-list montm
-             - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-         rpc pm-reset-otm2
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-             leaf-list montm
-             - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-         rpc pm-reset-otm3
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-             leaf-list montm
-             - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-         rpc pm-reset-otm
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-             leaf-list montm
-             - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-         rpc pm-reset-eth10g
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-             leaf-list montm
-             - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-         rpc pm-reset-ethn
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-             leaf-list montm
-             - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-         rpc pm-reset-wan
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-             leaf-list montm
-             - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-         rpc pm-show-oc3-threshold
-           output
-           - Removed leaf: oc3
-           - Removed leaf: aidtype
-           - Removed leaf: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         rpc pm-show-otm2-threshold
-           output
-           - Removed leaf: otm2aid
-           - Removed leaf: aidtype
-           - Removed leaf-list: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf-list: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         rpc pm-show-otm3-threshold
-           output
-           - Removed leaf: otm2aid
-           - Removed leaf: aidtype
-           - Removed leaf-list: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf-list: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         rpc pm-show-otm-threshold
-           output
-           - Removed leaf: otmaid
-           - Removed leaf: aidtype
-           - Removed leaf-list: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf-list: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         rpc pm-show-eth10g-threshold
-           output
-           - Removed leaf: eth10g
-           - Removed leaf: aidtype
-           - Removed leaf-list: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf-list: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         rpc pm-show-ethn-threshold
-           output
-           - Removed leaf: ethn
-           - Removed leaf: aidtype
-           - Removed leaf-list: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf-list: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         rpc pm-show-wan-threshold
-           output
-           - Removed leaf: wan
-           - Removed leaf: aidtype
-           - Removed leaf-list: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf-list: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         rpc pm-set-oc3-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-         rpc pm-set-otm2-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-         rpc pm-set-otm3-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-         rpc pm-set-otm-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-         rpc pm-set-eth10g-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-         rpc pm-set-ethn-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:LOCN to ciena-6500-enums:LOCN_ALL
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-         rpc pm-set-wan-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:LOCN to ciena-6500-enums:LOCN_ALL
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-         rpc pm-reset-nmcmon
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-             leaf locn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:LOCN_ALL
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT_PHT
-             leaf-list montm
-             - Changed type from enumeration to ciena-6500-types:STRING
-         rpc pm-reset-tcm
-           input
-           - Removed leaf-list: index
-           - Added choice: index-choice
-             leaf monval
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0 
-             leaf locn
-             - Added default: ALL 
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-             leaf-list montm
-             - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-         rpc pm-set-tcm-threshold
-           input
-             leaf locn
-             - Added default: ALL 
-             - Changed type from ciena-6500-enums:LOCN to ciena-6500-enums:LOCN_ALL
-             leaf dirn
-             - Added default: ALL 
-             - Changed type from enumeration to ciena-6500-enums:DIRN_INPUT
-         rpc pm-show-tcm-threshold
-           output
-           - Removed leaf: tcm
-           - Removed leaf: aidtype
-           - Removed leaf-list: montype
-           - Removed leaf: locn
-           - Removed leaf: dirn
-           - Removed leaf: thlev
-           - Removed leaf-list: tmper
-           - Removed leaf: srcprflid
-           - Added list: output
-         container pm
-         - Added container: chmon
-         - Added container: eth
-         - Added container: eth100
-         - Added container: ettp
-         - Added container: fiber-channel
-         - Added container: oductp
-         - Added container: oduttp
-         - Added container: osc
-         - Added container: otdrcfg
-         - Added container: otuttp
-         - Added container: ptp
-         - Added container: sttp
-         - Added container: voa
-         - Added list: all
-         - Added list: pmconfig
-         - Added list: cos
-           container amp
-             list counts
-               leaf ampaid
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:AMP_PM_MONTYPE_rtrv_resp to enumeration
-                 type enumeration
-                 - Added enum: ORL-OTS
-                 - Added enum: ORLMIN-OTS
-                 - Added enum: ORLMAX-OTS
-                 - Added enum: ORLAVG-OTS
-                 - Added enum: OPIN-OTS
-                 - Added enum: OPINMIN-OTS
-                 - Added enum: OPINMAX-OTS
-                 - Added enum: OPINAVG-OTS
-                 - Added enum: OPOUT-OTS
-                 - Added enum: OPOUTMIN-OTS
-                 - Added enum: OPOUTMAX-OTS
-                 - Added enum: OPOUTAVG-OTS
-                 - Added enum: GRPGAIN-OTS
-                 - Added enum: GRPGAINMIN-OTS
-                 - Added enum: GRPGAINMAX-OTS
-                 - Added enum: GRPGAINAVG-OTS
-                 - Added enum: GRPOPIN-OTS
-                 - Added enum: GRPOPINMIN-OTS
-                 - Added enum: GRPOPINMAX-OTS
-                 - Added enum: GRPOPINAVG-OTS
-                 - Added enum: GRPOPOUT-OTS
-                 - Added enum: GRPOPOUTMIN-OTS
-                 - Added enum: GRPOPOUTMAX-OTS
-                 - Added enum: GRPOPOUTAVG-OTS
-                 - Added enum: DROPGAIN-OTS
-                 - Added enum: DROPGAINMIN-OTS
-                 - Added enum: DROPGAINMAX-OTS
-                 - Added enum: DROPGAINAVG-OTS
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               - Changed type from ciena-6500-enums:LOCN_ALL to enumeration
-                 type enumeration
-                 - Added enum: NEND
-                 - Added enum: FEND
-                 - Added enum: ALL
-               leaf dirn
-               - Added default: ALL 
-               - Changed type from ciena-6500-enums:DIRN to enumeration
-                 type enumeration
-                 - Added enum: NA
-                 - Added enum: RCV
-                 - Added enum: TRMT
-                 - Added enum: ALL
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER_ALL to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container eth10g
-             list counts
-               leaf eth10g
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:ETH10G_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: CV-PCS
-                 - Added enum: ES-PCS
-                 - Added enum: SES-PCS
-                 - Added enum: UAS-PCS
-                 - Added enum: INFRAMES-E
-                 - Added enum: INFRAMESERR-E
-                 - Added enum: OUTFRAMES-E
-                 - Added enum: FCSERR-E
-                 - Added enum: OPR-OCH
-                 - Added enum: OPRMIN-OCH
-                 - Added enum: OPRMAX-OCH
-                 - Added enum: OPRAVG-OCH
-                 - Added enum: OPT-OCH
-                 - Added enum: OPTMIN-OCH
-                 - Added enum: OPTMAX-OCH
-                 - Added enum: OPTAVG-OCH
-                 - Added enum: OPRN-OCH
-                 - Added enum: OPTN-OCH
-                 - Added enum: ES-E
-                 - Added enum: SES-E
-                 - Added enum: UAS-E
-                 - Added enum: OUTFRAMESERR-E
-                 - Added enum: DFR-E
-                 - Added enum: INFRAMESDISCDS-E
-                 - Added enum: OUTFRAMESDISCDS-E
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container ethn
-           - Added list: pmconfig
-             list counts
-             - Removed leaf: portmode
-             - Added leaf: port-mode
-               leaf ethn
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:ETHN_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: CV-PCS
-                 - Added enum: ES-PCS
-                 - Added enum: SES-PCS
-                 - Added enum: UAS-PCS
-                 - Added enum: FEC-PMA
-                 - Added enum: FECCCW-PMA
-                 - Added enum: FECUNCCW-PMA
-                 - Added enum: HCCS-PMA
-                 - Added enum: PRFBER-PMA
-                 - Added enum: PRFBERMAX-PMA
-                 - Added enum: ES-E
-                 - Added enum: SES-E
-                 - Added enum: UAS-E
-                 - Added enum: INFRAMES-E
-                 - Added enum: INFRAMESERR-E
-                 - Added enum: INFRAMESDISCDS-E
-                 - Added enum: DFR-E
-                 - Added enum: OUTFRAMES-E
-                 - Added enum: OUTFRAMESERR-E
-                 - Added enum: OUTFRAMESDISCDS-E
-                 - Added enum: FCSERR-E
-                 - Added enum: OPR-OCH
-                 - Added enum: OPRMIN-OCH
-                 - Added enum: OPRMAX-OCH
-                 - Added enum: OPRAVG-OCH
-                 - Added enum: OPRN-OCH
-                 - Added enum: OPT-OCH
-                 - Added enum: OPTMIN-OCH
-                 - Added enum: OPTMAX-OCH
-                 - Added enum: OPTAVG-OCH
-                 - Added enum: OPTN-OCH
-                 - Added enum: OPRLOW-OCH
-                 - Added enum: OPRNLOW-OCH
-                 - Added enum: OPRHIGH-OCH
-                 - Added enum: OPRNHIGH-OCH
-                 - Added enum: OPTLOW-OCH
-                 - Added enum: OPTNLOW-OCH
-                 - Added enum: OPTHIGH-OCH
-                 - Added enum: OPTNHIGH-OCH
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-           container flex
-             list counts
-               leaf flex
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:FLEX_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: CV-PCS
-                 - Added enum: ES-PCS
-                 - Added enum: SES-PCS
-                 - Added enum: UAS-PCS
-                 - Added enum: ES-E
-                 - Added enum: SES-E
-                 - Added enum: UAS-E
-                 - Added enum: INFRAMES-E
-                 - Added enum: INFRAMESERR-E
-                 - Added enum: OUTFRAMES-E
-                 - Added enum: OUTFRAMESERR-E
-                 - Added enum: DFR-E
-                 - Added enum: INFRAMESDISCDS-E
-                 - Added enum: OUTFRAMESDISCDS-E
-                 - Added enum: FCSERR-E
-                 - Added enum: OPR-OCH
-                 - Added enum: OPRMIN-OCH
-                 - Added enum: OPRMAX-OCH
-                 - Added enum: OPRAVG-OCH
-                 - Added enum: OPRN-OCH
-                 - Added enum: OPT-OCH
-                 - Added enum: OPTMIN-OCH
-                 - Added enum: OPTMAX-OCH
-                 - Added enum: OPTAVG-OCH
-                 - Added enum: OPTN-OCH
-                 - Added enum: PSD-E
-                 - Added enum: PSCW-E
-                 - Added enum: PSCP-E
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container nmcmon
-             list counts
-             - Removed leaf-list: montype
-             - Added leaf-list: mon-type
-             - Added leaf: channelid
-             - Added leaf: channelstatus
-               leaf nmcmonaid
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf locn
-               - Added default: ALL 
-                 type enumeration
-                 - Added enum: FEND
-                 - Added enum: ALL
-               leaf dirn
-               - Added default: ALL 
-                 type enumeration
-                 - Added enum: NA
-                 - Added enum: RCV
-                 - Added enum: ALL
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list mondat
-               - Changed type from enumeration to ciena-6500-types:STRING
-               leaf-list montm
-               - Changed type from enumeration to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf portmode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container oc3
-             list counts
-               leaf oc3
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf aidtype
-                 type enumeration
-                 - Removed enum: OSC
-               leaf-list montype
-               - Changed type from ciena-6500-enums:OCn_MONTYPE_resp_ALL to enumeration
-                 type enumeration
-                 - Added enum: CV-S
-                 - Added enum: ES-S
-                 - Added enum: SES-S
-                 - Added enum: SEFS-S
-                 - Added enum: CV-L
-                 - Added enum: ES-L
-                 - Added enum: SES-L
-                 - Added enum: UAS-L
-                 - Added enum: FC-L
-                 - Added enum: OPR-OCH
-                 - Added enum: OPRMIN-OCH
-                 - Added enum: OPRMAX-OCH
-                 - Added enum: OPRAVG-OCH
-                 - Added enum: OPT-OCH
-                 - Added enum: OPTAVG-OCH
-                 - Added enum: OPTMIN-OCH
-                 - Added enum: OPTMAX-OCH
-                 - Added enum: OPRN-OCH
-                 - Added enum: OPTN-OCH
-                 - Added enum: PSCW-L
-                 - Added enum: PSCP-L
-                 - Added enum: PSD-L
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               - Changed type from ciena-6500-enums:LOCN_ALL to enumeration
-                 type enumeration
-                 - Added enum: NEND
-                 - Added enum: FEND
-                 - Added enum: ALL
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container odu
-             list counts
-               leaf odu
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:ODU_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: CV-ODU
-                 - Added enum: ES-ODU
-                 - Added enum: SES-ODU
-                 - Added enum: UAS-ODU
-                 - Added enum: FC-ODU
-                 - Added enum: PSCW-ODU
-                 - Added enum: PSCP-ODU
-                 - Added enum: PSD-ODU
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf portmode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container optmon
-             list counts
-               leaf optmonaid
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:OPTMON_PM_MONTYPE_rtrv_resp to enumeration
-                 type enumeration
-                 - Added enum: OPR-OTS
-                 - Added enum: OPRMIN-OTS
-                 - Added enum: OPRMAX-OTS
-                 - Added enum: OPRAVG-OTS
-                 - Added enum: OPT-OTS
-                 - Added enum: OPTMIN-OTS
-                 - Added enum: OPTMAX-OTS
-                 - Added enum: OPTAVG-OTS
-                 - Added enum: PSD-OTS
-                 - Added enum: PSCW-OTS
-                 - Added enum: PSCP-OTS
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               - Changed type from ciena-6500-enums:LOCN_ALL to enumeration
-                 type enumeration
-                 - Added enum: NEND
-                 - Added enum: FEND
-                 - Added enum: ALL
-               leaf dirn
-               - Added default: ALL 
-               - Changed type from ciena-6500-enums:DIRN to enumeration
-                 type enumeration
-                 - Added enum: NA
-                 - Added enum: RCV
-                 - Added enum: TRMT
-                 - Added enum: ALL
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER_ALL to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container otm
-           - Added list: pmconfig
-             list counts
-               leaf otmaid
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:OTM_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: CV-OTU
-                 - Added enum: ES-OTU
-                 - Added enum: SES-OTU
-                 - Added enum: SEFS-OTU
-                 - Added enum: FEC-OTU
-                 - Added enum: HCCS-OTU
-                 - Added enum: PFBERE-OTU
-                 - Added enum: PRFBER-OTU
-                 - Added enum: PRFBERMAX-OTU
-                 - Added enum: CV-ODU
-                 - Added enum: ES-ODU
-                 - Added enum: SES-ODU
-                 - Added enum: UAS-ODU
-                 - Added enum: FC-ODU
-                 - Added enum: DMMIN-ODU
-                 - Added enum: DMMAX-ODU
-                 - Added enum: DMAVG-ODU
-                 - Added enum: OPR-OCH
-                 - Added enum: OPRMIN-OCH
-                 - Added enum: OPRMAX-OCH
-                 - Added enum: OPRAVG-OCH
-                 - Added enum: OPT-OCH
-                 - Added enum: OPTMIN-OCH
-                 - Added enum: OPTMAX-OCH
-                 - Added enum: OPTAVG-OCH
-                 - Added enum: OPRN-OCH
-                 - Added enum: OPTN-OCH
-                 - Added enum: OPRLOW-OCH
-                 - Added enum: OPRNLOW-OCH
-                 - Added enum: OPRHIGH-OCH
-                 - Added enum: OPRNHIGH-OCH
-                 - Added enum: OPTLOW-OCH
-                 - Added enum: OPTNLOW-OCH
-                 - Added enum: OPTHIGH-OCH
-                 - Added enum: OPTNHIGH-OCH
-                 - Added enum: OPR-OTS
-                 - Added enum: OPRMIN-OTS
-                 - Added enum: OPRMAX-OTS
-                 - Added enum: OPRAVG-OTS
-                 - Added enum: OPRN-OTS
-                 - Added enum: PSCW-ODU
-                 - Added enum: PSCP-ODU
-                 - Added enum: PSD-ODU
-                 - Added enum: DGDAVG-OCH
-                 - Added enum: DGDMAX-OCH
-                 - Added enum: QMIN-OTU
-                 - Added enum: QMAX-OTU
-                 - Added enum: QAVG-OTU
-                 - Added enum: QSTDEV-OTU
-                 - Added enum: UNCFECBLK-OTU
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container otm2
-           - Added list: pmconfig
-             list counts
-               leaf otm2aid
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:OTM2_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: CV-OTU
-                 - Added enum: ES-OTU
-                 - Added enum: SES-OTU
-                 - Added enum: SEFS-OTU
-                 - Added enum: FEC-OTU
-                 - Added enum: HCCS-OTU
-                 - Added enum: CV-ODU
-                 - Added enum: ES-ODU
-                 - Added enum: SES-ODU
-                 - Added enum: UAS-ODU
-                 - Added enum: FC-ODU
-                 - Added enum: DMMIN-ODU
-                 - Added enum: DMMAX-ODU
-                 - Added enum: DMAVG-ODU
-                 - Added enum: OPR-OCH
-                 - Added enum: OPRMIN-OCH
-                 - Added enum: OPRMAX-OCH
-                 - Added enum: OPRAVG-OCH
-                 - Added enum: OPT-OCH
-                 - Added enum: OPTMIN-OCH
-                 - Added enum: OPTMAX-OCH
-                 - Added enum: OPTAVG-OCH
-                 - Added enum: OPRN-OCH
-                 - Added enum: OPTN-OCH
-                 - Added enum: PFBERE-OTU
-                 - Added enum: PRFBER-OTU
-                 - Added enum: PRFBERMAX-OTU
-                 - Added enum: PSCW-ODU
-                 - Added enum: PSCP-ODU
-                 - Added enum: PSD-ODU
-                 - Added enum: QMIN-OTU
-                 - Added enum: QMAX-OTU
-                 - Added enum: QAVG-OTU
-                 - Added enum: QSTDEV-OTU
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container otm3
-           - Added list: pmconfig
-             list counts
-               leaf otm3aid
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:OTM3_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: CV-OTU
-                 - Added enum: ES-OTU
-                 - Added enum: SES-OTU
-                 - Added enum: SEFS-OTU
-                 - Added enum: FEC-OTU
-                 - Added enum: HCCS-OTU
-                 - Added enum: PFBERE-OTU
-                 - Added enum: PRFBER-OTU
-                 - Added enum: PRFBERMAX-OTU
-                 - Added enum: CV-ODU
-                 - Added enum: ES-ODU
-                 - Added enum: SES-ODU
-                 - Added enum: UAS-ODU
-                 - Added enum: FC-ODU
-                 - Added enum: DMMIN-ODU
-                 - Added enum: DMMAX-ODU
-                 - Added enum: DMAVG-ODU
-                 - Added enum: OPR-OCH
-                 - Added enum: OPRMIN-OCH
-                 - Added enum: OPRMAX-OCH
-                 - Added enum: OPRAVG-OCH
-                 - Added enum: OPT-OCH
-                 - Added enum: OPTMIN-OCH
-                 - Added enum: OPTMAX-OCH
-                 - Added enum: OPTAVG-OCH
-                 - Added enum: OPRN-OCH
-                 - Added enum: OPTN-OCH
-                 - Added enum: OPRLOW-OCH
-                 - Added enum: OPRNLOW-OCH
-                 - Added enum: OPRHIGH-OCH
-                 - Added enum: OPRNHIGH-OCH
-                 - Added enum: OPTLOW-OCH
-                 - Added enum: OPTNLOW-OCH
-                 - Added enum: OPTHIGH-OCH
-                 - Added enum: OPTNHIGH-OCH
-                 - Added enum: OPR-OTS
-                 - Added enum: OPRMIN-OTS
-                 - Added enum: OPRMAX-OTS
-                 - Added enum: OPRAVG-OTS
-                 - Added enum: OPRN-OTS
-                 - Added enum: PSCW-ODU
-                 - Added enum: PSCP-ODU
-                 - Added enum: PSD-ODU
-                 - Added enum: DGDAVG-OCH
-                 - Added enum: DGDMAX-OCH
-                 - Added enum: QMIN-OTU
-                 - Added enum: QMAX-OTU
-                 - Added enum: QAVG-OTU
-                 - Added enum: QSTDEV-OTU
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container raman
-             list counts
-               leaf ramanaid
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:RAMAN_PM_MONTYPE_rtrv_resp to enumeration
-                 type enumeration
-                 - Added enum: ALL
-                 - Added enum: OPIN-OTS
-                 - Added enum: OPINMIN-OTS
-                 - Added enum: OPINMAX-OTS
-                 - Added enum: OPINAVG-OTS
-                 - Added enum: OPOUT-OTS
-                 - Added enum: OPOUTMIN-OTS
-                 - Added enum: OPOUTMAX-OTS
-                 - Added enum: OPOUTAVG-OTS
-                 - Added enum: OPROSC-OTS
-                 - Added enum: OPROSCMIN-OTS
-                 - Added enum: OPROSCMAX-OTS
-                 - Added enum: OPROSCAVG-OTS
-                 - Added enum: ORLIN-OTS
-                 - Added enum: ORLINMIN-OTS
-                 - Added enum: ORLINMAX-OTS
-                 - Added enum: ORLINAVG-OTS
-                 - Added enum: ORLOUT-OTS
-                 - Added enum: ORLOUTMIN-OTS
-                 - Added enum: ORLOUTMAX-OTS
-                 - Added enum: ORLOUTAVG-OTS
-               leaf locn
-               - Added default: ALL 
-               - Changed type from ciena-6500-enums:LOCN_ALL to enumeration
-                 type enumeration
-                 - Added enum: NEND
-                 - Added enum: FEND
-                 - Added enum: ALL
-               leaf dirn
-               - Added default: ALL 
-               - Changed type from ciena-6500-enums:DIRN to enumeration
-                 type enumeration
-                 - Added enum: NA
-                 - Added enum: RCV
-                 - Added enum: TRMT
-                 - Added enum: ALL
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER_ALL to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list mondat
-               - Changed type from enumeration to ciena-6500-types:STRING
-               leaf-list montm
-               - Changed type from enumeration to ciena-6500-types:STRING
-               leaf index
-               - Added default: 0 
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container tcm
-             list counts
-               leaf tcm
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:TCM_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: CV-TCM
-                 - Added enum: ES-TCM
-                 - Added enum: SES-TCM
-                 - Added enum: UAS-TCM
-                 - Added enum: FC-TCM
-                 - Added enum: PSCW-TCM
-                 - Added enum: PSCP-TCM
-                 - Added enum: PSD-TCM
-                 - Added enum: DMMIN-TCM
-                 - Added enum: DMMAX-TCM
-                 - Added enum: DMAVG-TCM
-                 - Added enum: IAE-TCM
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER to enumeration
-                 type enumeration
-                 - Added enum: 15-MIN
-                 - Added enum: 1-DAY
-                 - Added enum: 1-UNT
-                 - Added enum: BASLN
-                 - Added enum: ALL
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           container wan
-             list counts
-               leaf wan
-               - Added mandatory: true 
-               - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-               leaf-list montype
-               - Changed type from ciena-6500-enums:WAN_MONTYPE_resp to enumeration
-                 type enumeration
-                 - Added enum: ES-W
-                 - Added enum: SES-W
-                 - Added enum: UAS-W
-                 - Added enum: INFRAMES-W
-                 - Added enum: INFRAMESERR-W
-                 - Added enum: OUTFRAMES-W
-                 - Added enum: OUTFRAMESERR-W
-                 - Added enum: DFR-W
-                 - Added enum: UTL-W
-                 - Added enum: UTLMX-W
-                 - Added enum: LDS-W
-                 - Added enum: LSDS-W
-                 - Added enum: LUAS-W
-                 - Added enum: ALL
-               leaf locn
-               - Added default: ALL 
-               leaf dirn
-               - Added default: ALL 
-               leaf-list tmper
-                 type enumeration
-                 - Added enum: BASLN
-               leaf-list montm
-               - Changed type from ciena-6500-types:TIME to ciena-6500-types:STRING
-               leaf-list index
-                 type ciena-6500-types:INT
-                 - Added range: 0..32 
-               leaf channelid
-                 type ciena-6500-types:INT
-                 - Added range: 1..96 
-               leaf port-mode
-               - Changed type from enumeration to ciena-6500-enums:PORTMODE
-           list sdmon
-           - Added key: sdmonaid 
-           - Added config: false 
-           - Removed list: counts
-           - Added leaf: sdmonaid
-           - Added leaf: aidtype
-           - Added leaf-list: mon-type
-           - Added leaf: monval
-           - Added leaf: vldty
-           - Added leaf: locn
-           - Added leaf: dirn
-           - Added leaf: time-period
-           - Added leaf: mon-dat
-           - Added leaf: mon-time
-           - Added leaf-list: index
-           - Added leaf: altaid
-           - Added leaf: channelid
-           - Added leaf: channelstatus
-           - Added leaf: port-mode
-           - Added leaf: width
-           - Added leaf: wavelength";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added rpc: pm-reset-raman
-       - Added rpc: pm-set-raman-threshold
-       - Added rpc: pm-show-raman-threshold
-       - Added rpc: pm-reset-nmcmon
-         container pm
-         - Added container: raman
-         - Added container: sdmon
-         - Added container: nmcmon
-           container optmon
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container amp
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container oc3
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container otm2
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container otm3
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container otm
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container eth10g
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container ethn
-             list counts
-             - Removed leaf: port-mode
-             - Added leaf: portmode
-             - Added leaf: width
-             - Added leaf: wavelength
-           container flex
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container wan
-             list counts
-             - Added leaf: width
-             - Added leaf: wavelength
-           container odu
-             list counts
-             - Removed leaf: port-mode
-             - Added leaf: portmode
-             - Added leaf: width
-             - Added leaf: wavelength
-         rpc pm-set-optmon-threshold
-           input
-           - Removed leaf: src-prfl-id
-           - Removed leaf: dest-prfl-id
-           - Added leaf: srcprflid
-           - Added leaf: destprflid
-         rpc pm-show-optmon-threshold
-           input
-           - Removed leaf-list: prfl-info
-           - Removed leaf-list: src-prfl-id
-           - Added leaf-list: prflinfo
-           - Added leaf-list: srcprflid
-           output
-           - Changed leaf-list from src-prfl-id to srcprflid
-             leaf-list srcprflid
-             - Added type: ciena-6500-enums:RTRVPMProfile
-         rpc pm-set-amp-threshold
-           input
-           - Removed leaf: src-prfl-id
-           - Removed leaf: dest-prfl-id
-           - Added leaf: srcprflid
-           - Added leaf: destprflid
-         rpc pm-show-amp-threshold
-           input
-           - Removed leaf-list: prfl-info
-           - Removed leaf-list: src-prfl-id
-           - Added leaf-list: prflinfo
-           - Added leaf-list: srcprflid
-           output
-           - Changed leaf-list from src-prfl-id to srcprflid
-             leaf-list srcprflid
-             - Added type: ciena-6500-enums:RTRVPMProfile
-         rpc pm-show-oc3-threshold
-           input
-           - Removed leaf: prfl-info
-           - Removed leaf: src-prfl-id
-           - Added leaf: prflinfo
-           - Added leaf: srcprflid
-           output
-           - Removed leaf: src-prfl-id
-           - Added leaf: srcprflid
-         rpc pm-set-oc3-threshold
-           input
-           - Removed leaf: src-prfl-id
-           - Removed leaf: dest-prfl-id
-           - Added leaf: srcprflid
-           - Added leaf: destprflid";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Added rpc: pm-reset-otm2
-       - Added rpc: pm-reset-otm3
-       - Added rpc: pm-reset-otm
-       - Added rpc: pm-reset-eth10g
-       - Added rpc: pm-reset-ethn
-       - Added rpc: pm-reset-wan
-       - Added rpc: pm-show-otm2-threshold
-       - Added rpc: pm-show-otm3-threshold
-       - Added rpc: pm-show-otm-threshold
-       - Added rpc: pm-show-eth10g-threshold
-       - Added rpc: pm-show-ethn-threshold
-       - Added rpc: pm-show-wan-threshold
-       - Added rpc: pm-set-otm2-threshold
-       - Added rpc: pm-set-otm3-threshold
-       - Added rpc: pm-set-otm-threshold
-       - Added rpc: pm-set-eth10g-threshold
-       - Added rpc: pm-set-ethn-threshold
-       - Added rpc: pm-set-wan-threshold
-       - Added rpc: pm-reset-tcm
-       - Added rpc: pm-set-tcm-threshold
-       - Added rpc: pm-show-tcm-threshold
-         container pm
-         - Added container: otm2
-         - Added container: otm3
-         - Added container: otm
-         - Added container: eth10g
-         - Added container: ethn
-         - Added container: flex
-         - Added container: wan
-         - Added container: odu
-         - Added container: tcm
-           container optmon
-             list counts
-             - Changed key from aid to optmonaid
-             - Removed leaf: aid
-             - Removed leaf: monlev
-             - Removed leaf: trex-url
-             - Removed leaf: trex-frmt
-             - Removed leaf: channelID
-             - Removed leaf: channelStatus
-             - Removed leaf: portmode
-             - Added leaf: optmonaid
-             - Added leaf: channelid
-             - Added leaf: channelstatus
-             - Added leaf: port-mode
-               leaf-list montype
-               - Changed type from ciena-6500-enums:OPTMON_PM_MONTYPE_rtrv_bits to ciena-6500-enums:OPTMON_PM_MONTYPE_rtrv_resp
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER_ALL_bits to ciena-6500-enums:TMPER_ALL
-               leaf-list montm
-               - Changed type from bits to ciena-6500-types:TIME
-               leaf-list index
-               - Changed type from ciena-6500-enums:INDEX_bits to ciena-6500-enums:INDEX
-           container amp
-             list counts
-             - Changed key from aid to ampaid
-             - Removed leaf: aid
-             - Removed leaf: monlev
-             - Removed leaf: trex-url
-             - Removed leaf: trex-frmt
-             - Removed leaf: channelID
-             - Removed leaf: channelStatus
-             - Removed leaf: portmode
-             - Added leaf: ampaid
-             - Added leaf: channelid
-             - Added leaf: channelstatus
-             - Added leaf: port-mode
-               leaf-list montype
-               - Changed type from ciena-6500-enums:AMP_PM_MONTYPE_rtrv_bits to ciena-6500-enums:AMP_PM_MONTYPE_rtrv_resp
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER_ALL_bits to ciena-6500-enums:TMPER_ALL
-               leaf-list montm
-               - Changed type from bits to ciena-6500-types:TIME
-               leaf-list index
-               - Changed type from ciena-6500-enums:INDEX_bits to ciena-6500-enums:INDEX
-           container oc3
-             list counts
-             - Changed key from aid to oc3
-             - Removed leaf: aid
-             - Removed leaf: monlev
-             - Removed leaf: trex-url
-             - Removed leaf: trex-frmt
-             - Removed leaf: channelID
-             - Removed leaf: channelStatus
-             - Removed leaf: portmode
-             - Added leaf: oc3
-             - Added leaf: channelid
-             - Added leaf: channelstatus
-             - Added leaf: port-mode
-               leaf aidtype
-                 type enumeration
-                 - Added enum: OSC
-               leaf-list montype
-               - Changed type from ciena-6500-enums:OCn_MONTYPE_ALL_bits to ciena-6500-enums:OCn_MONTYPE_resp_ALL
-               leaf locn
-               - Changed type from ciena-6500-enums:LOCN to ciena-6500-enums:LOCN_ALL
-               leaf-list tmper
-               - Changed type from ciena-6500-enums:TMPER_ALL_bits to ciena-6500-enums:TMPER
-               leaf-list index
-               - Changed type from ciena-6500-enums:INDEX_bits to ciena-6500-enums:INDEX
-         rpc pm-reset-optmon
-           input
-           - Removed leaf: aid
-           - Added leaf: optmonaid
-             leaf-list tmper
-             - Changed type from ciena-6500-enums:TMPER_ALL_bits to ciena-6500-enums:TMPER_ALL
-             leaf-list montm
-             - Changed type from bits to enumeration
-               type enumeration
-               - Added enum: HH-MM
-               - Added enum: ALL
-             leaf-list index
-             - Changed type from ciena-6500-enums:INDEX_bits to ciena-6500-enums:INDEX
-         rpc pm-set-optmon-threshold
-           input
-           - Removed leaf: aid
-           - Added leaf: optmonaid
-             leaf thlev
-             - Changed type from ciena-6500-types:INT to ciena-6500-types:STRING
-         rpc pm-show-optmon-threshold
-           input
-           - Changed leaf from aid to optmonaid
-             leaf-list prfl-info
-             - Changed type from ciena-6500-types:BOOLEAN to ciena-6500-enums:BOOL_Y_N
-             leaf-list src-prfl-id
-             - Changed type from ciena-6500-enums:RTRVPMProfile_bits to ciena-6500-enums:RTRVPMProfile
-             leaf optmonaid
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-           output
-           - Added leaf: optmonaid
-             leaf thlev
-             - Changed type from ciena-6500-types:INT to ciena-6500-types:STRING
-             leaf-list src-prfl-id
-             - Changed type from ciena-6500-enums:RTRVPMProfile_bits to ciena-6500-enums:RTRVPMProfile
-         rpc pm-reset-amp
-           input
-           - Removed leaf: aid
-           - Added leaf: ampaid
-             leaf-list tmper
-             - Changed type from ciena-6500-enums:TMPER_ALL_bits to ciena-6500-enums:TMPER_ALL
-             leaf-list montm
-             - Changed type from bits to enumeration
-               type enumeration
-               - Added enum: MM-DD
-               - Added enum: ALL
-             leaf-list index
-             - Changed type from ciena-6500-enums:INDEX_bits to ciena-6500-enums:INDEX
-         rpc pm-set-amp-threshold
-           input
-           - Removed leaf: aid
-           - Added leaf: ampaid
-             leaf thlev
-             - Changed type from ciena-6500-types:INT to ciena-6500-types:STRING
-         rpc pm-show-amp-threshold
-           input
-           - Changed leaf from aid to ampaid
-             leaf-list prfl-info
-             - Changed type from ciena-6500-types:BOOLEAN to ciena-6500-enums:BOOL_Y_N
-             leaf-list src-prfl-id
-             - Changed type from ciena-6500-enums:RTRVPMProfile_bits to ciena-6500-enums:RTRVPMProfile
-             leaf ampaid
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-           output
-           - Added leaf: ampaid
-             leaf thlev
-             - Changed type from ciena-6500-types:INT to ciena-6500-types:STRING
-             leaf-list src-prfl-id
-             - Changed type from ciena-6500-enums:RTRVPMProfile_bits to ciena-6500-enums:RTRVPMProfile
-         rpc pm-reset-oc3
-           input
-           - Removed leaf: aid
-           - Added leaf: oc3
-             leaf-list montype
-             - Changed type from ciena-6500-enums:OCn_MONTYPE_ALL_bits to ciena-6500-enums:OCn_MONTYPE_ALL
-             leaf-list tmper
-             - Changed type from ciena-6500-enums:TMPER_ALL_bits to ciena-6500-enums:TMPER_ALL
-             leaf-list index
-             - Changed type from ciena-6500-enums:INDEX_bits to ciena-6500-enums:INDEX
-         rpc pm-show-oc3-threshold
-           input
-           - Removed leaf: aid
-           - Added leaf: oc3
-           output
-           - Added leaf: oc3
-             leaf thlev
-             - Changed type from enumeration to ciena-6500-types:STRING
-         rpc pm-set-oc3-threshold
-           input
-           - Removed leaf: aid
-           - Added leaf: oc3
-             leaf-list montype
-             - Changed type from ciena-6500-enums:OCn_TH_MONTYPE_bits to ciena-6500-enums:OCn_TH_MONTYPE
-             leaf thlev
-             - Changed type from enumeration to ciena-6500-types:STRING
-             leaf-list tmper
-             - Changed type from ciena-6500-enums:TMPR_bits to ciena-6500-enums:TMPR";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: pm
-       - Added rpc: pm-reset-optmon
-       - Added rpc: pm-set-optmon-threshold
-       - Added rpc: pm-show-optmon-threshold
-       - Added rpc: pm-reset-amp
-       - Added rpc: pm-set-amp-threshold
-       - Added rpc: pm-show-amp-threshold
-       - Added rpc: pm-reset-oc3
-       - Added rpc: pm-show-oc3-threshold
-       - Added rpc: pm-set-oc3-threshold";
-  }
-
-  rpc pm-show-raman-counts {
-    description
-      "Retrieve performance data and baseline for RAMAN entries";
-    input {
-      leaf ramanaid {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "ALL";
-          enum "OPIN-OTS" {
-            description
-              "Optical Power Input";
-          }
-          enum "OPINMIN-OTS" {
-            description
-              "Optical Power Input Minimum";
-          }
-          enum "OPINMAX-OTS" {
-            description
-              "Optical Power Input Maximum";
-          }
-          enum "OPINAVG-OTS" {
-            description
-              "Optical Power Input Average";
-          }
-          enum "OPOUT-OTS" {
-            description
-              "Optical Power Output";
-          }
-          enum "OPOUTMIN-OTS" {
-            description
-              "Optical Power Output Minimum";
-          }
-          enum "OPOUTMAX-OTS" {
-            description
-              "Optical Power Output Maximum";
-          }
-          enum "OPOUTAVG-OTS" {
-            description
-              "Optical Power Output Average";
-          }
-          enum "OPROSC-OTS" {
-            description
-              "Optical Power Receive, OSC";
-          }
-          enum "OPROSCMIN-OTS" {
-            description
-              "Optical Power Receive, OSC Minimum";
-          }
-          enum "OPROSCMAX-OTS" {
-            description
-              "Optical Power Receive, OSC Maximum";
-          }
-          enum "OPROSCAVG-OTS" {
-            description
-              "Optical Power Receive, OSC Average";
-          }
-          enum "ORLIN-OTS" {
-            description
-              "Optical Return Loss Input";
-          }
-          enum "ORLINMIN-OTS" {
-            description
-              "Optical Return Loss Input Minimum";
-          }
-          enum "ORLINMAX-OTS" {
-            description
-              "Optical Return Loss Input Maximum";
-          }
-          enum "ORLINAVG-OTS" {
-            description
-              "Optical Return Loss Input Average";
-          }
-          enum "ORLOUT-OTS" {
-            description
-              "Optical Return Loss Output";
-          }
-          enum "ORLOUTMIN-OTS" {
-            description
-              "Optical Return Loss Output Minimum";
-          }
-          enum "ORLOUTMAX-OTS" {
-            description
-              "Optical Return Loss Output Maximum";
-          }
-          enum "ORLOUTAVG-OTS" {
-            description
-              "Optical Return Loss Output Average";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data.";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      leaf index {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..32";
-        }
-        description
-          "Proprietary method of specifying a bin.";
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf ramanaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "RAMAN";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "ALL";
-            enum "OPIN-OTS" {
-              description
-                "Optical Power Input";
-            }
-            enum "OPINMIN-OTS" {
-              description
-                "Optical Power Input Minimum";
-            }
-            enum "OPINMAX-OTS" {
-              description
-                "Optical Power Input Maximum";
-            }
-            enum "OPINAVG-OTS" {
-              description
-                "Optical Power Input Average";
-            }
-            enum "OPOUT-OTS" {
-              description
-                "Optical Power Output";
-            }
-            enum "OPOUTMIN-OTS" {
-              description
-                "Optical Power Output Minimum";
-            }
-            enum "OPOUTMAX-OTS" {
-              description
-                "Optical Power Output Maximum";
-            }
-            enum "OPOUTAVG-OTS" {
-              description
-                "Optical Power Output Average";
-            }
-            enum "OPROSC-OTS" {
-              description
-                "Optical Power Receive, OSC";
-            }
-            enum "OPROSCMIN-OTS" {
-              description
-                "Optical Power Receive, OSC Minimum";
-            }
-            enum "OPROSCMAX-OTS" {
-              description
-                "Optical Power Receive, OSC Maximum";
-            }
-            enum "OPROSCAVG-OTS" {
-              description
-                "Optical Power Receive, OSC Average";
-            }
-            enum "ORLIN-OTS" {
-              description
-                "Optical Return Loss Input";
-            }
-            enum "ORLINMIN-OTS" {
-              description
-                "Optical Return Loss Input Minimum";
-            }
-            enum "ORLINMAX-OTS" {
-              description
-                "Optical Return Loss Input Maximum";
-            }
-            enum "ORLINAVG-OTS" {
-              description
-                "Optical Return Loss Input Average";
-            }
-            enum "ORLOUT-OTS" {
-              description
-                "Optical Return Loss Output";
-            }
-            enum "ORLOUTMIN-OTS" {
-              description
-                "Optical Return Loss Output Minimum";
-            }
-            enum "ORLOUTMAX-OTS" {
-              description
-                "Optical Return Loss Output Maximum";
-            }
-            enum "ORLOUTAVG-OTS" {
-              description
-                "Optical Return Loss Output Average";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data.";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-        }
-        leaf index {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "Proprietary method of specifying a bin.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-raman {
-    description
-      "Reset performance data for RAMAN entries";
-    input {
-      leaf ramanaid {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:RAMAN_PM_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      leaf index {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..32";
-        }
-        description
-          "Proprietary method of specifying a bin.";
-      }
-    }
-  }
-  rpc pm-set-raman-threshold {
-    description
-      "Set Threshold for RAMAN entries";
-    input {
-      leaf ramanaid {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:RAMAN_TH_MONTYPE_set;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "Threshold level";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_TH_PHT;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "Destination profile id";
-      }
-    }
-  }
-  rpc pm-show-raman-threshold {
-    description
-      "Retrieve Profiles for RAMAN entries";
-    input {
-      leaf ramanaid {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "profile info";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "";
-      }
-    }
-    output {
-      list output {
-        leaf ramanaid {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "RAMAN";
-          }
-          description
-            "Type of AID";
-        }
-        leaf montype {
-          type ciena-6500-enums:RAMAN_TH_MONTYPE_resp;
-          description
-            "Monitored parameter";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP_PHT;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "Threshold level";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_TH_PHT;
-          description
-            "Accumulation time period of data.";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:PMProfile;
-          description
-            "";
-        }
-      }
-    }
-  }
-  rpc pm-show-voa-counts {
-    description
-      "Retrieve performance data and baseline for VOA entries";
-    input {
-      leaf voa {
-        mandatory true;
-        description
-          "AID in format VOA-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "ORL-OTS" {
-            description
-              "Optical Return Loss";
-          }
-          enum "ORLMIN-OTS" {
-            description
-              "Optical Return Loss Minimum";
-          }
-          enum "ORLMAX-OTS" {
-            description
-              "Optical Return Loss Maximum";
-          }
-          enum "ORLAVG-OTS" {
-            description
-              "Optical Return Loss Average";
-          }
-          enum "OPIN-OTS" {
-            description
-              "Optical Power Input";
-          }
-          enum "OPINMIN-OTS" {
-            description
-              "Optical Power Input Minimum";
-          }
-          enum "OPINMAX-OTS" {
-            description
-              "Optical Power Input Maximum";
-          }
-          enum "OPINAVG-OTS" {
-            description
-              "Optical Power Input Average";
-          }
-          enum "OPOUT-OTS" {
-            description
-              "Optical Power Output";
-          }
-          enum "OPOUTMIN-OTS" {
-            description
-              "Optical Power Output Minimum";
-          }
-          enum "OPOUTMAX-OTS" {
-            description
-              "Optical Power Output Maximum";
-          }
-          enum "OPOUTAVG-OTS" {
-            description
-              "Optical Power Output Average";
-          }
-          enum "GRPOPOUT-OTS" {
-            description
-              "Group Optical Power Output";
-          }
-          enum "GRPOPOUTMIN-OTS" {
-            description
-              "Group Optical Power Output Minimum";
-          }
-          enum "GRPOPOUTMAX-OTS" {
-            description
-              "Group Optical Power Output Maximum";
-          }
-          enum "GRPOPOUTAVG-OTS" {
-            description
-              "Group Optical Power Output Average";
-          }
-          enum "ALL";
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf voa {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "VOA";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "ORL-OTS" {
-              description
-                "Optical Return Loss";
-            }
-            enum "ORLMIN-OTS" {
-              description
-                "Optical Return Loss Minimum";
-            }
-            enum "ORLMAX-OTS" {
-              description
-                "Optical Return Loss Maximum";
-            }
-            enum "ORLAVG-OTS" {
-              description
-                "Optical Return Loss Average";
-            }
-            enum "OPIN-OTS" {
-              description
-                "Optical Power Input";
-            }
-            enum "OPINMIN-OTS" {
-              description
-                "Optical Power Input Minimum";
-            }
-            enum "OPINMAX-OTS" {
-              description
-                "Optical Power Input Maximum";
-            }
-            enum "OPINAVG-OTS" {
-              description
-                "Optical Power Input Average";
-            }
-            enum "OPOUT-OTS" {
-              description
-                "Optical Power Output";
-            }
-            enum "OPOUTMIN-OTS" {
-              description
-                "Optical Power Output Minimum";
-            }
-            enum "OPOUTMAX-OTS" {
-              description
-                "Optical Power Output Maximum";
-            }
-            enum "OPOUTAVG-OTS" {
-              description
-                "Optical Power Output Average";
-            }
-            enum "GRPOPOUT-OTS" {
-              description
-                "Group Optical Power Output";
-            }
-            enum "GRPOPOUTMIN-OTS" {
-              description
-                "Group Optical Power Output Minimum";
-            }
-            enum "GRPOPOUTMAX-OTS" {
-              description
-                "Group Optical Power Output Maximum";
-            }
-            enum "GRPOPOUTAVG-OTS" {
-              description
-                "Group Optical Power Output Average";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-voa {
-    description
-      "Reset performance data for VOA entries";
-    input {
-      leaf voa {
-        mandatory true;
-        description
-          "AID in format VOA-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mon-type {
-        default "ALL";
-        type ciena-6500-enums:VOA_PM_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-voa-threshold {
-    description
-      "Set Threshold for VOA entries";
-    input {
-      leaf voa {
-        mandatory true;
-        description
-          "AID in format VOA-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf monitor-type {
-        default "ALL";
-        type ciena-6500-enums:VOA_TH_MONTYPE_set;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "Threshold level";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf tmper {
-        default "1-UNT";
-        type ciena-6500-enums:TMPER_TH_PHT;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "Destination profile id";
-      }
-    }
-  }
-  rpc pm-show-voa-threshold {
-    description
-      "Retrieve Profiles for VOA entries";
-    input {
-      leaf voa {
-        mandatory true;
-        description
-          "AID in format VOA-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list prflinfo {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "profile info";
-      }
-      leaf-list src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "";
-      }
-    }
-    output {
-      list output {
-        leaf voa {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "VOA";
-          }
-          description
-            "Type of AID";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:VOA_TH_MONTYPE_resp;
-          description
-            "Monitored parameter";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP_PHT;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "Threshold level";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_TH_PHT;
-          description
-            "Accumulation time period of data.";
-        }
-        leaf-list src-profile-id {
-          type ciena-6500-enums:PMProfile;
-          description
-            "";
-        }
-      }
-    }
-  }
-  rpc pm-show-optmon-counts {
-    description
-      "Retrieve performance data and baseline for OPTMON entries";
-    input {
-      leaf optmonaid {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-slot-portSsubport, OPTMON-shelf-slotSsubslot-port, OPTMON-shelf-slotSsubslot-portSsubport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "OPR-OTS" {
-            description
-              "Optical Power Receive";
-          }
-          enum "OPRMIN-OTS" {
-            description
-              "Optical Power Receive - Minimum";
-          }
-          enum "OPRMAX-OTS" {
-            description
-              "Optical Power Receive - Maximum";
-          }
-          enum "OPRAVG-OTS" {
-            description
-              "Optical Power Receive - Average";
-          }
-          enum "OPT-OTS" {
-            description
-              "Optical Power Transmit";
-          }
-          enum "OPTMIN-OTS" {
-            description
-              "Optical Power Transmit - Minimum";
-          }
-          enum "OPTMAX-OTS" {
-            description
-              "Optical Power Transmit - Maximum";
-          }
-          enum "OPTAVG-OTS" {
-            description
-              "Optical Power Transmit - Average";
-          }
-          enum "PSD-OTS" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "PSCW-OTS" {
-            description
-              "Protection Switch Count Working";
-          }
-          enum "PSCP-OTS" {
-            description
-              "Protection Switch Count Protection";
-          }
-          enum "ALL";
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-      leaf trex-url {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trex-frmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf optmonaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OPTMON";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "OPR-OTS" {
-              description
-                "Optical Power Receive";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Optical Power Receive - Minimum";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Optical Power Receive - Maximum";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Optical Power Receive - Average";
-            }
-            enum "OPT-OTS" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPTMIN-OTS" {
-              description
-                "Optical Power Transmit - Minimum";
-            }
-            enum "OPTMAX-OTS" {
-              description
-                "Optical Power Transmit - Maximum";
-            }
-            enum "OPTAVG-OTS" {
-              description
-                "Optical Power Transmit - Average";
-            }
-            enum "PSD-OTS" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "PSCW-OTS" {
-              description
-                "Protection Switch Count Working";
-            }
-            enum "PSCP-OTS" {
-              description
-                "Protection Switch Count Protection";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-optmon {
-    description
-      "Reset performance data for OPTMON entries";
-    input {
-      leaf optmonaid {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-slot-portSsubport, OPTMON-shelf-slotSsubslot-port, OPTMON-shelf-slotSsubslot-portSsubport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf montype {
-        default "ALL";
-        type ciena-6500-enums:OPTMON_PM_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-optmon-threshold {
-    description
-      "Set Threshold for OPTMON entries";
-    input {
-      leaf optmonaid {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-slot-portSsubport, OPTMON-shelf-slotSsubslot-port, OPTMON-shelf-slotSsubslot-portSsubport, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf montype {
-        default "ALL";
-        type ciena-6500-enums:OPTMON_TH_MONTYPE_set;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "Threshold level";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf tmper {
-        default "1-UNT";
-        type ciena-6500-enums:TMPER_TH_PHT;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "Source profile ID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "Destination profile ID";
-      }
-    }
-  }
-  rpc pm-show-optmon-threshold {
-    description
-      "Retrieve Profiles for OPTMON entries";
-    input {
-      leaf optmonaid {
-        mandatory true;
-        description
-          "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-slot-portSsubport, OPTMON-shelf-slotSsubslot-port, OPTMON-shelf-slotSsubslot-portSsubport, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list prflinfo {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "profile info";
-      }
-      leaf-list srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf optmonaid {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OPTMON";
-          }
-          description
-            "Type of AID";
-        }
-        leaf montype {
-          type ciena-6500-enums:OPTMON_TH_MONTYPE_resp;
-          description
-            "Monitored parameter";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP_PHT;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "Threshold level";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_TH_PHT;
-          description
-            "Accumulation time period of data.";
-        }
-        leaf-list srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-amp-counts {
-    description
-      "Retrieve performance data and baseline for EDFA entries";
-    input {
-      leaf ampaid {
-        mandatory true;
-        description
-          "AID in format AMP-shelf-slot-port, AMP-shelf-slot-portSsubport, AMP-shelf-slotSsubslot-portSsubport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "ORL-OTS" {
-            description
-              "Optical Return Loss";
-          }
-          enum "ORLMIN-OTS" {
-            description
-              "Optical Return Loss Minimum";
-          }
-          enum "ORLMAX-OTS" {
-            description
-              "Optical Return Loss Maximum";
-          }
-          enum "ORLAVG-OTS" {
-            description
-              "Optical Return Loss Average";
-          }
-          enum "OPIN-OTS" {
-            description
-              "Optical Power Input";
-          }
-          enum "OPINMIN-OTS" {
-            description
-              "Optical Power Input Minimum";
-          }
-          enum "OPINMAX-OTS" {
-            description
-              "Optical Power Input Maximum";
-          }
-          enum "OPINAVG-OTS" {
-            description
-              "Optical Power Input Average";
-          }
-          enum "OPOUT-OTS" {
-            description
-              "Optical Power Output";
-          }
-          enum "OPOUTMIN-OTS" {
-            description
-              "Optical Power Output Minimum";
-          }
-          enum "OPOUTMAX-OTS" {
-            description
-              "Optical Power Output Maximum";
-          }
-          enum "OPOUTAVG-OTS" {
-            description
-              "Optical Power Output Average";
-          }
-          enum "GRPGAIN-OTS" {
-            description
-              "Group Gain";
-          }
-          enum "GRPGAINMIN-OTS" {
-            description
-              "Group Gain Minimum";
-          }
-          enum "GRPGAINMAX-OTS" {
-            description
-              "Group Gain Maximum";
-          }
-          enum "GRPGAINAVG-OTS" {
-            description
-              "Group Gain Average";
-          }
-          enum "GRPOPIN-OTS" {
-            description
-              "Group Optical Power Input";
-          }
-          enum "GRPOPINMIN-OTS" {
-            description
-              "Group Optical Power Input Minimum";
-          }
-          enum "GRPOPINMAX-OTS" {
-            description
-              "Group Optical Power Input Maximum";
-          }
-          enum "GRPOPINAVG-OTS" {
-            description
-              "Group Optical Power Input Average";
-          }
-          enum "GRPOPOUT-OTS" {
-            description
-              "Group Optical Power Output";
-          }
-          enum "GRPOPOUTMIN-OTS" {
-            description
-              "Group Optical Power Output Minimum";
-          }
-          enum "GRPOPOUTMAX-OTS" {
-            description
-              "Group Optical Power Output Maximum";
-          }
-          enum "GRPOPOUTAVG-OTS" {
-            description
-              "Group Optical Power Output Average";
-          }
-          enum "DROPGAIN-OTS" {
-            description
-              "Drop Gain";
-          }
-          enum "DROPGAINMIN-OTS" {
-            description
-              "Drop Gain Minimum";
-          }
-          enum "DROPGAINMAX-OTS" {
-            description
-              "Drop Gain Maximum";
-          }
-          enum "DROPGAINAVG-OTS" {
-            description
-              "Drop Gain Average";
-          }
-          enum "ALL";
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-      leaf trex-url {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trex-frmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf ampaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "AMP";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "ORL-OTS" {
-              description
-                "Optical Return Loss";
-            }
-            enum "ORLMIN-OTS" {
-              description
-                "Optical Return Loss Minimum";
-            }
-            enum "ORLMAX-OTS" {
-              description
-                "Optical Return Loss Maximum";
-            }
-            enum "ORLAVG-OTS" {
-              description
-                "Optical Return Loss Average";
-            }
-            enum "OPIN-OTS" {
-              description
-                "Optical Power Input";
-            }
-            enum "OPINMIN-OTS" {
-              description
-                "Optical Power Input Minimum";
-            }
-            enum "OPINMAX-OTS" {
-              description
-                "Optical Power Input Maximum";
-            }
-            enum "OPINAVG-OTS" {
-              description
-                "Optical Power Input Average";
-            }
-            enum "OPOUT-OTS" {
-              description
-                "Optical Power Output";
-            }
-            enum "OPOUTMIN-OTS" {
-              description
-                "Optical Power Output Minimum";
-            }
-            enum "OPOUTMAX-OTS" {
-              description
-                "Optical Power Output Maximum";
-            }
-            enum "OPOUTAVG-OTS" {
-              description
-                "Optical Power Output Average";
-            }
-            enum "GRPGAIN-OTS" {
-              description
-                "Group Gain";
-            }
-            enum "GRPGAINMIN-OTS" {
-              description
-                "Group Gain Minimum";
-            }
-            enum "GRPGAINMAX-OTS" {
-              description
-                "Group Gain Maximum";
-            }
-            enum "GRPGAINAVG-OTS" {
-              description
-                "Group Gain Average";
-            }
-            enum "GRPOPIN-OTS" {
-              description
-                "Group Optical Power Input";
-            }
-            enum "GRPOPINMIN-OTS" {
-              description
-                "Group Optical Power Input Minimum";
-            }
-            enum "GRPOPINMAX-OTS" {
-              description
-                "Group Optical Power Input Maximum";
-            }
-            enum "GRPOPINAVG-OTS" {
-              description
-                "Group Optical Power Input Average";
-            }
-            enum "GRPOPOUT-OTS" {
-              description
-                "Group Optical Power Output";
-            }
-            enum "GRPOPOUTMIN-OTS" {
-              description
-                "Group Optical Power Output Minimum";
-            }
-            enum "GRPOPOUTMAX-OTS" {
-              description
-                "Group Optical Power Output Maximum";
-            }
-            enum "GRPOPOUTAVG-OTS" {
-              description
-                "Group Optical Power Output Average";
-            }
-            enum "DROPGAIN-OTS" {
-              description
-                "Drop Gain";
-            }
-            enum "DROPGAINMIN-OTS" {
-              description
-                "Drop Gain Minimum";
-            }
-            enum "DROPGAINMAX-OTS" {
-              description
-                "Drop Gain Maximum";
-            }
-            enum "DROPGAINAVG-OTS" {
-              description
-                "Drop Gain Average";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-amp {
-    description
-      "Reset performance data for EDFA entries";
-    input {
-      leaf ampaid {
-        mandatory true;
-        description
-          "AID in format AMP-shelf-slot-port, AMP-shelf-slot-portSsubport, AMP-shelf-slotSsubslot-portSsubport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf montype {
-        default "ALL";
-        type ciena-6500-enums:AMP_PM_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-amp-threshold {
-    description
-      "Set Threshold for EDFA entries";
-    input {
-      leaf ampaid {
-        mandatory true;
-        description
-          "AID in format AMP-shelf-slot-port, AMP-shelf-slot-portSsubport, AMP-shelf-slotSsubslot-portSsubport, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf montype {
-        default "ALL";
-        type ciena-6500-enums:AMP_TH_MONTYPE_set;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "Threshold level";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf tmper {
-        default "1-UNT";
-        type ciena-6500-enums:TMPER_TH_PHT;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "Source profile ID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "Destination profile id";
-      }
-    }
-  }
-  rpc pm-show-amp-threshold {
-    description
-      "Retrieve Profiles for EDFA entries";
-    input {
-      leaf ampaid {
-        mandatory true;
-        description
-          "AID in format AMP-shelf-slot-port, AMP-shelf-slot-portSsubport, AMP-shelf-slotSsubslot-portSsubport, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list prflinfo {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "profile info";
-      }
-      leaf-list srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf ampaid {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "AMP";
-          }
-          description
-            "Type of AID";
-        }
-        leaf montype {
-          type ciena-6500-enums:AMP_TH_MONTYPE_resp;
-          description
-            "Monitored parameter";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP_PHT;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "Threshold level";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_TH_PHT;
-          description
-            "Accumulation time period of data.";
-        }
-        leaf-list srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-all {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-S" {
-            description
-              "Coding Violations - Section";
-          }
-          enum "ES-S" {
-            description
-              "Errored Seconds - Section";
-          }
-          enum "SES-S" {
-            description
-              "Severely Errored Seconds - Section";
-          }
-          enum "SEFS-S" {
-            description
-              "Severely Errored Frame Seconds - Section";
-          }
-          enum "CV-L" {
-            description
-              "Coding Violations - Line";
-          }
-          enum "ES-L" {
-            description
-              "Errored Seconds - Line";
-          }
-          enum "SES-L" {
-            description
-              "Severely Errored Seconds - Line";
-          }
-          enum "UAS-L" {
-            description
-              "Unavailable Seconds - Line";
-          }
-          enum "FC-L" {
-            description
-              "Failure Count - Line";
-          }
-          enum "PSCW-L" {
-            description
-              "Protection switch count, working line - LINE";
-          }
-          enum "PSCP-L" {
-            description
-              "Protection switch count, protection line - LINE";
-          }
-          enum "PSD-L" {
-            description
-              "Protection switch duration, line - LINE";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive - Optical Channel. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "OPT-OCH" {
-            description
-              "Gauge Optical Power Transmit - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Minimum OPT for interval";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Maximum OPT for interval";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Average OPT for interval";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized - Optical Channel";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized - Optical Channel";
-          }
-          enum "OPRLOW-OCH" {
-            description
-              "Lowest optical power received.";
-          }
-          enum "OPRNLOW-OCH" {
-            description
-              "Lowest optical power received (normalized).";
-          }
-          enum "OPRHIGH-OCH" {
-            description
-              "Highest optical power received";
-          }
-          enum "OPRNHIGH-OCH" {
-            description
-              "Highest optical power received (normalized).";
-          }
-          enum "OPTLOW-OCH" {
-            description
-              "Lowest optical power transmitted";
-          }
-          enum "OPTNLOW-OCH" {
-            description
-              "Lowest optical power transmitted (normalized)";
-          }
-          enum "OPTHIGH-OCH" {
-            description
-              "Highest optical power transmitted";
-          }
-          enum "OPTNHIGH-OCH" {
-            description
-              "Highest optical power transmitted (normalized)";
-          }
-          enum "SPANLOSS-OCH" {
-            description
-              "The OSC Span Loss in dB";
-          }
-          enum "SPANLOSSMIN-OCH" {
-            description
-              "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "SPANLOSSMAX-OCH" {
-            description
-              "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "SPANLOSSAVG-OCH" {
-            description
-              "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "OPR-OTS" {
-            description
-              "Optical Power Received - Optical Transport Section ";
-          }
-          enum "OPRN-OTS" {
-            description
-              "Optical Power Receive - Normalized - Optical Transport Section";
-          }
-          enum "CV-OTU" {
-            description
-              "Coding Violations - OTU";
-          }
-          enum "ES-OTU" {
-            description
-              "Errored Seconds - OTU";
-          }
-          enum "SES-OTU" {
-            description
-              "Severely Errored Seconds - OTU";
-          }
-          enum "SEFS-OTU" {
-            description
-              "Severely Errored Framing Seconds - OTU";
-          }
-          enum "FEC-OTU" {
-            description
-              "Forward Error Corrections - OTU";
-          }
-          enum "HCCS-OTU" {
-            description
-              "High Correction Count Seconds - OTU";
-          }
-          enum "PFBERE-OTU" {
-            description
-              "Post-FEC Bit Error Rate Estimates - OTU. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "PRFBER-OTU" {
-            description
-              "Pre-FEC Bit Error Rate - OTU.";
-          }
-          enum "PRFBERMAX-OTU" {
-            description
-              "Pre-FEC Bit Max Error Rate - OTU";
-          }
-          enum "QMIN-OTU" {
-            description
-              "Minimum Q - OTU";
-          }
-          enum "QMAX-OTU" {
-            description
-              "Maximum Q - OTU";
-          }
-          enum "QAVG-OTU" {
-            description
-              "Average Q - OTU";
-          }
-          enum "QSTDEV-OTU" {
-            description
-              "Q Standard Deviation - OTU";
-          }
-          enum "UNCFECBLK-OTU" {
-            description
-              "Uncorrected FEC Block - OTU";
-          }
-          enum "IAE-OTU" {
-            description
-              "Incoming Alignment Error - OTU";
-          }
-          enum "CV-ODU" {
-            description
-              "Coding Violations - ODU";
-          }
-          enum "ES-ODU" {
-            description
-              "Errored Seconds - ODU";
-          }
-          enum "SES-ODU" {
-            description
-              "Severely Errored Seconds - ODU";
-          }
-          enum "UAS-ODU" {
-            description
-              "Unavailable Seconds - ODU";
-          }
-          enum "FC-ODU" {
-            description
-              "Failure Count - ODU";
-          }
-          enum "DMMIN-ODU" {
-            description
-              "Delay Measurement Min - ODU ";
-          }
-          enum "DMMAX-ODU" {
-            description
-              "Delay Measurement Max - ODU ";
-          }
-          enum "DMAVG-ODU" {
-            description
-              "Delay Measurement Avg - ODU ";
-          }
-          enum "PSD-ODU" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "PSCP-ODU" {
-            description
-              "Protection Switch Count - Protection";
-          }
-          enum "PSCW-ODU" {
-            description
-              "Protection Switch Count - Working";
-          }
-          enum "CV-TCM" {
-            description
-              "Coding Violations - TCM";
-          }
-          enum "ES-TCM" {
-            description
-              "Errored Seconds - TCM";
-          }
-          enum "SES-TCM" {
-            description
-              "Severely Errored Seconds - TCM";
-          }
-          enum "UAS-TCM" {
-            description
-              "Unavailable Seconds - TCM ";
-          }
-          enum "FC-TCM" {
-            description
-              "Failure Count - TCM";
-          }
-          enum "PSD-TCM" {
-            description
-              "Protection Switch Duration - TCM";
-          }
-          enum "PSCW-TCM" {
-            description
-              "Protection Switch Count, Working - TCM";
-          }
-          enum "PSCP-TCM" {
-            description
-              "Protection Switch Count, Protection - TCM";
-          }
-          enum "DMMIN-TCM" {
-            description
-              "Delay Measurement Min - TCM";
-          }
-          enum "DMMAX-TCM" {
-            description
-              "Delay Measurement Max - TCM";
-          }
-          enum "DMAVG-TCM" {
-            description
-              "Delay Measurement Avg - TCM";
-          }
-          enum "IAE-TCM" {
-            description
-              "Incoming Alignment Error - TCM";
-          }
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer";
-          }
-          enum "ES-E" {
-            description
-              "Errored Seconds -ETH";
-          }
-          enum "SES-E" {
-            description
-              "Severely Errored Seconds";
-          }
-          enum "UAS-E" {
-            description
-              "Unavailable Seconds";
-          }
-          enum "INFRAMES-E" {
-            description
-              "Number of frames received (binned OM) - Ethernet.";
-          }
-          enum "OUTFRAMES-E" {
-            description
-              "Frame Check Sequence Errors (binned OM) - Ethernet";
-          }
-          enum "INFRAMESERR-E" {
-            description
-              "Number of errored frames received";
-          }
-          enum "OUTFRAMESERR-E" {
-            description
-              "Number of errored frames transmitted";
-          }
-          enum "INFRAMESDISCDS-E" {
-            description
-              "Number of ingress discarded frames due to congestion or overflow";
-          }
-          enum "OUTFRAMESDISCDS-E" {
-            description
-              "Number of egress discarded frames due to congestion or overflow";
-          }
-          enum "DFR-E" {
-            description
-              "Aggregate count of discarded frames";
-          }
-          enum "FCSERR-E" {
-            description
-              "Frame Check Sequence Errors";
-          }
-          enum "FEC-PMA" {
-            description
-              "Forward Error Corrections - Physical Medium Attachment";
-          }
-          enum "FECCCW-PMA" {
-            description
-              "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-          }
-          enum "FECUNCCW-PMA" {
-            description
-              "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-          }
-          enum "HCCS-PMA" {
-            description
-              "High Correction Count Second - Physical Medium Attachment";
-          }
-          enum "PRFBER-PMA" {
-            description
-              "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-          }
-          enum "PRFBERMAX-PMA" {
-            description
-              "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-          }
-          enum "REMOTEINFRAMES-E" {
-            description
-              "Remote In Frames";
-          }
-          enum "REMOTEOUTFRAMES-E" {
-            description
-              "Remote Out Frames";
-          }
-          enum "REMOTEINFRAMESERR-E" {
-            description
-              "Remote In Frames Err";
-          }
-          enum "REMOTEOUTFRAMESDISCDS-E" {
-            description
-              "Remote Out Frames Disc";
-          }
-          enum "REMOTEFCSERR-E" {
-            description
-              "Remote FCS Err";
-          }
-          enum "GRPOPT-OTS" {
-            description
-              "Group Optical Power Transmit";
-          }
-          enum "GRPOPTMIN-OTS" {
-            description
-              "Group Optical Power Transmit - Minimum";
-          }
-          enum "GRPOPTMAX-OTS" {
-            description
-              "Group Optical Power Transmit - Maximum";
-          }
-          enum "GRPOPTAVG-OTS" {
-            description
-              "Group Optical Power Transmit - Average";
-          }
-          enum "OPROSC-OTS" {
-            description
-              "Optical Power Receive, OSC";
-          }
-          enum "OPROSCMIN-OTS" {
-            description
-              "Optical Power Receive, OSC Minimum";
-          }
-          enum "OPROSCMAX-OTS" {
-            description
-              "Optical Power Receive, OSC Maximum";
-          }
-          enum "OPROSCAVG-OTS" {
-            description
-              "Optical Power Receive, OSC Average";
-          }
-          enum "ORLIN-OTS" {
-            description
-              "Optical Return Loss Input";
-          }
-          enum "ORLINMIN-OTS" {
-            description
-              "Optical Return Loss Input Minimum";
-          }
-          enum "ORLINMAX-OTS" {
-            description
-              "Optical Return Loss Input Maximum";
-          }
-          enum "ORLINAVG-OTS" {
-            description
-              "Optical Return Loss Input Average";
-          }
-          enum "ORLOUT-OTS" {
-            description
-              "Optical Return Loss Output";
-          }
-          enum "ORLOUTMIN-OTS" {
-            description
-              "Optical Return Loss Output Minimum";
-          }
-          enum "ORLOUTMAX-OTS" {
-            description
-              "Optical Return Loss Output Maximum";
-          }
-          enum "ORLOUTAVG-OTS" {
-            description
-              "Optical Return Loss Output Average";
-          }
-          enum "OPRMIN-OTS" {
-            description
-              "Optical Power Receive - Minimum";
-          }
-          enum "OPRMAX-OTS" {
-            description
-              "Optical Power Receive - Maximum";
-          }
-          enum "OPRAVG-OTS" {
-            description
-              "Optical Power Receive - Average";
-          }
-          enum "OPT-OTS" {
-            description
-              "Optical Power Transmit";
-          }
-          enum "OPTMIN-OTS" {
-            description
-              "Optical Power Transmit - Minimum";
-          }
-          enum "OPTMAX-OTS" {
-            description
-              "Optical Power Transmit - Maximum";
-          }
-          enum "OPTAVG-OTS" {
-            description
-              "Optical Power Transmit - Average";
-          }
-          enum "ORL-OTS" {
-            description
-              "Optical Return Loss";
-          }
-          enum "ORLMIN-OTS" {
-            description
-              "Optical Return Loss Minimum";
-          }
-          enum "ORLMAX-OTS" {
-            description
-              "Optical Return Loss Maximum";
-          }
-          enum "ORLAVG-OTS" {
-            description
-              "Optical Return Loss Average";
-          }
-          enum "OPIN-OTS" {
-            description
-              "Optical Power Input";
-          }
-          enum "OPINMIN-OTS" {
-            description
-              "Optical Power Input Minimum";
-          }
-          enum "OPINMAX-OTS" {
-            description
-              "Optical Power Input Maximum";
-          }
-          enum "OPINAVG-OTS" {
-            description
-              "Optical Power Input Average";
-          }
-          enum "OPOUT-OTS" {
-            description
-              "Optical Power Output";
-          }
-          enum "OPOUTMIN-OTS" {
-            description
-              "Optical Power Output Minimum";
-          }
-          enum "OPOUTMAX-OTS" {
-            description
-              "Optical Power Output Maximum";
-          }
-          enum "OPOUTAVG-OTS" {
-            description
-              "Optical Power Output Average";
-          }
-          enum "GRPGAIN-OTS" {
-            description
-              "Group Gain";
-          }
-          enum "GRPGAINMIN-OTS" {
-            description
-              "Group Gain Minimum";
-          }
-          enum "GRPGAINMAX-OTS" {
-            description
-              "Group Gain Maximum";
-          }
-          enum "GRPGAINAVG-OTS" {
-            description
-              "Group Gain Average";
-          }
-          enum "GRPOPIN-OTS" {
-            description
-              "Group Optical Power Input";
-          }
-          enum "GRPOPINMIN-OTS" {
-            description
-              "Group Optical Power Input Minimum";
-          }
-          enum "GRPOPINMAX-OTS" {
-            description
-              "Group Optical Power Input Maximum";
-          }
-          enum "GRPOPINAVG-OTS" {
-            description
-              "Group Optical Power Input Average";
-          }
-          enum "GRPOPOUT-OTS" {
-            description
-              "Group Optical Power Output";
-          }
-          enum "GRPOPOUTMIN-OTS" {
-            description
-              "Group Optical Power Output Minimum";
-          }
-          enum "GRPOPOUTMAX-OTS" {
-            description
-              "Group Optical Power Output Maximum";
-          }
-          enum "GRPOPOUTAVG-OTS" {
-            description
-              "Group Optical Power Output Average";
-          }
-          enum "DROPGAIN-OTS" {
-            description
-              "Drop Gain";
-          }
-          enum "DROPGAINMIN-OTS" {
-            description
-              "Drop Gain Minimum";
-          }
-          enum "DROPGAINMAX-OTS" {
-            description
-              "Drop Gain Maximum";
-          }
-          enum "DROPGAINAVG-OTS" {
-            description
-              "Drop Gain Average";
-          }
-          enum "PSD-OTS" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "PSCW-OTS" {
-            description
-              "Protection Switch Count Working";
-          }
-          enum "PSCP-OTS" {
-            description
-              "Protection Switch Count Protection";
-          }
-          enum "EVCSH-OTS" {
-            description
-              "Event Count Short";
-          }
-          enum "EVCSHMAX-OTS" {
-            description
-              "Event Count Short - MAX";
-          }
-          enum "EVCLG-OTS" {
-            description
-              "Event Count Long";
-          }
-          enum "EVCLGMAX-OTS" {
-            description
-              "Event Count Long - MAX";
-          }
-          enum "MAXEVLDISSH-OTS" {
-            description
-              "Maximum Event Loss Distance Short";
-          }
-          enum "MAXEVLDISSHMAX-OTS" {
-            description
-              "Maximum Event Loss Distance Short - MAX";
-          }
-          enum "MAXEVLDISLG-OTS" {
-            description
-              "Maximum Event Loss Distance Long";
-          }
-          enum "MAXEVLDISLGMAX-OTS" {
-            description
-              "Maximum Event Loss Distance Long - MAX";
-          }
-          enum "MAXEVRDISSH-OTS" {
-            description
-              "Maximum Event Reflection Distance Short";
-          }
-          enum "MAXEVRDISSHMAX-OTS" {
-            description
-              "Maximum Event Reflection Distance Short - MAX";
-          }
-          enum "MAXEVRDISLG-OTS" {
-            description
-              "Maximum Event Reflection Distance Long";
-          }
-          enum "MAXEVRDISLGMAX-OTS" {
-            description
-              "Maximum Event Reflection Distance Long - MAX";
-          }
-          enum "MAXEVLSH-OTS" {
-            description
-              "Maximum Event Loss Short";
-          }
-          enum "MAXEVLSHMAX-OTS" {
-            description
-              "Maximum Event Loss Short - MAX";
-          }
-          enum "MAXEVLLG-OTS" {
-            description
-              "Maximum Event Loss Long";
-          }
-          enum "MAXEVLLGMAX-OTS" {
-            description
-              "Maximum Event Loss Long - MAX";
-          }
-          enum "MAXEVRSH-OTS" {
-            description
-              "Maximum Event Reflection Short";
-          }
-          enum "MAXEVRSHMAX-OTS" {
-            description
-              "Maximum Event Reflection Short - MAX";
-          }
-          enum "MAXEVRLG-OTS" {
-            description
-              "Maximum Event Reflection Long";
-          }
-          enum "MAXEVRLGMAX-OTS" {
-            description
-              "Maximum Event Reflection Long - MAX";
-          }
-          enum "CUMEVLSH-OTS" {
-            description
-              "Cumulative Event Loss Short";
-          }
-          enum "CUMEVLSHMAX-OTS" {
-            description
-              "Cumulative Event Loss Short MAX";
-          }
-          enum "CUMEVLLG-OTS" {
-            description
-              "Cumulative Event Loss Long";
-          }
-          enum "CUMEVLLGMAX-OTS" {
-            description
-              "Cumulative Event Loss Long MAX";
-          }
-          enum "CUMEVRSH-OTS" {
-            description
-              "Cumulative Event Reflection Short";
-          }
-          enum "CUMEVRSHMAX-OTS" {
-            description
-              "Cumulative Event Reflection Short MAX";
-          }
-          enum "CUMEVRLG-OTS" {
-            description
-              "Cumulative Event Reflection Long";
-          }
-          enum "CUMEVRLGMAX-OTS" {
-            description
-              "Cumulative Event Reflection Long MAX";
-          }
-          enum "DMMIN-L" {
-            description
-              "Delay Measurement MINimum - Line";
-          }
-          enum "DMMAX-L" {
-            description
-              "Delay Measurement MAXimum - Line";
-          }
-          enum "DMAVG-L" {
-            description
-              "Delay Measurement AVGrage - Line";
-          }
-          enum "ES-W" {
-            description
-              "Errored Seconds - WAN";
-          }
-          enum "SES-W" {
-            description
-              "Severely Errored Seconds - WAN";
-          }
-          enum "UAS-W" {
-            description
-              "Unavailable Seconds - WAN";
-          }
-          enum "INFRAMES-W" {
-            description
-              "Number of frames received (binned OM) - WAN";
-          }
-          enum "INFRAMESERR-W" {
-            description
-              "Number of errored frames received - WAN";
-          }
-          enum "OUTFRAMES-W" {
-            description
-              "Number of frames transmitted (binned OM)- WAN";
-          }
-          enum "DGDAVG-OCH" {
-            description
-              "Differential Group Delay (Average), Optical Channel";
-          }
-          enum "DGDMAX-OCH" {
-            description
-              "Differential Group Delay (Max), Optical Channel";
-          }
-          enum "LDS-W" {
-            description
-              "LCAS Degraded Second - WAN (Rx and Tx directions)";
-          }
-          enum "LSDS-W" {
-            description
-              "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-          }
-          enum "LUAS-W" {
-            description
-              "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-          }
-          enum "DFR-W" {
-            description
-              "Aggregate count of discarded frames - WAN";
-          }
-          enum "UTL-W" {
-            description
-              "Average percentage link utilization - WAN";
-          }
-          enum "UTLMX-W" {
-            description
-              "Maximum percentage link utilization - WAN";
-          }
-          enum "OUTFRAMESERR-W" {
-            description
-              "Out Frames Error Count, Wan";
-          }
-          enum "OPR-OTSI" {
-            description
-              "Optical Power Receive- OTSI";
-          }
-          enum "OPT-OTSI" {
-            description
-              "Optical Power Transmit- OTSI";
-          }
-          enum "OPRN-OTSI" {
-            description
-              "Normalized Optical Power Receive- OTSI";
-          }
-          enum "OPTN-OTSI" {
-            description
-              "Normalized Optical Power Transmit- OTSI";
-          }
-          enum "OPRAVG-OTSI" {
-            description
-              "Optical Power Receive, Average - OTSI";
-          }
-          enum "OPRMIN-OTSI" {
-            description
-              "Optical Power Receive, Minimum - OTSI";
-          }
-          enum "OPRMAX-OTSI" {
-            description
-              "Optical Power Receive, Maximum - OTSI";
-          }
-          enum "OPTAVG-OTSI" {
-            description
-              "Optical Power Transmit, Average - OTSI";
-          }
-          enum "OPTMIN-OTSI" {
-            description
-              "Optical Power Transmit, Minimum - OTSI";
-          }
-          enum "OPTMAX-OTSI" {
-            description
-              "Optical Power Transmit, Maximum - OTSI";
-          }
-          enum "DGDAVG-OTSI" {
-            description
-              "Differential Group Delay (Average) OTSI";
-          }
-          enum "DGDMAX-OTSI" {
-            description
-              "Differential Group Delay (Maximum) OTSI";
-          }
-          enum "PDLAVG-OTSI" {
-            description
-              "Polarization Dependent Loss, Average - OTSI";
-          }
-          enum "PDLMAX-OTSI" {
-            description
-              "Polarization Dependent Loss, Maximum - OTSI";
-          }
-          enum "HCCS-OTSI" {
-            description
-              "High Correction Count Seconds - OTSI";
-          }
-          enum "FEC-OTSI" {
-            description
-              "FEC Corrections - OTSI";
-          }
-          enum "PRFBER-OTSI" {
-            description
-              "Post-FEC BER - OTSI";
-          }
-          enum "PRFBERMAX-OTSI" {
-            description
-              "Pre-FEC BER Maximum - OTSI";
-          }
-          enum "QMIN-OTSI" {
-            description
-              "Q MIN - OTSI";
-          }
-          enum "QMAX-OTSI" {
-            description
-              "Q MAX - OTSI";
-          }
-          enum "QAVG-OTSI" {
-            description
-              "Q AVG - OTSI";
-          }
-          enum "QSTDEV-OTSI" {
-            description
-              "Q StDev - OTSI";
-          }
-          enum "UNCFECBLK-OTSI" {
-            description
-              "Uncorrected FEC Block - OTSI";
-          }
-          enum "OSNRMIN-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Minimum) OTSI";
-          }
-          enum "OSNRMAX-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Maximum) OTSI";
-          }
-          enum "OSNRAVG-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Average) OTSI";
-          }
-          enum "ESNRMIN-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Minimum) OTSI";
-          }
-          enum "ESNRMAX-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Maximum) OTSI";
-          }
-          enum "ESNRAVG-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Average) OTSI";
-          }
-          enum "CDMIN-OTSI" {
-            description
-              "Dispersion compensation (Minimum) OTSI";
-          }
-          enum "CDMAX-OTSI" {
-            description
-              "Dispersion compensation (Maximum) OTSI";
-          }
-          enum "CDAVG-OTSI" {
-            description
-              "Dispersion compensation (Average) OTSI";
-          }
-          enum "FEC-PCS" {
-            description
-              "Forward Error Corrections - Physical Coding Sublayer";
-          }
-          enum "FECCCW-PCS" {
-            description
-              "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-          }
-          enum "FECUNCCW-PCS" {
-            description
-              "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-          }
-          enum "HCCS-PCS" {
-            description
-              "High Correction Count Second - Physical Coding Sublayer";
-          }
-          enum "PRFBER-PCS" {
-            description
-              "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-          }
-          enum "PRFBERMAX-PCS" {
-            description
-              "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3...";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:PMAIDTYPE;
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-S" {
-              description
-                "Coding Violations - Section";
-            }
-            enum "ES-S" {
-              description
-                "Errored Seconds - Section";
-            }
-            enum "SES-S" {
-              description
-                "Severely Errored Seconds - Section";
-            }
-            enum "SEFS-S" {
-              description
-                "Severely Errored Frame Seconds - Section";
-            }
-            enum "CV-L" {
-              description
-                "Coding Violations - Line";
-            }
-            enum "ES-L" {
-              description
-                "Errored Seconds - Line";
-            }
-            enum "SES-L" {
-              description
-                "Severely Errored Seconds - Line";
-            }
-            enum "UAS-L" {
-              description
-                "Unavailable Seconds - Line";
-            }
-            enum "FC-L" {
-              description
-                "Failure Count - Line";
-            }
-            enum "PSCW-L" {
-              description
-                "Protection switch count, working line - LINE";
-            }
-            enum "PSCP-L" {
-              description
-                "Protection switch count, protection line - LINE";
-            }
-            enum "PSD-L" {
-              description
-                "Protection switch duration, line - LINE";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "OPT-OCH" {
-              description
-                "Gauge Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Minimum OPT for interval";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Maximum OPT for interval";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Average OPT for interval";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received.";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized).";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized).";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized)";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized)";
-            }
-            enum "SPANLOSS-OCH" {
-              description
-                "The OSC Span Loss in dB";
-            }
-            enum "SPANLOSSMIN-OCH" {
-              description
-                "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "SPANLOSSMAX-OCH" {
-              description
-                "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "SPANLOSSAVG-OCH" {
-              description
-                "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "OPR-OTS" {
-              description
-                "Optical Power Received - Optical Transport Section ";
-            }
-            enum "OPRN-OTS" {
-              description
-                "Optical Power Receive - Normalized - Optical Transport Section";
-            }
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Corrections - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimates - OTU. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU.";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "UNCFECBLK-OTU" {
-              description
-                "Uncorrected FEC Block - OTU";
-            }
-            enum "IAE-OTU" {
-              description
-                "Incoming Alignment Error - OTU";
-            }
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU ";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU ";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU ";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "CV-TCM" {
-              description
-                "Coding Violations - TCM";
-            }
-            enum "ES-TCM" {
-              description
-                "Errored Seconds - TCM";
-            }
-            enum "SES-TCM" {
-              description
-                "Severely Errored Seconds - TCM";
-            }
-            enum "UAS-TCM" {
-              description
-                "Unavailable Seconds - TCM ";
-            }
-            enum "FC-TCM" {
-              description
-                "Failure Count - TCM";
-            }
-            enum "PSD-TCM" {
-              description
-                "Protection Switch Duration - TCM";
-            }
-            enum "PSCW-TCM" {
-              description
-                "Protection Switch Count, Working - TCM";
-            }
-            enum "PSCP-TCM" {
-              description
-                "Protection Switch Count, Protection - TCM";
-            }
-            enum "DMMIN-TCM" {
-              description
-                "Delay Measurement Min - TCM";
-            }
-            enum "DMMAX-TCM" {
-              description
-                "Delay Measurement Max - TCM";
-            }
-            enum "DMAVG-TCM" {
-              description
-                "Delay Measurement Avg - TCM";
-            }
-            enum "IAE-TCM" {
-              description
-                "Incoming Alignment Error - TCM";
-            }
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "ES-E" {
-              description
-                "Errored Seconds -ETH";
-            }
-            enum "SES-E" {
-              description
-                "Severely Errored Seconds";
-            }
-            enum "UAS-E" {
-              description
-                "Unavailable Seconds";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Number of frames received (binned OM) - Ethernet.";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Frame Check Sequence Errors (binned OM) - Ethernet";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Number of errored frames received";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Number of errored frames transmitted";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Number of ingress discarded frames due to congestion or overflow";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Number of egress discarded frames due to congestion or overflow";
-            }
-            enum "DFR-E" {
-              description
-                "Aggregate count of discarded frames";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors";
-            }
-            enum "FEC-PMA" {
-              description
-                "Forward Error Corrections - Physical Medium Attachment";
-            }
-            enum "FECCCW-PMA" {
-              description
-                "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-            }
-            enum "FECUNCCW-PMA" {
-              description
-                "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-            }
-            enum "HCCS-PMA" {
-              description
-                "High Correction Count Second - Physical Medium Attachment";
-            }
-            enum "PRFBER-PMA" {
-              description
-                "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-            }
-            enum "PRFBERMAX-PMA" {
-              description
-                "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-            }
-            enum "REMOTEINFRAMES-E" {
-              description
-                "Remote In Frames";
-            }
-            enum "REMOTEOUTFRAMES-E" {
-              description
-                "Remote Out Frames";
-            }
-            enum "REMOTEINFRAMESERR-E" {
-              description
-                "Remote In Frames Err";
-            }
-            enum "REMOTEOUTFRAMESDISCDS-E" {
-              description
-                "Remote Out Frames Disc";
-            }
-            enum "REMOTEFCSERR-E" {
-              description
-                "Remote FCS Err";
-            }
-            enum "GRPOPT-OTS" {
-              description
-                "Group Optical Power Transmit";
-            }
-            enum "GRPOPTMIN-OTS" {
-              description
-                "Group Optical Power Transmit - Minimum";
-            }
-            enum "GRPOPTMAX-OTS" {
-              description
-                "Group Optical Power Transmit - Maximum";
-            }
-            enum "GRPOPTAVG-OTS" {
-              description
-                "Group Optical Power Transmit - Average";
-            }
-            enum "OPROSC-OTS" {
-              description
-                "Optical Power Receive, OSC";
-            }
-            enum "OPROSCMIN-OTS" {
-              description
-                "Optical Power Receive, OSC Minimum";
-            }
-            enum "OPROSCMAX-OTS" {
-              description
-                "Optical Power Receive, OSC Maximum";
-            }
-            enum "OPROSCAVG-OTS" {
-              description
-                "Optical Power Receive, OSC Average";
-            }
-            enum "ORLIN-OTS" {
-              description
-                "Optical Return Loss Input";
-            }
-            enum "ORLINMIN-OTS" {
-              description
-                "Optical Return Loss Input Minimum";
-            }
-            enum "ORLINMAX-OTS" {
-              description
-                "Optical Return Loss Input Maximum";
-            }
-            enum "ORLINAVG-OTS" {
-              description
-                "Optical Return Loss Input Average";
-            }
-            enum "ORLOUT-OTS" {
-              description
-                "Optical Return Loss Output";
-            }
-            enum "ORLOUTMIN-OTS" {
-              description
-                "Optical Return Loss Output Minimum";
-            }
-            enum "ORLOUTMAX-OTS" {
-              description
-                "Optical Return Loss Output Maximum";
-            }
-            enum "ORLOUTAVG-OTS" {
-              description
-                "Optical Return Loss Output Average";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Optical Power Receive - Minimum";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Optical Power Receive - Maximum";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Optical Power Receive - Average";
-            }
-            enum "OPT-OTS" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPTMIN-OTS" {
-              description
-                "Optical Power Transmit - Minimum";
-            }
-            enum "OPTMAX-OTS" {
-              description
-                "Optical Power Transmit - Maximum";
-            }
-            enum "OPTAVG-OTS" {
-              description
-                "Optical Power Transmit - Average";
-            }
-            enum "ORL-OTS" {
-              description
-                "Optical Return Loss";
-            }
-            enum "ORLMIN-OTS" {
-              description
-                "Optical Return Loss Minimum";
-            }
-            enum "ORLMAX-OTS" {
-              description
-                "Optical Return Loss Maximum";
-            }
-            enum "ORLAVG-OTS" {
-              description
-                "Optical Return Loss Average";
-            }
-            enum "OPIN-OTS" {
-              description
-                "Optical Power Input";
-            }
-            enum "OPINMIN-OTS" {
-              description
-                "Optical Power Input Minimum";
-            }
-            enum "OPINMAX-OTS" {
-              description
-                "Optical Power Input Maximum";
-            }
-            enum "OPINAVG-OTS" {
-              description
-                "Optical Power Input Average";
-            }
-            enum "OPOUT-OTS" {
-              description
-                "Optical Power Output";
-            }
-            enum "OPOUTMIN-OTS" {
-              description
-                "Optical Power Output Minimum";
-            }
-            enum "OPOUTMAX-OTS" {
-              description
-                "Optical Power Output Maximum";
-            }
-            enum "OPOUTAVG-OTS" {
-              description
-                "Optical Power Output Average";
-            }
-            enum "GRPGAIN-OTS" {
-              description
-                "Group Gain";
-            }
-            enum "GRPGAINMIN-OTS" {
-              description
-                "Group Gain Minimum";
-            }
-            enum "GRPGAINMAX-OTS" {
-              description
-                "Group Gain Maximum";
-            }
-            enum "GRPGAINAVG-OTS" {
-              description
-                "Group Gain Average";
-            }
-            enum "GRPOPIN-OTS" {
-              description
-                "Group Optical Power Input";
-            }
-            enum "GRPOPINMIN-OTS" {
-              description
-                "Group Optical Power Input Minimum";
-            }
-            enum "GRPOPINMAX-OTS" {
-              description
-                "Group Optical Power Input Maximum";
-            }
-            enum "GRPOPINAVG-OTS" {
-              description
-                "Group Optical Power Input Average";
-            }
-            enum "GRPOPOUT-OTS" {
-              description
-                "Group Optical Power Output";
-            }
-            enum "GRPOPOUTMIN-OTS" {
-              description
-                "Group Optical Power Output Minimum";
-            }
-            enum "GRPOPOUTMAX-OTS" {
-              description
-                "Group Optical Power Output Maximum";
-            }
-            enum "GRPOPOUTAVG-OTS" {
-              description
-                "Group Optical Power Output Average";
-            }
-            enum "DROPGAIN-OTS" {
-              description
-                "Drop Gain";
-            }
-            enum "DROPGAINMIN-OTS" {
-              description
-                "Drop Gain Minimum";
-            }
-            enum "DROPGAINMAX-OTS" {
-              description
-                "Drop Gain Maximum";
-            }
-            enum "DROPGAINAVG-OTS" {
-              description
-                "Drop Gain Average";
-            }
-            enum "PSD-OTS" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "PSCW-OTS" {
-              description
-                "Protection Switch Count Working";
-            }
-            enum "PSCP-OTS" {
-              description
-                "Protection Switch Count Protection";
-            }
-            enum "EVCSH-OTS" {
-              description
-                "Event Count Short";
-            }
-            enum "EVCSHMAX-OTS" {
-              description
-                "Event Count Short - MAX";
-            }
-            enum "EVCLG-OTS" {
-              description
-                "Event Count Long";
-            }
-            enum "EVCLGMAX-OTS" {
-              description
-                "Event Count Long - MAX";
-            }
-            enum "MAXEVLDISSH-OTS" {
-              description
-                "Maximum Event Loss Distance Short";
-            }
-            enum "MAXEVLDISSHMAX-OTS" {
-              description
-                "Maximum Event Loss Distance Short - MAX";
-            }
-            enum "MAXEVLDISLG-OTS" {
-              description
-                "Maximum Event Loss Distance Long";
-            }
-            enum "MAXEVLDISLGMAX-OTS" {
-              description
-                "Maximum Event Loss Distance Long - MAX";
-            }
-            enum "MAXEVRDISSH-OTS" {
-              description
-                "Maximum Event Reflection Distance Short";
-            }
-            enum "MAXEVRDISSHMAX-OTS" {
-              description
-                "Maximum Event Reflection Distance Short - MAX";
-            }
-            enum "MAXEVRDISLG-OTS" {
-              description
-                "Maximum Event Reflection Distance Long";
-            }
-            enum "MAXEVRDISLGMAX-OTS" {
-              description
-                "Maximum Event Reflection Distance Long - MAX";
-            }
-            enum "MAXEVLSH-OTS" {
-              description
-                "Maximum Event Loss Short";
-            }
-            enum "MAXEVLSHMAX-OTS" {
-              description
-                "Maximum Event Loss Short - MAX";
-            }
-            enum "MAXEVLLG-OTS" {
-              description
-                "Maximum Event Loss Long";
-            }
-            enum "MAXEVLLGMAX-OTS" {
-              description
-                "Maximum Event Loss Long - MAX";
-            }
-            enum "MAXEVRSH-OTS" {
-              description
-                "Maximum Event Reflection Short";
-            }
-            enum "MAXEVRSHMAX-OTS" {
-              description
-                "Maximum Event Reflection Short - MAX";
-            }
-            enum "MAXEVRLG-OTS" {
-              description
-                "Maximum Event Reflection Long";
-            }
-            enum "MAXEVRLGMAX-OTS" {
-              description
-                "Maximum Event Reflection Long - MAX";
-            }
-            enum "CUMEVLSH-OTS" {
-              description
-                "Cumulative Event Loss Short";
-            }
-            enum "CUMEVLSHMAX-OTS" {
-              description
-                "Cumulative Event Loss Short MAX";
-            }
-            enum "CUMEVLLG-OTS" {
-              description
-                "Cumulative Event Loss Long";
-            }
-            enum "CUMEVLLGMAX-OTS" {
-              description
-                "Cumulative Event Loss Long MAX";
-            }
-            enum "CUMEVRSH-OTS" {
-              description
-                "Cumulative Event Reflection Short";
-            }
-            enum "CUMEVRSHMAX-OTS" {
-              description
-                "Cumulative Event Reflection Short MAX";
-            }
-            enum "CUMEVRLG-OTS" {
-              description
-                "Cumulative Event Reflection Long";
-            }
-            enum "CUMEVRLGMAX-OTS" {
-              description
-                "Cumulative Event Reflection Long MAX";
-            }
-            enum "DMMIN-L" {
-              description
-                "Delay Measurement MINimum - Line";
-            }
-            enum "DMMAX-L" {
-              description
-                "Delay Measurement MAXimum - Line";
-            }
-            enum "DMAVG-L" {
-              description
-                "Delay Measurement AVGrage - Line";
-            }
-            enum "ES-W" {
-              description
-                "Errored Seconds - WAN";
-            }
-            enum "SES-W" {
-              description
-                "Severely Errored Seconds - WAN";
-            }
-            enum "UAS-W" {
-              description
-                "Unavailable Seconds - WAN";
-            }
-            enum "INFRAMES-W" {
-              description
-                "Number of frames received (binned OM) - WAN";
-            }
-            enum "INFRAMESERR-W" {
-              description
-                "Number of errored frames received - WAN";
-            }
-            enum "OUTFRAMES-W" {
-              description
-                "Number of frames transmitted (binned OM)- WAN";
-            }
-            enum "DGDAVG-OCH" {
-              description
-                "Differential Group Delay (Average), Optical Channel";
-            }
-            enum "DGDMAX-OCH" {
-              description
-                "Differential Group Delay (Max), Optical Channel";
-            }
-            enum "LDS-W" {
-              description
-                "LCAS Degraded Second - WAN (Rx and Tx directions)";
-            }
-            enum "LSDS-W" {
-              description
-                "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-            }
-            enum "LUAS-W" {
-              description
-                "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-            }
-            enum "DFR-W" {
-              description
-                "Aggregate count of discarded frames - WAN";
-            }
-            enum "UTL-W" {
-              description
-                "Average percentage link utilization - WAN";
-            }
-            enum "UTLMX-W" {
-              description
-                "Maximum percentage link utilization - WAN";
-            }
-            enum "OUTFRAMESERR-W" {
-              description
-                "Out Frames Error Count, Wan";
-            }
-            enum "OPR-OTSI" {
-              description
-                "Optical Power Receive- OTSI";
-            }
-            enum "OPT-OTSI" {
-              description
-                "Optical Power Transmit- OTSI";
-            }
-            enum "OPRN-OTSI" {
-              description
-                "Normalized Optical Power Receive- OTSI";
-            }
-            enum "OPTN-OTSI" {
-              description
-                "Normalized Optical Power Transmit- OTSI";
-            }
-            enum "OPRAVG-OTSI" {
-              description
-                "Optical Power Receive, Average - OTSI";
-            }
-            enum "OPRMIN-OTSI" {
-              description
-                "Optical Power Receive, Minimum - OTSI";
-            }
-            enum "OPRMAX-OTSI" {
-              description
-                "Optical Power Receive, Maximum - OTSI";
-            }
-            enum "OPTAVG-OTSI" {
-              description
-                "Optical Power Transmit, Average - OTSI";
-            }
-            enum "OPTMIN-OTSI" {
-              description
-                "Optical Power Transmit, Minimum - OTSI";
-            }
-            enum "OPTMAX-OTSI" {
-              description
-                "Optical Power Transmit, Maximum - OTSI";
-            }
-            enum "DGDAVG-OTSI" {
-              description
-                "Differential Group Delay (Average) OTSI";
-            }
-            enum "DGDMAX-OTSI" {
-              description
-                "Differential Group Delay (Maximum) OTSI";
-            }
-            enum "PDLAVG-OTSI" {
-              description
-                "Polarization Dependent Loss, Average - OTSI";
-            }
-            enum "PDLMAX-OTSI" {
-              description
-                "Polarization Dependent Loss, Maximum - OTSI";
-            }
-            enum "HCCS-OTSI" {
-              description
-                "High Correction Count Seconds - OTSI";
-            }
-            enum "FEC-OTSI" {
-              description
-                "FEC Corrections - OTSI";
-            }
-            enum "PRFBER-OTSI" {
-              description
-                "Post-FEC BER - OTSI";
-            }
-            enum "PRFBERMAX-OTSI" {
-              description
-                "Pre-FEC BER Maximum - OTSI";
-            }
-            enum "QMIN-OTSI" {
-              description
-                "Q MIN - OTSI";
-            }
-            enum "QMAX-OTSI" {
-              description
-                "Q MAX - OTSI";
-            }
-            enum "QAVG-OTSI" {
-              description
-                "Q AVG - OTSI";
-            }
-            enum "QSTDEV-OTSI" {
-              description
-                "Q StDev - OTSI";
-            }
-            enum "UNCFECBLK-OTSI" {
-              description
-                "Uncorrected FEC Block - OTSI";
-            }
-            enum "OSNRMIN-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Minimum) OTSI";
-            }
-            enum "OSNRMAX-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Maximum) OTSI";
-            }
-            enum "OSNRAVG-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Average) OTSI";
-            }
-            enum "ESNRMIN-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Minimum) OTSI";
-            }
-            enum "ESNRMAX-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Maximum) OTSI";
-            }
-            enum "ESNRAVG-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Average) OTSI";
-            }
-            enum "CDMIN-OTSI" {
-              description
-                "Dispersion compensation (Minimum) OTSI";
-            }
-            enum "CDMAX-OTSI" {
-              description
-                "Dispersion compensation (Maximum) OTSI";
-            }
-            enum "CDAVG-OTSI" {
-              description
-                "Dispersion compensation (Average) OTSI";
-            }
-            enum "FEC-PCS" {
-              description
-                "Forward Error Corrections - Physical Coding Sublayer";
-            }
-            enum "FECCCW-PCS" {
-              description
-                "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-            }
-            enum "FECUNCCW-PCS" {
-              description
-                "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-            }
-            enum "HCCS-PCS" {
-              description
-                "High Correction Count Second - Physical Coding Sublayer";
-            }
-            enum "PRFBER-PCS" {
-              description
-                "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-            }
-            enum "PRFBERMAX-PCS" {
-              description
-                "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3...";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-all {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3...";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf src-profile-id {
-        type enumeration {
-          enum "DFLT";
-        }
-        mandatory true;
-        description
-          "Source profile ID";
-      }
-    }
-  }
-  rpc pm-show-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list prflinfo {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "List Profile information";
-      }
-      leaf-list src-profile-id {
-        type enumeration {
-          enum "PROFILE1" {
-            description
-              "PM Profile 1";
-          }
-          enum "PROFILE2" {
-            description
-              "PM Profile 2";
-          }
-          enum "PROFILE3" {
-            description
-              "PM Profile 3";
-          }
-          enum "PROFILE4" {
-            description
-              "PM Profile 4";
-          }
-          enum "DFLT" {
-            description
-              "Default Source Profile";
-          }
-          enum "ALLOFF" {
-            description
-              "ALL PM Profiles OFF";
-          }
-          enum "FACTORYDFLT" {
-            description
-              "Factory DeFauLT PM Profile";
-          }
-          enum "ALLPROFILES" {
-            description
-              "All Source Profiles";
-          }
-        }
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:PMAIDTYPE;
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:ALL_TH_MONTYPE_resp;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP_PHT;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list src-profile-id {
-          type enumeration {
-            enum "PROFILE1" {
-              description
-                "PM Profile 1";
-            }
-            enum "PROFILE2" {
-              description
-                "PM Profile 2";
-            }
-            enum "PROFILE3" {
-              description
-                "PM Profile 3";
-            }
-            enum "PROFILE4" {
-              description
-                "PM Profile 4";
-            }
-            enum "DFLT" {
-              description
-                "Default Source Profile";
-            }
-            enum "ALLOFF" {
-              description
-                "ALL PM Profiles OFF";
-            }
-            enum "FACTORYDFLT" {
-              description
-                "Factory DeFauLT PM Profile";
-            }
-            enum "ALLPROFILES" {
-              description
-                "All Source Profiles";
-            }
-          }
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-abort-abort {
-    description
-      "Retrieve Performance Monitoring Abort: this command allows you to abort the active retrieve (RTRV-PM) command. If the retrieve command completes before the abort command is processed by the system, there is no impact.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc pm-reset-osc {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf osc {
-        mandatory true;
-        description
-          "AID in format OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OSC_MONTYPE_ALL;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-oc3 {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf oc3 {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OCn_MONTYPE_ALL;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-otm2 {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OTM2_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-otm3 {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OTM3_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-otm {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OTM_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-eth10g {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:ETH10G_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-ec1 {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf ec1 {
-        mandatory true;
-        description
-          "AID in format EC1-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:OCn_MONTYPE_ALL;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-eth {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ETH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-eth100 {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf eth100 {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ETH100_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-ethn {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:ETHN_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-fiber-channel {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf fc {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:FC_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-flex {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:FLEX_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-wan {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:WAN_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-show-osc-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data from OSC facility.";
-    input {
-      leaf osc {
-        mandatory true;
-        description
-          "AID in format OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-S" {
-            description
-              "Coding Violations - Section";
-          }
-          enum "ES-S" {
-            description
-              "Errored Seconds - Section";
-          }
-          enum "SES-S" {
-            description
-              "Severely Errored Seconds - Section";
-          }
-          enum "SEFS-S" {
-            description
-              "Severely Errored Frame Seconds - Section";
-          }
-          enum "CV-L" {
-            description
-              "Coding Violations - Line";
-          }
-          enum "ES-L" {
-            description
-              "Errored Seconds - Line";
-          }
-          enum "SES-L" {
-            description
-              "Severely Errored Seconds - Line";
-          }
-          enum "UAS-L" {
-            description
-              "Unavailable Seconds - Line";
-          }
-          enum "FC-L" {
-            description
-              "Failure Count - Line";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical Power Transmit";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "SPANLOSS-OCH" {
-            description
-              "The OSC Span Loss in dB";
-          }
-          enum "SPANLOSSMIN-OCH" {
-            description
-              "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "SPANLOSSMAX-OCH" {
-            description
-              "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "SPANLOSSAVG-OCH" {
-            description
-              "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "DMMIN-L" {
-            description
-              "Delay Measurement MINimum - Line";
-          }
-          enum "DMMAX-L" {
-            description
-              "Delay Measurement MAXimum - Line";
-          }
-          enum "DMAVG-L" {
-            description
-              "Delay Measurement AVGrage - Line";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trex-frmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf osc {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OSC";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-S" {
-              description
-                "Coding Violations - Section";
-            }
-            enum "ES-S" {
-              description
-                "Errored Seconds - Section";
-            }
-            enum "SES-S" {
-              description
-                "Severely Errored Seconds - Section";
-            }
-            enum "SEFS-S" {
-              description
-                "Severely Errored Frame Seconds - Section";
-            }
-            enum "CV-L" {
-              description
-                "Coding Violations - Line";
-            }
-            enum "ES-L" {
-              description
-                "Errored Seconds - Line";
-            }
-            enum "SES-L" {
-              description
-                "Severely Errored Seconds - Line";
-            }
-            enum "UAS-L" {
-              description
-                "Unavailable Seconds - Line";
-            }
-            enum "FC-L" {
-              description
-                "Failure Count - Line";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "SPANLOSS-OCH" {
-              description
-                "The OSC Span Loss in dB";
-            }
-            enum "SPANLOSSMIN-OCH" {
-              description
-                "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "SPANLOSSMAX-OCH" {
-              description
-                "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "SPANLOSSAVG-OCH" {
-              description
-                "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "DMMIN-L" {
-              description
-                "Delay Measurement MINimum - Line";
-            }
-            enum "DMMAX-L" {
-              description
-                "Delay Measurement MAXimum - Line";
-            }
-            enum "DMAVG-L" {
-              description
-                "Delay Measurement AVGrage - Line";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf portmode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-      }
-    }
-  }
-  rpc pm-show-oc3-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data from OC3 facility.";
-    input {
-      leaf oc3 {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-S" {
-            description
-              "Coding Violations - Section";
-          }
-          enum "ES-S" {
-            description
-              "Errored Seconds - Section";
-          }
-          enum "SES-S" {
-            description
-              "Severely Errored Seconds - Section";
-          }
-          enum "SEFS-S" {
-            description
-              "Severely Errored Frame Seconds - Section";
-          }
-          enum "CV-L" {
-            description
-              "Coding Violations - Line";
-          }
-          enum "ES-L" {
-            description
-              "Errored Seconds - Line";
-          }
-          enum "SES-L" {
-            description
-              "Severely Errored Seconds - Line";
-          }
-          enum "UAS-L" {
-            description
-              "Unavailable Seconds - Line";
-          }
-          enum "FC-L" {
-            description
-              "Failure Count - Line";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical Power Transmit";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized";
-          }
-          enum "PSCW-L" {
-            description
-              "Protection Switch Count Working - Line";
-          }
-          enum "PSCP-L" {
-            description
-              "Protection Switch Count Protection - Line";
-          }
-          enum "PSD-L" {
-            description
-              "Protection Switch Duration - Line";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trex-frmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf oc3 {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OC3";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-S" {
-              description
-                "Coding Violations - Section";
-            }
-            enum "ES-S" {
-              description
-                "Errored Seconds - Section";
-            }
-            enum "SES-S" {
-              description
-                "Severely Errored Seconds - Section";
-            }
-            enum "SEFS-S" {
-              description
-                "Severely Errored Frame Seconds - Section";
-            }
-            enum "CV-L" {
-              description
-                "Coding Violations - Line";
-            }
-            enum "ES-L" {
-              description
-                "Errored Seconds - Line";
-            }
-            enum "SES-L" {
-              description
-                "Severely Errored Seconds - Line";
-            }
-            enum "UAS-L" {
-              description
-                "Unavailable Seconds - Line";
-            }
-            enum "FC-L" {
-              description
-                "Failure Count - Line";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized";
-            }
-            enum "PSCW-L" {
-              description
-                "Protection Switch Count Working - Line";
-            }
-            enum "PSCP-L" {
-              description
-                "Protection Switch Count Protection - Line";
-            }
-            enum "PSD-L" {
-              description
-                "Protection Switch Duration - Line";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-otm2-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-OTU" {
-            description
-              "Coding Violations - OTU ";
-          }
-          enum "ES-OTU" {
-            description
-              "Errored Seconds - OTU";
-          }
-          enum "SES-OTU" {
-            description
-              "Severely Errored Seconds - OTU";
-          }
-          enum "SEFS-OTU" {
-            description
-              "Severely Errored Framing Seconds - OTU";
-          }
-          enum "FEC-OTU" {
-            description
-              "Forward Error Correction - OTU";
-          }
-          enum "HCCS-OTU" {
-            description
-              "High Correction Count Seconds - OTU";
-          }
-          enum "CV-ODU" {
-            description
-              "Coding Violations - ODU";
-          }
-          enum "ES-ODU" {
-            description
-              "Errored Seconds - ODU";
-          }
-          enum "SES-ODU" {
-            description
-              "Severely Errored Seconds - ODU";
-          }
-          enum "UAS-ODU" {
-            description
-              "Unavailable Seconds - ODU ";
-          }
-          enum "FC-ODU" {
-            description
-              "Failure Count - ODU";
-          }
-          enum "DMMIN-ODU" {
-            description
-              "Delay Measurement Min - ODU ";
-          }
-          enum "DMMAX-ODU" {
-            description
-              "Delay Measurement Max - ODU ";
-          }
-          enum "DMAVG-ODU" {
-            description
-              "Delay Measurement Avg - ODU ";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical Power Transmit - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized - Optical Channel";
-          }
-          enum "PFBERE-OTU" {
-            description
-              "Post-FEC Bit Error Rate Estimate - OTU";
-          }
-          enum "PRFBER-OTU" {
-            description
-              "Pre-FEC Bit Error Rate - OTU";
-          }
-          enum "PRFBERMAX-OTU" {
-            description
-              "Pre-FEC Bit Max Error Rate - OTU";
-          }
-          enum "PSCW-ODU" {
-            description
-              "Protection Switch Count - Working";
-          }
-          enum "PSCP-ODU" {
-            description
-              "Protection Switch Count - Protection";
-          }
-          enum "PSD-ODU" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "QMIN-OTU" {
-            description
-              "Minimum Q - OTU";
-          }
-          enum "QMAX-OTU" {
-            description
-              "Maximum Q - OTU";
-          }
-          enum "QAVG-OTU" {
-            description
-              "Average Q - OTU";
-          }
-          enum "QSTDEV-OTU" {
-            description
-              "Q Standard Deviation - OTU";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf otm2aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM2Aid";
-            enum "OTM2";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU ";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Correction - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU ";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU ";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU ";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimate - OTU";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-otm3-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-OTU" {
-            description
-              "Coding Violations - OTU ";
-          }
-          enum "ES-OTU" {
-            description
-              "Errored Seconds - OTU";
-          }
-          enum "SES-OTU" {
-            description
-              "Severely Errored Seconds - OTU";
-          }
-          enum "SEFS-OTU" {
-            description
-              "Severely Errored Framing Seconds - OTU";
-          }
-          enum "FEC-OTU" {
-            description
-              "Forward Error Corrections - OTU";
-          }
-          enum "HCCS-OTU" {
-            description
-              "High Correction Count Seconds - OTU";
-          }
-          enum "PFBERE-OTU" {
-            description
-              "Post-FEC Bit Error Rate Estimate - OTU";
-          }
-          enum "PRFBER-OTU" {
-            description
-              "Pre-FEC Bit Error Rate - OTU";
-          }
-          enum "PRFBERMAX-OTU" {
-            description
-              "Pre-FEC Bit Max Error Rate - OTU";
-          }
-          enum "CV-ODU" {
-            description
-              "Coding Violations - ODU";
-          }
-          enum "ES-ODU" {
-            description
-              "Errored Seconds - ODU";
-          }
-          enum "SES-ODU" {
-            description
-              "Severely Errored Seconds - ODU";
-          }
-          enum "UAS-ODU" {
-            description
-              "Unavailable Seconds - ODU ";
-          }
-          enum "FC-ODU" {
-            description
-              "Failure Count - ODU";
-          }
-          enum "DMMIN-ODU" {
-            description
-              "Delay Measurement Min - ODU ";
-          }
-          enum "DMMAX-ODU" {
-            description
-              "Delay Measurement Max - ODU ";
-          }
-          enum "DMAVG-ODU" {
-            description
-              "Delay Measurement Avg - ODU ";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical Power Transmit - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized - Optical Channel";
-          }
-          enum "OPRLOW-OCH" {
-            description
-              "Lowest optical power received";
-          }
-          enum "OPRNLOW-OCH" {
-            description
-              "Lowest optical power received (normalized).";
-          }
-          enum "OPRHIGH-OCH" {
-            description
-              "Highest optical power received";
-          }
-          enum "OPRNHIGH-OCH" {
-            description
-              "Highest optical power received (normalized).";
-          }
-          enum "OPTLOW-OCH" {
-            description
-              "Lowest optical power transmitted";
-          }
-          enum "OPTNLOW-OCH" {
-            description
-              "Lowest optical power transmitted (normalized)";
-          }
-          enum "OPTHIGH-OCH" {
-            description
-              "Highest optical power transmitted";
-          }
-          enum "OPTNHIGH-OCH" {
-            description
-              "Highest optical power transmitted (normalized)";
-          }
-          enum "OPR-OTS" {
-            description
-              "Optical Power Received - Optical Transport Section ";
-          }
-          enum "OPRMIN-OTS" {
-            description
-              "Optical Power Receive Min - Optical Transport Section";
-          }
-          enum "OPRMAX-OTS" {
-            description
-              "Optical Power Receive Max - Optical Transport Section";
-          }
-          enum "OPRAVG-OTS" {
-            description
-              "Optical Power Receive Avg - Optical Transport Section";
-          }
-          enum "OPRN-OTS" {
-            description
-              "Optical Power Receive - Normalized - Optical Transport Section";
-          }
-          enum "PSCW-ODU" {
-            description
-              "Protection Switch Count - Working";
-          }
-          enum "PSCP-ODU" {
-            description
-              "Protection Switch Count - Protection";
-          }
-          enum "PSD-ODU" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "DGDAVG-OCH" {
-            description
-              "Differential Group Delay (Average), Optical Channel";
-          }
-          enum "DGDMAX-OCH" {
-            description
-              "Differential Group Delay (Max), Optical Channel";
-          }
-          enum "QMIN-OTU" {
-            description
-              "Minimum Q - OTU";
-          }
-          enum "QMAX-OTU" {
-            description
-              "Maximum Q - OTU";
-          }
-          enum "QAVG-OTU" {
-            description
-              "Average Q - OTU";
-          }
-          enum "QSTDEV-OTU" {
-            description
-              "Q Standard Deviation - OTU";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf otm3aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM3Aid";
-            enum "OTM3";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU ";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Corrections - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimate - OTU";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU ";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU ";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU ";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized).";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized).";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized)";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized)";
-            }
-            enum "OPR-OTS" {
-              description
-                "Optical Power Received - Optical Transport Section ";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Optical Power Receive Min - Optical Transport Section";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Optical Power Receive Max - Optical Transport Section";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Optical Power Receive Avg - Optical Transport Section";
-            }
-            enum "OPRN-OTS" {
-              description
-                "Optical Power Receive - Normalized - Optical Transport Section";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "DGDAVG-OCH" {
-              description
-                "Differential Group Delay (Average), Optical Channel";
-            }
-            enum "DGDMAX-OCH" {
-              description
-                "Differential Group Delay (Max), Optical Channel";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-otm-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-OTU" {
-            description
-              "Coding Violations - OTU ";
-          }
-          enum "ES-OTU" {
-            description
-              "Errored Seconds - OTU";
-          }
-          enum "SES-OTU" {
-            description
-              "Severely Errored Seconds - OTU";
-          }
-          enum "SEFS-OTU" {
-            description
-              "Severely Errored Framing Seconds - OTU";
-          }
-          enum "FEC-OTU" {
-            description
-              "Forward Error Corrections - OTU";
-          }
-          enum "HCCS-OTU" {
-            description
-              "High Correction Count Seconds - OTU";
-          }
-          enum "PFBERE-OTU" {
-            description
-              "Post-FEC Bit Error Rate Estimate - OTU";
-          }
-          enum "PRFBER-OTU" {
-            description
-              "Pre-FEC Bit Error Rate - OTU";
-          }
-          enum "PRFBERMAX-OTU" {
-            description
-              "Pre-FEC Bit Max Error Rate - OTU";
-          }
-          enum "CV-ODU" {
-            description
-              "Coding Violations - ODU";
-          }
-          enum "ES-ODU" {
-            description
-              "Errored Seconds - ODU";
-          }
-          enum "SES-ODU" {
-            description
-              "Severely Errored Seconds - ODU";
-          }
-          enum "UAS-ODU" {
-            description
-              "Unavailable Seconds - ODU ";
-          }
-          enum "FC-ODU" {
-            description
-              "Failure Count - ODU";
-          }
-          enum "DMMIN-ODU" {
-            description
-              "Delay Measurement Min - ODU ";
-          }
-          enum "DMMAX-ODU" {
-            description
-              "Delay Measurement Max - ODU ";
-          }
-          enum "DMAVG-ODU" {
-            description
-              "Delay Measurement Avg - ODU ";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical Power Transmit - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized - Optical Channel";
-          }
-          enum "OPRLOW-OCH" {
-            description
-              "Lowest optical power received";
-          }
-          enum "OPRNLOW-OCH" {
-            description
-              "Lowest optical power received (normalized).";
-          }
-          enum "OPRHIGH-OCH" {
-            description
-              "Highest optical power received";
-          }
-          enum "OPRNHIGH-OCH" {
-            description
-              "Highest optical power received (normalized).";
-          }
-          enum "OPTLOW-OCH" {
-            description
-              "Lowest optical power transmitted";
-          }
-          enum "OPTNLOW-OCH" {
-            description
-              "Lowest optical power transmitted (normalized)";
-          }
-          enum "OPTHIGH-OCH" {
-            description
-              "Highest optical power transmitted";
-          }
-          enum "OPTNHIGH-OCH" {
-            description
-              "Highest optical power transmitted (normalized)";
-          }
-          enum "OPR-OTS" {
-            description
-              "Optical Power Received - Optical Transport Section ";
-          }
-          enum "OPRMIN-OTS" {
-            description
-              "Optical Power Receive Min - Optical Transport Section";
-          }
-          enum "OPRMAX-OTS" {
-            description
-              "Optical Power Receive Max - Optical Transport Section";
-          }
-          enum "OPRAVG-OTS" {
-            description
-              "Optical Power Receive Avg - Optical Transport Section";
-          }
-          enum "OPRN-OTS" {
-            description
-              "Optical Power Receive - Normalized - Optical Transport Section";
-          }
-          enum "PSCW-ODU" {
-            description
-              "Protection Switch Count - Working";
-          }
-          enum "PSCP-ODU" {
-            description
-              "Protection Switch Count - Protection";
-          }
-          enum "PSD-ODU" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "DGDAVG-OCH" {
-            description
-              "Differential Group Delay (Average), Optical Channel";
-          }
-          enum "DGDMAX-OCH" {
-            description
-              "Differential Group Delay (Max), Optical Channel";
-          }
-          enum "QMIN-OTU" {
-            description
-              "Minimum Q - OTU";
-          }
-          enum "QMAX-OTU" {
-            description
-              "Maximum Q - OTU";
-          }
-          enum "QAVG-OTU" {
-            description
-              "Average Q - OTU";
-          }
-          enum "QSTDEV-OTU" {
-            description
-              "Q Standard Deviation - OTU";
-          }
-          enum "UNCFECBLK-OTU" {
-            description
-              "Uncorrected FEC Block - OTU";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf otmaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM3Aid";
-            enum "OTM";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU ";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Corrections - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimate - OTU";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU ";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU ";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU ";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized).";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized).";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized)";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized)";
-            }
-            enum "OPR-OTS" {
-              description
-                "Optical Power Received - Optical Transport Section ";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Optical Power Receive Min - Optical Transport Section";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Optical Power Receive Max - Optical Transport Section";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Optical Power Receive Avg - Optical Transport Section";
-            }
-            enum "OPRN-OTS" {
-              description
-                "Optical Power Receive - Normalized - Optical Transport Section";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "DGDAVG-OCH" {
-              description
-                "Differential Group Delay (Average), Optical Channel";
-            }
-            enum "DGDMAX-OCH" {
-              description
-                "Differential Group Delay (Max), Optical Channel";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "UNCFECBLK-OTU" {
-              description
-                "Uncorrected FEC Block - OTU";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-eth10g-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer, NEND RCV/TRMT supported";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-          }
-          enum "INFRAMES-E" {
-            description
-              "Number of frames received (binned OM) - Ethernet, NEND RCV supported";
-          }
-          enum "INFRAMESERR-E" {
-            description
-              "Number of errored frames received.";
-          }
-          enum "OUTFRAMES-E" {
-            description
-              "Number of frames transmitted (binned OM) - Ethernet, NEND TRMT supported";
-          }
-          enum "FCSERR-E" {
-            description
-              "Frame Check Sequence Errors (binned OM) - Ethernet";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive - Optical Channel";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical Power Transmit - Optical Channel, NEND TRMT supported";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized - Optical Channel, NEND TRMT supported";
-          }
-          enum "ES-E" {
-            description
-              "ETH Errored seconds.";
-          }
-          enum "SES-E" {
-            description
-              "ETH Severely Errored Seconds.";
-          }
-          enum "UAS-E" {
-            description
-              "ETH Unavailable Seconds.";
-          }
-          enum "OUTFRAMESERR-E" {
-            description
-              "Total egress direction ETH frames transmitted with FCS errors.";
-          }
-          enum "DFR-E" {
-            description
-              "Total frames discarded for any reason other than FCS errors (Rx and Tx).";
-          }
-          enum "INFRAMESDISCDS-E" {
-            description
-              "Ingress frames discarded due to congestion or policing.";
-          }
-          enum "OUTFRAMESDISCDS-E" {
-            description
-              "Egress frames discarded due to congestion or policing.";
-          }
-          enum "UTLMIN-E" {
-            description
-              "Percent Bandwidth Utilization Min";
-          }
-          enum "UTLMAX-E" {
-            description
-              "Percent Bandwidth Utilization Max";
-          }
-          enum "UTLAVG-E" {
-            description
-              "Percent Bandwidth Utilization Avg";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf eth10g {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH10G";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer, NEND RCV/TRMT supported";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Number of frames received (binned OM) - Ethernet, NEND RCV supported";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Number of errored frames received.";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Number of frames transmitted (binned OM) - Ethernet, NEND TRMT supported";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors (binned OM) - Ethernet";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel, NEND TRMT supported";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel, NEND TRMT supported";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds.";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds.";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds.";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors.";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx).";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing.";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing.";
-            }
-            enum "UTLMIN-E" {
-              description
-                "Percent Bandwidth Utilization Min";
-            }
-            enum "UTLMAX-E" {
-              description
-                "Percent Bandwidth Utilization Max";
-            }
-            enum "UTLAVG-E" {
-              description
-                "Percent Bandwidth Utilization Avg";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-eth100-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "ES-E" {
-            description
-              "ETH Errored seconds (RX)";
-          }
-          enum "SES-E" {
-            description
-              "ETH Severely Errored Seconds (Rx)";
-          }
-          enum "UAS-E" {
-            description
-              "ETH Unavailable Seconds (Rx)";
-          }
-          enum "INFRAMES-E" {
-            description
-              "Total ETH frames received";
-          }
-          enum "INFRAMESERR-E" {
-            description
-              "Total ETH frames received with errors";
-          }
-          enum "OUTFRAMES-E" {
-            description
-              "Total ETH frames transmitted";
-          }
-          enum "OUTFRAMESERR-E" {
-            description
-              "Total egress direction ETH frames transmitted with FCS errors";
-          }
-          enum "DFR-E" {
-            description
-              "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-          }
-          enum "INFRAMESDISCDS-E" {
-            description
-              "Ingress frames discarded due to congestion or policing";
-          }
-          enum "OUTFRAMESDISCDS-E" {
-            description
-              "Egress frames discarded due to congestion or policing";
-          }
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical power received";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical power received (normalized).";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical power transmitted";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical power transmitted (normalized)";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf eth {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH100";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical power received";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical power received (normalized).";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical power transmitted (normalized)";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-ethn-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer";
-          }
-          enum "FEC-PMA" {
-            description
-              "Forward Error Corrections - Physical Medium Attachment";
-          }
-          enum "FECCCW-PMA" {
-            description
-              "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-          }
-          enum "FECUNCCW-PMA" {
-            description
-              "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-          }
-          enum "HCCS-PMA" {
-            description
-              "High Correction Count Second - Physical Medium Attachment";
-          }
-          enum "PRFBER-PMA" {
-            description
-              "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-          }
-          enum "PRFBERMAX-PMA" {
-            description
-              "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-          }
-          enum "ES-E" {
-            description
-              "ETH Errored seconds (RX)";
-          }
-          enum "SES-E" {
-            description
-              "ETH Severely Errored Seconds (Rx)";
-          }
-          enum "UAS-E" {
-            description
-              "ETH Unavailable Seconds (Rx)";
-          }
-          enum "INFRAMES-E" {
-            description
-              "Total ETH frames received";
-          }
-          enum "INFRAMESERR-E" {
-            description
-              "Total ETH frames received with errors";
-          }
-          enum "INFRAMESDISCDS-E" {
-            description
-              "Ingress frames discarded due to congestion or policing";
-          }
-          enum "DFR-E" {
-            description
-              "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-          }
-          enum "OUTFRAMES-E" {
-            description
-              "Total ETH frames transmitted";
-          }
-          enum "OUTFRAMESERR-E" {
-            description
-              "Total egress direction ETH frames transmitted with FCS errors";
-          }
-          enum "OUTFRAMESDISCDS-E" {
-            description
-              "Egress frames discarded due to congestion or policing";
-          }
-          enum "FCSERR-E" {
-            description
-              "Frame Check Sequence Errors";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical power received";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical power received (normalized).";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical power transmitted";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical power transmitted";
-          }
-          enum "OPRLOW-OCH" {
-            description
-              "Lowest optical power received";
-          }
-          enum "OPRNLOW-OCH" {
-            description
-              "Lowest optical power received (normalized).";
-          }
-          enum "OPRHIGH-OCH" {
-            description
-              "Highest optical power received";
-          }
-          enum "OPRNHIGH-OCH" {
-            description
-              "Highest optical power received (normalized).";
-          }
-          enum "OPTLOW-OCH" {
-            description
-              "Lowest optical power transmitted";
-          }
-          enum "OPTNLOW-OCH" {
-            description
-              "Lowest optical power transmitted (normalized)";
-          }
-          enum "OPTHIGH-OCH" {
-            description
-              "Highest optical power transmitted";
-          }
-          enum "OPTNHIGH-OCH" {
-            description
-              "Highest optical power transmitted (normalized)";
-          }
-          enum "UTLMIN-E" {
-            description
-              "Percent Bandwidth Utilization Min";
-          }
-          enum "UTLMAX-E" {
-            description
-              "Percent Bandwidth Utilization Max";
-          }
-          enum "UTLAVG-E" {
-            description
-              "Percent Bandwidth Utilization Avg";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf ethn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETHN";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "FEC-PMA" {
-              description
-                "Forward Error Corrections - Physical Medium Attachment";
-            }
-            enum "FECCCW-PMA" {
-              description
-                "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-            }
-            enum "FECUNCCW-PMA" {
-              description
-                "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-            }
-            enum "HCCS-PMA" {
-              description
-                "High Correction Count Second - Physical Medium Attachment";
-            }
-            enum "PRFBER-PMA" {
-              description
-                "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-            }
-            enum "PRFBERMAX-PMA" {
-              description
-                "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical power received";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical power received (normalized).";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized).";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized).";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized)";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized)";
-            }
-            enum "UTLMIN-E" {
-              description
-                "Percent Bandwidth Utilization Min";
-            }
-            enum "UTLMAX-E" {
-              description
-                "Percent Bandwidth Utilization Max";
-            }
-            enum "UTLAVG-E" {
-              description
-                "Percent Bandwidth Utilization Avg";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-eth-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer";
-          }
-          enum "ES-E" {
-            description
-              "ETH Errored seconds (RX)";
-          }
-          enum "SES-E" {
-            description
-              "ETH Severely Errored Seconds (Rx)";
-          }
-          enum "UAS-E" {
-            description
-              "ETH Unavailable Seconds (Rx)";
-          }
-          enum "INFRAMES-E" {
-            description
-              "Total ETH frames received";
-          }
-          enum "INFRAMESERR-E" {
-            description
-              "Total ETH frames received with errors";
-          }
-          enum "OUTFRAMES-E" {
-            description
-              "Total ETH frames transmitted";
-          }
-          enum "OUTFRAMESERR-E" {
-            description
-              "Total egress direction ETH frames transmitted with FCS errors";
-          }
-          enum "DFR-E" {
-            description
-              "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-          }
-          enum "INFRAMESDISCDS-E" {
-            description
-              "Ingress frames discarded due to congestion or policing";
-          }
-          enum "OUTFRAMESDISCDS-E" {
-            description
-              "Egress frames discarded due to congestion or policing";
-          }
-          enum "REMOTEINFRAMES-E" {
-            description
-              "Remote In Frames";
-          }
-          enum "REMOTEOUTFRAMES-E" {
-            description
-              "Remote Out Frames";
-          }
-          enum "REMOTEINFRAMESERR-E" {
-            description
-              "Remote In Frames Err";
-          }
-          enum "REMOTEOUTFRAMESDISCDS-E" {
-            description
-              "Remote Out Frames Disc";
-          }
-          enum "REMOTEFCSERR-E" {
-            description
-              "Remote FCS Err";
-          }
-          enum "PSD-E" {
-            description
-              "Protection Switch Duration - Ethernet";
-          }
-          enum "PSCW-E" {
-            description
-              "Protection Switch Count - Working - Ethernet";
-          }
-          enum "PSCP-E" {
-            description
-              "Protection Switch Count - Protection - Ethernet";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical power received";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical power received (normalized).";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical power transmitted";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical power transmitted (normalized)";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-          enum "ES" {
-            description
-              "Errored Seconds";
-          }
-          enum "SES" {
-            description
-              "Severely Errored Seconds";
-          }
-          enum "UAS" {
-            description
-              "Unavailable Seconds";
-          }
-          enum "INFRAMES" {
-            description
-              "Number of frames received (binned OM)";
-          }
-          enum "INFRAMESERR" {
-            description
-              "Number of errored frames received (binned OM)";
-          }
-          enum "INFRAMESDISCDS" {
-            description
-              "Number of received frames discarded (binned OM)";
-          }
-          enum "OUTFRAMES" {
-            description
-              "Number of frames transmitted (binned OM)";
-          }
-          enum "FRTOOLONGS" {
-            description
-              "Number of frames too long";
-          }
-          enum "FRTOOSHORT" {
-            description
-              "Number of frames too short";
-          }
-          enum "INMACCONTROLFR" {
-            description
-              "Number of Ethernet control frames received (discarded or not)";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf eth {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "REMOTEINFRAMES-E" {
-              description
-                "Remote In Frames";
-            }
-            enum "REMOTEOUTFRAMES-E" {
-              description
-                "Remote Out Frames";
-            }
-            enum "REMOTEINFRAMESERR-E" {
-              description
-                "Remote In Frames Err";
-            }
-            enum "REMOTEOUTFRAMESDISCDS-E" {
-              description
-                "Remote Out Frames Disc";
-            }
-            enum "REMOTEFCSERR-E" {
-              description
-                "Remote FCS Err";
-            }
-            enum "PSD-E" {
-              description
-                "Protection Switch Duration - Ethernet";
-            }
-            enum "PSCW-E" {
-              description
-                "Protection Switch Count - Working - Ethernet";
-            }
-            enum "PSCP-E" {
-              description
-                "Protection Switch Count - Protection - Ethernet";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical power received";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical power received (normalized).";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical power transmitted (normalized)";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-            enum "ES" {
-              description
-                "Errored Seconds";
-            }
-            enum "SES" {
-              description
-                "Severely Errored Seconds";
-            }
-            enum "UAS" {
-              description
-                "Unavailable Seconds";
-            }
-            enum "INFRAMES" {
-              description
-                "Number of frames received (binned OM)";
-            }
-            enum "INFRAMESERR" {
-              description
-                "Number of errored frames received (binned OM)";
-            }
-            enum "INFRAMESDISCDS" {
-              description
-                "Number of received frames discarded (binned OM)";
-            }
-            enum "OUTFRAMES" {
-              description
-                "Number of frames transmitted (binned OM)";
-            }
-            enum "FRTOOLONGS" {
-              description
-                "Number of frames too long";
-            }
-            enum "FRTOOSHORT" {
-              description
-                "Number of frames too short";
-            }
-            enum "INMACCONTROLFR" {
-              description
-                "Number of Ethernet control frames received (discarded or not)";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-fiber-channel-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf fc {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-PCS" {
-            description
-              "Coding Violation - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Second - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Second - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Second - Physical Coding Sublayer";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical Power Transmit";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf fc {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "FC";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violation - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Second - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Second - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Second - Physical Coding Sublayer";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-flex-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer";
-          }
-          enum "ES-E" {
-            description
-              "ETH Errored seconds (RX)";
-          }
-          enum "SES-E" {
-            description
-              "ETH Severely Errored Seconds (Rx)";
-          }
-          enum "UAS-E" {
-            description
-              "ETH Unavailable Seconds (Rx)";
-          }
-          enum "INFRAMES-E" {
-            description
-              "Total ETH frames received";
-          }
-          enum "INFRAMESERR-E" {
-            description
-              "Total ETH frames received with errors";
-          }
-          enum "OUTFRAMES-E" {
-            description
-              "Total ETH frames transmitted";
-          }
-          enum "OUTFRAMESERR-E" {
-            description
-              "Total egress direction ETH frames transmitted with FCS errors";
-          }
-          enum "DFR-E" {
-            description
-              "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-          }
-          enum "INFRAMESDISCDS-E" {
-            description
-              "Ingress frames discarded due to congestion or policing";
-          }
-          enum "OUTFRAMESDISCDS-E" {
-            description
-              "Egress frames discarded due to congestion or policing";
-          }
-          enum "FCSERR-E" {
-            description
-              "Frame Check Sequence Errors (binned OM) - Ethernet";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical power received";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical power received (normalized).";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical power transmitted";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Power Transmit Min - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Power Transmit Max - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Power Transmit Avg - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical power transmitted (normalized)";
-          }
-          enum "PSD-E" {
-            description
-              "Protection Switch Duration - Ethernet";
-          }
-          enum "PSCW-E" {
-            description
-              "Protection Switch Count - Working - Ethernet";
-          }
-          enum "PSCP-E" {
-            description
-              "Protection Switch Count - Protection - Ethernet";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf flex {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "FLEX";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors (binned OM) - Ethernet";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical power received";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical power received (normalized).";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical power transmitted (normalized)";
-            }
-            enum "PSD-E" {
-              description
-                "Protection Switch Duration - Ethernet";
-            }
-            enum "PSCW-E" {
-              description
-                "Protection Switch Count - Working - Ethernet";
-            }
-            enum "PSCP-E" {
-              description
-                "Protection Switch Count - Protection - Ethernet";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-wan-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "ES-W" {
-            description
-              "WAN Errored seconds (RX)";
-          }
-          enum "SES-W" {
-            description
-              "WAN Severely Errored Seconds (Rx)";
-          }
-          enum "UAS-W" {
-            description
-              "WAN Unavailable Seconds (Rx)";
-          }
-          enum "INFRAMES-W" {
-            description
-              "Total WAN frames received";
-          }
-          enum "INFRAMESERR-W" {
-            description
-              "Total WAN frames received with errors";
-          }
-          enum "OUTFRAMES-W" {
-            description
-              "Total WAN frames transmitted";
-          }
-          enum "OUTFRAMESERR-W" {
-            description
-              "Out Frames Error Count, WAN";
-          }
-          enum "DFR-W" {
-            description
-              "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-          }
-          enum "UTL-W" {
-            description
-              "Average WAN link Utilization (Rx and Tx)";
-          }
-          enum "UTLMX-W" {
-            description
-              "Maximum (peak) WAN link Utilization (Rx and Tx)";
-          }
-          enum "LDS-W" {
-            description
-              "LCAS Degraded Second - WAN (Rx and Tx directions)";
-          }
-          enum "LSDS-W" {
-            description
-              "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-          }
-          enum "LUAS-W" {
-            description
-              "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf wan {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "WAN";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "ES-W" {
-              description
-                "WAN Errored seconds (RX)";
-            }
-            enum "SES-W" {
-              description
-                "WAN Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-W" {
-              description
-                "WAN Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-W" {
-              description
-                "Total WAN frames received";
-            }
-            enum "INFRAMESERR-W" {
-              description
-                "Total WAN frames received with errors";
-            }
-            enum "OUTFRAMES-W" {
-              description
-                "Total WAN frames transmitted";
-            }
-            enum "OUTFRAMESERR-W" {
-              description
-                "Out Frames Error Count, WAN";
-            }
-            enum "DFR-W" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "UTL-W" {
-              description
-                "Average WAN link Utilization (Rx and Tx)";
-            }
-            enum "UTLMX-W" {
-              description
-                "Maximum (peak) WAN link Utilization (Rx and Tx)";
-            }
-            enum "LDS-W" {
-              description
-                "LCAS Degraded Second - WAN (Rx and Tx directions)";
-            }
-            enum "LSDS-W" {
-              description
-                "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-            }
-            enum "LUAS-W" {
-              description
-                "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-otm3-pmconfig {
-    description
-      "Retrieve PM Configuration information: this command retrieves PM configuration data for a monitored entity.";
-    input {
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf attribute {
-        default "ALL";
-        type enumeration {
-          enum "HCCSREF" {
-            description
-              "Margin in dBQ relative to a post FEC BER of 1E-15. (floating point value)";
-          }
-          enum "ALL" {
-            description
-              "All applicable attributes.";
-          }
-        }
-        description
-          "Profile information";
-      }
-    }
-    output {
-      list output {
-        leaf otm3aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value representing the margin in dBQ relative to a post FEC BER of 1E-15.";
-        }
-      }
-    }
-  }
-  rpc pm-show-otm-pmconfig {
-    description
-      "Retrieve PM Configuration information: this command retrieves PM configuration data for a monitored entity.";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf attribute {
-        default "ALL";
-        type enumeration {
-          enum "HCCSREF" {
-            description
-              "Margin in dBQ relative to a post FEC BER of 1E-15. (floating point value)";
-          }
-          enum "ALL" {
-            description
-              "All applicable attributes.";
-          }
-        }
-        description
-          "Profile information";
-      }
-    }
-    output {
-      list output {
-        leaf otmaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value representing the margin in dBQ relative to a post FEC BER of 1E-15.";
-        }
-      }
-    }
-  }
-  rpc pm-show-ethn-pmconfig {
-    description
-      "Retrieve PM Configuration information: this command retrieves PM configuration data for a monitored entity.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf attribute {
-        default "ALL";
-        type enumeration {
-          enum "HCCSREF" {
-            description
-              "Margin in dBQ relative to a post FEC BER of 1E-12. (floating point value)";
-          }
-          enum "ALL" {
-            description
-              "All applicable attributes.";
-          }
-        }
-        description
-          "Profile information";
-      }
-    }
-    output {
-      list output {
-        leaf ethn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value representing the margin in dBQ relative to a post FEC BER of 1E-15.";
-        }
-      }
-    }
-  }
-  rpc pm-show-osc-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf osc {
-        mandatory true;
-        description
-          "AID in format OSC-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prfl-info {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-prfl-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf osc {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OSC";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:OSC_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-prfl-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-oc3-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf oc3 {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport, SHELF-shelf-ALL, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf oc3 {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OC3";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:OCn_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "The provisioned threshold level for montype";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-otm2-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf otm2aid {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM2";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:OTM2_TH_MONTYPE_resp;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-otm3-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message";
-    input {
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf otm3aid {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM3";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:OTM3_TH_MONTYPE_resp;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-otm-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf otmaid {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:OTM_TH_MONTYPE_resp;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-eth10g-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf eth10g {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH10G";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:ETH10G_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-eth-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf eth {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf mon-type {
-          type ciena-6500-enums:ETH_SET_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-eth100-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf ethn {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH100";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf mon-type {
-          type ciena-6500-enums:ETH_SET_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-ethn-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf ethn {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETHN";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:ETHN_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-fiber-channel-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf fc {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type enumeration {
-          enum "PROFILE1" {
-            description
-              "PM Profile 1";
-          }
-          enum "PROFILE2" {
-            description
-              "PM Profile 2";
-          }
-          enum "PROFILE3" {
-            description
-              "PM Profile 3";
-          }
-          enum "PROFILE4" {
-            description
-              "PM Profile 4";
-          }
-          enum "DFLT" {
-            description
-              "ALLOFF - ALL Source Profiles OFF";
-          }
-          enum "ALLOFF" {
-            description
-              "ALL PM Profiles OFF";
-          }
-          enum "FACTORYDFLT" {
-            description
-              "Factory DeFauLT PM Profile";
-          }
-          enum "ALLPROFILES" {
-            description
-              "All Source Profiles";
-          }
-        }
-        description
-          "SRCPRFLID";
-      }
-    }
-    output {
-      list output {
-        leaf fc {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "FC";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:FC_TH_MONTYPE_resp;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type enumeration {
-            enum "PROFILE1" {
-              description
-                "PM Profile 1";
-            }
-            enum "PROFILE2" {
-              description
-                "PM Profile 2";
-            }
-            enum "PROFILE3" {
-              description
-                "PM Profile 3";
-            }
-            enum "PROFILE4" {
-              description
-                "PM Profile 4";
-            }
-            enum "DFLT" {
-              description
-                "ALLOFF - ALL Source Profiles OFF";
-            }
-            enum "ALLOFF" {
-              description
-                "ALL PM Profiles OFF";
-            }
-            enum "FACTORYDFLT" {
-              description
-                "Factory DeFauLT PM Profile";
-            }
-            enum "ALLPROFILES" {
-              description
-                "All Source Profiles";
-            }
-          }
-          mandatory true;
-          description
-            "SRCPRFLID";
-        }
-      }
-    }
-  }
-  rpc pm-show-flex-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type enumeration {
-          enum "PROFILE1" {
-            description
-              "PM Profile 1";
-          }
-          enum "PROFILE2" {
-            description
-              "PM Profile 2";
-          }
-          enum "PROFILE3" {
-            description
-              "PM Profile 3";
-          }
-          enum "PROFILE4" {
-            description
-              "PM Profile 4";
-          }
-          enum "DFLT" {
-            description
-              "ALLOFF - ALL Source Profiles OFF";
-          }
-          enum "ALLOFF" {
-            description
-              "ALL PM Profiles OFF";
-          }
-          enum "FACTORYDFLT" {
-            description
-              "Factory DeFauLT PM Profile";
-          }
-          enum "ALLPROFILES" {
-            description
-              "All Source Profiles";
-          }
-        }
-        description
-          "SRCPRFLID";
-      }
-    }
-    output {
-      list output {
-        leaf flex {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "FLEX";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:FLEX_TH_MONTYPE_resp;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type enumeration {
-            enum "PROFILE1" {
-              description
-                "PM Profile 1";
-            }
-            enum "PROFILE2" {
-              description
-                "PM Profile 2";
-            }
-            enum "PROFILE3" {
-              description
-                "PM Profile 3";
-            }
-            enum "PROFILE4" {
-              description
-                "PM Profile 4";
-            }
-            enum "DFLT" {
-              description
-                "ALLOFF - ALL Source Profiles OFF";
-            }
-            enum "ALLOFF" {
-              description
-                "ALL PM Profiles OFF";
-            }
-            enum "FACTORYDFLT" {
-              description
-                "Factory DeFauLT PM Profile";
-            }
-            enum "ALLPROFILES" {
-              description
-                "All Source Profiles";
-            }
-          }
-          mandatory true;
-          description
-            "SRCPRFLID";
-        }
-      }
-    }
-  }
-  rpc pm-show-wan-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf wan {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "WAN";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:WAN_MONTYPE_resp;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-set-osc-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf osc {
-        mandatory true;
-        description
-          "AID in format OSC-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OSC_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "";
-      }
-      leaf src-prfl-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-prfl-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-oc3-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf oc3 {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport, SHELF-shelf-ALL, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OCn_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-otm2-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OTM2_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-otm3-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters";
-    input {
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OTM3_SET_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element (default value is both RCV+TRMT on 6500).";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-otm-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:OTM_SET_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data (default value 15-MIN).";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-eth10g-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:ETH10G_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-eth-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ETH_SET_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-eth100-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ETH_SET_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-ethn-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:ETHN_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-fiber-channel-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf fc {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:FC_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-flex-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:FLEX_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-wan-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:WAN_SET_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-reset-cos {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf cos {
-        mandatory true;
-        description
-          "AID in format COSST-shelf-slot-port, COSBR-shelf-slot-port, COSSL-shelf-slot-port, COSGD-shelf-slot-port, COSPL-shelf-slot-port, COSPR-shelf-slot-port, COSNW-shelf-slot-port, COSCR-shelf-slot-port, COSA-shelf-slot-port, COSBC-shelf-slot-port, COSBE-shelf-slot-port, COSC-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:COS_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:STRING;
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-show-cos {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf cos {
-        mandatory true;
-        description
-          "AID in format COSST-shelf-slot-port, COSBR-shelf-slot-port, COSSL-shelf-slot-port, COSGD-shelf-slot-port, COSPL-shelf-slot-port, COSPR-shelf-slot-port, COSNW-shelf-slot-port, COSCR-shelf-slot-port, COSA-shelf-slot-port, COSBC-shelf-slot-port, COSBE-shelf-slot-port, COSC-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:COS_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf cos {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "COS";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type ciena-6500-enums:COS_MONTYPE;
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-chmon-counts {
-    description
-      "Retrieve performance data for CHMON entries.";
-    input {
-      leaf chmon {
-        mandatory true;
-        description
-          "AID in format CHMON-shelf-slot-port-wavelength, CHMON-shelf-ALL, CHMON-shelf-slot-ALL, CHMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "OPT-OCH" {
-            description
-              "Optical Channel Power Transmit.";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Channel Power Transmit Minimum.";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Channel Power Transmit Maximum.";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Channel Power Transmit Average.";
-          }
-          enum "ALL";
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf chmon {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "CHMON";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "OPT-OCH" {
-              description
-                "Optical Channel Power Transmit.";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Channel Power Transmit Minimum.";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Channel Power Transmit Maximum.";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Channel Power Transmit Average.";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-chmon {
-    description
-      "Reset performance data for CHMON entries.";
-    input {
-      leaf chmon {
-        mandatory true;
-        description
-          "AID in format CHMON-shelf-slot-port-wavelength, CHMON-shelf-ALL, CHMON-shelf-slot-ALL, CHMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:CHMON_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:STRING;
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-chmon-threshold {
-    description
-      "Set Threshold for CHMON entries";
-    input {
-      leaf chmon {
-        mandatory true;
-        description
-          "AID in format CHMON-shelf-slot-port-wavelength, CHMON-shelf-ALL, CHMON-shelf-slot-ALL, CHMON-shelf-slot-port-ALL, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:CHMON_TH_MONTYPE_set;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_TH_PHT;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "Destination profile id";
-      }
-    }
-  }
-  rpc pm-show-chmon-threshold {
-    description
-      "Retrieve Profiles for CHMON entries";
-    input {
-      leaf chmon {
-        mandatory true;
-        description
-          "AID in format CHMON-shelf-slot-port-wavelength, CHMON-shelf-ALL, CHMON-shelf-slot-ALL, CHMON-shelf-slot-port-ALL, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "profile info";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "";
-      }
-    }
-    output {
-      list output {
-        leaf chmon {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:AIDTYPE;
-          description
-            "Type of AID";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:CHMON_TH_MONTYPE_resp;
-          description
-            "Monitored parameter";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP_PHT;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "Threshold level";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_TH_PHT;
-          description
-            "Accumulation time period of data.";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:PMProfile;
-          description
-            "";
-        }
-      }
-    }
-  }
-  rpc pm-show-sdmon {
-    description
-      "Retrieve performance data for SDMON entries.";
-    input {
-      leaf sdmonaid {
-        mandatory true;
-        description
-          "AID in format SDMON-shelf-slot-port-frequency, SDMON-shelf-ALL, SDMON-shelf-slot-ALL, SDMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:SDMON_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf sdmonaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "SDMON";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type ciena-6500-enums:SDMON_MONTYPE;
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf time-period {
-          type ciena-6500-enums:TMPER;
-          description
-            "Accumulation time period of data";
-        }
-        leaf mon-dat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf mon-time {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-sdmon {
-    description
-      "Capture baseline performance data for SDMON entries";
-    input {
-      leaf sdmonaid {
-        mandatory true;
-        description
-          "AID in format SDMON-shelf-slot-port-frequency, SDMON-shelf-ALL, SDMON-shelf-slot-ALL, SDMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf montype {
-        default "ALL";
-        type ciena-6500-enums:SDMON_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-show-otdrcfg-counts {
-    description
-      "Retrieve performance data and baseline for OTDRCFG entries";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port, OTDRCFG-shelf-slot-ALL, OTDRCFG-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "EVCSH-OTS" {
-            description
-              "Event Count Short";
-          }
-          enum "EVCSHMAX-OTS" {
-            description
-              "Event Count Short - MAX";
-          }
-          enum "EVCLG-OTS" {
-            description
-              "Event Count Long";
-          }
-          enum "EVCLGMAX-OTS" {
-            description
-              "Event Count Long - MAX";
-          }
-          enum "MAXEVLDISSH-OTS" {
-            description
-              "Maximum Event Loss Distance Short";
-          }
-          enum "MAXEVLDISSHMAX-OTS" {
-            description
-              "Maximum Event Loss Distance Short - MAX";
-          }
-          enum "MAXEVLDISLG-OTS" {
-            description
-              "Maximum Event Loss Distance Long";
-          }
-          enum "MAXEVLDISLGMAX-OTS" {
-            description
-              "Maximum Event Loss Distance Long - MAX";
-          }
-          enum "MAXEVRDISSH-OTS" {
-            description
-              "Maximum Event Reflection Distance Short";
-          }
-          enum "MAXEVRDISSHMAX-OTS" {
-            description
-              "Maximum Event Reflection Distance Short - MAX";
-          }
-          enum "MAXEVRDISLG-OTS" {
-            description
-              "Maximum Event Reflection Distance Long";
-          }
-          enum "MAXEVRDISLGMAX-OTS" {
-            description
-              "Maximum Event Reflection Distance Long - MAX";
-          }
-          enum "MAXEVLSH-OTS" {
-            description
-              "Maximum Event Loss Short";
-          }
-          enum "MAXEVLSHMAX-OTS" {
-            description
-              "Maximum Event Loss Short - MAX";
-          }
-          enum "MAXEVLLG-OTS" {
-            description
-              "Maximum Event Loss Long";
-          }
-          enum "MAXEVLLGMAX-OTS" {
-            description
-              "Maximum Event Loss Long - MAX";
-          }
-          enum "MAXEVRSH-OTS" {
-            description
-              "Maximum Event Reflection Short";
-          }
-          enum "MAXEVRSHMAX-OTS" {
-            description
-              "Maximum Event Reflection Short - MAX";
-          }
-          enum "MAXEVRLG-OTS" {
-            description
-              "Maximum Event Reflection Long";
-          }
-          enum "MAXEVRLGMAX-OTS" {
-            description
-              "Maximum Event Reflection Long - MAX";
-          }
-          enum "CUMEVLSH-OTS" {
-            description
-              "Cumulative Event Loss Short";
-          }
-          enum "CUMEVLSHMAX-OTS" {
-            description
-              "Cumulative Event Loss Short MAX";
-          }
-          enum "CUMEVLLG-OTS" {
-            description
-              "Cumulative Event Loss Long";
-          }
-          enum "CUMEVLLGMAX-OTS" {
-            description
-              "Cumulative Event Loss Long MAX";
-          }
-          enum "CUMEVRSH-OTS" {
-            description
-              "Cumulative Event Reflection Short";
-          }
-          enum "CUMEVRSHMAX-OTS" {
-            description
-              "Cumulative Event Reflection Short MAX";
-          }
-          enum "CUMEVRLG-OTS" {
-            description
-              "Cumulative Event Reflection Long";
-          }
-          enum "CUMEVRLGMAX-OTS" {
-            description
-              "Cumulative Event Reflection Long MAX";
-          }
-          enum "ALL";
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-      leaf trex-url {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trex-frmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf otdrcfg {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTDRCFG";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "EVCSH-OTS" {
-              description
-                "Event Count Short";
-            }
-            enum "EVCSHMAX-OTS" {
-              description
-                "Event Count Short - MAX";
-            }
-            enum "EVCLG-OTS" {
-              description
-                "Event Count Long";
-            }
-            enum "EVCLGMAX-OTS" {
-              description
-                "Event Count Long - MAX";
-            }
-            enum "MAXEVLDISSH-OTS" {
-              description
-                "Maximum Event Loss Distance Short";
-            }
-            enum "MAXEVLDISSHMAX-OTS" {
-              description
-                "Maximum Event Loss Distance Short - MAX";
-            }
-            enum "MAXEVLDISLG-OTS" {
-              description
-                "Maximum Event Loss Distance Long";
-            }
-            enum "MAXEVLDISLGMAX-OTS" {
-              description
-                "Maximum Event Loss Distance Long - MAX";
-            }
-            enum "MAXEVRDISSH-OTS" {
-              description
-                "Maximum Event Reflection Distance Short";
-            }
-            enum "MAXEVRDISSHMAX-OTS" {
-              description
-                "Maximum Event Reflection Distance Short - MAX";
-            }
-            enum "MAXEVRDISLG-OTS" {
-              description
-                "Maximum Event Reflection Distance Long";
-            }
-            enum "MAXEVRDISLGMAX-OTS" {
-              description
-                "Maximum Event Reflection Distance Long - MAX";
-            }
-            enum "MAXEVLSH-OTS" {
-              description
-                "Maximum Event Loss Short";
-            }
-            enum "MAXEVLSHMAX-OTS" {
-              description
-                "Maximum Event Loss Short - MAX";
-            }
-            enum "MAXEVLLG-OTS" {
-              description
-                "Maximum Event Loss Long";
-            }
-            enum "MAXEVLLGMAX-OTS" {
-              description
-                "Maximum Event Loss Long - MAX";
-            }
-            enum "MAXEVRSH-OTS" {
-              description
-                "Maximum Event Reflection Short";
-            }
-            enum "MAXEVRSHMAX-OTS" {
-              description
-                "Maximum Event Reflection Short - MAX";
-            }
-            enum "MAXEVRLG-OTS" {
-              description
-                "Maximum Event Reflection Long";
-            }
-            enum "MAXEVRLGMAX-OTS" {
-              description
-                "Maximum Event Reflection Long - MAX";
-            }
-            enum "CUMEVLSH-OTS" {
-              description
-                "Cumulative Event Loss Short";
-            }
-            enum "CUMEVLSHMAX-OTS" {
-              description
-                "Cumulative Event Loss Short MAX";
-            }
-            enum "CUMEVLLG-OTS" {
-              description
-                "Cumulative Event Loss Long";
-            }
-            enum "CUMEVLLGMAX-OTS" {
-              description
-                "Cumulative Event Loss Long MAX";
-            }
-            enum "CUMEVRSH-OTS" {
-              description
-                "Cumulative Event Reflection Short";
-            }
-            enum "CUMEVRSHMAX-OTS" {
-              description
-                "Cumulative Event Reflection Short MAX";
-            }
-            enum "CUMEVRLG-OTS" {
-              description
-                "Cumulative Event Reflection Long";
-            }
-            enum "CUMEVRLGMAX-OTS" {
-              description
-                "Cumulative Event Reflection Long MAX";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf time-period {
-          type ciena-6500-enums:TMPER;
-          description
-            "Accumulation time period of data.";
-        }
-        leaf mon-dat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf mon-time {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-      }
-    }
-  }
-  rpc pm-reset-otdrcfg {
-    description
-      "Reset performance data for OTDRCFG entries";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port, OTDRCFG-shelf-slot-ALL, OTDRCFG-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf montype {
-        type ciena-6500-enums:OTDRCFG_PM_MONTYPE;
-        default "ALL";
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-enums:INDEX;
-            description
-              "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-otdrcfg-threshold {
-    description
-      "Set Threshold for OTDRCFG entries";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port, OTDRCFG-shelf-slot-ALL, OTDRCFG-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf montype {
-        type ciena-6500-enums:OTDRCFG_TH_MONTYPE_set;
-        default "ALL";
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf tmper {
-        default "1-UNT";
-        type ciena-6500-enums:TMPER_TH_PHT;
-        description
-          "Accumulation time period of data.";
-      }
-      leaf src-prfl-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "Source profile ID";
-      }
-      leaf dest-prfl-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "Destination profile ID";
-      }
-    }
-  }
-  rpc pm-show-otdrcfg-threshold {
-    description
-      "Retrieve Profiles for OTDRCFG entries";
-    input {
-      leaf otdrcfg {
-        mandatory true;
-        description
-          "AID in format OTDRCFG-shelf-slot-port, OTDRCFG-shelf-slot-ALL, OTDRCFG-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list prfl-info {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "profile info";
-      }
-      leaf-list src-prfl-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf otdrcfg {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTDRCFG";
-          }
-          description
-            "Type of AID";
-        }
-        leaf montype {
-          type ciena-6500-enums:OTDRCFG_TH_MONTYPE_resp;
-          default "ALL";
-          description
-            "Monitored parameter";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP_PHT;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "Threshold level";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_TH_PHT;
-          description
-            "Accumulation time period of data.";
-        }
-        leaf-list src-prfl-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-nmcmon-counts {
-    description
-      "Retrieve performance data for flexible NMC channels.";
-    input {
-      leaf nmcmonaid {
-        mandatory true;
-        description
-          "AID in format NMCMON-shelf-slot-port-frequency, NMCMON-shelf-ALL, NMCMON-shelf-slot-ALL, NMCMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "OPT-OCH" {
-            description
-              "Optical Channel Power Transmit.";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Optical Channel Power Transmit Minimum.";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Optical Channel Power Transmit Maximum.";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Optical Channel Power Transmit Average.";
-          }
-          enum "ALL";
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf nmcmonaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "NMCMON";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "OPT-OCH" {
-              description
-                "Optical Channel Power Transmit.";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Channel Power Transmit Minimum.";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Channel Power Transmit Maximum.";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Channel Power Transmit Average.";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf portmode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-nmcmon {
-    description
-      "Reset performance data for flexible NMC channels.";
-    input {
-      leaf nmcmonaid {
-        mandatory true;
-        description
-          "AID in format NMCMON-shelf-slot-port-frequency, NMCMON-shelf-ALL, NMCMON-shelf-slot-ALL, NMCMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:NMCMON_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:STRING;
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-nmcmon-threshold {
-    description
-      "Set Threshold for NMCMON entries";
-    input {
-      leaf nmcmon {
-        mandatory true;
-        description
-          "AID in format NMCMON-shelf-slot-port-frequency, NMCMON-shelf-ALL, NMCMON-shelf-slot-ALL, NMCMON-shelf-slot-port-ALL, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:NMCMON_TH_MONTYPE_set;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT_PHT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "1-UNT";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data.";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "Destination profile id";
-      }
-    }
-  }
-  rpc pm-show-nmcmon-threshold {
-    description
-      "Retrieve Profiles for NMCMON entries";
-    input {
-      leaf nmcmon {
-        mandatory true;
-        description
-          "AID in format NMCMON-shelf-slot-port-frequency, NMCMON-shelf-ALL, NMCMON-shelf-slot-ALL, NMCMON-shelf-slot-port-ALL, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "profile info";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "";
-      }
-    }
-    output {
-      list output {
-        leaf nmcmon {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-enums:AIDTYPE;
-          description
-            "Type of AID";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:NMCMON_TH_MONTYPE_resp;
-          description
-            "Monitored parameter";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP_PHT;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "Threshold level";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data.";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:PMProfile;
-          description
-            "";
-        }
-      }
-    }
-  }
-  rpc pm-show-ptp-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive - Optical Channel";
-          }
-          enum "OPT-OCH" {
-            description
-              "Optical Power Transmit - Optical Channel";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized - Optical Channel";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Average Optical Power Transmit - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Minimum Optical Power Transmit - Optical Channel";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Maximum Optical Power Transmit - Optical Channel";
-          }
-          enum "DGDAVG-OCH" {
-            description
-              "Differential Group Delay (Average) - Optical Channel";
-          }
-          enum "DGDMAX-OCH" {
-            description
-              "Differential Group Delay (Max) - Optical Channel";
-          }
-          enum "OPRLOW-OCH" {
-            description
-              "Lowest optical power received - Optical Channel";
-          }
-          enum "OPTLOW-OCH" {
-            description
-              "Lowest optical power transmitted - Optical Channel";
-          }
-          enum "OPRNLOW-OCH" {
-            description
-              "Lowest optical power received (normalized) - Optical Channel";
-          }
-          enum "OPTNLOW-OCH" {
-            description
-              "Lowest optical power transmitted (normalized) - Optical Channel";
-          }
-          enum "OPRHIGH-OCH" {
-            description
-              "Highest optical power received - Optical Channel";
-          }
-          enum "OPTHIGH-OCH" {
-            description
-              "Highest optical power transmitted - Optical Channel";
-          }
-          enum "OPRNHIGH-OCH" {
-            description
-              "Highest optical power received (normalized) - Optical Channel";
-          }
-          enum "OPTNHIGH-OCH" {
-            description
-              "Highest optical power transmitted (normalized) - Optical Channel";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Minimum Optical Power Receive - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Maximum Optical Power Receive - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Average Optical Power Receive - Optical Channel";
-          }
-          enum "OPR-OTS" {
-            description
-              "Optical Power Received - Optical Transport Section";
-          }
-          enum "OPRN-OTS" {
-            description
-              "Optical Power Received (normalized) - Optical Transport Section";
-          }
-          enum "OPRMIN-OTS" {
-            description
-              "Total Optical Power Received (Minimum) - Optical Transport Section";
-          }
-          enum "OPRMAX-OTS" {
-            description
-              "Total Optical Power Received (Maximum) - Optical Transport Section";
-          }
-          enum "OPRAVG-OTS" {
-            description
-              "Total Optical Power Received (Average) - Optical Transport Section";
-          }
-          enum "OPR-OTSI" {
-            description
-              "Optical Power Receive- OTSI";
-          }
-          enum "OPT-OTSI" {
-            description
-              "Optical Power Transmit- OTSI";
-          }
-          enum "OPRN-OTSI" {
-            description
-              "Normalized Optical Power Receive- OTSI";
-          }
-          enum "OPTN-OTSI" {
-            description
-              "Normalized Optical Power Transmit- OTSI";
-          }
-          enum "OPRAVG-OTSI" {
-            description
-              "Optical Power Receive, Average - OTSI";
-          }
-          enum "OPRMIN-OTSI" {
-            description
-              "Optical Power Receive, Minimum - OTSI";
-          }
-          enum "OPRMAX-OTSI" {
-            description
-              "Optical Power Receive, Maximum - OTSI";
-          }
-          enum "OPTAVG-OTSI" {
-            description
-              "Optical Power Transmit, Average - OTSI";
-          }
-          enum "OPTMIN-OTSI" {
-            description
-              "Optical Power Transmit, Minimum - OTSI";
-          }
-          enum "OPTMAX-OTSI" {
-            description
-              "Optical Power Transmit, Maximum - OTSI";
-          }
-          enum "DGDAVG-OTSI" {
-            description
-              "Differential Group Delay (Average) OTSI";
-          }
-          enum "DGDMAX-OTSI" {
-            description
-              "Differential Group Delay (Maximum) OTSI";
-          }
-          enum "PDLAVG-OTSI" {
-            description
-              "Polarization Dependent Loss, Average - OTSI";
-          }
-          enum "PDLMAX-OTSI" {
-            description
-              "Polarization Dependent Loss, Maximum - OTSI";
-          }
-          enum "HCCS-OTSI" {
-            description
-              "High Correction Count Seconds - OTSI";
-          }
-          enum "FEC-OTSI" {
-            description
-              "FEC Corrections - OTSI";
-          }
-          enum "PRFBER-OTSI" {
-            description
-              "Post-FEC BER - OTSI";
-          }
-          enum "PRFBERMAX-OTSI" {
-            description
-              "Pre-FEC BER Maximum - OTSI";
-          }
-          enum "QMIN-OTSI" {
-            description
-              "Q MIN - OTSI";
-          }
-          enum "QMAX-OTSI" {
-            description
-              "Q MAX - OTSI";
-          }
-          enum "QAVG-OTSI" {
-            description
-              "Q AVG - OTSI";
-          }
-          enum "QSTDEV-OTSI" {
-            description
-              "Q StDev - OTSI";
-          }
-          enum "UNCFECBLK-OTSI" {
-            description
-              "Uncorrected FEC Block - OTSI";
-          }
-          enum "OSNRMIN-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Minimum) OTSI";
-          }
-          enum "OSNRMAX-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Maximum) OTSI";
-          }
-          enum "OSNRAVG-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Average) OTSI";
-          }
-          enum "ESNRMIN-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Minimum) OTSI";
-          }
-          enum "ESNRMAX-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Maximum) OTSI";
-          }
-          enum "ESNRAVG-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Average) OTSI";
-          }
-          enum "CDMIN-OTSI" {
-            description
-              "Dispersion compensation (Minimum) OTSI";
-          }
-          enum "CDMAX-OTSI" {
-            description
-              "Dispersion compensation (Maximum) OTSI";
-          }
-          enum "CDAVG-OTSI" {
-            description
-              "Dispersion compensation (Average) OTSI";
-          }
-          enum "PSCW-OTS" {
-            description
-              "Protection Switch Count Working";
-          }
-          enum "PSCP-OTS" {
-            description
-              "Protection Switch Count Protection";
-          }
-          enum "PSD-OTS" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf ptp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "PTP";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Average Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Minimum Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Maximum Optical Power Transmit - Optical Channel";
-            }
-            enum "DGDAVG-OCH" {
-              description
-                "Differential Group Delay (Average) - Optical Channel";
-            }
-            enum "DGDMAX-OCH" {
-              description
-                "Differential Group Delay (Max) - Optical Channel";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received - Optical Channel";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted - Optical Channel";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized) - Optical Channel";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized) - Optical Channel";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received - Optical Channel";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted - Optical Channel";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized) - Optical Channel";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized) - Optical Channel";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Minimum Optical Power Receive - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Maximum Optical Power Receive - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Average Optical Power Receive - Optical Channel";
-            }
-            enum "OPR-OTS" {
-              description
-                "Optical Power Received - Optical Transport Section";
-            }
-            enum "OPRN-OTS" {
-              description
-                "Optical Power Received (normalized) - Optical Transport Section";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Total Optical Power Received (Minimum) - Optical Transport Section";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Total Optical Power Received (Maximum) - Optical Transport Section";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Total Optical Power Received (Average) - Optical Transport Section";
-            }
-            enum "OPR-OTSI" {
-              description
-                "Optical Power Receive- OTSI";
-            }
-            enum "OPT-OTSI" {
-              description
-                "Optical Power Transmit- OTSI";
-            }
-            enum "OPRN-OTSI" {
-              description
-                "Normalized Optical Power Receive- OTSI";
-            }
-            enum "OPTN-OTSI" {
-              description
-                "Normalized Optical Power Transmit- OTSI";
-            }
-            enum "OPRAVG-OTSI" {
-              description
-                "Optical Power Receive, Average - OTSI";
-            }
-            enum "OPRMIN-OTSI" {
-              description
-                "Optical Power Receive, Minimum - OTSI";
-            }
-            enum "OPRMAX-OTSI" {
-              description
-                "Optical Power Receive, Maximum - OTSI";
-            }
-            enum "OPTAVG-OTSI" {
-              description
-                "Optical Power Transmit, Average - OTSI";
-            }
-            enum "OPTMIN-OTSI" {
-              description
-                "Optical Power Transmit, Minimum - OTSI";
-            }
-            enum "OPTMAX-OTSI" {
-              description
-                "Optical Power Transmit, Maximum - OTSI";
-            }
-            enum "DGDAVG-OTSI" {
-              description
-                "Differential Group Delay (Average) OTSI";
-            }
-            enum "DGDMAX-OTSI" {
-              description
-                "Differential Group Delay (Maximum) OTSI";
-            }
-            enum "PDLAVG-OTSI" {
-              description
-                "Polarization Dependent Loss, Average - OTSI";
-            }
-            enum "PDLMAX-OTSI" {
-              description
-                "Polarization Dependent Loss, Maximum - OTSI";
-            }
-            enum "HCCS-OTSI" {
-              description
-                "High Correction Count Seconds - OTSI";
-            }
-            enum "FEC-OTSI" {
-              description
-                "FEC Corrections - OTSI";
-            }
-            enum "PRFBER-OTSI" {
-              description
-                "Post-FEC BER - OTSI";
-            }
-            enum "PRFBERMAX-OTSI" {
-              description
-                "Pre-FEC BER Maximum - OTSI";
-            }
-            enum "QMIN-OTSI" {
-              description
-                "Q MIN - OTSI";
-            }
-            enum "QMAX-OTSI" {
-              description
-                "Q MAX - OTSI";
-            }
-            enum "QAVG-OTSI" {
-              description
-                "Q AVG - OTSI";
-            }
-            enum "QSTDEV-OTSI" {
-              description
-                "Q StDev - OTSI";
-            }
-            enum "UNCFECBLK-OTSI" {
-              description
-                "Uncorrected FEC Block - OTSI";
-            }
-            enum "OSNRMIN-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Minimum) OTSI";
-            }
-            enum "OSNRMAX-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Maximum) OTSI";
-            }
-            enum "OSNRAVG-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Average) OTSI";
-            }
-            enum "ESNRMIN-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Minimum) OTSI";
-            }
-            enum "ESNRMAX-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Maximum) OTSI";
-            }
-            enum "ESNRAVG-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Average) OTSI";
-            }
-            enum "CDMIN-OTSI" {
-              description
-                "Dispersion compensation (Minimum) OTSI";
-            }
-            enum "CDMAX-OTSI" {
-              description
-                "Dispersion compensation (Maximum) OTSI";
-            }
-            enum "CDAVG-OTSI" {
-              description
-                "Dispersion compensation (Average) OTSI";
-            }
-            enum "PSCW-OTS" {
-              description
-                "Protection Switch Count Working";
-            }
-            enum "PSCP-OTS" {
-              description
-                "Protection Switch Count Protection";
-            }
-            enum "PSD-OTS" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-ptp {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:PTP_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type enumeration {
-          enum "0" {
-            description
-              "Reset baselines";
-          }
-          enum "INIT" {
-            description
-              "Init baselines";
-          }
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-ptp-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:PTP_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location (default value is both NEND+FEND on 6500).";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element (default value is both RCV+TRMT on 6500).";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-show-ptp-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf ptp {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "PTP";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:PTP_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-otuttp-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf otuttp {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-OTU" {
-            description
-              "Coding Violations - OTU ";
-          }
-          enum "ES-OTU" {
-            description
-              "Errored Seconds - OTU";
-          }
-          enum "SES-OTU" {
-            description
-              "Severely Errored Seconds - OTU";
-          }
-          enum "SEFS-OTU" {
-            description
-              "Severely Errored Framing Seconds - OTU";
-          }
-          enum "FEC-OTU" {
-            description
-              "Forward Error Corrections - OTU";
-          }
-          enum "HCCS-OTU" {
-            description
-              "High Correction Count Seconds - OTU";
-          }
-          enum "PFBERE-OTU" {
-            description
-              "Post-FEC Bit Error Rate Estimate - OTU";
-          }
-          enum "PRFBER-OTU" {
-            description
-              "Pre-FEC Bit Error Rate - OTU";
-          }
-          enum "PRFBERMAX-OTU" {
-            description
-              "Pre-FEC Bit Max Error Rate - OTU";
-          }
-          enum "IAE-OTU" {
-            description
-              "Incoming Alignment Error - OTU";
-          }
-          enum "QMIN-OTU" {
-            description
-              "Minimum Q - OTU";
-          }
-          enum "QMAX-OTU" {
-            description
-              "Maximum Q - OTU";
-          }
-          enum "QAVG-OTU" {
-            description
-              "Average Q - OTU";
-          }
-          enum "QSTDEV-OTU" {
-            description
-              "Q Standard Deviation - OTU";
-          }
-          enum "UNCFECBLK-OTU" {
-            description
-              "Uncorrected FEC Block - OTU";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf otuttp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTUTTP";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU ";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Corrections - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimate - OTU";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "IAE-OTU" {
-              description
-                "Incoming Alignment Error - OTU";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "UNCFECBLK-OTU" {
-              description
-                "Uncorrected FEC Block - OTU";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-otuttp {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf otuttp {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:OTUTTP_MONTYPE_resp;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-otuttp-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf otuttp {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:OTUTTP_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-show-otuttp-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf otuttp {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf otuttp {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTUTTP";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf mon-type {
-          type ciena-6500-enums:OTUTTP_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-sttp-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-S" {
-            description
-              "Coding Violations - Section";
-          }
-          enum "ES-S" {
-            description
-              "Errored Seconds - Section";
-          }
-          enum "SES-S" {
-            description
-              "Severely Errored Seconds - Section";
-          }
-          enum "SEFS-S" {
-            description
-              "Severely Errored Frame Seconds - Section";
-          }
-          enum "CV-L" {
-            description
-              "Coding Violations - Line";
-          }
-          enum "ES-L" {
-            description
-              "Errored Seconds - Line";
-          }
-          enum "SES-L" {
-            description
-              "Severely Errored Seconds - Line";
-          }
-          enum "UAS-L" {
-            description
-              "Unavailable Seconds - Line";
-          }
-          enum "FC-L" {
-            description
-              "Failure Count - Line";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf sttp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "STTP";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-S" {
-              description
-                "Coding Violations - Section";
-            }
-            enum "ES-S" {
-              description
-                "Errored Seconds - Section";
-            }
-            enum "SES-S" {
-              description
-                "Severely Errored Seconds - Section";
-            }
-            enum "SEFS-S" {
-              description
-                "Severely Errored Frame Seconds - Section";
-            }
-            enum "CV-L" {
-              description
-                "Coding Violations - Line";
-            }
-            enum "ES-L" {
-              description
-                "Errored Seconds - Line";
-            }
-            enum "SES-L" {
-              description
-                "Severely Errored Seconds - Line";
-            }
-            enum "UAS-L" {
-              description
-                "Unavailable Seconds - Line";
-            }
-            enum "FC-L" {
-              description
-                "Failure Count - Line";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-sttp {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:STTP_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-sttp-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:STTP_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-show-sttp-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf sttp {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "STTP";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:STTP_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-ettp-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer";
-          }
-          enum "ES-E" {
-            description
-              "ETH Errored seconds (RX)";
-          }
-          enum "SES-E" {
-            description
-              "ETH Severely Errored Seconds (Rx)";
-          }
-          enum "UAS-E" {
-            description
-              "ETH Unavailable Seconds (Rx)";
-          }
-          enum "FEC-PMA" {
-            description
-              "Forward Error Corrections - Physical Medium Attachment";
-          }
-          enum "FECCCW-PMA" {
-            description
-              "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-          }
-          enum "FECUNCCW-PMA" {
-            description
-              "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-          }
-          enum "HCCS-PMA" {
-            description
-              "High Correction Count Second - Physical Medium Attachment";
-          }
-          enum "PRFBER-PMA" {
-            description
-              "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-          }
-          enum "PRFBERMAX-PMA" {
-            description
-              "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-          }
-          enum "INFRAMES-E" {
-            description
-              "Total ETH frames received";
-          }
-          enum "INFRAMESERR-E" {
-            description
-              "Total ETH frames received with errors";
-          }
-          enum "INFRAMESDISCDS-E" {
-            description
-              "Ingress frames discarded due to congestion or policing";
-          }
-          enum "DFR-E" {
-            description
-              "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-          }
-          enum "OUTFRAMES-E" {
-            description
-              "Total ETH frames transmitted";
-          }
-          enum "OUTFRAMESERR-E" {
-            description
-              "Total egress direction ETH frames transmitted with FCS errors";
-          }
-          enum "OUTFRAMESDISCDS-E" {
-            description
-              "Egress frames discarded due to congestion or policing";
-          }
-          enum "FCSERR-E" {
-            description
-              "Frame Check Sequence Errors";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf ettp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETTP";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "FEC-PMA" {
-              description
-                "Forward Error Corrections - Physical Medium Attachment";
-            }
-            enum "FECCCW-PMA" {
-              description
-                "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-            }
-            enum "FECUNCCW-PMA" {
-              description
-                "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-            }
-            enum "HCCS-PMA" {
-              description
-                "High Correction Count Second - Physical Medium Attachment";
-            }
-            enum "PRFBER-PMA" {
-              description
-                "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-            }
-            enum "PRFBERMAX-PMA" {
-              description
-                "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-ettp {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ETTP_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-ettp-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:ETTP_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-show-ettp-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf ettp {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETTP";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:ETTP_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-ettp-pmconfig {
-    description
-      "Retrieve PM Configuration information: this command retrieves PM configuration data for a monitored entity.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf attribute {
-        type enumeration {
-          enum "HCCSREF" {
-            description
-              "Margin in dBQ relative to a post FEC BER of 1E-12. (floating point value)";
-          }
-          enum "ALL" {
-            description
-              "All applicable attributes.";
-          }
-        }
-        description
-          "Profile information";
-      }
-    }
-    output {
-      list output {
-        leaf ettp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value representing the margin in dBQ relative to a post FEC BER of 1E-15.";
-        }
-      }
-    }
-  }
-  rpc pm-show-odu-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf odu {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU2-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU1-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-ODU" {
-            description
-              "Coding Violations - ODU";
-          }
-          enum "ES-ODU" {
-            description
-              "Errored Seconds - ODU";
-          }
-          enum "SES-ODU" {
-            description
-              "Severely Errored Seconds - ODU";
-          }
-          enum "UAS-ODU" {
-            description
-              "Unavailable Seconds - ODU ";
-          }
-          enum "FC-ODU" {
-            description
-              "Failure Count - ODU";
-          }
-          enum "PSCW-ODU" {
-            description
-              "Protection Switch Count - Working";
-          }
-          enum "PSCP-ODU" {
-            description
-              "Protection Switch Count - Protection";
-          }
-          enum "PSD-ODU" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf odu {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODU";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf portmode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-show-oduttp-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-ODU" {
-            description
-              "Coding Violations - ODU";
-          }
-          enum "ES-ODU" {
-            description
-              "Errored Seconds - ODU";
-          }
-          enum "SES-ODU" {
-            description
-              "Severely Errored Seconds - ODU";
-          }
-          enum "UAS-ODU" {
-            description
-              "Unavailable Seconds - ODU ";
-          }
-          enum "FC-ODU" {
-            description
-              "Failure Count - ODU";
-          }
-          enum "DMMIN-ODU" {
-            description
-              "Delay Measurement Min - ODU";
-          }
-          enum "DMMAX-ODU" {
-            description
-              "Delay Measurement Max - ODU";
-          }
-          enum "DMAVG-ODU" {
-            description
-              "Delay Measurement Avg - ODU";
-          }
-          enum "PSCW-ODU" {
-            description
-              "Protection Switch Count - Working";
-          }
-          enum "PSCP-ODU" {
-            description
-              "Protection Switch Count - Protection";
-          }
-          enum "PSD-ODU" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf oduttp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODUTTP";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-odu {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf odu {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU2-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU1-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ODU_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-reset-oduttp {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ODUTTP_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-odu-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf odu {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU2-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU1-shelf-slot-port-index, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:ODU_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-set-oduttp-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ODUTTP_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location.";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-show-odu-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf odu {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU2-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU1-shelf-slot-port-index, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf odu {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODU";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:ODU_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-oduttp-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf oduttp {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODUTTP";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf mon-type {
-          type ciena-6500-enums:ODUTTP_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-oductp-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-ODU" {
-            description
-              "Coding Violations - ODU";
-          }
-          enum "ES-ODU" {
-            description
-              "Errored Seconds - ODU";
-          }
-          enum "SES-ODU" {
-            description
-              "Severely Errored Seconds - ODU";
-          }
-          enum "UAS-ODU" {
-            description
-              "Unavailable Seconds - ODU ";
-          }
-          enum "FC-ODU" {
-            description
-              "Failure Count - ODU";
-          }
-          enum "DMMIN-ODU" {
-            description
-              "Delay Measurement Min - ODU";
-          }
-          enum "DMMAX-ODU" {
-            description
-              "Delay Measurement Max - ODU";
-          }
-          enum "DMAVG-ODU" {
-            description
-              "Delay Measurement Avg - ODU";
-          }
-          enum "PSCW-ODU" {
-            description
-              "Protection Switch Count - Working";
-          }
-          enum "PSCP-ODU" {
-            description
-              "Protection Switch Count - Protection";
-          }
-          enum "PSD-ODU" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf oductp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODUCTP";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-oductp {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ODUCTP_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-oductp-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:ODUCTP_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-show-oductp-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf oductp {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODUCTP";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf mon-type {
-          type ciena-6500-enums:ODUCTP_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-tcm-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf tcm {
-        mandatory true;
-        description
-          "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type enumeration {
-          enum "CV-TCM" {
-            description
-              "Coding Violations - TCM";
-          }
-          enum "ES-TCM" {
-            description
-              "Errored Seconds - TCM";
-          }
-          enum "SES-TCM" {
-            description
-              "Severely Errored Seconds - TCM";
-          }
-          enum "UAS-TCM" {
-            description
-              "Unavailable Seconds - TCM ";
-          }
-          enum "FC-TCM" {
-            description
-              "Failure Count - TCM";
-          }
-          enum "PSCW-TCM" {
-            description
-              "Protection Switch Count, Working - TCM";
-          }
-          enum "PSCP-TCM" {
-            description
-              "Protection Switch Count, Protection - TCM";
-          }
-          enum "PSD-TCM" {
-            description
-              "Protection Switch Duration - TCM";
-          }
-          enum "DMMIN-TCM" {
-            description
-              "Delay Measurement Min - TCM";
-          }
-          enum "DMMAX-TCM" {
-            description
-              "Delay Measurement Max - TCM";
-          }
-          enum "DMAVG-TCM" {
-            description
-              "Delay Measurement Avg - TCM";
-          }
-          enum "IAE-TCM" {
-            description
-              "Incoming Alignment Error - TCM";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf tcm {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "TCM";
-          }
-          description
-            "AID type";
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-TCM" {
-              description
-                "Coding Violations - TCM";
-            }
-            enum "ES-TCM" {
-              description
-                "Errored Seconds - TCM";
-            }
-            enum "SES-TCM" {
-              description
-                "Severely Errored Seconds - TCM";
-            }
-            enum "UAS-TCM" {
-              description
-                "Unavailable Seconds - TCM ";
-            }
-            enum "FC-TCM" {
-              description
-                "Failure Count - TCM";
-            }
-            enum "PSCW-TCM" {
-              description
-                "Protection Switch Count, Working - TCM";
-            }
-            enum "PSCP-TCM" {
-              description
-                "Protection Switch Count, Protection - TCM";
-            }
-            enum "PSD-TCM" {
-              description
-                "Protection Switch Duration - TCM";
-            }
-            enum "DMMIN-TCM" {
-              description
-                "Delay Measurement Min - TCM";
-            }
-            enum "DMMAX-TCM" {
-              description
-                "Delay Measurement Max - TCM";
-            }
-            enum "DMAVG-TCM" {
-              description
-                "Delay Measurement Avg - TCM";
-            }
-            enum "IAE-TCM" {
-              description
-                "Incoming Alignment Error - TCM";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-      }
-    }
-  }
-  rpc pm-reset-tcm {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf tcm {
-        mandatory true;
-        description
-          "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:TCM_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-tcm-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf tcm {
-        mandatory true;
-        description
-          "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list montype {
-        type ciena-6500-enums:TCM_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf destprflid {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-show-tcm-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf tcm {
-        mandatory true;
-        description
-          "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf srcprflid {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf tcm {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "TCM";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf montype {
-          type ciena-6500-enums:TCM_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf srcprflid {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-cbrttp-counts {
-    description
-      "Retrieve Current/Previous Counts: this command retrieves current and historical performance data.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer";
-          }
-          enum "FEC-PCS" {
-            description
-              "Forward Error Corrections - Physical Coding Sublayer";
-          }
-          enum "FECCCW-PCS" {
-            description
-              "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-          }
-          enum "FECUNCCW-PCS" {
-            description
-              "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-          }
-          enum "HCCS-PCS" {
-            description
-              "High Correction Count Second - Physical Coding Sublayer";
-          }
-          enum "PRFBER-PCS" {
-            description
-              "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-          }
-          enum "PRFBERMAX-PCS" {
-            description
-              "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-      }
-      leaf monlev {
-        default "1-UP";
-        type ciena-6500-enums:MONLEV;
-        description
-          "Discriminating Level for requested monitored parameter. The monlev parameter does not apply to gauge readings, for example physical readings associated with the OCH and OTS layers.";
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-      leaf trexurl {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes). Example for IPv4 address: ftp://user:pass@xx.xx.xx.xx[:port]/path/filename or sftp://user:pass@xx.xx.xx.xx[:port]/path/filename. Example for IPv6 address: ftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename or sftp://user:pass@[abcd:abcd:abcd:abcd:abcd:abcd:abcd:abcd][:port]/path/filename. IPv6 address must be enclosed in []. The password cannot contain the character '@'.";
-      }
-      leaf trexfrmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf cbrttp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "CBRTTP";
-          }
-          description
-            "AID type";
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "FEC-PCS" {
-              description
-                "Forward Error Corrections - Physical Coding Sublayer";
-            }
-            enum "FECCCW-PCS" {
-              description
-                "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-            }
-            enum "FECUNCCW-PCS" {
-              description
-                "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-            }
-            enum "HCCS-PCS" {
-              description
-                "High Correction Count Second - Physical Coding Sublayer";
-            }
-            enum "PRFBER-PCS" {
-              description
-                "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-            }
-            enum "PRFBERMAX-PCS" {
-              description
-                "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-        }
-      }
-    }
-  }
-  rpc pm-reset-cbrttp {
-    description
-      "Initialize Register: This command allows you to initialize one or more storage registers or event counters associated with specific entities in the NE.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:CBRTTP_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf monval {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0";
-        }
-        description
-          "The value of the monitored PM parameter.";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element.";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPER_ALL;
-        description
-          "Accumulation time period of data";
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "(Nominal) Start date of monitoring interval (MM-DD).";
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal start time of monitoring level. HH-MM. Range = 00-00 to 23-59.";
-      }
-      choice index-choice {
-        case list {
-          leaf-list index {
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-        case range {
-          leaf index-min {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-          leaf index-max {
-            default "0";
-            type ciena-6500-types:INT {
-              range "0..32";
-            }
-            description
-              "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          }
-        }
-      }
-    }
-  }
-  rpc pm-set-cbrttp-threshold {
-    description
-      "Set Threshold: Instructs the Network Element to set the threshold levels for specified PM monitored parameters.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf-list monitor-type {
-        type ciena-6500-enums:CBRTTP_TH_MONTYPE;
-        description
-          "Monitored parameter";
-      }
-      leaf thlev {
-        type ciena-6500-types:STRING;
-        description
-          "This field must contain the desired threshold level to be set for montype. This field supports Non-negative integers (0 = disable threshold) and strings to support scientific notations such as 4E-10";
-      }
-      leaf locn {
-        default "ALL";
-        type ciena-6500-enums:LOCN_ALL;
-        description
-          "Location";
-      }
-      leaf dirn {
-        default "ALL";
-        type ciena-6500-enums:DIRN_INPUT;
-        description
-          "Direction of signal flow relative to network element";
-      }
-      leaf-list tmper {
-        type ciena-6500-enums:TMPR;
-        description
-          "Accumulation time period of data";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:PMProfile;
-        description
-          "SRCPRFLID";
-      }
-      leaf dest-profile-id {
-        type ciena-6500-enums:EdPMProfile;
-        description
-          "DESTPRFLID";
-      }
-    }
-  }
-  rpc pm-show-cbrttp-threshold {
-    description
-      "Retrieve Threshold: Instructs an NE to send the current threshold level of one or more monitored parameters for which violation will trigger an automatic message.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf prflinfo {
-        type enumeration {
-          enum "N" {
-            description
-              "do not list profile information";
-          }
-          enum "Y" {
-            description
-              "list profile information";
-          }
-        }
-        description
-          "Profile information";
-      }
-      leaf src-profile-id {
-        type ciena-6500-enums:RTRVPMProfile;
-        description
-          "Source profile ID";
-      }
-    }
-    output {
-      list output {
-        leaf cbrttp {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "CBRTTP";
-          }
-          mandatory true;
-          description
-            "AID type";
-        }
-        leaf monitor-type {
-          type ciena-6500-enums:CBRTTP_TH_MONTYPE;
-          description
-            "";
-        }
-        leaf locn {
-          type ciena-6500-enums:LOCN;
-          description
-            "Location";
-        }
-        leaf dirn {
-          type ciena-6500-enums:DIRN_RESP;
-          description
-            "Direction of signal flow relative to network element.";
-        }
-        leaf thlev {
-          type ciena-6500-types:STRING;
-          description
-            "";
-        }
-        leaf tmper {
-          type ciena-6500-enums:TMPER_MIN;
-          description
-            "Accumulation time period of data";
-        }
-        leaf src-profile-id {
-          type ciena-6500-enums:RTRVPMProfile;
-          mandatory true;
-          description
-            "Source profile ID";
-        }
-      }
-    }
-  }
-  rpc pm-show-cbrttp-pmconfig {
-    description
-      "Retrieve PM Configuration information: this command retrieves PM configuration data for a monitored entity.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf attribute {
-        type enumeration {
-          enum "HCCSREF" {
-            description
-              "Margin in dBQ relative to a post FEC BER of 1E-12. (floating point value)";
-          }
-          enum "ALL" {
-            description
-              "All applicable attributes.";
-          }
-        }
-        description
-          "Profile information";
-      }
-    }
-    output {
-      list output {
-        leaf cbrttp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value representing the margin in dBQ relative to a post FEC BER of 1E-15.";
-        }
-      }
-    }
-  }
-  container pm {
-    container amp {
-      list counts {
-        key "ampaid";
-        config false;
-        leaf ampaid {
-          mandatory true;
-          description
-            "AID in format AMP-shelf-slot-port, AMP-shelf-slot-portSsubport, AMP-shelf-slotSsubslot-portSsubport, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "AMP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "ORL-OTS" {
-              description
-                "Optical Return Loss";
-            }
-            enum "ORLMIN-OTS" {
-              description
-                "Optical Return Loss Minimum";
-            }
-            enum "ORLMAX-OTS" {
-              description
-                "Optical Return Loss Maximum";
-            }
-            enum "ORLAVG-OTS" {
-              description
-                "Optical Return Loss Average";
-            }
-            enum "OPIN-OTS" {
-              description
-                "Optical Power Input";
-            }
-            enum "OPINMIN-OTS" {
-              description
-                "Optical Power Input Minimum";
-            }
-            enum "OPINMAX-OTS" {
-              description
-                "Optical Power Input Maximum";
-            }
-            enum "OPINAVG-OTS" {
-              description
-                "Optical Power Input Average";
-            }
-            enum "OPOUT-OTS" {
-              description
-                "Optical Power Output";
-            }
-            enum "OPOUTMIN-OTS" {
-              description
-                "Optical Power Output Minimum";
-            }
-            enum "OPOUTMAX-OTS" {
-              description
-                "Optical Power Output Maximum";
-            }
-            enum "OPOUTAVG-OTS" {
-              description
-                "Optical Power Output Average";
-            }
-            enum "GRPGAIN-OTS" {
-              description
-                "Group Gain";
-            }
-            enum "GRPGAINMIN-OTS" {
-              description
-                "Group Gain Minimum";
-            }
-            enum "GRPGAINMAX-OTS" {
-              description
-                "Group Gain Maximum";
-            }
-            enum "GRPGAINAVG-OTS" {
-              description
-                "Group Gain Average";
-            }
-            enum "GRPOPIN-OTS" {
-              description
-                "Group Optical Power Input";
-            }
-            enum "GRPOPINMIN-OTS" {
-              description
-                "Group Optical Power Input Minimum";
-            }
-            enum "GRPOPINMAX-OTS" {
-              description
-                "Group Optical Power Input Maximum";
-            }
-            enum "GRPOPINAVG-OTS" {
-              description
-                "Group Optical Power Input Average";
-            }
-            enum "GRPOPOUT-OTS" {
-              description
-                "Group Optical Power Output";
-            }
-            enum "GRPOPOUTMIN-OTS" {
-              description
-                "Group Optical Power Output Minimum";
-            }
-            enum "GRPOPOUTMAX-OTS" {
-              description
-                "Group Optical Power Output Maximum";
-            }
-            enum "GRPOPOUTAVG-OTS" {
-              description
-                "Group Optical Power Output Average";
-            }
-            enum "DROPGAIN-OTS" {
-              description
-                "Drop Gain";
-            }
-            enum "DROPGAINMIN-OTS" {
-              description
-                "Drop Gain Minimum";
-            }
-            enum "DROPGAINMAX-OTS" {
-              description
-                "Drop Gain Maximum";
-            }
-            enum "DROPGAINAVG-OTS" {
-              description
-                "Drop Gain Average";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container cbrttp {
-      list counts {
-        key "cbrttp";
-        config false;
-        leaf cbrttp {
-          mandatory true;
-          description
-            "AID in format CBRTTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "CBRTTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "FEC-PCS" {
-              description
-                "Forward Error Corrections - Physical Coding Sublayer";
-            }
-            enum "FECCCW-PCS" {
-              description
-                "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-            }
-            enum "FECUNCCW-PCS" {
-              description
-                "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-            }
-            enum "HCCS-PCS" {
-              description
-                "High Correction Count Second - Physical Coding Sublayer";
-            }
-            enum "PRFBER-PCS" {
-              description
-                "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-            }
-            enum "PRFBERMAX-PCS" {
-              description
-                "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-      list pmconfig {
-        key "cbrttp";
-        config true;
-        leaf cbrttp {
-          mandatory true;
-          description
-            "AID in format CBRTTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Margin in dBQ relative to a post FEC BER of 1E-12. (floating point value)";
-          config true;
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-          config false;
-        }
-      }
-    }
-    container chmon {
-      list counts {
-        key "chmon";
-        config false;
-        leaf chmon {
-          mandatory true;
-          description
-            "AID in format CHMON-shelf-slot-port-wavelength, CHMON-shelf-ALL, CHMON-shelf-slot-ALL, CHMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "CHMON";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "OPT-OCH" {
-              description
-                "Optical Channel Power Transmit.";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Channel Power Transmit Minimum.";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Channel Power Transmit Maximum.";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Channel Power Transmit Average.";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container eth {
-      list counts {
-        key "eth";
-        config false;
-        leaf eth {
-          mandatory true;
-          description
-            "AID in format ETH-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "REMOTEINFRAMES-E" {
-              description
-                "Remote In Frames";
-            }
-            enum "REMOTEOUTFRAMES-E" {
-              description
-                "Remote Out Frames";
-            }
-            enum "REMOTEINFRAMESERR-E" {
-              description
-                "Remote In Frames Err";
-            }
-            enum "REMOTEOUTFRAMESDISCDS-E" {
-              description
-                "Remote Out Frames Disc";
-            }
-            enum "REMOTEFCSERR-E" {
-              description
-                "Remote FCS Err";
-            }
-            enum "PSD-E" {
-              description
-                "Protection Switch Duration - Ethernet";
-            }
-            enum "PSCW-E" {
-              description
-                "Protection Switch Count - Working - Ethernet";
-            }
-            enum "PSCP-E" {
-              description
-                "Protection Switch Count - Protection - Ethernet";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical power received";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical power received (normalized).";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical power transmitted (normalized)";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-            enum "ES" {
-              description
-                "Errored Seconds";
-            }
-            enum "SES" {
-              description
-                "Severely Errored Seconds";
-            }
-            enum "UAS" {
-              description
-                "Unavailable Seconds";
-            }
-            enum "INFRAMES" {
-              description
-                "Number of frames received (binned OM)";
-            }
-            enum "INFRAMESERR" {
-              description
-                "Number of errored frames received (binned OM)";
-            }
-            enum "INFRAMESDISCDS" {
-              description
-                "Number of received frames discarded (binned OM)";
-            }
-            enum "OUTFRAMES" {
-              description
-                "Number of frames transmitted (binned OM)";
-            }
-            enum "FRTOOLONGS" {
-              description
-                "Number of frames too long";
-            }
-            enum "FRTOOSHORT" {
-              description
-                "Number of frames too short";
-            }
-            enum "INMACCONTROLFR" {
-              description
-                "Number of Ethernet control frames received (discarded or not)";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container eth100 {
-      list counts {
-        key "eth";
-        config false;
-        leaf eth {
-          mandatory true;
-          description
-            "AID in format ETH100-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH100";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical power received";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical power received (normalized).";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical power transmitted (normalized)";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container eth10g {
-      list counts {
-        key "eth10g";
-        config false;
-        leaf eth10g {
-          mandatory true;
-          description
-            "AID in format ETH10G-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETH10G";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer, NEND RCV/TRMT supported";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer, NEND RCV/TRMT supported";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Number of frames received (binned OM) - Ethernet, NEND RCV supported";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Number of errored frames received.";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Number of frames transmitted (binned OM) - Ethernet, NEND TRMT supported";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors (binned OM) - Ethernet";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel, NEND TRMT supported";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel, NEND TRMT supported";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds.";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds.";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds.";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors.";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx).";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing.";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing.";
-            }
-            enum "UTLMIN-E" {
-              description
-                "Percent Bandwidth Utilization Min";
-            }
-            enum "UTLMAX-E" {
-              description
-                "Percent Bandwidth Utilization Max";
-            }
-            enum "UTLAVG-E" {
-              description
-                "Percent Bandwidth Utilization Avg";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container ethn {
-      list pmconfig {
-        key "ethn";
-        config true;
-        leaf ethn {
-          mandatory true;
-          description
-            "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value";
-          config true;
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-          config false;
-        }
-      }
-      list counts {
-        key "ethn";
-        config false;
-        leaf ethn {
-          mandatory true;
-          description
-            "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETHN";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "FEC-PMA" {
-              description
-                "Forward Error Corrections - Physical Medium Attachment";
-            }
-            enum "FECCCW-PMA" {
-              description
-                "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-            }
-            enum "FECUNCCW-PMA" {
-              description
-                "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-            }
-            enum "HCCS-PMA" {
-              description
-                "High Correction Count Second - Physical Medium Attachment";
-            }
-            enum "PRFBER-PMA" {
-              description
-                "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-            }
-            enum "PRFBERMAX-PMA" {
-              description
-                "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical power received";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical power received (normalized).";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized).";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized).";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized)";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized)";
-            }
-            enum "UTLMIN-E" {
-              description
-                "Percent Bandwidth Utilization Min";
-            }
-            enum "UTLMAX-E" {
-              description
-                "Percent Bandwidth Utilization Max";
-            }
-            enum "UTLAVG-E" {
-              description
-                "Percent Bandwidth Utilization Avg";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container ettp {
-      list pmconfig {
-        key "ettp";
-        config true;
-        leaf ettp {
-          mandatory true;
-          description
-            "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-          type ciena-6500-types:aid;
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Margin in dBQ relative to a post FEC BER of 1E-12. (floating point value)";
-          config true;
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-          config false;
-        }
-      }
-      list counts {
-        key "ettp";
-        config false;
-        leaf ettp {
-          mandatory true;
-          description
-            "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ETTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "FEC-PMA" {
-              description
-                "Forward Error Corrections - Physical Medium Attachment";
-            }
-            enum "FECCCW-PMA" {
-              description
-                "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-            }
-            enum "FECUNCCW-PMA" {
-              description
-                "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-            }
-            enum "HCCS-PMA" {
-              description
-                "High Correction Count Second - Physical Medium Attachment";
-            }
-            enum "PRFBER-PMA" {
-              description
-                "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-            }
-            enum "PRFBERMAX-PMA" {
-              description
-                "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container fiber-channel {
-      list counts {
-        key "fc";
-        config false;
-        leaf fc {
-          mandatory true;
-          description
-            "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "FC";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violation - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Second - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Second - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Second - Physical Coding Sublayer";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container flex {
-      list counts {
-        key "flex";
-        config false;
-        leaf flex {
-          mandatory true;
-          description
-            "AID in format FLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "FLEX";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-PCS" {
-              description
-                "Coding Violations - Physical Coding Sublayer";
-            }
-            enum "ES-PCS" {
-              description
-                "Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "SES-PCS" {
-              description
-                "Severely Errored Seconds - Physical Coding Sublayer";
-            }
-            enum "UAS-PCS" {
-              description
-                "Unavailable Seconds - Physical Coding Sublayer";
-            }
-            enum "ES-E" {
-              description
-                "ETH Errored seconds (RX)";
-            }
-            enum "SES-E" {
-              description
-                "ETH Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-E" {
-              description
-                "ETH Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-E" {
-              description
-                "Total ETH frames received";
-            }
-            enum "INFRAMESERR-E" {
-              description
-                "Total ETH frames received with errors";
-            }
-            enum "OUTFRAMES-E" {
-              description
-                "Total ETH frames transmitted";
-            }
-            enum "OUTFRAMESERR-E" {
-              description
-                "Total egress direction ETH frames transmitted with FCS errors";
-            }
-            enum "DFR-E" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "INFRAMESDISCDS-E" {
-              description
-                "Ingress frames discarded due to congestion or policing";
-            }
-            enum "OUTFRAMESDISCDS-E" {
-              description
-                "Egress frames discarded due to congestion or policing";
-            }
-            enum "FCSERR-E" {
-              description
-                "Frame Check Sequence Errors (binned OM) - Ethernet";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical power received";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical power received (normalized).";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical power transmitted";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical power transmitted (normalized)";
-            }
-            enum "PSD-E" {
-              description
-                "Protection Switch Duration - Ethernet";
-            }
-            enum "PSCW-E" {
-              description
-                "Protection Switch Count - Working - Ethernet";
-            }
-            enum "PSCP-E" {
-              description
-                "Protection Switch Count - Protection - Ethernet";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container nmcmon {
-      list counts {
-        key "nmcmonaid";
-        config false;
-        leaf nmcmonaid {
-          mandatory true;
-          description
-            "AID in format NMCMON-shelf-slot-port-frequency, NMCMON-shelf-ALL, NMCMON-shelf-slot-ALL, NMCMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "NMCMON";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "OPT-OCH" {
-              description
-                "Optical Channel Power Transmit.";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Channel Power Transmit Minimum.";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Channel Power Transmit Maximum.";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Channel Power Transmit Average.";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf portmode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container oc3 {
-      list counts {
-        key "oc3";
-        config false;
-        leaf oc3 {
-          mandatory true;
-          description
-            "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OC3";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-S" {
-              description
-                "Coding Violations - Section";
-            }
-            enum "ES-S" {
-              description
-                "Errored Seconds - Section";
-            }
-            enum "SES-S" {
-              description
-                "Severely Errored Seconds - Section";
-            }
-            enum "SEFS-S" {
-              description
-                "Severely Errored Frame Seconds - Section";
-            }
-            enum "CV-L" {
-              description
-                "Coding Violations - Line";
-            }
-            enum "ES-L" {
-              description
-                "Errored Seconds - Line";
-            }
-            enum "SES-L" {
-              description
-                "Severely Errored Seconds - Line";
-            }
-            enum "UAS-L" {
-              description
-                "Unavailable Seconds - Line";
-            }
-            enum "FC-L" {
-              description
-                "Failure Count - Line";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized";
-            }
-            enum "PSCW-L" {
-              description
-                "Protection Switch Count Working - Line";
-            }
-            enum "PSCP-L" {
-              description
-                "Protection Switch Count Protection - Line";
-            }
-            enum "PSD-L" {
-              description
-                "Protection Switch Duration - Line";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container odu {
-      list counts {
-        key "odu";
-        config false;
-        leaf odu {
-          mandatory true;
-          description
-            "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU2-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU1-shelf-slot-port-index";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODU";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf portmode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container oductp {
-      list counts {
-        key "oductp";
-        config false;
-        leaf oductp {
-          mandatory true;
-          description
-            "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODUCTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container oduttp {
-      list counts {
-        key "oduttp";
-        config false;
-        leaf oduttp {
-          mandatory true;
-          description
-            "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "ODUTTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container optmon {
-      list counts {
-        key "optmonaid";
-        config false;
-        leaf optmonaid {
-          mandatory true;
-          description
-            "AID in format OPTMON-shelf-slot-port, OPTMON-shelf-slot-portSsubport, OPTMON-shelf-slotSsubslot-port, OPTMON-shelf-slotSsubslot-portSsubport, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OPTMON";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "OPR-OTS" {
-              description
-                "Optical Power Receive";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Optical Power Receive - Minimum";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Optical Power Receive - Maximum";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Optical Power Receive - Average";
-            }
-            enum "OPT-OTS" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPTMIN-OTS" {
-              description
-                "Optical Power Transmit - Minimum";
-            }
-            enum "OPTMAX-OTS" {
-              description
-                "Optical Power Transmit - Maximum";
-            }
-            enum "OPTAVG-OTS" {
-              description
-                "Optical Power Transmit - Average";
-            }
-            enum "PSD-OTS" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "PSCW-OTS" {
-              description
-                "Protection Switch Count Working";
-            }
-            enum "PSCP-OTS" {
-              description
-                "Protection Switch Count Protection";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container osc {
-      list counts {
-        key "osc";
-        config false;
-        leaf osc {
-          mandatory true;
-          description
-            "AID in format OSC-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OSC";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-S" {
-              description
-                "Coding Violations - Section";
-            }
-            enum "ES-S" {
-              description
-                "Errored Seconds - Section";
-            }
-            enum "SES-S" {
-              description
-                "Severely Errored Seconds - Section";
-            }
-            enum "SEFS-S" {
-              description
-                "Severely Errored Frame Seconds - Section";
-            }
-            enum "CV-L" {
-              description
-                "Coding Violations - Line";
-            }
-            enum "ES-L" {
-              description
-                "Errored Seconds - Line";
-            }
-            enum "SES-L" {
-              description
-                "Severely Errored Seconds - Line";
-            }
-            enum "UAS-L" {
-              description
-                "Unavailable Seconds - Line";
-            }
-            enum "FC-L" {
-              description
-                "Failure Count - Line";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "SPANLOSS-OCH" {
-              description
-                "The OSC Span Loss in dB";
-            }
-            enum "SPANLOSSMIN-OCH" {
-              description
-                "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "SPANLOSSMAX-OCH" {
-              description
-                "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "SPANLOSSAVG-OCH" {
-              description
-                "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "DMMIN-L" {
-              description
-                "Delay Measurement MINimum - Line";
-            }
-            enum "DMMAX-L" {
-              description
-                "Delay Measurement MAXimum - Line";
-            }
-            enum "DMAVG-L" {
-              description
-                "Delay Measurement AVGrage - Line";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3.... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf portmode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-      }
-    }
-    container otdrcfg {
-      list counts {
-        key "otdrcfg";
-        config false;
-        leaf otdrcfg {
-          mandatory true;
-          description
-            "AID in format OTDRCFG-shelf-slot-port, OTDRCFG-shelf-slot-ALL, OTDRCFG-shelf-ALL, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTDRCFG";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "EVCSH-OTS" {
-              description
-                "Event Count Short";
-            }
-            enum "EVCSHMAX-OTS" {
-              description
-                "Event Count Short - MAX";
-            }
-            enum "EVCLG-OTS" {
-              description
-                "Event Count Long";
-            }
-            enum "EVCLGMAX-OTS" {
-              description
-                "Event Count Long - MAX";
-            }
-            enum "MAXEVLDISSH-OTS" {
-              description
-                "Maximum Event Loss Distance Short";
-            }
-            enum "MAXEVLDISSHMAX-OTS" {
-              description
-                "Maximum Event Loss Distance Short - MAX";
-            }
-            enum "MAXEVLDISLG-OTS" {
-              description
-                "Maximum Event Loss Distance Long";
-            }
-            enum "MAXEVLDISLGMAX-OTS" {
-              description
-                "Maximum Event Loss Distance Long - MAX";
-            }
-            enum "MAXEVRDISSH-OTS" {
-              description
-                "Maximum Event Reflection Distance Short";
-            }
-            enum "MAXEVRDISSHMAX-OTS" {
-              description
-                "Maximum Event Reflection Distance Short - MAX";
-            }
-            enum "MAXEVRDISLG-OTS" {
-              description
-                "Maximum Event Reflection Distance Long";
-            }
-            enum "MAXEVRDISLGMAX-OTS" {
-              description
-                "Maximum Event Reflection Distance Long - MAX";
-            }
-            enum "MAXEVLSH-OTS" {
-              description
-                "Maximum Event Loss Short";
-            }
-            enum "MAXEVLSHMAX-OTS" {
-              description
-                "Maximum Event Loss Short - MAX";
-            }
-            enum "MAXEVLLG-OTS" {
-              description
-                "Maximum Event Loss Long";
-            }
-            enum "MAXEVLLGMAX-OTS" {
-              description
-                "Maximum Event Loss Long - MAX";
-            }
-            enum "MAXEVRSH-OTS" {
-              description
-                "Maximum Event Reflection Short";
-            }
-            enum "MAXEVRSHMAX-OTS" {
-              description
-                "Maximum Event Reflection Short - MAX";
-            }
-            enum "MAXEVRLG-OTS" {
-              description
-                "Maximum Event Reflection Long";
-            }
-            enum "MAXEVRLGMAX-OTS" {
-              description
-                "Maximum Event Reflection Long - MAX";
-            }
-            enum "CUMEVLSH-OTS" {
-              description
-                "Cumulative Event Loss Short";
-            }
-            enum "CUMEVLSHMAX-OTS" {
-              description
-                "Cumulative Event Loss Short MAX";
-            }
-            enum "CUMEVLLG-OTS" {
-              description
-                "Cumulative Event Loss Long";
-            }
-            enum "CUMEVLLGMAX-OTS" {
-              description
-                "Cumulative Event Loss Long MAX";
-            }
-            enum "CUMEVRSH-OTS" {
-              description
-                "Cumulative Event Reflection Short";
-            }
-            enum "CUMEVRSHMAX-OTS" {
-              description
-                "Cumulative Event Reflection Short MAX";
-            }
-            enum "CUMEVRLG-OTS" {
-              description
-                "Cumulative Event Reflection Long";
-            }
-            enum "CUMEVRLGMAX-OTS" {
-              description
-                "Cumulative Event Reflection Long MAX";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf time-period {
-          type ciena-6500-enums:TMPER;
-          description
-            "Accumulation time period of data.";
-          config false;
-        }
-        leaf mon-dat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf mon-time {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-      }
-    }
-    container otm {
-      list pmconfig {
-        key "otmaid";
-        config true;
-        leaf otmaid {
-          mandatory true;
-          description
-            "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value";
-          config true;
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-          config false;
-        }
-      }
-      list counts {
-        key "otmaid";
-        config false;
-        leaf otmaid {
-          mandatory true;
-          description
-            "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM3Aid";
-            enum "OTM";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU ";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Corrections - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimate - OTU";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU ";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU ";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU ";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized).";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized).";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized)";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized)";
-            }
-            enum "OPR-OTS" {
-              description
-                "Optical Power Received - Optical Transport Section ";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Optical Power Receive Min - Optical Transport Section";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Optical Power Receive Max - Optical Transport Section";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Optical Power Receive Avg - Optical Transport Section";
-            }
-            enum "OPRN-OTS" {
-              description
-                "Optical Power Receive - Normalized - Optical Transport Section";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "DGDAVG-OCH" {
-              description
-                "Differential Group Delay (Average), Optical Channel";
-            }
-            enum "DGDMAX-OCH" {
-              description
-                "Differential Group Delay (Max), Optical Channel";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "UNCFECBLK-OTU" {
-              description
-                "Uncorrected FEC Block - OTU";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container otm2 {
-      list pmconfig {
-        key "otm2aid";
-        config true;
-        leaf otm2aid {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value";
-          config true;
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-          config false;
-        }
-      }
-      list counts {
-        key "otm2aid";
-        config false;
-        leaf otm2aid {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM2Aid";
-            enum "OTM2";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU ";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Correction - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU ";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU ";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU ";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimate - OTU";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container otm3 {
-      list pmconfig {
-        key "otm3aid";
-        config true;
-        leaf otm3aid {
-          mandatory true;
-          description
-            "AID in format OTM3-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value";
-          config true;
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-          config false;
-        }
-      }
-      list counts {
-        key "otm3aid";
-        config false;
-        leaf otm3aid {
-          mandatory true;
-          description
-            "AID in format OTM3-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTM3Aid";
-            enum "OTM3";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU ";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Corrections - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimate - OTU";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "CV-ODU" {
-              description
-                "Coding Violations - ODU";
-            }
-            enum "ES-ODU" {
-              description
-                "Errored Seconds - ODU";
-            }
-            enum "SES-ODU" {
-              description
-                "Severely Errored Seconds - ODU";
-            }
-            enum "UAS-ODU" {
-              description
-                "Unavailable Seconds - ODU ";
-            }
-            enum "FC-ODU" {
-              description
-                "Failure Count - ODU";
-            }
-            enum "DMMIN-ODU" {
-              description
-                "Delay Measurement Min - ODU ";
-            }
-            enum "DMMAX-ODU" {
-              description
-                "Delay Measurement Max - ODU ";
-            }
-            enum "DMAVG-ODU" {
-              description
-                "Delay Measurement Avg - ODU ";
-            }
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Optical Power Receive Min - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Optical Power Receive Max - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Optical Power Receive Avg - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Optical Power Transmit Min - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Optical Power Transmit Max - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Optical Power Transmit Avg - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized).";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized).";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized)";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized)";
-            }
-            enum "OPR-OTS" {
-              description
-                "Optical Power Received - Optical Transport Section ";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Optical Power Receive Min - Optical Transport Section";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Optical Power Receive Max - Optical Transport Section";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Optical Power Receive Avg - Optical Transport Section";
-            }
-            enum "OPRN-OTS" {
-              description
-                "Optical Power Receive - Normalized - Optical Transport Section";
-            }
-            enum "PSCW-ODU" {
-              description
-                "Protection Switch Count - Working";
-            }
-            enum "PSCP-ODU" {
-              description
-                "Protection Switch Count - Protection";
-            }
-            enum "PSD-ODU" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "DGDAVG-OCH" {
-              description
-                "Differential Group Delay (Average), Optical Channel";
-            }
-            enum "DGDMAX-OCH" {
-              description
-                "Differential Group Delay (Max), Optical Channel";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container otuttp {
-      list counts {
-        key "otuttp";
-        config false;
-        leaf otuttp {
-          mandatory true;
-          description
-            "AID in format OTUTTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "OTUTTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-OTU" {
-              description
-                "Coding Violations - OTU ";
-            }
-            enum "ES-OTU" {
-              description
-                "Errored Seconds - OTU";
-            }
-            enum "SES-OTU" {
-              description
-                "Severely Errored Seconds - OTU";
-            }
-            enum "SEFS-OTU" {
-              description
-                "Severely Errored Framing Seconds - OTU";
-            }
-            enum "FEC-OTU" {
-              description
-                "Forward Error Corrections - OTU";
-            }
-            enum "HCCS-OTU" {
-              description
-                "High Correction Count Seconds - OTU";
-            }
-            enum "PFBERE-OTU" {
-              description
-                "Post-FEC Bit Error Rate Estimate - OTU";
-            }
-            enum "PRFBER-OTU" {
-              description
-                "Pre-FEC Bit Error Rate - OTU";
-            }
-            enum "PRFBERMAX-OTU" {
-              description
-                "Pre-FEC Bit Max Error Rate - OTU";
-            }
-            enum "IAE-OTU" {
-              description
-                "Incoming Alignment Error - OTU";
-            }
-            enum "QMIN-OTU" {
-              description
-                "Minimum Q - OTU";
-            }
-            enum "QMAX-OTU" {
-              description
-                "Maximum Q - OTU";
-            }
-            enum "QAVG-OTU" {
-              description
-                "Average Q - OTU";
-            }
-            enum "QSTDEV-OTU" {
-              description
-                "Q Standard Deviation - OTU";
-            }
-            enum "UNCFECBLK-OTU" {
-              description
-                "Uncorrected FEC Block - OTU";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-      list pmconfig {
-        key "otuttp";
-        config true;
-        leaf otuttp {
-          mandatory true;
-          description
-            "AID in format OTUTTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value representing the margin in dBQ relative to a post FEC BER of 1E-15.";
-          config true;
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-          config false;
-        }
-      }
-    }
-    container ptp {
-      list counts {
-        key "ptp";
-        config false;
-        leaf ptp {
-          mandatory true;
-          description
-            "AID in format PTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "PTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "OPR-OCH" {
-              description
-                "Optical Power Receive - Optical Channel";
-            }
-            enum "OPT-OCH" {
-              description
-                "Optical Power Transmit - Optical Channel";
-            }
-            enum "OPRN-OCH" {
-              description
-                "Optical Power Receive - Normalized - Optical Channel";
-            }
-            enum "OPTN-OCH" {
-              description
-                "Optical Power Transmit - Normalized - Optical Channel";
-            }
-            enum "OPTAVG-OCH" {
-              description
-                "Average Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMIN-OCH" {
-              description
-                "Minimum Optical Power Transmit - Optical Channel";
-            }
-            enum "OPTMAX-OCH" {
-              description
-                "Maximum Optical Power Transmit - Optical Channel";
-            }
-            enum "DGDAVG-OCH" {
-              description
-                "Differential Group Delay (Average) - Optical Channel";
-            }
-            enum "DGDMAX-OCH" {
-              description
-                "Differential Group Delay (Max) - Optical Channel";
-            }
-            enum "OPRLOW-OCH" {
-              description
-                "Lowest optical power received - Optical Channel";
-            }
-            enum "OPTLOW-OCH" {
-              description
-                "Lowest optical power transmitted - Optical Channel";
-            }
-            enum "OPRNLOW-OCH" {
-              description
-                "Lowest optical power received (normalized) - Optical Channel";
-            }
-            enum "OPTNLOW-OCH" {
-              description
-                "Lowest optical power transmitted (normalized) - Optical Channel";
-            }
-            enum "OPRHIGH-OCH" {
-              description
-                "Highest optical power received - Optical Channel";
-            }
-            enum "OPTHIGH-OCH" {
-              description
-                "Highest optical power transmitted - Optical Channel";
-            }
-            enum "OPRNHIGH-OCH" {
-              description
-                "Highest optical power received (normalized) - Optical Channel";
-            }
-            enum "OPTNHIGH-OCH" {
-              description
-                "Highest optical power transmitted (normalized) - Optical Channel";
-            }
-            enum "OPRMIN-OCH" {
-              description
-                "Minimum Optical Power Receive - Optical Channel";
-            }
-            enum "OPRMAX-OCH" {
-              description
-                "Maximum Optical Power Receive - Optical Channel";
-            }
-            enum "OPRAVG-OCH" {
-              description
-                "Average Optical Power Receive - Optical Channel";
-            }
-            enum "OPR-OTS" {
-              description
-                "Optical Power Received - Optical Transport Section";
-            }
-            enum "OPRN-OTS" {
-              description
-                "Optical Power Received (normalized) - Optical Transport Section";
-            }
-            enum "OPRMIN-OTS" {
-              description
-                "Total Optical Power Received (Minimum) - Optical Transport Section";
-            }
-            enum "OPRMAX-OTS" {
-              description
-                "Total Optical Power Received (Maximum) - Optical Transport Section";
-            }
-            enum "OPRAVG-OTS" {
-              description
-                "Total Optical Power Received (Average) - Optical Transport Section";
-            }
-            enum "OPR-OTSI" {
-              description
-                "Optical Power Receive- OTSI";
-            }
-            enum "OPT-OTSI" {
-              description
-                "Optical Power Transmit- OTSI";
-            }
-            enum "OPRN-OTSI" {
-              description
-                "Normalized Optical Power Receive- OTSI";
-            }
-            enum "OPTN-OTSI" {
-              description
-                "Normalized Optical Power Transmit- OTSI";
-            }
-            enum "OPRAVG-OTSI" {
-              description
-                "Optical Power Receive, Average - OTSI";
-            }
-            enum "OPRMIN-OTSI" {
-              description
-                "Optical Power Receive, Minimum - OTSI";
-            }
-            enum "OPRMAX-OTSI" {
-              description
-                "Optical Power Receive, Maximum - OTSI";
-            }
-            enum "OPTAVG-OTSI" {
-              description
-                "Optical Power Transmit, Average - OTSI";
-            }
-            enum "OPTMIN-OTSI" {
-              description
-                "Optical Power Transmit, Minimum - OTSI";
-            }
-            enum "OPTMAX-OTSI" {
-              description
-                "Optical Power Transmit, Maximum - OTSI";
-            }
-            enum "DGDAVG-OTSI" {
-              description
-                "Differential Group Delay (Average) OTSI";
-            }
-            enum "DGDMAX-OTSI" {
-              description
-                "Differential Group Delay (Maximum) OTSI";
-            }
-            enum "PDLAVG-OTSI" {
-              description
-                "Polarization Dependent Loss, Average - OTSI";
-            }
-            enum "PDLMAX-OTSI" {
-              description
-                "Polarization Dependent Loss, Maximum - OTSI";
-            }
-            enum "HCCS-OTSI" {
-              description
-                "High Correction Count Seconds - OTSI";
-            }
-            enum "FEC-OTSI" {
-              description
-                "FEC Corrections - OTSI";
-            }
-            enum "PRFBER-OTSI" {
-              description
-                "Post-FEC BER - OTSI";
-            }
-            enum "PRFBERMAX-OTSI" {
-              description
-                "Pre-FEC BER Maximum - OTSI";
-            }
-            enum "QMIN-OTSI" {
-              description
-                "Q MIN - OTSI";
-            }
-            enum "QMAX-OTSI" {
-              description
-                "Q MAX - OTSI";
-            }
-            enum "QAVG-OTSI" {
-              description
-                "Q AVG - OTSI";
-            }
-            enum "QSTDEV-OTSI" {
-              description
-                "Q StDev - OTSI";
-            }
-            enum "UNCFECBLK-OTSI" {
-              description
-                "Uncorrected FEC Block - OTSI";
-            }
-            enum "OSNRMIN-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Minimum) OTSI";
-            }
-            enum "OSNRMAX-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Maximum) OTSI";
-            }
-            enum "OSNRAVG-OTSI" {
-              description
-                "Optical Signal to Noise Ratio (Average) OTSI";
-            }
-            enum "ESNRMIN-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Minimum) OTSI";
-            }
-            enum "ESNRMAX-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Maximum) OTSI";
-            }
-            enum "ESNRAVG-OTSI" {
-              description
-                "Electrical Signal to Noise Ratio (Average) OTSI";
-            }
-            enum "CDMIN-OTSI" {
-              description
-                "Dispersion compensation (Minimum) OTSI";
-            }
-            enum "CDMAX-OTSI" {
-              description
-                "Dispersion compensation (Maximum) OTSI";
-            }
-            enum "CDAVG-OTSI" {
-              description
-                "Dispersion compensation (Average) OTSI";
-            }
-            enum "PSCW-OTS" {
-              description
-                "Protection Switch Count Working";
-            }
-            enum "PSCP-OTS" {
-              description
-                "Protection Switch Count Protection";
-            }
-            enum "PSD-OTS" {
-              description
-                "Protection Switch Duration";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-      list pmconfig {
-        key "ptp";
-        config true;
-        leaf ptp {
-          mandatory true;
-          description
-            "AID in format PTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf hccs-ref {
-          type ciena-6500-types:STRING;
-          description
-            "Floating point value representing the margin in dBQ relative to a post FEC BER of 1E-15.";
-          config true;
-        }
-        leaf aidtype {
-          type ciena-6500-types:STRING;
-          description
-            "aidtype";
-          config false;
-        }
-      }
-    }
-    container raman {
-      list counts {
-        key "ramanaid";
-        config false;
-        leaf ramanaid {
-          mandatory true;
-          description
-            "AID in format RAMAN-shelf-slot-port, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "RAMAN";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "ALL";
-            enum "OPIN-OTS" {
-              description
-                "Optical Power Input";
-            }
-            enum "OPINMIN-OTS" {
-              description
-                "Optical Power Input Minimum";
-            }
-            enum "OPINMAX-OTS" {
-              description
-                "Optical Power Input Maximum";
-            }
-            enum "OPINAVG-OTS" {
-              description
-                "Optical Power Input Average";
-            }
-            enum "OPOUT-OTS" {
-              description
-                "Optical Power Output";
-            }
-            enum "OPOUTMIN-OTS" {
-              description
-                "Optical Power Output Minimum";
-            }
-            enum "OPOUTMAX-OTS" {
-              description
-                "Optical Power Output Maximum";
-            }
-            enum "OPOUTAVG-OTS" {
-              description
-                "Optical Power Output Average";
-            }
-            enum "OPROSC-OTS" {
-              description
-                "Optical Power Receive, OSC";
-            }
-            enum "OPROSCMIN-OTS" {
-              description
-                "Optical Power Receive, OSC Minimum";
-            }
-            enum "OPROSCMAX-OTS" {
-              description
-                "Optical Power Receive, OSC Maximum";
-            }
-            enum "OPROSCAVG-OTS" {
-              description
-                "Optical Power Receive, OSC Average";
-            }
-            enum "ORLIN-OTS" {
-              description
-                "Optical Return Loss Input";
-            }
-            enum "ORLINMIN-OTS" {
-              description
-                "Optical Return Loss Input Minimum";
-            }
-            enum "ORLINMAX-OTS" {
-              description
-                "Optical Return Loss Input Maximum";
-            }
-            enum "ORLINAVG-OTS" {
-              description
-                "Optical Return Loss Input Average";
-            }
-            enum "ORLOUT-OTS" {
-              description
-                "Optical Return Loss Output";
-            }
-            enum "ORLOUTMIN-OTS" {
-              description
-                "Optical Return Loss Output Minimum";
-            }
-            enum "ORLOUTMAX-OTS" {
-              description
-                "Optical Return Loss Output Maximum";
-            }
-            enum "ORLOUTAVG-OTS" {
-              description
-                "Optical Return Loss Output Average";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data.";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-          config false;
-        }
-        leaf index {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "Proprietary method of specifying a bin.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container sttp {
-      list counts {
-        key "sttp";
-        config false;
-        leaf sttp {
-          mandatory true;
-          description
-            "AID in format STTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "STTP";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "CV-S" {
-              description
-                "Coding Violations - Section";
-            }
-            enum "ES-S" {
-              description
-                "Errored Seconds - Section";
-            }
-            enum "SES-S" {
-              description
-                "Severely Errored Seconds - Section";
-            }
-            enum "SEFS-S" {
-              description
-                "Severely Errored Frame Seconds - Section";
-            }
-            enum "CV-L" {
-              description
-                "Coding Violations - Line";
-            }
-            enum "ES-L" {
-              description
-                "Errored Seconds - Line";
-            }
-            enum "SES-L" {
-              description
-                "Severely Errored Seconds - Line";
-            }
-            enum "UAS-L" {
-              description
-                "Unavailable Seconds - Line";
-            }
-            enum "FC-L" {
-              description
-                "Failure Count - Line";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container tcm {
-      list counts {
-        key "tcm";
-        config false;
-        leaf tcm {
-          mandatory true;
-          description
-            "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "TCM";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "CV-TCM" {
-              description
-                "Coding Violations - TCM";
-            }
-            enum "ES-TCM" {
-              description
-                "Errored Seconds - TCM";
-            }
-            enum "SES-TCM" {
-              description
-                "Severely Errored Seconds - TCM";
-            }
-            enum "UAS-TCM" {
-              description
-                "Unavailable Seconds - TCM ";
-            }
-            enum "FC-TCM" {
-              description
-                "Failure Count - TCM";
-            }
-            enum "PSCW-TCM" {
-              description
-                "Protection Switch Count, Working - TCM";
-            }
-            enum "PSCP-TCM" {
-              description
-                "Protection Switch Count, Protection - TCM";
-            }
-            enum "PSD-TCM" {
-              description
-                "Protection Switch Duration - TCM";
-            }
-            enum "DMMIN-TCM" {
-              description
-                "Delay Measurement Min - TCM";
-            }
-            enum "DMMAX-TCM" {
-              description
-                "Delay Measurement Max - TCM";
-            }
-            enum "DMAVG-TCM" {
-              description
-                "Delay Measurement Avg - TCM";
-            }
-            enum "IAE-TCM" {
-              description
-                "Incoming Alignment Error - TCM";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-      }
-    }
-    container voa {
-      list counts {
-        key "voa";
-        config false;
-        leaf voa {
-          mandatory true;
-          description
-            "AID in format VOA-shelf-slot-port, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "VOA";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list mon-type {
-          type enumeration {
-            enum "ORL-OTS" {
-              description
-                "Optical Return Loss";
-            }
-            enum "ORLMIN-OTS" {
-              description
-                "Optical Return Loss Minimum";
-            }
-            enum "ORLMAX-OTS" {
-              description
-                "Optical Return Loss Maximum";
-            }
-            enum "ORLAVG-OTS" {
-              description
-                "Optical Return Loss Average";
-            }
-            enum "OPIN-OTS" {
-              description
-                "Optical Power Input";
-            }
-            enum "OPINMIN-OTS" {
-              description
-                "Optical Power Input Minimum";
-            }
-            enum "OPINMAX-OTS" {
-              description
-                "Optical Power Input Maximum";
-            }
-            enum "OPINAVG-OTS" {
-              description
-                "Optical Power Input Average";
-            }
-            enum "OPOUT-OTS" {
-              description
-                "Optical Power Output";
-            }
-            enum "OPOUTMIN-OTS" {
-              description
-                "Optical Power Output Minimum";
-            }
-            enum "OPOUTMAX-OTS" {
-              description
-                "Optical Power Output Maximum";
-            }
-            enum "OPOUTAVG-OTS" {
-              description
-                "Optical Power Output Average";
-            }
-            enum "GRPOPOUT-OTS" {
-              description
-                "Group Optical Power Output";
-            }
-            enum "GRPOPOUTMIN-OTS" {
-              description
-                "Group Optical Power Output Minimum";
-            }
-            enum "GRPOPOUTMAX-OTS" {
-              description
-                "Group Optical Power Output Maximum";
-            }
-            enum "GRPOPOUTAVG-OTS" {
-              description
-                "Group Optical Power Output Average";
-            }
-            enum "ALL";
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "NA" {
-              description
-                "Not Applicable";
-            }
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "Both directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data. Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-enums:INDEX;
-          description
-            "Proprietary method of specifying a bin. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3....";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    container wan {
-      list counts {
-        key "wan";
-        config false;
-        leaf wan {
-          mandatory true;
-          description
-            "AID in format WAN-shelf-slot-port, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4";
-          type ciena-6500-types:aid;
-        }
-        leaf aidtype {
-          type enumeration {
-            enum "WAN";
-          }
-          description
-            "AID type";
-          config false;
-        }
-        leaf-list montype {
-          type enumeration {
-            enum "ES-W" {
-              description
-                "WAN Errored seconds (RX)";
-            }
-            enum "SES-W" {
-              description
-                "WAN Severely Errored Seconds (Rx)";
-            }
-            enum "UAS-W" {
-              description
-                "WAN Unavailable Seconds (Rx)";
-            }
-            enum "INFRAMES-W" {
-              description
-                "Total WAN frames received";
-            }
-            enum "INFRAMESERR-W" {
-              description
-                "Total WAN frames received with errors";
-            }
-            enum "OUTFRAMES-W" {
-              description
-                "Total WAN frames transmitted";
-            }
-            enum "OUTFRAMESERR-W" {
-              description
-                "Out Frames Error Count, WAN";
-            }
-            enum "DFR-W" {
-              description
-                "Total frames discarded for any reason other than FCS errors (Rx and Tx)";
-            }
-            enum "UTL-W" {
-              description
-                "Average WAN link Utilization (Rx and Tx)";
-            }
-            enum "UTLMX-W" {
-              description
-                "Maximum (peak) WAN link Utilization (Rx and Tx)";
-            }
-            enum "LDS-W" {
-              description
-                "LCAS Degraded Second - WAN (Rx and Tx directions)";
-            }
-            enum "LSDS-W" {
-              description
-                "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-            }
-            enum "LUAS-W" {
-              description
-                "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-            }
-            enum "ALL" {
-              description
-                "All applicable montypes";
-            }
-          }
-          description
-            "Monitored parameter";
-          config false;
-        }
-        leaf monval {
-          type ciena-6500-types:STRING;
-          description
-            "Discriminating Level for requested monitored parameter.";
-          config false;
-        }
-        leaf vldty {
-          type ciena-6500-enums:VLDTY;
-          description
-            "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-          config false;
-        }
-        leaf locn {
-          default "ALL";
-          type enumeration {
-            enum "NEND" {
-              description
-                "Near End";
-            }
-            enum "FEND" {
-              description
-                "Far End";
-            }
-            enum "ALL" {
-              description
-                "All ends";
-            }
-          }
-          description
-            "Location";
-          config false;
-        }
-        leaf dirn {
-          default "ALL";
-          type enumeration {
-            enum "RCV" {
-              description
-                "Receive direction only";
-            }
-            enum "TRMT" {
-              description
-                "Transmit direction only";
-            }
-            enum "ALL" {
-              description
-                "All directions";
-            }
-          }
-          description
-            "Direction of signal flow relative to network element.";
-          config false;
-        }
-        leaf-list tmper {
-          type enumeration {
-            enum "15-MIN";
-            enum "1-DAY";
-            enum "1-UNT";
-            enum "BASLN";
-            enum "ALL";
-          }
-          description
-            "Accumulation time period of data";
-          config false;
-        }
-        leaf-list mondat {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-          config false;
-        }
-        leaf-list montm {
-          type ciena-6500-types:STRING;
-          description
-            "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-          config false;
-        }
-        leaf-list index {
-          type ciena-6500-types:INT {
-            range "0..32";
-          }
-          description
-            "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-          config false;
-        }
-        leaf altaid {
-          type ciena-6500-types:STRING;
-          description
-            "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-          config false;
-        }
-        leaf channelid {
-          type ciena-6500-types:INT {
-            range "1..96";
-          }
-          description
-            "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-          config false;
-        }
-        leaf channelstatus {
-          type ciena-6500-types:STRING;
-          description
-            "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-          config false;
-        }
-        leaf port-mode {
-          type ciena-6500-enums:PORTMODE;
-          description
-            "Optical Port market preference";
-          config false;
-        }
-        leaf width {
-          type ciena-6500-types:STRING;
-          description
-            "Channel width.";
-          config false;
-        }
-        leaf wavelength {
-          type ciena-6500-types:STRING;
-          description
-            "Channel wavelength.";
-          config false;
-        }
-      }
-    }
-    list all {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type ciena-6500-enums:PMAIDTYPE;
-        description
-          "AID type";
-        config false;
-      }
-      leaf-list mon-type {
-        type enumeration {
-          enum "CV-S" {
-            description
-              "Coding Violations - Section";
-          }
-          enum "ES-S" {
-            description
-              "Errored Seconds - Section";
-          }
-          enum "SES-S" {
-            description
-              "Severely Errored Seconds - Section";
-          }
-          enum "SEFS-S" {
-            description
-              "Severely Errored Frame Seconds - Section";
-          }
-          enum "CV-L" {
-            description
-              "Coding Violations - Line";
-          }
-          enum "ES-L" {
-            description
-              "Errored Seconds - Line";
-          }
-          enum "SES-L" {
-            description
-              "Severely Errored Seconds - Line";
-          }
-          enum "UAS-L" {
-            description
-              "Unavailable Seconds - Line";
-          }
-          enum "FC-L" {
-            description
-              "Failure Count - Line";
-          }
-          enum "PSCW-L" {
-            description
-              "Protection switch count, working line - LINE";
-          }
-          enum "PSCP-L" {
-            description
-              "Protection switch count, protection line - LINE";
-          }
-          enum "PSD-L" {
-            description
-              "Protection switch duration, line - LINE";
-          }
-          enum "OPR-OCH" {
-            description
-              "Optical Power Receive - Optical Channel. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "OPT-OCH" {
-            description
-              "Gauge Optical Power Transmit - Optical Channel";
-          }
-          enum "OPTMIN-OCH" {
-            description
-              "Minimum OPT for interval";
-          }
-          enum "OPTMAX-OCH" {
-            description
-              "Maximum OPT for interval";
-          }
-          enum "OPTAVG-OCH" {
-            description
-              "Average OPT for interval";
-          }
-          enum "OPRN-OCH" {
-            description
-              "Optical Power Receive - Normalized - Optical Channel";
-          }
-          enum "OPRMIN-OCH" {
-            description
-              "Optical Power Receive Min - Optical Channel";
-          }
-          enum "OPRMAX-OCH" {
-            description
-              "Optical Power Receive Max - Optical Channel";
-          }
-          enum "OPRAVG-OCH" {
-            description
-              "Optical Power Receive Avg - Optical Channel";
-          }
-          enum "OPTN-OCH" {
-            description
-              "Optical Power Transmit - Normalized - Optical Channel";
-          }
-          enum "OPRLOW-OCH" {
-            description
-              "Lowest optical power received.";
-          }
-          enum "OPRNLOW-OCH" {
-            description
-              "Lowest optical power received (normalized).";
-          }
-          enum "OPRHIGH-OCH" {
-            description
-              "Highest optical power received";
-          }
-          enum "OPRNHIGH-OCH" {
-            description
-              "Highest optical power received (normalized).";
-          }
-          enum "OPTLOW-OCH" {
-            description
-              "Lowest optical power transmitted";
-          }
-          enum "OPTNLOW-OCH" {
-            description
-              "Lowest optical power transmitted (normalized)";
-          }
-          enum "OPTHIGH-OCH" {
-            description
-              "Highest optical power transmitted";
-          }
-          enum "OPTNHIGH-OCH" {
-            description
-              "Highest optical power transmitted (normalized)";
-          }
-          enum "SPANLOSS-OCH" {
-            description
-              "The OSC Span Loss in dB";
-          }
-          enum "SPANLOSSMIN-OCH" {
-            description
-              "Minimum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "SPANLOSSMAX-OCH" {
-            description
-              "Maximum OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "SPANLOSSAVG-OCH" {
-            description
-              "Average OSC Span Loss, When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "OPR-OTS" {
-            description
-              "Optical Power Received - Optical Transport Section ";
-          }
-          enum "OPRN-OTS" {
-            description
-              "Optical Power Receive - Normalized - Optical Transport Section";
-          }
-          enum "CV-OTU" {
-            description
-              "Coding Violations - OTU";
-          }
-          enum "ES-OTU" {
-            description
-              "Errored Seconds - OTU";
-          }
-          enum "SES-OTU" {
-            description
-              "Severely Errored Seconds - OTU";
-          }
-          enum "SEFS-OTU" {
-            description
-              "Severely Errored Framing Seconds - OTU";
-          }
-          enum "FEC-OTU" {
-            description
-              "Forward Error Corrections - OTU";
-          }
-          enum "HCCS-OTU" {
-            description
-              "High Correction Count Seconds - OTU";
-          }
-          enum "PFBERE-OTU" {
-            description
-              "Post-FEC Bit Error Rate Estimates - OTU. When tmper=1-UNT this is a gauge value; when tmper=1-15-MIN, 1-DAY this is a snapshot value";
-          }
-          enum "PRFBER-OTU" {
-            description
-              "Pre-FEC Bit Error Rate - OTU.";
-          }
-          enum "PRFBERMAX-OTU" {
-            description
-              "Pre-FEC Bit Max Error Rate - OTU";
-          }
-          enum "QMIN-OTU" {
-            description
-              "Minimum Q - OTU";
-          }
-          enum "QMAX-OTU" {
-            description
-              "Maximum Q - OTU";
-          }
-          enum "QAVG-OTU" {
-            description
-              "Average Q - OTU";
-          }
-          enum "QSTDEV-OTU" {
-            description
-              "Q Standard Deviation - OTU";
-          }
-          enum "UNCFECBLK-OTU" {
-            description
-              "Uncorrected FEC Block - OTU";
-          }
-          enum "IAE-OTU" {
-            description
-              "Incoming Alignment Error - OTU";
-          }
-          enum "CV-ODU" {
-            description
-              "Coding Violations - ODU";
-          }
-          enum "ES-ODU" {
-            description
-              "Errored Seconds - ODU";
-          }
-          enum "SES-ODU" {
-            description
-              "Severely Errored Seconds - ODU";
-          }
-          enum "UAS-ODU" {
-            description
-              "Unavailable Seconds - ODU";
-          }
-          enum "FC-ODU" {
-            description
-              "Failure Count - ODU";
-          }
-          enum "DMMIN-ODU" {
-            description
-              "Delay Measurement Min - ODU ";
-          }
-          enum "DMMAX-ODU" {
-            description
-              "Delay Measurement Max - ODU ";
-          }
-          enum "DMAVG-ODU" {
-            description
-              "Delay Measurement Avg - ODU ";
-          }
-          enum "PSD-ODU" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "PSCP-ODU" {
-            description
-              "Protection Switch Count - Protection";
-          }
-          enum "PSCW-ODU" {
-            description
-              "Protection Switch Count - Working";
-          }
-          enum "CV-TCM" {
-            description
-              "Coding Violations - TCM";
-          }
-          enum "ES-TCM" {
-            description
-              "Errored Seconds - TCM";
-          }
-          enum "SES-TCM" {
-            description
-              "Severely Errored Seconds - TCM";
-          }
-          enum "UAS-TCM" {
-            description
-              "Unavailable Seconds - TCM ";
-          }
-          enum "FC-TCM" {
-            description
-              "Failure Count - TCM";
-          }
-          enum "PSD-TCM" {
-            description
-              "Protection Switch Duration - TCM";
-          }
-          enum "PSCW-TCM" {
-            description
-              "Protection Switch Count, Working - TCM";
-          }
-          enum "PSCP-TCM" {
-            description
-              "Protection Switch Count, Protection - TCM";
-          }
-          enum "DMMIN-TCM" {
-            description
-              "Delay Measurement Min - TCM";
-          }
-          enum "DMMAX-TCM" {
-            description
-              "Delay Measurement Max - TCM";
-          }
-          enum "DMAVG-TCM" {
-            description
-              "Delay Measurement Avg - TCM";
-          }
-          enum "IAE-TCM" {
-            description
-              "Incoming Alignment Error - TCM";
-          }
-          enum "CV-PCS" {
-            description
-              "Coding Violations - Physical Coding Sublayer";
-          }
-          enum "ES-PCS" {
-            description
-              "Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "SES-PCS" {
-            description
-              "Severely Errored Seconds - Physical Coding Sublayer";
-          }
-          enum "UAS-PCS" {
-            description
-              "Unavailable Seconds - Physical Coding Sublayer";
-          }
-          enum "ES-E" {
-            description
-              "Errored Seconds -ETH";
-          }
-          enum "SES-E" {
-            description
-              "Severely Errored Seconds";
-          }
-          enum "UAS-E" {
-            description
-              "Unavailable Seconds";
-          }
-          enum "INFRAMES-E" {
-            description
-              "Number of frames received (binned OM) - Ethernet.";
-          }
-          enum "OUTFRAMES-E" {
-            description
-              "Frame Check Sequence Errors (binned OM) - Ethernet";
-          }
-          enum "INFRAMESERR-E" {
-            description
-              "Number of errored frames received";
-          }
-          enum "OUTFRAMESERR-E" {
-            description
-              "Number of errored frames transmitted";
-          }
-          enum "INFRAMESDISCDS-E" {
-            description
-              "Number of ingress discarded frames due to congestion or overflow";
-          }
-          enum "OUTFRAMESDISCDS-E" {
-            description
-              "Number of egress discarded frames due to congestion or overflow";
-          }
-          enum "DFR-E" {
-            description
-              "Aggregate count of discarded frames";
-          }
-          enum "FCSERR-E" {
-            description
-              "Frame Check Sequence Errors";
-          }
-          enum "FEC-PMA" {
-            description
-              "Forward Error Corrections - Physical Medium Attachment";
-          }
-          enum "FECCCW-PMA" {
-            description
-              "Forward Error Corrections Corrected Codewords - Physical Medium Attachment";
-          }
-          enum "FECUNCCW-PMA" {
-            description
-              "Forward Error Corrections Uncorrected Codewords - Physical Medium Attachment";
-          }
-          enum "HCCS-PMA" {
-            description
-              "High Correction Count Second - Physical Medium Attachment";
-          }
-          enum "PRFBER-PMA" {
-            description
-              "Pre-FEC Bit Error Rate (Average) - Physical Medium Attachment";
-          }
-          enum "PRFBERMAX-PMA" {
-            description
-              "Pre-FEC Bit Error Rate Maximum - Physical Medium Attachment";
-          }
-          enum "REMOTEINFRAMES-E" {
-            description
-              "Remote In Frames";
-          }
-          enum "REMOTEOUTFRAMES-E" {
-            description
-              "Remote Out Frames";
-          }
-          enum "REMOTEINFRAMESERR-E" {
-            description
-              "Remote In Frames Err";
-          }
-          enum "REMOTEOUTFRAMESDISCDS-E" {
-            description
-              "Remote Out Frames Disc";
-          }
-          enum "REMOTEFCSERR-E" {
-            description
-              "Remote FCS Err";
-          }
-          enum "GRPOPT-OTS" {
-            description
-              "Group Optical Power Transmit";
-          }
-          enum "GRPOPTMIN-OTS" {
-            description
-              "Group Optical Power Transmit - Minimum";
-          }
-          enum "GRPOPTMAX-OTS" {
-            description
-              "Group Optical Power Transmit - Maximum";
-          }
-          enum "GRPOPTAVG-OTS" {
-            description
-              "Group Optical Power Transmit - Average";
-          }
-          enum "OPROSC-OTS" {
-            description
-              "Optical Power Receive, OSC";
-          }
-          enum "OPROSCMIN-OTS" {
-            description
-              "Optical Power Receive, OSC Minimum";
-          }
-          enum "OPROSCMAX-OTS" {
-            description
-              "Optical Power Receive, OSC Maximum";
-          }
-          enum "OPROSCAVG-OTS" {
-            description
-              "Optical Power Receive, OSC Average";
-          }
-          enum "ORLIN-OTS" {
-            description
-              "Optical Return Loss Input";
-          }
-          enum "ORLINMIN-OTS" {
-            description
-              "Optical Return Loss Input Minimum";
-          }
-          enum "ORLINMAX-OTS" {
-            description
-              "Optical Return Loss Input Maximum";
-          }
-          enum "ORLINAVG-OTS" {
-            description
-              "Optical Return Loss Input Average";
-          }
-          enum "ORLOUT-OTS" {
-            description
-              "Optical Return Loss Output";
-          }
-          enum "ORLOUTMIN-OTS" {
-            description
-              "Optical Return Loss Output Minimum";
-          }
-          enum "ORLOUTMAX-OTS" {
-            description
-              "Optical Return Loss Output Maximum";
-          }
-          enum "ORLOUTAVG-OTS" {
-            description
-              "Optical Return Loss Output Average";
-          }
-          enum "OPRMIN-OTS" {
-            description
-              "Optical Power Receive - Minimum";
-          }
-          enum "OPRMAX-OTS" {
-            description
-              "Optical Power Receive - Maximum";
-          }
-          enum "OPRAVG-OTS" {
-            description
-              "Optical Power Receive - Average";
-          }
-          enum "OPT-OTS" {
-            description
-              "Optical Power Transmit";
-          }
-          enum "OPTMIN-OTS" {
-            description
-              "Optical Power Transmit - Minimum";
-          }
-          enum "OPTMAX-OTS" {
-            description
-              "Optical Power Transmit - Maximum";
-          }
-          enum "OPTAVG-OTS" {
-            description
-              "Optical Power Transmit - Average";
-          }
-          enum "ORL-OTS" {
-            description
-              "Optical Return Loss";
-          }
-          enum "ORLMIN-OTS" {
-            description
-              "Optical Return Loss Minimum";
-          }
-          enum "ORLMAX-OTS" {
-            description
-              "Optical Return Loss Maximum";
-          }
-          enum "ORLAVG-OTS" {
-            description
-              "Optical Return Loss Average";
-          }
-          enum "OPIN-OTS" {
-            description
-              "Optical Power Input";
-          }
-          enum "OPINMIN-OTS" {
-            description
-              "Optical Power Input Minimum";
-          }
-          enum "OPINMAX-OTS" {
-            description
-              "Optical Power Input Maximum";
-          }
-          enum "OPINAVG-OTS" {
-            description
-              "Optical Power Input Average";
-          }
-          enum "OPOUT-OTS" {
-            description
-              "Optical Power Output";
-          }
-          enum "OPOUTMIN-OTS" {
-            description
-              "Optical Power Output Minimum";
-          }
-          enum "OPOUTMAX-OTS" {
-            description
-              "Optical Power Output Maximum";
-          }
-          enum "OPOUTAVG-OTS" {
-            description
-              "Optical Power Output Average";
-          }
-          enum "GRPGAIN-OTS" {
-            description
-              "Group Gain";
-          }
-          enum "GRPGAINMIN-OTS" {
-            description
-              "Group Gain Minimum";
-          }
-          enum "GRPGAINMAX-OTS" {
-            description
-              "Group Gain Maximum";
-          }
-          enum "GRPGAINAVG-OTS" {
-            description
-              "Group Gain Average";
-          }
-          enum "GRPOPIN-OTS" {
-            description
-              "Group Optical Power Input";
-          }
-          enum "GRPOPINMIN-OTS" {
-            description
-              "Group Optical Power Input Minimum";
-          }
-          enum "GRPOPINMAX-OTS" {
-            description
-              "Group Optical Power Input Maximum";
-          }
-          enum "GRPOPINAVG-OTS" {
-            description
-              "Group Optical Power Input Average";
-          }
-          enum "GRPOPOUT-OTS" {
-            description
-              "Group Optical Power Output";
-          }
-          enum "GRPOPOUTMIN-OTS" {
-            description
-              "Group Optical Power Output Minimum";
-          }
-          enum "GRPOPOUTMAX-OTS" {
-            description
-              "Group Optical Power Output Maximum";
-          }
-          enum "GRPOPOUTAVG-OTS" {
-            description
-              "Group Optical Power Output Average";
-          }
-          enum "DROPGAIN-OTS" {
-            description
-              "Drop Gain";
-          }
-          enum "DROPGAINMIN-OTS" {
-            description
-              "Drop Gain Minimum";
-          }
-          enum "DROPGAINMAX-OTS" {
-            description
-              "Drop Gain Maximum";
-          }
-          enum "DROPGAINAVG-OTS" {
-            description
-              "Drop Gain Average";
-          }
-          enum "PSD-OTS" {
-            description
-              "Protection Switch Duration";
-          }
-          enum "PSCW-OTS" {
-            description
-              "Protection Switch Count Working";
-          }
-          enum "PSCP-OTS" {
-            description
-              "Protection Switch Count Protection";
-          }
-          enum "EVCSH-OTS" {
-            description
-              "Event Count Short";
-          }
-          enum "EVCSHMAX-OTS" {
-            description
-              "Event Count Short - MAX";
-          }
-          enum "EVCLG-OTS" {
-            description
-              "Event Count Long";
-          }
-          enum "EVCLGMAX-OTS" {
-            description
-              "Event Count Long - MAX";
-          }
-          enum "MAXEVLDISSH-OTS" {
-            description
-              "Maximum Event Loss Distance Short";
-          }
-          enum "MAXEVLDISSHMAX-OTS" {
-            description
-              "Maximum Event Loss Distance Short - MAX";
-          }
-          enum "MAXEVLDISLG-OTS" {
-            description
-              "Maximum Event Loss Distance Long";
-          }
-          enum "MAXEVLDISLGMAX-OTS" {
-            description
-              "Maximum Event Loss Distance Long - MAX";
-          }
-          enum "MAXEVRDISSH-OTS" {
-            description
-              "Maximum Event Reflection Distance Short";
-          }
-          enum "MAXEVRDISSHMAX-OTS" {
-            description
-              "Maximum Event Reflection Distance Short - MAX";
-          }
-          enum "MAXEVRDISLG-OTS" {
-            description
-              "Maximum Event Reflection Distance Long";
-          }
-          enum "MAXEVRDISLGMAX-OTS" {
-            description
-              "Maximum Event Reflection Distance Long - MAX";
-          }
-          enum "MAXEVLSH-OTS" {
-            description
-              "Maximum Event Loss Short";
-          }
-          enum "MAXEVLSHMAX-OTS" {
-            description
-              "Maximum Event Loss Short - MAX";
-          }
-          enum "MAXEVLLG-OTS" {
-            description
-              "Maximum Event Loss Long";
-          }
-          enum "MAXEVLLGMAX-OTS" {
-            description
-              "Maximum Event Loss Long - MAX";
-          }
-          enum "MAXEVRSH-OTS" {
-            description
-              "Maximum Event Reflection Short";
-          }
-          enum "MAXEVRSHMAX-OTS" {
-            description
-              "Maximum Event Reflection Short - MAX";
-          }
-          enum "MAXEVRLG-OTS" {
-            description
-              "Maximum Event Reflection Long";
-          }
-          enum "MAXEVRLGMAX-OTS" {
-            description
-              "Maximum Event Reflection Long - MAX";
-          }
-          enum "CUMEVLSH-OTS" {
-            description
-              "Cumulative Event Loss Short";
-          }
-          enum "CUMEVLSHMAX-OTS" {
-            description
-              "Cumulative Event Loss Short MAX";
-          }
-          enum "CUMEVLLG-OTS" {
-            description
-              "Cumulative Event Loss Long";
-          }
-          enum "CUMEVLLGMAX-OTS" {
-            description
-              "Cumulative Event Loss Long MAX";
-          }
-          enum "CUMEVRSH-OTS" {
-            description
-              "Cumulative Event Reflection Short";
-          }
-          enum "CUMEVRSHMAX-OTS" {
-            description
-              "Cumulative Event Reflection Short MAX";
-          }
-          enum "CUMEVRLG-OTS" {
-            description
-              "Cumulative Event Reflection Long";
-          }
-          enum "CUMEVRLGMAX-OTS" {
-            description
-              "Cumulative Event Reflection Long MAX";
-          }
-          enum "DMMIN-L" {
-            description
-              "Delay Measurement MINimum - Line";
-          }
-          enum "DMMAX-L" {
-            description
-              "Delay Measurement MAXimum - Line";
-          }
-          enum "DMAVG-L" {
-            description
-              "Delay Measurement AVGrage - Line";
-          }
-          enum "ES-W" {
-            description
-              "Errored Seconds - WAN";
-          }
-          enum "SES-W" {
-            description
-              "Severely Errored Seconds - WAN";
-          }
-          enum "UAS-W" {
-            description
-              "Unavailable Seconds - WAN";
-          }
-          enum "INFRAMES-W" {
-            description
-              "Number of frames received (binned OM) - WAN";
-          }
-          enum "INFRAMESERR-W" {
-            description
-              "Number of errored frames received - WAN";
-          }
-          enum "OUTFRAMES-W" {
-            description
-              "Number of frames transmitted (binned OM)- WAN";
-          }
-          enum "DGDAVG-OCH" {
-            description
-              "Differential Group Delay (Average), Optical Channel";
-          }
-          enum "DGDMAX-OCH" {
-            description
-              "Differential Group Delay (Max), Optical Channel";
-          }
-          enum "LDS-W" {
-            description
-              "LCAS Degraded Second - WAN (Rx and Tx directions)";
-          }
-          enum "LSDS-W" {
-            description
-              "LCAS Severely Degraded Second - WAN (Rx and Tx directions)";
-          }
-          enum "LUAS-W" {
-            description
-              "LCAS Unavailable Second - WAN (Rx and Tx directions)";
-          }
-          enum "DFR-W" {
-            description
-              "Aggregate count of discarded frames - WAN";
-          }
-          enum "UTL-W" {
-            description
-              "Average percentage link utilization - WAN";
-          }
-          enum "UTLMX-W" {
-            description
-              "Maximum percentage link utilization - WAN";
-          }
-          enum "OUTFRAMESERR-W" {
-            description
-              "Out Frames Error Count, Wan";
-          }
-          enum "OPR-OTSI" {
-            description
-              "Optical Power Receive- OTSI";
-          }
-          enum "OPT-OTSI" {
-            description
-              "Optical Power Transmit- OTSI";
-          }
-          enum "OPRN-OTSI" {
-            description
-              "Normalized Optical Power Receive- OTSI";
-          }
-          enum "OPTN-OTSI" {
-            description
-              "Normalized Optical Power Transmit- OTSI";
-          }
-          enum "OPRAVG-OTSI" {
-            description
-              "Optical Power Receive, Average - OTSI";
-          }
-          enum "OPRMIN-OTSI" {
-            description
-              "Optical Power Receive, Minimum - OTSI";
-          }
-          enum "OPRMAX-OTSI" {
-            description
-              "Optical Power Receive, Maximum - OTSI";
-          }
-          enum "OPTAVG-OTSI" {
-            description
-              "Optical Power Transmit, Average - OTSI";
-          }
-          enum "OPTMIN-OTSI" {
-            description
-              "Optical Power Transmit, Minimum - OTSI";
-          }
-          enum "OPTMAX-OTSI" {
-            description
-              "Optical Power Transmit, Maximum - OTSI";
-          }
-          enum "DGDAVG-OTSI" {
-            description
-              "Differential Group Delay (Average) OTSI";
-          }
-          enum "DGDMAX-OTSI" {
-            description
-              "Differential Group Delay (Maximum) OTSI";
-          }
-          enum "PDLAVG-OTSI" {
-            description
-              "Polarization Dependent Loss, Average - OTSI";
-          }
-          enum "PDLMAX-OTSI" {
-            description
-              "Polarization Dependent Loss, Maximum - OTSI";
-          }
-          enum "HCCS-OTSI" {
-            description
-              "High Correction Count Seconds - OTSI";
-          }
-          enum "FEC-OTSI" {
-            description
-              "FEC Corrections - OTSI";
-          }
-          enum "PRFBER-OTSI" {
-            description
-              "Post-FEC BER - OTSI";
-          }
-          enum "PRFBERMAX-OTSI" {
-            description
-              "Pre-FEC BER Maximum - OTSI";
-          }
-          enum "QMIN-OTSI" {
-            description
-              "Q MIN - OTSI";
-          }
-          enum "QMAX-OTSI" {
-            description
-              "Q MAX - OTSI";
-          }
-          enum "QAVG-OTSI" {
-            description
-              "Q AVG - OTSI";
-          }
-          enum "QSTDEV-OTSI" {
-            description
-              "Q StDev - OTSI";
-          }
-          enum "UNCFECBLK-OTSI" {
-            description
-              "Uncorrected FEC Block - OTSI";
-          }
-          enum "OSNRMIN-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Minimum) OTSI";
-          }
-          enum "OSNRMAX-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Maximum) OTSI";
-          }
-          enum "OSNRAVG-OTSI" {
-            description
-              "Optical Signal to Noise Ratio (Average) OTSI";
-          }
-          enum "ESNRMIN-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Minimum) OTSI";
-          }
-          enum "ESNRMAX-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Maximum) OTSI";
-          }
-          enum "ESNRAVG-OTSI" {
-            description
-              "Electrical Signal to Noise Ratio (Average) OTSI";
-          }
-          enum "CDMIN-OTSI" {
-            description
-              "Dispersion compensation (Minimum) OTSI";
-          }
-          enum "CDMAX-OTSI" {
-            description
-              "Dispersion compensation (Maximum) OTSI";
-          }
-          enum "CDAVG-OTSI" {
-            description
-              "Dispersion compensation (Average) OTSI";
-          }
-          enum "FEC-PCS" {
-            description
-              "Forward Error Corrections - Physical Coding Sublayer";
-          }
-          enum "FECCCW-PCS" {
-            description
-              "Forward Error Corrections Corrected Codewords - Physical Coding Sublayer";
-          }
-          enum "FECUNCCW-PCS" {
-            description
-              "Forward Error Corrections Uncorrected Codewords - Physical Coding Sublayer";
-          }
-          enum "HCCS-PCS" {
-            description
-              "High Correction Count Second - Physical Coding Sublayer";
-          }
-          enum "PRFBER-PCS" {
-            description
-              "Pre-FEC Bit Error Rate (Average) - Physical Coding Sublayer";
-          }
-          enum "PRFBERMAX-PCS" {
-            description
-              "Pre-FEC Bit Error Rate Maximum - Physical Coding Sublayer";
-          }
-          enum "ALL" {
-            description
-              "All applicable montypes";
-          }
-        }
-        description
-          "Monitored parameter";
-        config false;
-      }
-      leaf monval {
-        type ciena-6500-types:STRING;
-        description
-          "Discriminating Level for requested monitored parameter.";
-        config false;
-      }
-      leaf vldty {
-        type ciena-6500-enums:VLDTY;
-        description
-          "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        config false;
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-        config false;
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-        config false;
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data. Group format: bin_1&bin_2&bin_3...";
-        config false;
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        config false;
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        config false;
-      }
-      leaf-list index {
-        type ciena-6500-enums:INDEX;
-        description
-          "The interval numbers to be accessed. Range format: low_bin&&high_bin Group format: bin_1&bin_2&bin_3... 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        config false;
-      }
-      leaf altaid {
-        type ciena-6500-types:STRING;
-        description
-          "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        config false;
-      }
-      leaf channelid {
-        type ciena-6500-types:INT {
-          range "1..96";
-        }
-        description
-          "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        config false;
-      }
-      leaf channelstatus {
-        type ciena-6500-types:STRING;
-        description
-          "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        config false;
-      }
-      leaf port-mode {
-        type ciena-6500-enums:PORTMODE;
-        description
-          "Optical Port market preference";
-        config false;
-      }
-      leaf width {
-        type ciena-6500-types:STRING;
-        description
-          "Channel width.";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:STRING;
-        description
-          "Channel wavelength.";
-        config false;
-      }
-    }
-    list pmconfig {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf hccs-ref {
-        type ciena-6500-types:STRING;
-        description
-          "Floating point value";
-        config true;
-      }
-      leaf aidtype {
-        type ciena-6500-types:STRING;
-        description
-          "aidtype";
-        config false;
-      }
-    }
-    list cos {
-      key "cos";
-      config false;
-      leaf cos {
-        mandatory true;
-        description
-          "AID in format COSST-shelf-slot-port, COSBR-shelf-slot-port, COSSL-shelf-slot-port, COSGD-shelf-slot-port, COSPL-shelf-slot-port, COSPR-shelf-slot-port, COSNW-shelf-slot-port, COSCR-shelf-slot-port, COSA-shelf-slot-port, COSBC-shelf-slot-port, COSBE-shelf-slot-port, COSC-shelf-slot-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type enumeration {
-          enum "COS";
-        }
-        description
-          "AID type";
-        config false;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:COS_MONTYPE;
-        description
-          "Monitored parameter";
-        config false;
-      }
-      leaf monval {
-        type ciena-6500-types:STRING;
-        description
-          "Discriminating Level for requested monitored parameter.";
-        config false;
-      }
-      leaf vldty {
-        type ciena-6500-enums:VLDTY;
-        description
-          "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        config false;
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-        config false;
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "All directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-        config false;
-      }
-      leaf-list tmper {
-        type enumeration {
-          enum "15-MIN";
-          enum "1-DAY";
-          enum "1-UNT";
-          enum "BASLN";
-          enum "ALL";
-        }
-        description
-          "Accumulation time period of data";
-        config false;
-      }
-      leaf-list mondat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        config false;
-      }
-      leaf-list montm {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. Hour = 00..23, Minute = 00,15,30,45";
-        config false;
-      }
-      leaf-list index {
-        type ciena-6500-types:INT {
-          range "0..32";
-        }
-        description
-          "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        config false;
-      }
-      leaf altaid {
-        type ciena-6500-types:STRING;
-        description
-          "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        config false;
-      }
-      leaf channelid {
-        type ciena-6500-types:INT {
-          range "1..96";
-        }
-        description
-          "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        config false;
-      }
-      leaf channelstatus {
-        type ciena-6500-types:STRING;
-        description
-          "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        config false;
-      }
-      leaf port-mode {
-        type ciena-6500-enums:PORTMODE;
-        description
-          "Optical Port market preference";
-        config false;
-      }
-      leaf width {
-        type ciena-6500-types:STRING;
-        description
-          "Channel width.";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:STRING;
-        description
-          "Channel wavelength.";
-        config false;
-      }
-    }
-    list sdmon {
-      key "sdmonaid";
-      config false;
-      leaf sdmonaid {
-        mandatory true;
-        description
-          "AID in format SDMON-shelf-slot-port-frequency, SDMON-shelf-ALL, SDMON-shelf-slot-ALL, SDMON-shelf-slot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf aidtype {
-        type enumeration {
-          enum "SDMON";
-        }
-        description
-          "AID type";
-        config false;
-      }
-      leaf-list mon-type {
-        type ciena-6500-enums:SDMON_MONTYPE;
-        description
-          "Monitored parameter";
-        config false;
-      }
-      leaf monval {
-        type ciena-6500-types:STRING;
-        description
-          "Discriminating Level for requested monitored parameter.";
-        config false;
-      }
-      leaf vldty {
-        type ciena-6500-enums:VLDTY;
-        description
-          "Validity indicator for historical monitoring information. It indicates whether the information for the specified time period was accumulated over the entire time period or some portion of it.";
-        config false;
-      }
-      leaf locn {
-        default "ALL";
-        type enumeration {
-          enum "NEND" {
-            description
-              "Near End";
-          }
-          enum "FEND" {
-            description
-              "Far End";
-          }
-          enum "ALL" {
-            description
-              "All ends";
-          }
-        }
-        description
-          "Location";
-        config false;
-      }
-      leaf dirn {
-        default "ALL";
-        type enumeration {
-          enum "NA" {
-            description
-              "Not Applicable";
-          }
-          enum "RCV" {
-            description
-              "Receive direction only";
-          }
-          enum "TRMT" {
-            description
-              "Transmit direction only";
-          }
-          enum "ALL" {
-            description
-              "Both directions";
-          }
-        }
-        description
-          "Direction of signal flow relative to network element.";
-        config false;
-      }
-      leaf time-period {
-        type ciena-6500-enums:TMPER;
-        description
-          "Accumulation time period of data";
-        config false;
-      }
-      leaf mon-dat {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start date of monitoring interval (MM-DD) or ALL. MM = 01..12, DD = 01..31";
-        config false;
-      }
-      leaf mon-time {
-        type ciena-6500-types:STRING;
-        description
-          "Nominal Start time of monitoring level (HH-MM) or ALL. HH = 00..23, MM = 00,15,30,45";
-        config false;
-      }
-      leaf-list index {
-        type ciena-6500-types:INT {
-          range "0..32";
-        }
-        description
-          "The interval numbers to be accessed. 0 = current interval; 1-32 = previous intervals e.g. for tmper=15-MIN, index=1 is the most recently completed 15-minute interval, index=2 is the interval before that. For tmper=1-DAY, index=1 is the most recently completed day interval (yesterday); ALL = all intervals.";
-        config false;
-      }
-      leaf altaid {
-        type ciena-6500-types:STRING;
-        description
-          "A physical location identifier for a facility consisting of a Bay and Shelf identifier.";
-        config false;
-      }
-      leaf channelid {
-        type ciena-6500-types:INT {
-          range "1..96";
-        }
-        description
-          "logical channel number assignment for each defined wavelength. Range 1 - 96.";
-        config false;
-      }
-      leaf channelstatus {
-        type ciena-6500-types:STRING;
-        description
-          "Unknown, InUse (managed by DOC), and Idle (not managed by DOC).";
-        config false;
-      }
-      leaf port-mode {
-        type ciena-6500-enums:PORTMODE;
-        description
-          "Optical Port market preference";
-        config false;
-      }
-      leaf width {
-        type ciena-6500-types:STRING;
-        description
-          "Channel width.";
-        config false;
-      }
-      leaf wavelength {
-        type ciena-6500-types:STRING;
-        description
-          "Channel wavelength.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-port.yang b/models/ciena-6500-port.yang
deleted file mode 100644
index 8513ec60cdf6bdc871160df94a16e396f03839a6..0000000000000000000000000000000000000000
--- a/models/ciena-6500-port.yang
+++ /dev/null
@@ -1,23801 +0,0 @@
-module ciena-6500-port {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-port";
-  prefix port;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's port object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Added rpc: port-show-sttp
-       - Added rpc: port-disable-sttp
-       - Added rpc: port-enable-sttp
-       - Added rpc: port-operate-loopback-oductp
-       - Added rpc: port-release-loopback-oductp
-       - Added rpc: port-disable-cbrttp
-       - Added rpc: port-enable-cbrttp
-       - Added rpc: port-show-cbrttp
-       - Added rpc: port-operate-loopback-cbrttp
-       - Added rpc: port-release-loopback-cbrttp
-         container port
-         - Added list: cbrttp
-           container loopback
-           - Added list: oductp
-           - Added list: cbrttp
-           list eth10g
-             leaf-list sst
-               type enumeration
-               - Added enum: TSGEN
-               - Added enum: TSMON
-           list ethn
-             leaf pre-fec-sf-th-lev
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -1.00..1.00 
-             leaf pre-fec-sd-th-lev
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -1.00..2.00 
-             leaf-list sst
-               type enumeration
-               - Added enum: TSMON
-             leaf mapping
-               type enumeration
-               - Added enum: GFPFLEX
-           list flex
-             leaf-list sst
-               type enumeration
-               - Added enum: TSGEN
-               - Added enum: TSMON
-           list oc48
-           - Removed leaf: och-rx-act-power
-           - Removed leaf: och-tx-act-power
-           - Removed leaf: och-rx-min-power
-           - Removed leaf: och-rx-max-power
-           - Removed leaf: och-tx-min-power
-           - Removed leaf: och-tx-max-power
-           - Removed leaf: laserofffarendfail
-           - Added leaf: rx-act-power
-           - Added leaf: tx-act-power
-           - Added leaf: rx-min-power
-           - Added leaf: rx-max-power
-           - Added leaf: tx-min-power
-           - Added leaf: tx-max-power
-           - Added leaf: laser-off-far-end-fail
-           list oc192
-           - Removed leaf: laserofffarendfail
-           - Removed leaf: ochtxwvlngthprov
-           - Removed leaf: och-rx-act-power
-           - Removed leaf: och-rx-min-power
-           - Removed leaf: och-rx-max-power
-           - Removed leaf: och-tx-act-power
-           - Removed leaf: och-tx-min-power
-           - Removed leaf: och-tx-max-power
-           - Removed leaf: ochtxwvlngthmin
-           - Removed leaf: ochtxwvlngthmax
-           - Removed leaf: ochtxwvlngthspacing
-           - Added leaf: laser-off-far-end-fail
-           - Added leaf: tx-wvlngth-prov
-           - Added leaf: rx-act-power
-           - Added leaf: rx-min-power
-           - Added leaf: rx-max-power
-           - Added leaf: tx-act-power
-           - Added leaf: tx-min-power
-           - Added leaf: tx-max-power
-           - Added leaf: tx-wvlngth-min
-           - Added leaf: tx-wvlngth-max
-           - Added leaf: tx-wvlngth-spacing
-             leaf-list sst
-               type enumeration
-               - Added enum: TSGEN
-               - Added enum: TSMON
-           list oc768
-           - Removed leaf: laserofffarendfail
-           - Removed leaf: och-rx-act-power
-           - Removed leaf: och-rx-min-power
-           - Removed leaf: och-rx-max-power
-           - Removed leaf: och-tx-act-power
-           - Removed leaf: och-tx-min-power
-           - Removed leaf: och-tx-max-power
-           - Added leaf: laser-off-far-end-fail
-           - Added leaf: rx-act-power
-           - Added leaf: rx-min-power
-           - Added leaf: rx-max-power
-           - Added leaf: tx-act-power
-           - Added leaf: tx-min-power
-           - Added leaf: tx-max-power
-             leaf-list sst
-               type enumeration
-               - Added enum: TSGEN
-               - Added enum: TSMON
-           list otm2
-             leaf-list sst
-               type enumeration
-               - Added enum: TSGEN
-               - Added enum: TSMON
-           list otm3
-             leaf-list sst
-               type enumeration
-               - Added enum: TSGEN
-               - Added enum: TSMON
-           list otm
-             leaf-list sst
-               type enumeration
-               - Added enum: TSGEN
-               - Added enum: TSMON
-             leaf assoc-q
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-           list ptp
-           - Added leaf: exp-res-time-prov
-           - Added leaf: rqst-trans-mode
-           - Added leaf: saved-trans-mode
-           - Added leaf: rqst-linkOpt-mode
-           - Added leaf: act-linkOpt-mode
-           - Added leaf: saved-linkOpt-mode
-           - Added leaf: rqst-tx-wvlngth
-           - Added leaf: act-tx-wvlngth
-           - Added leaf: rqst-tx-wvlngth-spacing
-           - Added leaf: rqst-tx-freq
-           - Added leaf: act-tx-freq
-           - Added leaf: rqst-tx-pwr
-           - Added leaf: rqst-tx-mode
-           - Added leaf: act-tx-mode
-           - Added leaf: rqst-tx-disp
-           - Added leaf: act-tx-disp
-           - Added leaf: rqst-path-disp
-           - Added leaf: act-path-disp
-           - Added leaf: rqst-carrier-centering-mode
-           - Added leaf: act-carrier-centering-mode
-           - Added leaf: rqst-laser-centering-range
-           - Added leaf: act-laser-centering-range
-           - Added leaf: rqst-ccda
-           - Added leaf: act-ccda
-           - Added leaf: rqst-och-tx-blanking
-           - Added leaf: act-och-tx-blanking
-           - Added leaf: rqst-line-type
-           - Added leaf: rqst-allocated-spec-width
-           - Added leaf: rqst-exp-res-time
-           - Added leaf: act-exp-res-time
-             leaf pre-fec-sf-th-lev
-               type decimal64
-               - Changed range from -1.0..1.0 to -1.00..1.00
-             leaf pre-fec-sd-th-lev
-               type decimal64
-               - Changed range from -1.0..3.5 to -1.00..3.50
-           list otuttp
-           - Removed leaf-list: pm-aid
-           list sttp
-             leaf rate
-             - Added mandatory: true 
-             - Changed config from false to true
-             leaf pst
-             - Changed config from false to true
-             - Changed type from ciena-6500-enums:PSTfac_RTRV to enumeration
-               type enumeration
-               - Added enum: IS
-               - Added enum: OOS-MA
-               - Added enum: IS-ANR
-               - Added enum: OOS-AU
-               - Added enum: OOS-AUMA
-               - Added enum: OOS-MAANR
-           list oductp
-           - Added leaf: act-avail-ts
-             leaf trib-slot-assignment
-               type string
-               - Changed length from 1..24 to 1..51
-             leaf ex-pt
-             - Changed config from false to true
-           list tcm
-             leaf sd-th
-             - Changed config from false to true
-               type ciena-6500-types:INT
-               - Changed range from 5..9 to 6..9
-         rpc port-show-eth10g
-           output
-             list output
-               leaf-list sst
-                 type enumeration
-                 - Added enum: TSGEN
-                 - Added enum: TSMON
-         rpc port-show-ethn
-           output
-             list output
-               leaf mapping
-                 type enumeration
-                 - Added enum: GFPFLEX
-               leaf pre-fec-sf-th-lev
-               - Changed type from ciena-6500-types:DECIMAL to decimal64
-                 type decimal64
-                 - Added range: -1.00..1.00 
-               leaf pre-fec-sd-th-lev
-               - Changed type from ciena-6500-types:DECIMAL to decimal64
-                 type decimal64
-                 - Added range: -1.00..2.00 
-               leaf-list sst
-                 type enumeration
-                 - Added enum: TSMON
-         rpc port-show-flex
-           output
-             list output
-               leaf-list sst
-                 type enumeration
-                 - Added enum: TSGEN
-                 - Added enum: TSMON
-         rpc port-show-oc48
-           output
-             list output
-             - Removed leaf: och-rx-act-power
-             - Removed leaf: och-tx-act-power
-             - Removed leaf: och-rx-min-power
-             - Removed leaf: och-rx-max-power
-             - Removed leaf: och-tx-min-power
-             - Removed leaf: och-tx-max-power
-             - Added leaf: rx-act-power
-             - Added leaf: tx-act-power
-             - Added leaf: rx-min-power
-             - Added leaf: rx-max-power
-             - Added leaf: tx-min-power
-             - Added leaf: tx-max-power
-         rpc port-show-oc192
-           output
-             list output
-             - Removed leaf: och-rx-act-power
-             - Removed leaf: och-rx-min-power
-             - Removed leaf: och-rx-max-power
-             - Removed leaf: och-tx-act-power
-             - Removed leaf: och-tx-min-power
-             - Removed leaf: och-tx-max-power
-             - Removed leaf: ochtxwvlngthprov
-             - Removed leaf: ochtxwvlngthmin
-             - Removed leaf: ochtxwvlngthmax
-             - Removed leaf: ochtxwvlngthspacing
-             - Removed leaf: laserofffarendfail
-             - Added leaf: rx-act-power
-             - Added leaf: rx-min-power
-             - Added leaf: rx-max-power
-             - Added leaf: tx-act-power
-             - Added leaf: tx-min-power
-             - Added leaf: tx-max-power
-             - Added leaf: tx-wvlngth-prov
-             - Added leaf: tx-wvlngth-min
-             - Added leaf: tx-wvlngth-max
-             - Added leaf: tx-wvlngth-spacing
-             - Added leaf: laser-off-far-end-fail
-               leaf-list sst
-                 type enumeration
-                 - Added enum: TSGEN
-                 - Added enum: TSMON
-         rpc port-show-oc768
-           output
-             list output
-             - Removed leaf: och-rx-act-power
-             - Removed leaf: och-rx-min-power
-             - Removed leaf: och-rx-max-power
-             - Removed leaf: och-tx-act-power
-             - Removed leaf: och-tx-min-power
-             - Removed leaf: och-tx-max-power
-             - Removed leaf: laserofffarendfail
-             - Added leaf: rx-act-power
-             - Added leaf: rx-min-power
-             - Added leaf: rx-max-power
-             - Added leaf: tx-act-power
-             - Added leaf: tx-min-power
-             - Added leaf: tx-max-power
-             - Added leaf: laser-off-far-end-fail
-               leaf-list sst
-                 type enumeration
-                 - Added enum: TSGEN
-                 - Added enum: TSMON
-         rpc port-show-otm2
-           output
-             list output
-               leaf-list sst
-                 type enumeration
-                 - Added enum: TSGEN
-                 - Added enum: TSMON
-         rpc port-measure-rawber-otm2
-           output
-             list output
-             - Removed leaf: och-rx-raw-ber
-             - Added leaf: rx-raw-ber
-         rpc port-show-otm3
-           output
-             list output
-               leaf-list sst
-                 type enumeration
-                 - Added enum: TSGEN
-                 - Added enum: TSMON
-         rpc port-show-otm
-           output
-             list output
-               leaf assoc-q
-               - Changed type from ciena-6500-types:INT to union
-                 type union
-                 - Added type: enumeration
-                 - Added type: ciena-6500-types:INT
-               leaf-list sst
-                 type enumeration
-                 - Added enum: TSGEN
-                 - Added enum: TSMON
-         rpc port-show-ptp
-           output
-             list output
-             - Added leaf: rqst-trans-mode
-             - Added leaf: saved-trans-mode
-             - Added leaf: rqst-linkOpt-mode
-             - Added leaf: act-linkOpt-mode
-             - Added leaf: saved-linkOpt-mode
-             - Added leaf: rqst-tx-wvlngth
-             - Added leaf: act-tx-wvlngth
-             - Added leaf: rqst-tx-wvlngth-spacing
-             - Added leaf: rqst-tx-freq
-             - Added leaf: act-tx-freq
-             - Added leaf: rqst-tx-pwr
-             - Added leaf: rqst-tx-mode
-             - Added leaf: act-tx-mode
-             - Added leaf: rqst-tx-disp
-             - Added leaf: act-tx-disp
-             - Added leaf: rqst-path-disp
-             - Added leaf: act-path-disp
-             - Added leaf: rqst-carrier-centering-mode
-             - Added leaf: act-carrier-centering-mode
-             - Added leaf: rqst-laser-centering-range
-             - Added leaf: act-laser-centering-range
-             - Added leaf: rqst-ccda
-             - Added leaf: act-ccda
-             - Added leaf: rqst-och-tx-blanking
-             - Added leaf: act-och-tx-blanking
-             - Added leaf: rqst-line-type
-             - Added leaf: rqst-allocated-spec-width
-             - Added leaf: rqst-exp-res-time
-             - Added leaf: exp-res-time-prov
-             - Added leaf: act-exp-res-time
-               leaf pre-fec-sf-th-lev
-                 type decimal64
-                 - Changed range from -1.0..1.0 to -1.00..1.00
-               leaf pre-fec-sd-th-lev
-                 type decimal64
-                 - Changed range from -1.0..3.5 to -1.00..3.50
-         rpc port-show-otuttp
-           output
-             list output
-             - Removed leaf-list: pm-aid
-         rpc port-show-oductp
-           output
-             list output
-             - Added leaf: act-avail-ts
-               leaf trib-slot-assignment
-                 type string
-                 - Changed length from 1..24 to 1..51";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         rpc port-show-otm
-           output
-             list output
-             - Added leaf: laser-freq-thr
-         container port
-           list otm
-           - Added leaf: laser-freq-thr
-           list ptp
-             leaf laser-freq-thr
-             - Changed default from 1.5 to 1.6
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC
-           list otuttp
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC
-           list ettp
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC
-           list tcm
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: port-disable-eth
-       - Added rpc: port-disable-eth100
-       - Added rpc: port-enable-eth
-       - Added rpc: port-enable-eth100
-       - Added rpc: port-disable-wan
-       - Added rpc: port-enable-wan
-       - Added rpc: port-show-wan
-       - Added rpc: port-show-eth10g
-       - Added rpc: port-show-ethn
-       - Added rpc: port-disable-lag
-       - Added rpc: port-enable-lag
-       - Added rpc: port-delete-lag-port
-       - Added rpc: port-enable-fiber-channel
-       - Added rpc: port-disable-fiber-channel
-       - Added rpc: port-show-flex
-       - Added rpc: port-enable-flex
-       - Added rpc: port-disable-flex
-       - Added rpc: port-disable-oc3
-       - Added rpc: port-enable-oc3
-       - Added rpc: port-show-oc3
-       - Added rpc: port-disable-oc12
-       - Added rpc: port-enable-oc12
-       - Added rpc: port-show-oc12
-       - Added rpc: port-disable-oc48
-       - Added rpc: port-enable-oc48
-       - Added rpc: port-show-oc48
-       - Added rpc: port-disable-oc192
-       - Added rpc: port-enable-oc192
-       - Added rpc: port-show-oc192
-       - Added rpc: port-disable-oc768
-       - Added rpc: port-enable-oc768
-       - Added rpc: port-show-oc768
-       - Added rpc: port-show-otm2
-       - Added rpc: port-init-dispscan-otm2
-       - Added rpc: port-measure-rawber-otm2
-       - Added rpc: port-show-otm3
-       - Added rpc: port-show-otm
-       - Added rpc: port-init-dispscan-otm
-       - Added rpc: port-show-sts192c
-       - Added rpc: port-show-tti-odu
-       - Added rpc: port-show-trace-flex
-       - Added rpc: port-show-ptp
-       - Added rpc: port-disable-ptp
-       - Added rpc: port-enable-ptp
-       - Added rpc: port-init-dispscan-ptp
-       - Added rpc: port-show-otuttp
-       - Added rpc: port-disable-otuttp
-       - Added rpc: port-enable-otuttp
-       - Added rpc: port-operate-loopback-otuttp
-       - Added rpc: port-release-loopback-otuttp
-       - Added rpc: port-operate-loopback-sttp
-       - Added rpc: port-release-loopback-sttp
-       - Added rpc: port-show-ettp
-       - Added rpc: port-disable-ettp
-       - Added rpc: port-enable-ettp
-       - Added rpc: port-operate-loopback-ettp
-       - Added rpc: port-release-loopback-ettp
-       - Added rpc: port-show-oduttp
-       - Added rpc: port-disable-oduttp
-       - Added rpc: port-enable-oduttp
-       - Added rpc: port-operate-loopback-oduttp
-       - Added rpc: port-release-loopback-oduttp
-       - Added rpc: port-show-oductp
-       - Added rpc: port-delete-oductp
-       - Added rpc: port-disable-oductp
-       - Added rpc: port-enable-oductp
-       - Added rpc: port-show-tcm
-       - Added rpc: port-disable-tcm
-       - Added rpc: port-enable-tcm
-       - Added rpc: port-show-odu
-       - Added rpc: port-disable-odu
-       - Added rpc: port-enable-odu
-         container port
-         - Added container: loopback
-         - Added container: trace
-         - Added container: tti
-         - Added container: wavelength
-         - Added list: eth
-         - Added list: eth100
-         - Added list: lag
-         - Added list: lag-port
-         - Added list: fiber-channel
-         - Added list: oc3
-         - Added list: oc12
-         - Added list: oc48
-         - Added list: oc192
-         - Added list: oc768
-         - Added list: sts192c
-         - Added list: ptp
-         - Added list: otuttp
-         - Added list: fttp
-         - Added list: sttp
-         - Added list: ettp
-         - Added list: oduttp
-         - Added list: oductp
-         - Added list: tcm
-         - Added list: pc
-         - Added list: vcp
-           list wan
-             leaf wan
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf fcs
-             - Added default: 0 
-             leaf scramble
-               type enumeration
-               - Added enum: DISABLE
-             leaf mapping
-             - Added default: GFP-F 
-               type enumeration
-               - Added enum: POS
-             leaf lcas
-             - Added default: DISABLE 
-             leaf cond-type
-             - Changed type from ciena-6500-enums:Conditioning to enumeration
-               type enumeration
-               - Added enum: NONE
-               - Added enum: GFPCMF
-               - Added enum: GFPCMFUSER
-               - Added enum: GFP10BERR
-               - Added enum: UNEQ
-               - Added enum: NILTR
-               - Added enum: AIS
-               - Added enum: GFPCSF
-             leaf if-type
-             - Added mandatory: true 
-             leaf policing
-             - Added default: ENABLE 
-             leaf loop-detect
-             - Added default: DISABLE 
-             leaf bw-threshld
-               type ciena-6500-types:INT
-               - Added range: 1..100 
-             leaf gfp-rfi-upi
-               type ciena-6500-types:INT
-               - Added range: 3..255 
-             leaf user-rx-cos
-               type ciena-6500-types:INT
-               - Added range: 0..15 
-             leaf pbt-list-sup
-               type ciena-6500-types:INT
-               - Added range: 0 | 1 
-             leaf pst
-             - Added default: OOS-MA 
-             - Changed config from false to true
-             leaf prov-units
-               type ciena-6500-types:INT
-               - Added range: 0..64 
-             leaf prov-rx-units
-               type ciena-6500-types:INT
-               - Added range: 0..64 
-             leaf actual-units
-               type ciena-6500-types:INT
-               - Added range: 0..64 
-             leaf max-vc-del
-               type ciena-6500-types:INT
-               - Added range: 0..256000 
-             leaf curr-vc-del
-               type ciena-6500-types:INT
-               - Added range: 0..256000 
-             leaf round-trip-delay
-               type ciena-6500-types:INT
-               - Added range: 0..220000 
-             leaf actual-rx-units
-               type ciena-6500-types:INT
-               - Added range: 0..64 
-             leaf bw-remain
-               type ciena-6500-types:INT
-               - Added range: 1..2500000 
-             leaf bw-utl
-               type ciena-6500-types:INT
-               - Added range: 0..100 
-             leaf snmp-index
-               type ciena-6500-types:INT
-               - Added range: 0..4294967295 
-             leaf force
-             - Added default: NO 
-           list eth10g
-           - Removed leaf: suto-neg
-             leaf eth10g
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf laser-off-far-end-fail
-             - Added default: DISABLED 
-             leaf auto-neg
-             - Added default: DISABLE 
-             leaf pause-tx
-             - Added default: ENABLE 
-             leaf speed
-             - Added default: 10G 
-             leaf eth-duplex
-             - Added default: FULL 
-             leaf tx-con
-             - Added default: ENABLE 
-             leaf tx-inter-pkt-gap
-             - Added default: 12 
-             leaf tx-con-hb
-             - Added default: ENABLE 
-             leaf tx-con-hb-interval
-             - Added default: 1SEC 
-             leaf tx-con-md-level
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..7 
-             leaf tx-cond-network-flt-sig
-             - Added default: EXPLICIT 
-             leaf eqpt
-             - Added default: XGELAN 
-             leaf pause-tx-override
-             - Added default: DISABLE 
-             leaf rx-idle
-             - Added default: 0 
-             leaf dus-override
-             - Added default: DISABLE 
-             leaf user-rx-cos
-               type ciena-6500-types:INT
-               - Added range: 0..15 
-             leaf pbt-list-sup
-               type ciena-6500-types:INT
-               - Added range: 0 | 1 
-             leaf rate
-               type ciena-6500-types:INT
-               - Added range: 10 | 20 | 30..10000 
-             leaf hold-off
-               type ciena-6500-types:INT
-               - Added range: 0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000 
-             leaf-list sst
-               type enumeration
-               - Added enum: AINS-DEA
-             leaf mapping
-             - Added default: GFPSTD 
-             leaf mode
-             - Added default: L2 
-             leaf pst
-             - Added default: IS 
-             leaf tx-wvlngth-min
-             - Added default: 0.00 
-             leaf tx-wvlngth-max
-             - Added default: 0.00 
-           list ethn
-           - Added leaf: hold-off
-             leaf ethn
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf laser-off-far-end-fail
-             - Added default: DISABLED 
-             leaf pre-fec-sf-th-lev
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:DECIMAL
-               type ciena-6500-types:DECIMAL
-               - Added range: -1 | 0 | 1 
-             leaf pre-fec-sd-th-lev
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:DECIMAL
-               type ciena-6500-types:DECIMAL
-               - Added range: -1.0..2.0 
-             leaf-list sst
-               type enumeration
-               - Added enum: AINS-DEA
-               - Added enum: TSGEN
-             leaf mapping
-               type enumeration
-               - Added enum: PROPRIETARY
-             leaf pst
-             - Added default: IS 
-           list flex
-             leaf flex
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf protocol
-             - Added mandatory: true 
-             leaf latency-opt
-             - Added default: MEDIUM 
-             leaf hold-off
-               type ciena-6500-types:INT
-               - Added range: 0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000 
-             leaf tf-mode
-             - Added default: OFF 
-             leaf ing-police
-             - Added default: DISABLED 
-             leaf cir
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 1..1000000 
-             leaf cbs
-             - Added default: 12176 
-               type ciena-6500-types:INT
-               - Added range: 1..131071 
-             leaf cbs-units
-             - Added default: BYTE 
-             leaf-list sst
-               type enumeration
-               - Added enum: AINS-DEA
-           list otm2
-           - Removed leaf: otu-term
-           - Added leaf: otm-term
-             leaf otm2aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf tx-sbs
-             - Added default: ON 
-             leaf tx-am-frmt
-             - Added default: AM2 
-             leaf tx-path-id
-               type ciena-6500-types:INT
-               - Added range: 1..254 
-             leaf tx-tr-cont
-             - Added default: ON 
-             leaf tx-mode
-             - Added default: ED 
-             leaf tx-wvlngth-prov
-             - Added default: 0.00 
-             leaf tx-disp-prov
-             - Added default: 0 
-             leaf tf-mode
-             - Added default: OFF 
-               type enumeration
-               - Added enum: LINEFAIL
-             leaf odu-tf-mode
-             - Added default: OFF 
-             leaf otu-timen
-             - Added default: OPERATOR 
-             leaf odu-timen
-             - Added default: OPERATOR 
-             leaf laser-off-far-end-fail
-             - Added default: DISABLED 
-             leaf tx-chrip
-             - Added default: NEGATIVE 
-             leaf otu-rate
-             - Added default: 10G709 
-             leaf odu-sf-th-lev
-             - Added default: 0 
-             leaf odu-sd-th-lev
-             - Added default: 0 
-             leaf cc-tx-msg-len
-             - Added default: 16 
-             leaf rc-rx-msg-len
-             - Added default: 28 
-             leaf rc-rx-ask-baud-rate
-             - Added default: 16.67 
-             leaf rc-rx-decode-frmt
-             - Added default: 3SB1 
-             leaf rc-rx-thresh-mode
-             - Added default: AUTO 
-             leaf rc-rx-thresh
-             - Added default: 100 
-             leaf dm-enable
-             - Added default: NO 
-             leaf encr-tcm
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 1..6 
-             leaf spli-mgmt
-             - Added default: ON 
-             leaf pst
-             - Added default: IS 
-             leaf-list sst
-               type enumeration
-               - Added enum: AINS-DEA
-             leaf tx-wvlngth-min
-             - Added default: 0.00 
-             leaf tx-wvlngth-max
-             - Added default: 0.00 
-             leaf tx-act-disp
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-             leaf rx-act-disp
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-             leaf force
-             - Added default: NO 
-           list otm3
-           - Removed leaf: otu-term
-           - Added leaf: otm-term
-             leaf otm3aid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf tx-path-id
-               type ciena-6500-types:INT
-               - Added range: 1..254 
-             leaf tx-wvlngth-prov
-             - Added default: 0.00 
-             leaf tf-mode
-             - Added default: OFF 
-               type enumeration
-               - Added enum: LINEFAIL
-             leaf odu-tf-mode
-             - Added default: OFF 
-             leaf otu-timen
-             - Added default: OPERATOR 
-             leaf odu-timen
-             - Added default: OPERATOR 
-             leaf laser-off-far-end-fail
-             - Added default: DISABLED 
-             leaf pwr-bal-ctlr
-             - Added default: DISABLED 
-             leaf tuning-mode
-             - Added default: NORMAL 
-             leaf odu-handoff
-             - Added default: AUTO 
-             leaf frr
-             - Added default: DISABLED 
-             leaf frr-config
-             - Added default: MATCHEDCD 
-             leaf frr-path1-disp
-             - Added default: AUTO 
-             leaf frr-path2-disp
-             - Added default: AUTO 
-             leaf dm-enable
-             - Added default: NO 
-             leaf spli-mgmt
-             - Added default: ON 
-             leaf pst
-             - Added default: IS 
-             leaf-list sst
-               type enumeration
-               - Added enum: AINS-DEA
-             leaf tx-wvlngth-min
-             - Added default: 0.00 
-             leaf tx-wvlngth-max
-             - Added default: 0.00 
-             leaf rx-act-disp
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-             leaf odu-sf-th-lev
-             - Added default: 0 
-             leaf odu-sd-th-lev
-             - Added default: 0 
-             leaf hold-off
-             - Added default: 0 
-             leaf hold-on
-             - Added default: 0 
-             leaf force
-             - Added default: NO 
-           list otminfo
-             leaf otmnaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list otm
-           - Removed leaf: otu-term
-           - Added leaf: otm-term
-             leaf otmaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf tx-path-id
-               type ciena-6500-types:INT
-               - Added range: 1..254 
-             leaf tx-wvlngth-prov
-             - Added default: 0.00 
-             leaf tx-wvlngth-spacing
-             - Added default: 50 
-             leaf odu-handoff
-             - Added default: AUTO 
-             leaf tf-mode
-             - Added default: OFF 
-               type enumeration
-               - Added enum: LINEFAIL
-             leaf odu-tf-mode
-             - Added default: OFF 
-             leaf otu-timen
-             - Added default: OPERATOR 
-             leaf odu-timen
-             - Added default: OPERATOR 
-             leaf laser-off-far-end-fail
-             - Added default: DISABLED 
-             leaf frr
-             - Added default: DISABLED 
-             leaf frr-config
-             - Added default: MATCHEDCD 
-             leaf frr-path1-disp
-             - Added default: AUTO 
-             leaf frr-path2-disp
-             - Added default: AUTO 
-             leaf odu-sf-th-lev
-             - Added default: 0 
-             leaf odu-sd-th-lev
-             - Added default: 0 
-             leaf otu-rate
-               type enumeration
-               - Added enum: OTUC2
-             leaf dm-enable
-             - Added default: NO 
-             leaf spli-mgmt
-             - Added default: ON 
-             leaf encr-tcm
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 1..6 
-             leaf rx-pwr-l-thr
-             - Added default: 0 
-             leaf rx-pwr-h-thr
-             - Added default: 0 
-             leaf rx-ch-pwr-l-thr
-             - Added default: 0 
-             leaf rx-ch-pwr-h-thr
-             - Added default: 0 
-             leaf rx-pwr-thr-prov
-             - Added default: OFF 
-             leaf laser-centering-range
-             - Added default: 2.5 Ghz 
-             leaf pst
-             - Added default: IS 
-             leaf-list sst
-               type enumeration
-               - Added enum: AINS-DEA
-             leaf tx-act-disp
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-             leaf rx-act-disp
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-             leaf tx-pre-disp
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-             leaf rx-post-disp
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-             leaf tx-wvlngth-min
-             - Added default: 0.00 
-             leaf tx-wvlngth-max
-             - Added default: 0.00 
-             leaf hold-off
-             - Added default: 0 
-             leaf hold-on
-             - Added default: 0 
-             leaf tx-disp-found
-             - Changed type from ciena-6500-types:INT to union
-               type union
-               - Added type: enumeration
-               - Added type: ciena-6500-types:INT
-             leaf tx-freq-min
-             - Added default: 0.00 
-             leaf tx-freq-max
-             - Added default: 0.00 
-             leaf force
-             - Added default: NO 
-           list odu
-             leaf odun
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf odu-tf-mode
-             - Added default: OFF 
-             leaf odu-timen
-             - Added default: OPERATOR 
-             leaf odu-monitor
-             - Added default: NO 
-             leaf encryption-tcm
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 1..6 
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTODU to enumeration
-               type enumeration
-               - Added enum: AINS
-               - Added enum: AINS-DEA
-               - Added enum: ACT
-               - Added enum: IDLE
-               - Added enum: STBYS
-               - Added enum: WRK
-               - Added enum: FLT
-               - Added enum: MEA
-               - Added enum: UEQ
-               - Added enum: SGEO
-               - Added enum: DISCD
-               - Added enum: LPBK
-               - Added enum: TS
-               - Added enum: STBYH
-               - Added enum: WRKRX
-               - Added enum: WRKTX
-               - Added enum: UAS
-               - Added enum: PROTECTED
-               - Added enum: MT
-               - Added enum: DSBLD";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Added container: port
-       - Added rpc: port-enable-eth10g
-       - Added rpc: port-disable-eth10g
-       - Added rpc: port-enable-ethn
-       - Added rpc: port-disable-ethn
-       - Added rpc: port-disable-otm2
-       - Added rpc: port-enable-otm2
-       - Added rpc: port-disable-otm3
-       - Added rpc: port-enable-otm3
-       - Added rpc: port-disable-otm
-       - Added rpc: port-enable-otm";
-  }
-
-  rpc port-disable-eth {
-    description
-      "Remove Ethernet Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-disable-eth100 {
-    description
-      "Remove Ethernet (10/100) Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf eth100 {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-eth {
-    description
-      "Restore Ethernet Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-enable-eth100 {
-    description
-      "Restore Ethernet (10/100) Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf eth100 {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-disable-wan {
-    description
-      "Remove WAN Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state";
-    input {
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-enable-wan {
-    description
-      "Restore WAN Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-wan {
-    description
-      "Retrieve WAN Facility attributes.";
-    input {
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port, WAN-shelf-slot-portSsubport, WAN10G-shelf-slot-portSsubport, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, WAN-shelf-slot-portSsubport-rt1Ptp1, WAN-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Dynamic Status information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Dynamic Status information in the response";
-          }
-        }
-        description
-          "Specify if Dynamic Status Information is to be included in the response";
-      }
-    }
-    output {
-      list output {
-        leaf wan {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf mapping {
-          type enumeration {
-            enum "GFP-F";
-            enum "GFP-T";
-          }
-          description
-            "Packet mapping into SONET/SDH";
-        }
-        leaf mode {
-          type enumeration {
-            enum "SDH";
-            enum "SONET";
-          }
-          description
-            "Indicates the current mode (either SONET or SDH).";
-        }
-        leaf rate {
-          type enumeration {
-            enum "NONE" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "STS1" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "STS3C" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "STS6C" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "STS9C" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "STS12C" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "STS24C" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "STS48C" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "STS192C" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "VT1" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-            enum "VT2" {
-              description
-                "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-            }
-          }
-          description
-            "SONET/SDH Basic rate (derived from SONET/SDH cross-connections)";
-        }
-        leaf-list vcat {
-          type enumeration {
-            enum "ENABLE";
-            enum "GROUPED" {
-              description
-                "Grouped switching enabled (from dual sources).";
-            }
-            enum "DISABLE";
-          }
-          description
-            "SONET/SDH concatenation";
-        }
-        leaf-list pdh-type {
-          type ciena-6500-enums:PDHTYPE_LIST;
-          description
-            "Accociated PDH channel type";
-        }
-        leaf lcas {
-          type enumeration {
-            enum "DISABLE";
-            enum "ENABLE" {
-              description
-                "Only if VCAT is ENABLE";
-            }
-          }
-          description
-            "Link Capacity Adjustment Scheme Mode";
-        }
-        leaf prov-units {
-          type ciena-6500-types:INT {
-            range "0..64";
-          }
-          description
-            "Used to indicate the number of provisioned bandwidth units (of rate specified by the RATE attribute). Number of provisioned bandwidth units (RATE attributes). For contiguous concatenation, allowable values are either 0 or 1. The information is derived from the cross connection(s).";
-        }
-        leaf prov-rx-units {
-          type ciena-6500-types:INT {
-            range "0..64";
-          }
-          description
-            "Indicate the current number of provisioned members in the receive direction.";
-        }
-        leaf actual-units {
-          type ciena-6500-types:INT {
-            range "0..64";
-          }
-          description
-            "Indicates the number of bandwidth units actually carrying traffic. For contiguous concatenation, or for virtual concatenation without LCAS enabled, allowable values are either 0 or PROVUNITS. With LCAS enabled, allowable values are 0 to PROVUNITS. If the value cannot be retrieved, UNKNOWN will be displayed.";
-        }
-        leaf magic-num {
-          type enumeration {
-            enum "DISABLE";
-            enum "ENABLE";
-          }
-          description
-            "Enables or disables the use of a magic number to distinguish between two peers and detect error conditions. Can be used to determine whether trying to establish a link with one self. Default value is Enable for MAPPING=POS, and Disable for MAPPING=GFP-F or GFP-T. For MAPPING=GFP-F or GFP-T, only possible value is Disable.";
-        }
-        leaf fcs {
-          type enumeration {
-            enum "0";
-            enum "16";
-            enum "32";
-          }
-          description
-            "Frame Checksum. For MAPPING=POS, value can be 16 or 32. For MAPPING=GFP-F, value can be 0 or 32. For MAPPING=GFP-T, only possible value is 0.";
-        }
-        leaf scramble {
-          type enumeration {
-            enum "ENABLE";
-          }
-          description
-            "Used to control payload X^43+1 payload scrambling.";
-        }
-        leaf lcm {
-          type enumeration {
-            enum "DISABLE";
-            enum "ENABLE";
-          }
-          description
-            "Link Connectivity Monitor. In some circumstances it may be desirable to disable the link continuity monitor (LCM). When enabled, LCM sends an echo request every second. If more than five echo requests are transmitted without receiving an echo response, the PPP operational OSI state becomes disabled, and PPP attempts to re-establish the link connection via LCP configuration request packets. Default value is Enable for MAPPING=POS, and Disable for MAPPING=GFP-F or GFP-T. For MAPPING=GFP-F or GFP-T, only possible value is Disable.";
-        }
-        leaf ncp {
-          type enumeration {
-            enum "NONE";
-            enum "BCP";
-          }
-          description
-            "Used to indicate the Network Control Protocol used. BCP is returned when MAPPING=POS, and NONE is returned when MAPPING=GFP=F or GFP-T.";
-        }
-        leaf max-vc-del {
-          type ciena-6500-types:INT {
-            range "0..256000";
-          }
-          description
-            "Maximum differential delay supported by the port in microseconds. If the value cannot be retrieved, UNKNOWN will be displayed.";
-        }
-        leaf curr-vc-del {
-          type ciena-6500-types:INT {
-            range "0..256000";
-          }
-          description
-            "Current differential delay in microseconds. If the value cannot be retrieved, UNKNOWN will be displayed. If VCAT is disabled or if WAN is not cross-connected, NA (Not Applicable) will be displayed.";
-        }
-        leaf lan-fcs {
-          type enumeration {
-            enum "DISABLE";
-            enum "ENABLE";
-          }
-          description
-            "Indicates whether the LAN FCS is included in the encapsulated frame (for both the ingress and egress direction). Enable indicates the LAN FCS is included. Default value is Enable for MAPPING=POS, and Disable for MAPPING=GFP-F or GFP-T. For MAPPING=GFP-F or GFP-T, only possible value is Disable.";
-        }
-        leaf round-trip-delay {
-          type ciena-6500-types:INT {
-            range "0..220000";
-          }
-          description
-            "Round Trip Delay in microseconds. If the value cannot be retrieved, UNKNOWN will be displayed.";
-        }
-        leaf actual-rx-units {
-          type ciena-6500-types:INT {
-            range "0..64";
-          }
-          description
-            "Current number of active members in the receive direction. When LCAS is disabled, allowable values are either 0 or PROVRXUNITS. With LCAS enabled, allowable values are 0 to PROVRXUNITS. If the value cannot be retrieved, UNKNOWN will be displayed.";
-        }
-        leaf gfp-rfi {
-          type enumeration {
-            enum "ENABLE" {
-              description
-                "(Default) Transmit GFP RFI CMF on WAN link down.";
-            }
-            enum "DISABLE" {
-              description
-                " Do not transmit CMF UPI on WAN link down.";
-            }
-            enum "CMFCSF" {
-              description
-                "Transmit GFP CSF CMF on WAN link down.";
-            }
-            enum "USERDEF" {
-              description
-                "The provisioned UPI value to be transmitted on WAN link down.";
-            }
-          }
-          description
-            "The state of the transmission of GFP Client Signal Fail (CSF) CMFs.";
-        }
-        leaf gfp-rfi-upi {
-          type ciena-6500-types:INT {
-            range "3..255";
-          }
-          description
-            "The provisioned UPI value to be transmitted on WAN link down.";
-        }
-        leaf gfp-cmf-upi {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x03-0xFF. UPI to be transmitted in GFP client management frames.";
-        }
-        leaf gfp-rt-delay {
-          type ciena-6500-enums:ENABLE_DISABLE;
-          description
-            "DISABLE means the ping CMFs used for RTDELAY calculation and Distance Exceeded Alarm will no longer be sent. This implies RTDELAY will always display UNKNOWN and the Distance Exceeded Alarm will never raise.";
-        }
-        leaf cond-type {
-          type ciena-6500-enums:Conditioning;
-          description
-            "This attribute is used to control the type of WAN conditioning applied to WAN upon LAN defects (Rx Loss of Signal, Rx Loss of Sync, AN time-out, Rx Idle, Link Down) and CP Fail. Possible values are NONE or a combination of: GFPCMF, GFPCMFUSER, GFP10BERR, UNEQ, AIS and NILTR.";
-        }
-        leaf if-type {
-          type enumeration {
-            enum "UNI";
-            enum "NNI";
-          }
-          description
-            "The type of the WAN facility being queried";
-        }
-        leaf policing {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Indicates whether policing will be done on the given port";
-        }
-        leaf e-type {
-          type string {
-            length "1..4";
-          }
-          description
-            "Encapsulation scheme used in customer frames";
-        }
-        leaf p-mode {
-          type enumeration {
-            enum "PBITS";
-            enum "TOS";
-          }
-          description
-            "(DEPRECATED) Priority Mode";
-        }
-        leaf dm-prf {
-          type ciena-6500-types:STRING;
-          description
-            "(DEPRECATED) Discard Marking Profile";
-        }
-        leaf cf-prf {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the port Control Frame Profile (CFPRF-shelf-profileNo)";
-        }
-        leaf sch-prf {
-          type ciena-6500-types:STRING;
-          description
-            "(DEPRECATED) Scheduler Profiler";
-        }
-        leaf loop-detect {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Loopback Detection using SONMP.";
-        }
-        leaf bw-threshld {
-          type ciena-6500-types:INT {
-            range "1..100";
-          }
-          description
-            "The bandwidth utilization percentage threshold ";
-        }
-        leaf-list available-rate {
-          type enumeration {
-            enum "RATE" {
-              description
-                "The available bandwidth for a given port (in SONET/SDH Basic RATE) For Ex : In GE card VCAT=ENABLE. AVLBLRATE on all WAN ports is STS1LO/STS1HO/STS3C ";
-            }
-          }
-          description
-            "Used to indicate the available bandwidth rate in the wan port.";
-        }
-        leaf bw-remain {
-          type ciena-6500-types:INT {
-            range "1..2500000";
-          }
-          description
-            "The unused bandwidth remained for a given port (in KBIT)";
-        }
-        leaf bw-utl {
-          type ciena-6500-types:INT {
-            range "0..100";
-          }
-          description
-            "The port bandwidth utilization percentage";
-        }
-        leaf snmp-index {
-          type ciena-6500-types:INT {
-            range "0..4294967295";
-          }
-          description
-            "Identifies the index of the equivalent entry in the SNMP interfaces MIB group";
-        }
-        leaf preamble {
-          type enumeration {
-            enum "KEEP" {
-              description
-                "Keep Ethernet preamble.";
-            }
-            enum "DISCARD" {
-              description
-                "Discard Ethernet preamble.";
-            }
-          }
-          description
-            "This attribute is used to specify whether to use the preamble at beginning of GFP frame or throw it away. The preamble is 8 bytes in total (7 bytes + 1 byte sfd).";
-        }
-        leaf opu2-resvd {
-          type enumeration {
-            enum "YES" {
-              description
-                "Use 7 unused bytes of the OPU2 overhead for payload.";
-            }
-            enum "NO" {
-              description
-                "Do not use 7 unused bytes of the OPU2 overhead for payload";
-            }
-          }
-          description
-            "This attribute is used to specify whether to use the 7 unused bytes of the OPU2 overhead for payload or not.";
-        }
-        leaf fcs-err-frames {
-          type enumeration {
-            enum "KEEP" {
-              description
-                "Keep FCS-errored frames end-to-end.";
-            }
-            enum "DISCARD" {
-              description
-                "Discard FCS-errored frames end-to-end.";
-            }
-          }
-          description
-            "This attribute is used to specify whether to keep FCS-errored frames or Ethernet frames end-to-end or to discard them.";
-        }
-        leaf received-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used for Received PT";
-        }
-        leaf tx-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used for Transmitted PT";
-        }
-        leaf exp-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used for Expected PT";
-        }
-        leaf received-upi {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used for Received UPI";
-        }
-        leaf tx-upi {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used for Transmitted UPI";
-        }
-        leaf expected-upi {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used for Expected UPI";
-        }
-        leaf rx-cos-profile {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the port RX COS Profile (RXCOSPRF-shelf-profileNo)";
-        }
-        leaf tx-cos-profile {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the port TX COS Profile (TXCOSPRF-shelf-profileNo)";
-        }
-        leaf user-rx-cos {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The IPHB value to map the untagged frames";
-        }
-        leaf q-grp-1 {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 1.";
-        }
-        leaf q-grp-2 {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 2.";
-        }
-        leaf wan-cap {
-          type enumeration {
-            enum "HICAP" {
-              description
-                "WAN port supports rate up to STS-192";
-            }
-            enum "MEDCAP" {
-              description
-                "WAN port supports rate up to STS-24";
-            }
-            enum "LOCAP" {
-              description
-                "WAN port supports rate up to STS-3";
-            }
-          }
-          description
-            "This attribute indicates the capacity of the WAN port";
-        }
-        leaf pbt-list-sup {
-          type ciena-6500-types:INT {
-            range "0 | 1";
-          }
-          description
-            "Indicates the PBT VID list support on WAN facility";
-        }
-        leaf pdh-vli {
-          type enumeration {
-            enum "DISABLE" {
-              description
-                "Default - VLI overhead octet used for data";
-            }
-            enum "ENABLE" {
-              description
-                "VLI overhead octet set to zeros.";
-            }
-          }
-          description
-            "This attribute is used to specify VLI octet usage for PDH WANs. VLI=Vcat Lcas Interworking, the concatenation overhead octet.";
-        }
-        leaf mac-option {
-          type enumeration {
-            enum "NONE" {
-              description
-                "No MAC provisioned on the facility.";
-            }
-            enum "MANUAL" {
-              description
-                "MAC manually provisioned on the facility.";
-            }
-            enum "AUTO" {
-              description
-                "MAC automatically assigned to the facility.";
-            }
-          }
-          description
-            "The MAC provisioning option";
-        }
-        leaf mac {
-          type ciena-6500-types:IDENT;
-          description
-            "48-bit Ethernet MAC address displayed as 12 alphanumeric characters. Unique to each facility.";
-        }
-        leaf os-tran {
-          type enumeration {
-            enum "NONE" {
-              description
-                "This value is used when OSTRAN is not applicable.";
-            }
-            enum "LEGACYCMF" {
-              description
-                "Proprietary Legacy Client Managed Frame.";
-            }
-            enum "G7041CMF" {
-              description
-                "G704.1 standard GFP Client Managed Frame.";
-            }
-            enum "G7041CDF" {
-              description
-                "Ordered Set Transparency encapsulated in Client Data Frame.";
-            }
-          }
-          description
-            "This attribute is used to specify whether the WAN facility supports Ordered Set Transparency for G704.1 compliance.";
-        }
-        leaf supported-term-pt {
-          type ciena-6500-types:STRING;
-          description
-            "Facility AID format. The supporting Termination Point.";
-        }
-        leaf direction {
-          type enumeration {
-            enum "RX" {
-              description
-                "Monitoring receive direction";
-            }
-            enum "TX" {
-              description
-                "Monitoring transmit direction";
-            }
-          }
-          description
-            "Monitoring GFP layer in receive or transmit direction";
-        }
-        leaf reserved {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specify if the facility is being reserved for packet SNC's";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal.";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "ACT" {
-              description
-                "Active, carrying traffic";
-            }
-            enum "DISCD" {
-              description
-                "Idle, not carrying traffic";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "WRKRX" {
-              description
-                "Working in the receive direction";
-            }
-            enum "WRKTX" {
-              description
-                "Working in the transmit direction";
-            }
-            enum "UEQ" {
-              description
-                "Unequipped";
-            }
-            enum "MEA" {
-              description
-                "Mismatched equipment attributes";
-            }
-            enum "DSBLD" {
-              description
-                "Missing layer 2 connection; Idle, not carrying traffic";
-            }
-            enum "UAS" {
-              description
-                "RPR WAN only, Not associated to an RPR SPAN";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-enable-eth10g {
-    description
-      "Restore Ethernet10G Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port, ETH10G-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-disable-eth10g {
-    description
-      "Remove Ethernet10G Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port, ETH10G-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-show-eth10g {
-    description
-      "Retrieve Ethernet10G Facility: Retrieve Ethernet Facility attributes.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port, ETH10G-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Dynamic Status information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Dynamic Status information in the response";
-          }
-        }
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf eth10g {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf laser-off-far-end-fail {
-          type ciena-6500-enums:Laserofffarendfail;
-          description
-            "Enable or Disable LOL (Loss of Light) feature";
-        }
-        leaf tx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf tx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf rx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf rx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf mtu {
-          type ciena-6500-enums:MTU;
-          description
-            "Maximum Ethernet frame size supported. Setting the MTU size will influence the distance lossless local flow control is supported (the smaller the MTU, the larger the lossless distance).";
-        }
-        leaf flow-ctrl {
-          type ciena-6500-enums:FLOWCTRL;
-          description
-            "Advertised flow control capabilities.";
-        }
-        leaf auto-neg {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE" {
-              description
-                "Always Disable for 10GE.";
-            }
-          }
-          description
-            "Auto-negotiation, R/W, only one value supported=DISABLE on 10GE.";
-        }
-        leaf an-status {
-          type enumeration {
-            enum "INPROGRESS";
-            enum "COMPLETED";
-            enum "DISABLED";
-            enum "UNKNOWN" {
-              description
-                "Always UNKNOWN for 10GE.";
-            }
-          }
-          description
-            "Auto-negotiation status";
-        }
-        leaf eth-duplex {
-          type enumeration {
-            enum "FULL" {
-              description
-                "Always FULL for 10GE";
-            }
-            enum "HALF";
-            enum "BOTH";
-          }
-          description
-            "Advertised duplex operation capabilities if AN is enabled.";
-        }
-        leaf speed {
-          type enumeration {
-            enum "10G" {
-              description
-                "Always 10G for 10GE";
-            }
-          }
-          description
-            "Only one value is allowed, Always 10G.";
-        }
-        leaf tx-con {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Control the EPL conditioning. Enabling will turn off the GigE laser when Ethernet conditioning is required. Disabling will prevent Ethernet conditioning (i.e. the GigE laser will remain enabled) as a result of SONET/SDH path failure, as well as GFP failures and GFP RFI/CSF client management frame reception.";
-        }
-        leaf tx-inter-pkt-gap {
-          type enumeration {
-            enum "11";
-            enum "12";
-          }
-          description
-            "Tx Inter-Packet Gap. 12 is the default value.";
-        }
-        leaf tx-con-hb {
-          type enumeration {
-            enum "DISABLE";
-            enum "ENABLE";
-            enum "TXONLY";
-          }
-          description
-            "Used to control conditioning of client ports through Heartbeat mechanism with remote using Y.1731 CCM PDUs.";
-        }
-        leaf tx-con-hb-interval {
-          type enumeration {
-            enum "100MSEC";
-            enum "1SEC";
-          }
-          description
-            "Tx Conditioning Heartbeat Interval";
-        }
-        leaf tx-con-md-level {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Tx Conditioning MD Level";
-        }
-        leaf tx-cond-network-flt-sig {
-          type enumeration {
-            enum "TLV";
-            enum "EXPLICIT";
-            enum "CFM";
-          }
-          description
-            "Tx Conditioning Network Fault Signal";
-        }
-        leaf pause-tx {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Controls PAUSE transmission when AN is disabled. Ignored when AN is enabled.";
-        }
-        leaf pause-rx {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE" {
-              description
-                "Always DISABLE for 10GE";
-            }
-          }
-          description
-            "Controls PAUSE reception when AN is disabled. Ignored when AN is enabled.";
-        }
-        leaf pause-rx-override {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "If AN is enabled, and ANPAUSERX is negotiated to enable, setting this attribute to enable means received PAUSE frames will not be acted upon. They will either be discarded or pass through transparently (based on the PASSCTRL setting).";
-        }
-        leaf pause-tx-override {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE" {
-              description
-                "Always DISABLE for 10GE";
-            }
-          }
-          description
-            "Controls PAUSE reception when AN is disabled. Ignored when AN is enabled.";
-        }
-        leaf an-eth-duplex {
-          type enumeration {
-            enum "FULL";
-            enum "HALF";
-            enum "BOTH";
-            enum "UNKNOWN" {
-              description
-                "Always UNKNOWN for 10GE";
-            }
-          }
-          description
-            "Negotiated Duplex Operation, when AN is enabled.";
-        }
-        leaf an-speed {
-          type enumeration {
-            enum "10G";
-            enum "UNKNOWN" {
-              description
-                "Always UNKNOWN for 10GE.";
-            }
-          }
-          description
-            "Negotiated speed, when AN is enabled.";
-        }
-        leaf an-pause-tx {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-            enum "UNKNOWN" {
-              description
-                "Always UNKNOWN for 10GE.";
-            }
-          }
-          description
-            "Negotiated PAUSE transmit, when AN is enabled.";
-        }
-        leaf an-pause-rx {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-            enum "UNKNOWN" {
-              description
-                "Always UNKNOWN for 10GE.";
-            }
-          }
-          description
-            "Negotiated PAUSE receive, when AN is enabled.";
-        }
-        leaf adv-eth-duplex {
-          type enumeration {
-            enum "FULL";
-            enum "HALF";
-            enum "BOTH";
-            enum "UNKNOWN" {
-              description
-                "Always UNKNOWN for 10GE.";
-            }
-          }
-          description
-            "Link partner advertised Duplex capabilities. Only valid when ANSTATUS is COMPLETED.";
-        }
-        leaf adv-speed {
-          type enumeration {
-            enum "10G";
-            enum "UNKNOWN" {
-              description
-                "Always UNKNOWN for 10GE.";
-            }
-          }
-          description
-            "Link partner advertised speed capabilities. Only valid when ANSTATUS is COMPLETED.";
-        }
-        leaf adv-flow-ctrl {
-          type enumeration {
-            enum "NONE";
-            enum "ASYM";
-            enum "SYM";
-            enum "UNKNOWN" {
-              description
-                "Always UNKNOWN for 10GE";
-            }
-          }
-          description
-            "Link partner advertised flow control capabilities. Only valid when ANSTATUS is COMPLETED.";
-        }
-        leaf pass-ctrl {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE" {
-              description
-                "Always DISABLE for 10GE.";
-            }
-          }
-          description
-            "Controls whether transmitted Ethernet Control Frames (T/L=8808) are passed transparently (Enable), or removed from the flow (Disable).";
-        }
-        leaf phys-addr {
-          type ciena-6500-types:IDENT;
-          description
-            "48-bit Ethernet MAC address displayed as 12 alphanumeric characters. Used as SA in PAUSE frames.";
-        }
-        leaf eqpt {
-          type enumeration {
-            enum "XGELAN";
-            enum "XGEWAN";
-          }
-          description
-            "Interface equipment type.";
-        }
-        leaf rx-idle {
-          type enumeration {
-            enum "0";
-            enum "1";
-            enum "2";
-            enum "3";
-            enum "4";
-            enum "5";
-            enum "10";
-            enum "60";
-            enum "120";
-            enum "300";
-          }
-          description
-            "Always 0 for 10GE.";
-        }
-        leaf if-type {
-          type enumeration {
-            enum "UNI";
-            enum "NNI";
-          }
-          description
-            "The type of the ETH10G facility being queried";
-        }
-        leaf policing {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Indicates whether policing will be done on the given port";
-        }
-        leaf e-type {
-          type string {
-            length "1..4";
-          }
-          description
-            "Encapsulation scheme used in customer frames";
-        }
-        leaf latency-opt {
-          type enumeration {
-            enum "MINIMUM";
-            enum "MEDIUM";
-            enum "MAXIMUM";
-          }
-          description
-            "Latency Optimization";
-        }
-        leaf sync-status-msg-transmit {
-          type ciena-6500-enums:SSMTRANSMIT;
-          description
-            "Synchronized Status Messaging Transmit.";
-        }
-        leaf dus-override {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS.";
-        }
-        leaf cbr-bw-remain {
-          type ciena-6500-types:STRING;
-          description
-            "CBR Bandwidth Remain";
-        }
-        leaf dm-prf {
-          type ciena-6500-types:STRING;
-          description
-            "(DEPRECATED) Discard Marking Profile";
-        }
-        leaf cf-prf {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the port Control Frame Profile (CFPRF-shelf-profileNo)";
-        }
-        leaf sch-prf {
-          type ciena-6500-types:STRING;
-          description
-            "(DEPRECATED) Scheduler Profiler";
-        }
-        leaf lag-id {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the LAG to which the given ETH10G port belongs.";
-        }
-        leaf rx-cos-profile {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the port RX COS Profile (RXCOSPRF-shelf-profileNo)";
-        }
-        leaf tx-cos-profile {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the port TX COS Profile (TXCOSPRF-shelf-profileNo)";
-        }
-        leaf user-rx-cos {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "The IPHB value to map the untagged frames";
-        }
-        leaf q-grp-1 {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 1.";
-        }
-        leaf q-grp-2 {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 2.";
-        }
-        leaf port-bw {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the bandwidth profile (BWPRF-shelf-profileNo).";
-        }
-        leaf pbt-list-sup {
-          type ciena-6500-types:INT {
-            range "0 | 1";
-          }
-          description
-            "Indicates the PBT VID list support on Ethernet facility";
-        }
-        leaf mapping {
-          type enumeration {
-            enum "PROP237" {
-              description
-                "proportional 11.09";
-            }
-            enum "PROP238" {
-              description
-                "proportional 11.05";
-            }
-            enum "GFPMACTR" {
-              description
-                "GFP-F mapped, MAC transparent";
-            }
-            enum "GFPSTD" {
-              description
-                "GFP-F mapped, Standard WAN";
-            }
-            enum "GFPMACTR192" {
-              description
-                "GFP-F mapped, MAC transparent, port mode of layer facility is SONET";
-            }
-            enum "GFPSTD192" {
-              description
-                "GFP-F mapped, Standard WAN, port mode of layer facility is SONET";
-            }
-            enum "GFPMACTR64" {
-              description
-                "GFP-F mapped, MAC transparent, port mode of layer facility is SDH";
-            }
-            enum "GFPSTD64" {
-              description
-                "GFP-F mapped, Standard WAN, port mode of layer facility is SDH";
-            }
-            enum "GFPMACOSTR" {
-              description
-                "GFP-F mapped, Ordered Set MAC transparent";
-            }
-            enum "GFPMACOSTR192" {
-              description
-                "GFP-F mapped, Ordered Set MAC transparent, port mode of layer facility is SONET";
-            }
-            enum "GFPMACOSTR64" {
-              description
-                "GFP-F mapped, Ordered Set MAC transparent, port mode of layer facility is SDH";
-            }
-            enum "NONE" {
-              description
-                "Not mapped";
-            }
-            enum "ULL" {
-              description
-                "Ultra Low Latency";
-            }
-          }
-          description
-            "The mapping layer OTM2 OTURATE and client mapping";
-        }
-        leaf timing-ref {
-          type enumeration {
-            enum "N" {
-              description
-                "Not a timing reference";
-            }
-            enum "Y" {
-              description
-                "Is a timing reference";
-            }
-          }
-          description
-            "Indicates whether the ETH10G facility is a timing reference";
-        }
-        leaf rate {
-          type ciena-6500-types:INT {
-            range "10 | 20 | 30..10000";
-          }
-          description
-            "The EVPL bandwidth rate.";
-        }
-        leaf mode {
-          type enumeration {
-            enum "L2";
-            enum "EVPL";
-          }
-          description
-            "The mode of service.";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be HH-MM for the time left in AINS timeout.";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf hold-off {
-          type ciena-6500-types:INT {
-            range "0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-          }
-          description
-            "Conditioning holdoff time in milliseconds.";
-        }
-        leaf tx-wvlngth-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Wavelength in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-min {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-max {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Maximum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-spacing {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Wavelength Spacing in Ghz";
-        }
-        leaf spli-mgmt {
-          type ciena-6500-enums:spliMgmt;
-          description
-            "Identify if Port is Manageable by SPLI";
-        }
-        leaf spli-managed {
-          type ciena-6500-enums:spliManaged;
-          description
-            "Identify if Port is Currently Managed by SPLI";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected. (no transparent traffic connection on this facility)";
-            }
-            enum "TSGEN" {
-              description
-                "Test set generation";
-            }
-            enum "TSMON" {
-              description
-                "Test set monitor";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-enable-ethn {
-    description
-      "RST-ETHN Switch ETHn Facility In Service";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-disable-ethn {
-    description
-      "Remove Switch ETHn Facility Out of Service";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-show-ethn {
-    description
-      "RTRV-ETHN Retrieve Provisioned ETHn Facilities";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Dynamic Status information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Dynamic Status information in the response";
-          }
-        }
-        description
-          "Specify if Dynamic Status Information is to be included in the response";
-      }
-    }
-    output {
-      list output {
-        leaf ethn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf laser-off-far-end-fail {
-          type ciena-6500-enums:Laserofffarendfail;
-          description
-            "Enable the feature of laser off far end fail";
-        }
-        leaf mapping {
-          type enumeration {
-            enum "GMP" {
-              description
-                "GMP";
-            }
-            enum "GFPFLEX" {
-              description
-                "GFPFLEX mapping";
-            }
-          }
-          description
-            "Mapping";
-        }
-        leaf-list tx-act-ln-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Lanes TX Power(Format:Lane1|Lane2|...)";
-        }
-        leaf tx-act-high-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX Actual High Power Value in dBm (xx.x)";
-        }
-        leaf tx-act-low-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX Actual Low Power Value in dBm (xx.x)";
-        }
-        leaf tx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf-list rx-act-ln-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Lanes RX Power(Format:Lane1|Lane2|...)";
-        }
-        leaf rx-act-high-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX Actual High Power Value in dBm (xx.x)";
-        }
-        leaf rx-act-low-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX Actual Low Power Value in dBm (xx.x)";
-        }
-        leaf rx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be HH-MM for the time left in AINS timeout.";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf member-1 {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of member 1 (FLEX-shelf-slot-port).";
-        }
-        leaf member-2 {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of member 2 (FLEX-shelf-slot-port).";
-        }
-        leaf member-3 {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of member 3 (FLEX-shelf-slot-port).";
-        }
-        leaf member-4 {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of member 4 (FLEX-shelf-slot-port).";
-        }
-        leaf fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "NO FEC";
-            }
-            enum "RS10" {
-              description
-                "RS10 FEC";
-            }
-          }
-          description
-            "FEC Format";
-        }
-        leaf pre-fec-sf-th-lev {
-          type decimal64 {
-            range "-1.00..1.00";
-            fraction-digits 2;
-          }
-          description
-            "Pre-FEC Signal Fail Threshold Level (in dBQ).";
-        }
-        leaf pre-fec-sf-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Bit Error Rate.";
-        }
-        leaf pre-fec-sd-th-lev {
-          type decimal64 {
-            range "-1.00..2.00";
-            fraction-digits 2;
-          }
-          description
-            "Pre-FEC Signal Degrade Threshold Level (in dBQ).";
-        }
-        leaf pre-fec-sd-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Bit Error Rate.";
-        }
-        leaf spli-mgmt {
-          type ciena-6500-enums:spliMgmt;
-          description
-            "Identify if Port is Manageable by SPLI";
-        }
-        leaf spli-managed {
-          type ciena-6500-enums:spliManaged;
-          description
-            "Identify if Port is Currently Managed by SPLI";
-        }
-        leaf hold-off {
-          type ciena-6500-types:INT {
-            range "0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-          }
-          description
-            "Hold Off signal conditioning timer (in increments of 100).";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected (no transparent traffic connection on this facility)";
-            }
-            enum "TSGEN" {
-              description
-                "Test set generation";
-            }
-            enum "TSMON" {
-              description
-                "Test set monitor";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-disable-lag {
-    description
-      "Set the Primary state of a Link Aggregation Group to OOS";
-    input {
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-enable-lag {
-    description
-      "Set the Primary state of a Link Aggregation Group to IS";
-    input {
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-delete-lag-port {
-    description
-      "Remove a port from an existing LAG.";
-    input {
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-      leaf port-aid {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "Member port AID";
-      }
-    }
-  }
-  rpc port-enable-fiber-channel {
-    description
-      "Restore Fibre Channel Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf fc {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-disable-fiber-channel {
-    description
-      "Remove Fibre Channel Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf fc {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-show-flex {
-    description
-      "Retrieve Flex Facility: Retrieve FLEX Facility attributes.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port, FLEX-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        description
-          "Include Dynamic Status Information in the Response";
-      }
-      leaf trc-info {
-        type enumeration {
-          enum "NO";
-          enum "YES";
-        }
-        description
-          "Include Trace Information in the Response";
-      }
-    }
-    output {
-      list output {
-        leaf flex {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf protocol {
-          type ciena-6500-enums:PROTOCOL;
-          description
-            "Protocol";
-        }
-        leaf rate {
-          type ciena-6500-types:STRING;
-          description
-            "Protocol Rate, in Mbps. Supported values are 1000, 1062.5, 1250, 2125, 4250, 8500, and 10500.";
-        }
-        leaf mapping {
-          type ciena-6500-enums:FLEX_MAPPING;
-          description
-            "Mapping type";
-        }
-        leaf latency-opt {
-          type enumeration {
-            enum "MINIMUM";
-            enum "MEDIUM";
-            enum "MAXIMUM";
-          }
-          description
-            "Latency Optimization";
-        }
-        leaf tx-con {
-          type enumeration {
-            enum "LOFEF" {
-              description
-                "Laser Off Far End Fail";
-            }
-            enum "8B10B" {
-              description
-                "8B10B";
-            }
-            enum "NOS" {
-              description
-                "NOS";
-            }
-            enum "K30_7" {
-              description
-                "K30_7";
-            }
-            enum "LF" {
-              description
-                "Local Fault";
-            }
-          }
-          description
-            "TX conditioning";
-        }
-        leaf hold-off {
-          type ciena-6500-types:INT {
-            range "0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-          }
-          description
-            "Conditioning holdoff time in seconds.";
-        }
-        leaf tf-mode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-            enum "LINEFAIL" {
-              description
-                "Alarms on, with traffic protection";
-            }
-          }
-          description
-            "Trace Fail Mode";
-        }
-        leaf mappedrate {
-          type ciena-6500-types:INT;
-          description
-            "Mapped Rate, in Mbps";
-        }
-        leaf trc {
-          type string {
-            length "1..48";
-          }
-          description
-            "Outgoing Trace Message";
-        }
-        leaf exp-trc {
-          type string {
-            length "1..48";
-          }
-          description
-            "Expected Trace Message";
-        }
-        leaf defrag-hit {
-          type enumeration {
-            enum "YES" {
-              description
-                "Traffic is impacted on this port";
-            }
-            enum "NO" {
-              description
-                "No Traffic impact on this port";
-            }
-          }
-          description
-            "Determine if this port will be impacted by Bandwidth Defragmenation";
-        }
-        leaf tx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf tx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf rx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf rx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be HH-MM for the time left in AINS timeout.";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf prime {
-          type ciena-6500-types:STRING;
-          description
-            "The AID of the prime (ETH40G-shelf-slot-port).";
-        }
-        leaf ing-police {
-          type enumeration {
-            enum "ENABLED" {
-              description
-                "Enable Ingress Policing";
-            }
-            enum "DISABLED" {
-              description
-                "Disable Ingress Policing";
-            }
-          }
-          description
-            "Ingress Policing. Only supported on the OTN FlexMOTR.";
-        }
-        leaf cir {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..1000000";
-          }
-          description
-            "Committed Information Rate. Measured in kb/s.";
-        }
-        leaf cbs-units {
-          type enumeration {
-            enum "BYTE" {
-              description
-                "Commited Burst Size is measured in Bytes";
-            }
-            enum "KBYTE" {
-              description
-                "Commited Burst Size is measured in KBytes";
-            }
-          }
-          description
-            "Committed Burst Size Units. Only supported when CBS is supported. Only supported on the OTN FlexMOTR.";
-        }
-        leaf cbs {
-          default "12176";
-          type ciena-6500-types:INT {
-            range "1..131071";
-          }
-          description
-            "Committed Burst Size";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected. (no transparent traffic connection on this facility)";
-            }
-            enum "TSGEN" {
-              description
-                "Test set generation";
-            }
-            enum "TSMON" {
-              description
-                "Test set monitor";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-enable-flex {
-    description
-      "Restore Flex Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port, FLEX-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-disable-flex {
-    description
-      "Remove Flex Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port, FLEX-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-disable-oc3 {
-    description
-      "Remove OC-3 Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf oc3 {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-oc3 {
-    description
-      "Restore OC-3 Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf oc3 {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-oc3 {
-    description
-      "Retrieve OC-3 Facility: view the attributes of an OC-3 facility.";
-    input {
-      leaf oc3 {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport";
-        type ciena-6500-types:aid;
-      }
-      leaf stinfo {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        description
-          "Specify if Section Trace information is to be included in the response.";
-      }
-      leaf ssbitinfo {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        description
-          "Specify if SS Bit information is to be included in the response.";
-      }
-      leaf dsminfo {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-          enum "NONE" {
-            description
-              "Not a DSM provisioned link";
-          }
-          enum "HOSTSIDE" {
-            description
-              "Host located intermediate line facility";
-          }
-          enum "DSMSIDE" {
-            description
-              "DSM located intermediate line facility";
-          }
-        }
-        description
-          "Specify if the DSM information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf oc3 {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf timing-reference {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Facility is a Timing Reference.";
-        }
-        leaf dcc {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Facility has DCC enabled";
-        }
-        leaf sd-th {
-          default "6";
-          type ciena-6500-types:INT {
-            range "5..9";
-          }
-          description
-            "Signal degrade threshold value";
-        }
-        leaf stformat {
-          type enumeration {
-            enum "NUM" {
-              description
-                "1 byte";
-            }
-            enum "STRING" {
-              description
-                "16 byte";
-            }
-          }
-          description
-            "Section Trace Format";
-        }
-        leaf strc {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted section trace";
-        }
-        leaf exp-trc {
-          type ciena-6500-types:STRING;
-          description
-            "Expected section trace";
-        }
-        leaf stfmode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-            enum "LINEFAIL" {
-              description
-                "Alarms on, with traffic protection";
-            }
-          }
-          description
-            "Section Trace Fail Mode";
-        }
-        leaf ssbitmde {
-          type ciena-6500-enums:SSBITMDE;
-          description
-            "SS Bit mode (facility personality)";
-        }
-        leaf als {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "Automatic Laser Shutdown";
-        }
-        leaf eber-thresh {
-          default "3";
-          type ciena-6500-types:INT {
-            range "3 | 4 | 5";
-          }
-          description
-            "Excessive bit error threshold value";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "Optical Port market preference";
-        }
-        leaf uneqmode {
-          type enumeration {
-            enum "UNKNOWN" {
-              description
-                "Unknown unequipped insertion mode";
-            }
-            enum "STS1" {
-              description
-                "Insert STS1 Unequipped";
-            }
-            enum "VC4" {
-              description
-                "Insert VC4 Unequipped";
-            }
-          }
-          description
-            "Unequipped Insertion Mode";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf dsminfo {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-            enum "NONE" {
-              description
-                "Not a DSM provisioned link";
-            }
-            enum "HOSTSIDE" {
-              description
-                "Host located intermediate line facility";
-            }
-            enum "DSMSIDE" {
-              description
-                "DSM located intermediate line facility";
-            }
-          }
-          description
-            "Specify if the DSM information is to be included in the response.";
-        }
-        leaf dus-override {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal.";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected (no cross-connects exist on facility)";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "TS" {
-              description
-                "Test";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "WRKRX" {
-              description
-                "Working in the receive direction";
-            }
-            enum "WRKTX" {
-              description
-                "Working in the transmit direction";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-disable-oc12 {
-    description
-      "Remove OC-12 Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf oc12 {
-        mandatory true;
-        description
-          "AID in format OC12-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-oc12 {
-    description
-      "Restore OC-12 Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf oc12 {
-        mandatory true;
-        description
-          "AID in format OC12-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-oc12 {
-    description
-      "Retrieve OC-12 Facility: view the attributes of an OC-12 facility.";
-    input {
-      leaf oc12 {
-        mandatory true;
-        description
-          "AID in format OC12-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf stinfo {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        description
-          "Specify if Section Trace information is to be included in the response.";
-      }
-      leaf ssbitinfo {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        description
-          "Specify if SS Bit information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf oc12 {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf timing-reference {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Facility is a Timing Reference.";
-        }
-        leaf dcc {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Facility has DCC enabled";
-        }
-        leaf sd-th {
-          default "6";
-          type ciena-6500-types:INT {
-            range "5..9";
-          }
-          description
-            "Signal degrade threshold value";
-        }
-        leaf stformat {
-          type enumeration {
-            enum "NUM" {
-              description
-                "1 byte";
-            }
-            enum "STRING" {
-              description
-                "16 byte";
-            }
-          }
-          description
-            "Section Trace Format";
-        }
-        leaf strc {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted section trace";
-        }
-        leaf exp-trc {
-          type ciena-6500-types:STRING;
-          description
-            "Expected section trace";
-        }
-        leaf stfmode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-            enum "LINEFAIL" {
-              description
-                "Alarms on, with traffic protection";
-            }
-          }
-          description
-            "Section Trace Fail Mode";
-        }
-        leaf ssbitmde {
-          type ciena-6500-enums:SSBITMDE;
-          description
-            "SS Bit mode (facility personality)";
-        }
-        leaf als {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "Automatic Laser Shutdown";
-        }
-        leaf eber-thresh {
-          default "3";
-          type ciena-6500-types:INT {
-            range "3 | 4 | 5";
-          }
-          description
-            "Excessive bit error threshold value";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "Optical Port market preference";
-        }
-        leaf uneqmode {
-          type enumeration {
-            enum "UNKNOWN" {
-              description
-                "Unknown unequipped insertion mode";
-            }
-            enum "STS1" {
-              description
-                "Insert STS1 Unequipped";
-            }
-            enum "VC4" {
-              description
-                "Insert VC4 Unequipped";
-            }
-          }
-          description
-            "Unequipped Insertion Mode";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf dus-override {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal.";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected (no cross-connects exist on facility)";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "TS" {
-              description
-                "Test";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "WRKRX" {
-              description
-                "Working in the receive direction";
-            }
-            enum "WRKTX" {
-              description
-                "Working in the transmit direction";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-disable-oc48 {
-    description
-      "Remove OC-48 Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf oc48 {
-        mandatory true;
-        description
-          "AID in format OC48-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-oc48 {
-    description
-      "Restore OC-48 Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf oc48 {
-        mandatory true;
-        description
-          "AID in format OC48-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-oc48 {
-    description
-      "Retrieve OC-48 Facility: view the attributes of an OC-48 facility.";
-    input {
-      leaf oc48 {
-        mandatory true;
-        description
-          "AID in format OC48-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf stinfo {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        description
-          "Specify if Section Trace information is to be included in the response.";
-      }
-      leaf ssbitinfo {
-        type ciena-6500-enums:BOOL_YES_NO_defaultNO;
-        description
-          "Specify if SS Bit information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf oc48 {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf timing-reference {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Facility is a Timing Reference.";
-        }
-        leaf dcc {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Facility has DCC enabled";
-        }
-        leaf sd-th {
-          default "6";
-          type ciena-6500-types:INT {
-            range "5..9";
-          }
-          description
-            "Signal degrade threshold value";
-        }
-        leaf stformat {
-          type enumeration {
-            enum "NUM" {
-              description
-                "1 byte";
-            }
-            enum "STRING" {
-              description
-                "16 byte";
-            }
-          }
-          description
-            "Section Trace Format";
-        }
-        leaf strc {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted section trace";
-        }
-        leaf exp-trc {
-          type ciena-6500-types:STRING;
-          description
-            "Expected section trace";
-        }
-        leaf stfmode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-            enum "LINEFAIL" {
-              description
-                "Alarms on, traffic protection (OC48 facilities only)";
-            }
-          }
-          description
-            "Section Trace Fail Mode";
-        }
-        leaf ssbitmde {
-          type ciena-6500-enums:SSBITMDE;
-          description
-            "SS Bit mode (facility personality)";
-        }
-        leaf als {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "Automatic Laser Shutdown";
-        }
-        leaf eber-thresh {
-          default "3";
-          type ciena-6500-types:INT {
-            range "3 | 4 | 5";
-          }
-          description
-            "Excessive bit error threshold value";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "Optical Port market preference";
-        }
-        leaf uneqmode {
-          type enumeration {
-            enum "UNKNOWN" {
-              description
-                "Unknown unequipped insertion mode";
-            }
-            enum "STS1" {
-              description
-                "Insert STS1 Unequipped";
-            }
-            enum "VC4" {
-              description
-                "Insert VC4 Unequipped";
-            }
-          }
-          description
-            "Unequipped Insertion Mode";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf rx-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf tx-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf rx-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf tx-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf dus-override {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf rout-sig-disabled {
-          type enumeration {
-            enum "NO" {
-              description
-                "Used by control plane";
-            }
-            enum "YES" {
-              description
-                "Not used by control plane";
-            }
-          }
-          description
-            "This attribute controls whether the underlying interface will be used by control plane for I-NNI routing and signaling purposes.";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal.";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected (no cross-connects exist on facility)";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "TS" {
-              description
-                "Test";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "WRKRX" {
-              description
-                "Working in the receive direction";
-            }
-            enum "WRKTX" {
-              description
-                "Working in the transmit direction";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-disable-oc192 {
-    description
-      "Remove OC-192 Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf oc192 {
-        mandatory true;
-        description
-          "AID in format OC192-shelf-slot-port, OC192-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-oc192 {
-    description
-      "Restore OC-192 Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf oc192 {
-        mandatory true;
-        description
-          "AID in format OC192-shelf-slot-port, OC192-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-oc192 {
-    description
-      "Retrieve OC-192 Facility: view the attributes of an OC-192 facility.";
-    input {
-      leaf oc192 {
-        mandatory true;
-        description
-          "AID in format OC192-shelf-slot-port, OC192-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf stinfo {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Section Trace information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Section Trace information in the response";
-          }
-        }
-        description
-          "Specify if Section Trace information is to be included in the response.";
-      }
-      leaf ssbitinfo {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include SS bit information in the response";
-          }
-          enum "YES" {
-            description
-              "Do not include SS bit information in the response";
-          }
-        }
-        description
-          "Specify if SS Bit information is to be included in the response.";
-      }
-      leaf statsinfo {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Dynamic Status information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Dynamic Status information in the response";
-          }
-        }
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf oc192 {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf timing-reference {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Facility is a Timing Reference.";
-        }
-        leaf dcc {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Facility has DCC enabled";
-        }
-        leaf sd-th {
-          default "6";
-          type ciena-6500-types:INT {
-            range "5..9";
-          }
-          description
-            "Signal degrade threshold value";
-        }
-        leaf stformat {
-          type enumeration {
-            enum "NUM" {
-              description
-                "1 byte";
-            }
-            enum "STRING" {
-              description
-                "16 byte";
-            }
-          }
-          description
-            "Section Trace Format";
-        }
-        leaf strc {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted section trace";
-        }
-        leaf exp-trc {
-          type ciena-6500-types:STRING;
-          description
-            "Expected section trace";
-        }
-        leaf stfmode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-            enum "LINEFAIL" {
-              description
-                "Alarms on, with traffic protection";
-            }
-          }
-          description
-            "Section Trace Fail Mode";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "Optical Port market preference";
-        }
-        leaf uneqmode {
-          type enumeration {
-            enum "UNKNOWN" {
-              description
-                "Unknown unequipped insertion mode";
-            }
-            enum "STS1" {
-              description
-                "Insert STS1 Unequipped";
-            }
-            enum "VC4" {
-              description
-                "Insert VC4 Unequipped";
-            }
-          }
-          description
-            "Unequipped Insertion Mode";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf rx-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf rx-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf tx-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf tx-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf tx-wvlngth-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Wavelength in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-min {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-max {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Maximum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-spacing {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Wavelength Spacing in Ghz";
-        }
-        leaf splimgmt {
-          type ciena-6500-enums:spliMgmt;
-          description
-            "Identify if Port is Manageable by SPLI";
-        }
-        leaf splimanaged {
-          type ciena-6500-enums:spliManaged;
-          description
-            "Identify if Port is Currently Managed by SPLI";
-        }
-        leaf laser-off-far-end-fail {
-          type ciena-6500-enums:Laserofffarendfail;
-          description
-            "Loss of light feature";
-        }
-        leaf mapping {
-          type enumeration {
-            enum "NONE" {
-              description
-                "Not Mapped";
-            }
-            enum "AMP" {
-              description
-                "AMP Mapping";
-            }
-            enum "BMP" {
-              description
-                "BMP Mapping";
-            }
-          }
-          description
-            "Signal Mapping";
-        }
-        leaf ste {
-          type enumeration {
-            enum "YES" {
-              description
-                "Facility is section terminating.";
-            }
-            enum "NO" {
-              description
-                "Facility is section transparent.";
-            }
-          }
-          description
-            "Section Terminating";
-        }
-        leaf ssbitmde {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "SS Bit mode (facility personality)";
-        }
-        leaf als {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "Automatic Laser Shutdown";
-        }
-        leaf fec {
-          type ciena-6500-enums:FEC;
-          description
-            "FEC";
-        }
-        leaf nls {
-          type ciena-6500-enums:BOOL_ON_OFF;
-          description
-            "Non Linear Supression compensation";
-        }
-        leaf eber-thresh {
-          default "3";
-          type ciena-6500-types:INT {
-            range "3 | 4 | 5";
-          }
-          description
-            "Excessive bit error threshold value";
-        }
-        leaf sf-th {
-          default "4";
-          type ciena-6500-types:INT {
-            range "4..8";
-          }
-          description
-            "Signal Fail Threshold value";
-        }
-        leaf dus-override {
-          type enumeration {
-            enum "ENABLED";
-            enum "DISABLED";
-          }
-          description
-            "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf rout-sig-disabled {
-          type enumeration {
-            enum "NO" {
-              description
-                "Used by control plane";
-            }
-            enum "YES" {
-              description
-                "Not used by control plane";
-            }
-          }
-          description
-            "This attribute controls whether the underlying interface will be used by control plane for I-NNI routing and signaling purposes.";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal.";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected (no cross-connects exist on facility)";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "TS" {
-              description
-                "Test";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "WRKRX" {
-              description
-                "Working in the receive direction";
-            }
-            enum "WRKTX" {
-              description
-                "Working in the transmit direction";
-            }
-            enum "TSGEN" {
-              description
-                "Test set generation";
-            }
-            enum "TSMON" {
-              description
-                "Test set monitor";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-disable-oc768 {
-    description
-      "Remove OC-768 Facility: This command allows you to remove the specified facility from service and put it in an out-of-service for maintenance state.";
-    input {
-      leaf oc768 {
-        mandatory true;
-        description
-          "AID in format OC768-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-oc768 {
-    description
-      "Restore OC-768 Facility: This command allows you to restore a facility to service. The facility goes from a maintenance state to an in-service state.";
-    input {
-      leaf oc768 {
-        mandatory true;
-        description
-          "AID in format OC768-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-oc768 {
-    description
-      "Retrieve OC-768 Facility: view the attributes of an OC-768 facility.";
-    input {
-      leaf oc768 {
-        mandatory true;
-        description
-          "AID in format OC768-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf stinfo {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Section Trace information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Section Trace information in the response";
-          }
-        }
-        description
-          "Specify if Section Trace information is to be included in the response.";
-      }
-      leaf statsinfo {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Dynamic Status information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Dynamic Status information in the response";
-          }
-        }
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf oc768 {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf stformat {
-          type enumeration {
-            enum "NUM" {
-              description
-                "1 byte";
-            }
-            enum "STRING" {
-              description
-                "16 byte";
-            }
-          }
-          description
-            "Section Trace Format";
-        }
-        leaf strc {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted section trace";
-        }
-        leaf exp-trc {
-          type ciena-6500-types:STRING;
-          description
-            "Expected section trace";
-        }
-        leaf stfmode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-          }
-          description
-            "Section Trace Fail Mode";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "Optical Port market preference";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf rx-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf rx-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf tx-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf tx-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf laser-off-far-end-fail {
-          type ciena-6500-enums:Laserofffarendfail;
-          description
-            "Loss of light feature. Under certain scenarios insert Loss of Light (i.e. turn off the TX laser).";
-        }
-        leaf eber-thresh {
-          default "3";
-          type ciena-6500-types:INT {
-            range "3 | 4 | 5";
-          }
-          description
-            "Excessive bit error threshold value";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf hold-off {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-          }
-          description
-            "HoldOff signal conditioning timer";
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal.";
-            }
-          }
-          description
-            "Identify the primary state";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "FLT" {
-              description
-                "Fault detected in equipment";
-            }
-            enum "SGEO" {
-              description
-                "Supporting entity outage";
-            }
-            enum "TSGEN" {
-              description
-                "Test set generation";
-            }
-            enum "TSMON" {
-              description
-                "Test set monitor";
-            }
-          }
-          description
-            "Identify the secondary state";
-        }
-      }
-    }
-  }
-  rpc port-show-otm2 {
-    description
-      "Retrieve parameters against the OTM2 Facility";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, OTM2-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf tti-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include TTI information in the response";
-          }
-          enum "YES" {
-            description
-              "Include TTI information in the response";
-          }
-        }
-        description
-          "Specify if TTI Information is to be included in the response (default is NO).";
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Dynamic Status information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Dynamic Status information in the response";
-          }
-        }
-        description
-          "Specify if Dynamic Status Information is to be included in the response (default is YES).";
-      }
-      leaf otm-flags {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include detailed OTM (OTU, OPU, ODU) termination and monitoring information in the response";
-          }
-          enum "YES" {
-            description
-              "Include detailed OTM (OTU, OPU, ODU) termination and monitoring in the response";
-          }
-        }
-        description
-          "Specify if OTM (OPU, ODU, OTU) Layer termination and monitoring indicators are to be included in the response (default is NO).";
-      }
-    }
-    output {
-      list output {
-        leaf otm2aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf osid {
-          type string {
-            length "0..8";
-          }
-          description
-            "8 Byte OSID identifier";
-        }
-        leaf tx-fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "NO FEC";
-            }
-            enum "PFEC" {
-              description
-                "Product FEC";
-            }
-            enum "RS8" {
-              description
-                "Reed Solomon 8";
-            }
-            enum "UFEC" {
-              description
-                "7% UFEC";
-            }
-            enum "SCFEC" {
-              description
-                "Super Concatenated FEC";
-            }
-            enum "BCH20" {
-              description
-                "BCH20 FEC";
-            }
-          }
-          description
-            "TX Supported FEC";
-        }
-        leaf rx-fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "NO FEC";
-            }
-            enum "PFEC" {
-              description
-                "Product FEC";
-            }
-            enum "RS8" {
-              description
-                "Reed Solomon 8";
-            }
-            enum "UFEC" {
-              description
-                "7% UFEC";
-            }
-            enum "SCFEC" {
-              description
-                "Super Concatenated FEC";
-            }
-            enum "BCH20" {
-              description
-                "BCH20 FEC";
-            }
-          }
-          description
-            "RX Supported FEC";
-        }
-        leaf odu-term {
-          type enumeration {
-            enum "YES" {
-              description
-                "Indicates that ODU TTI is terminated on this OTM2 facility.";
-            }
-            enum "NO" {
-              description
-                "Indicates that ODU TTI is not terminated on this OTM2 facility.";
-            }
-          }
-          description
-            "ODUTTITERM parameter has been introduced in the RTRV-OTM2 TL-1 commands. Values it takes on are ?YES? and ?NO?. ODUTTITERM values:?YES?: means that ODU TTI is terminated on this particular OTM2 facility and Site Manager should display ODU TTI and allow provisioning / monitoring of all ODU TTI parameters.?NO?: means that ODU TTI is not terminated on this port and SM should not display the ODU TTI parameters except the ODU TTI RX Incoming value. The 6500 BB packs (10GOTR/10GOTSC, 40GMUX, 2x10G OTR, 4x10G OTR, and OTNWT) that act as a regen will passthrough ODU TTI but will allow for the monitoring of ODU TTI RX Incoming value.When there is no client facilty, ODU TTI is not terminated. Default is NO since the client facility does not autoprov. If client facility is not an OTM2, then this port terminates ODU TTI (Terminal). If client facility is OTM2, then this port does not terminate ODU TTI (Regen).";
-        }
-        leaf otu-tx-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted TTI 32B. TTI =OTU Trail Trace Identifier";
-        }
-        leaf odu-tx-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted TTI 32B. TTI =ODU Trail Trace Identifier";
-        }
-        leaf otu-rx-exp-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Expected 32 Characters OTU TTI";
-        }
-        leaf odu-rx-exp-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Expected 32 Characters ODU TTI";
-        }
-        leaf otu-tx-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf otu-tx-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf otu-exp-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Expected SAPI TTI (15 Characters)";
-        }
-        leaf otu-exp-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Expected DAPI TTI (15 Characters)";
-        }
-        leaf odu-tx-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf odu-tx-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf odu-exp-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Expected SAPI TTI (15 Characters)";
-        }
-        leaf odu-exp-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Expected DAPI TTI (15 Characters)";
-        }
-        leaf tx-path-id {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..254";
-          }
-          description
-            "TX path identifier";
-        }
-        leaf tx-mode {
-          type enumeration {
-            enum "ED" {
-              description
-                "Extended Dispersion";
-            }
-            enum "EP" {
-              description
-                "Extended Power";
-            }
-          }
-          description
-            "Transmitter Dispersion Mode";
-        }
-        leaf tx-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned TX Power in dBm (xx.x)";
-        }
-        leaf tx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf tx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf rx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf rx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf tx-wvlngth-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Wavelength in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-min {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-max {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Maximum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-spacing {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Wavelength Spacing";
-        }
-        leaf tx-tr-cont {
-          type enumeration {
-            enum "ON" {
-              description
-                "Dispersion Control";
-            }
-            enum "OFF";
-          }
-          description
-            "TR Control";
-        }
-        leaf tx-tr-cont-state {
-          type enumeration {
-            enum "TRCONTOFF" {
-              description
-                "TR Control OFF";
-            }
-            enum "IDLE" {
-              description
-                "TX Wavelength not provisioned.";
-            }
-            enum "UNKNOWN";
-            enum "DISPSCANINPROG" {
-              description
-                "Dispersion Scan in progress";
-            }
-            enum "OOSOPTIMIZATION" {
-              description
-                "Out of service optimization";
-            }
-            enum "ISOPTIMIZATION" {
-              description
-                "In service optimization";
-            }
-            enum "ISOPTIMIZATIONHOLDOVER" {
-              description
-                "In service optimization in Holdover";
-            }
-            enum "SSOPTIMIZATION" {
-              description
-                "Steady State Optimization";
-            }
-          }
-          description
-            "TR Control State";
-        }
-        leaf tx-disp-prov {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "Transmitter Dispersion Value";
-        }
-        leaf tx-act-disp {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Transmitter actual Dispersion Value";
-        }
-        leaf tx-disp-min {
-          type ciena-6500-types:INT;
-          description
-            "Minimum Transmitter Dispersion Value";
-        }
-        leaf tx-disp-max {
-          type ciena-6500-types:INT;
-          description
-            "Maximum Transmitter Dispersion Value";
-        }
-        leaf rx-act-disp {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "TR Control RX Last Acquired Dispersion";
-        }
-        leaf rx-echo-trace {
-          type ciena-6500-types:STRING;
-          description
-            "TR Transmit Identifier Received";
-        }
-        leaf tx-trace {
-          type ciena-6500-types:STRING;
-          description
-            "TR Transmit Identifier Received Expected";
-        }
-        leaf tx-assoc-far-end-rx {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitter associated far end receiver";
-        }
-        leaf tx-sbs {
-          type enumeration {
-            enum "ON" {
-              description
-                "SBS Dither";
-            }
-            enum "OFF";
-          }
-          description
-            "Stimulated Brillouin Scattering compensation Dither";
-        }
-        leaf tx-am-frmt {
-          type enumeration {
-            enum "AM1";
-            enum "AM2";
-            enum "AM1IDLER";
-            enum "AM2IDLER";
-            enum "OFF";
-          }
-          description
-            "TX AM format";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET" {
-              description
-                "Optical port market";
-            }
-            enum "SDH";
-          }
-          description
-            "Optical port Market preference";
-        }
-        leaf tf-mode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-          }
-          description
-            "OTU Trace Fail Mode";
-        }
-        leaf odu-tf-mode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-          }
-          description
-            "ODU Trace Fail Mode";
-        }
-        leaf otu-timen {
-          type enumeration {
-            enum "OPERATOR" {
-              description
-                "Monitor OTU Operator Specific TTI mismatch";
-            }
-            enum "SAPI" {
-              description
-                "Monitor OTU SAPI TTI mismatch";
-            }
-            enum "DAPI" {
-              description
-                "Monitor OTU DAPI TTI mismatch";
-            }
-            enum "SAPI_DAPI" {
-              description
-                "Monitor OTU SAPI and DAPI TTI mismatch";
-            }
-          }
-          description
-            "OTU TTI Mismatch Detection";
-        }
-        leaf odu-timen {
-          type enumeration {
-            enum "OPERATOR" {
-              description
-                "Monitor ODU Operator Specific TTI mismatch";
-            }
-            enum "SAPI" {
-              description
-                "Monitor ODU SAPI TTI mismatch";
-            }
-            enum "DAPI" {
-              description
-                "Monitor ODU DAPI TTI mismatch";
-            }
-            enum "SAPI_DAPI" {
-              description
-                "Monitor ODU SAPI and DAPI TTI mismatch";
-            }
-          }
-          description
-            "ODU TTI Mismatch Detection";
-        }
-        leaf laser-off-far-end-fail {
-          type ciena-6500-enums:Laserofffarendfail;
-          description
-            "Enabled or Disabled LOL (Loss of Light) feature";
-        }
-        leaf tx-chrip {
-          type enumeration {
-            enum "POSITIVE";
-            enum "NEGATIVE";
-          }
-          description
-            "Positive or Negative Chirp setting";
-        }
-        leaf pre-fec-sf-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Level. Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sf-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sd-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Level. Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sd-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        }
-        leaf otu-rate {
-          type enumeration {
-            enum "9G95" {
-              description
-                "9.95 G connection - Typically OC192 sonet";
-            }
-            enum "10G709" {
-              description
-                "10.70 G connection - Typically OTU2/OC192/STM64/10GE WAN";
-            }
-            enum "11G05" {
-              description
-                "11.05 G connection - Typically 10GE/OTU2 Mapping";
-            }
-            enum "11G09" {
-              description
-                "11.09 G connection - Typically 10GE/OTU2 Mapping";
-            }
-            enum "11G27" {
-              description
-                "11.27 G connection - Typically Fibre Channel 1200";
-            }
-          }
-          description
-            "OTMn Rate";
-        }
-        leaf exp-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Expected PT.";
-        }
-        leaf tx-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Transmitted PT.";
-        }
-        leaf opu2-resvd {
-          type enumeration {
-            enum "YES" {
-              description
-                "Use 7 unused bytes of the OPU2 overhead for payload";
-            }
-            enum "NO";
-          }
-          description
-            "This attribute is used to specify whether to use the 7 unused bytes of the OPU2 overhead for payload or not.";
-        }
-        leaf odu-monitor {
-          type enumeration {
-            enum "NO" {
-              description
-                "Not monitor ODU Layer";
-            }
-            enum "YES" {
-              description
-                "Monitor ODU Layer";
-            }
-          }
-          description
-            "Indicating whether to monitor ODU Layer";
-        }
-        leaf otu-sd-th-lev {
-          type ciena-6500-types:INT;
-          description
-            "OTU Signal Degrade Threshold Level, only applies when FEC is OFF";
-        }
-        leaf odu-sf-th-lev {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "ODU Post-FEC Signal Fail Threshold Level";
-        }
-        leaf odu-sd-th-lev {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "ODU Post-FEC Signal Degrade Threshold Level";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf otm-term {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Termination per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf otm-flt-mon {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Fault Monitoring per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf otm-prf-mon {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Performance Monitoring per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf cc-tx-freq {
-          type ciena-6500-types:STRING;
-          description
-            "Tx Sub-carrier Frequency";
-        }
-        leaf cc-tx-mod-depth {
-          type ciena-6500-types:STRING;
-          description
-            "Tx Modulation Depth";
-        }
-        leaf cc-tx-msg-len {
-          default "16";
-          type ciena-6500-types:STRING;
-          description
-            "Tx Message Length";
-        }
-        leaf cc-tx-ask-baud-rate {
-          type enumeration {
-            enum "333.33" {
-              description
-                "Baud Rate";
-            }
-            enum "1667" {
-              description
-                "Baud Rate";
-            }
-            enum "150" {
-              description
-                "Baud Rate";
-            }
-            enum "1000" {
-              description
-                "Baud Rate";
-            }
-            enum "UNKNOWN" {
-              description
-                "Baud Rate";
-            }
-          }
-          description
-            "Tx ASK Baud Rate";
-        }
-        leaf cc-tx-encode-frmt {
-          type enumeration {
-            enum "NRZ" {
-              description
-                "Encoding Format";
-            }
-            enum "NRZ2" {
-              description
-                "Encoding Format";
-            }
-            enum "3SB1" {
-              description
-                "Encoding Format";
-            }
-            enum "3SB2" {
-              description
-                "Encoding Format";
-            }
-            enum "UNKNOWN" {
-              description
-                "UNKNOWN Encoding Format";
-            }
-          }
-          description
-            "Tx Encoding Format";
-        }
-        leaf rc-rx-freq {
-          type ciena-6500-types:STRING;
-          description
-            "Rx Sub-carrier Frequency";
-        }
-        leaf rc-rx-msg-len {
-          default "28";
-          type ciena-6500-types:STRING;
-          description
-            "Rx Message Length";
-        }
-        leaf rc-rx-ask-baud-rate {
-          type enumeration {
-            enum "16.67" {
-              description
-                "Baud Rate";
-            }
-            enum "83.33" {
-              description
-                "Baud Rate";
-            }
-            enum "50" {
-              description
-                "Baud Rate";
-            }
-            enum "UNKNOWN" {
-              description
-                "UNKNOWN Baud Rate";
-            }
-          }
-          description
-            "Rx ASK Baud Rate";
-        }
-        leaf rc-rx-bpsk-baud-rate {
-          type enumeration {
-            enum "150" {
-              description
-                "Baud Rate";
-            }
-            enum "5" {
-              description
-                "Baud Rate";
-            }
-            enum "UNKNOWN" {
-              description
-                "UNKNOWN Baud Rate";
-            }
-          }
-          description
-            "Rx BPSK Baud Rate";
-        }
-        leaf rc-rx-decode-frmt {
-          type enumeration {
-            enum "NRZ" {
-              description
-                "Encoding Format";
-            }
-            enum "NRZ2" {
-              description
-                "Encoding Format";
-            }
-            enum "3SB1" {
-              description
-                "Encoding Format";
-            }
-            enum "3SB2" {
-              description
-                "Encoding Format";
-            }
-            enum "UNKNOWN" {
-              description
-                "UNKNOWN Encoding Format";
-            }
-          }
-          description
-            "Rx Decoding Format";
-        }
-        leaf rc-rx-thresh-mode {
-          type enumeration {
-            enum "AUTO" {
-              description
-                "Threshold Mode AUTO";
-            }
-            enum "MANUAL" {
-              description
-                "Threshold Mode MANUAL";
-            }
-            enum "UNKNOWN" {
-              description
-                "Threshold Mode UNKNOWN";
-            }
-          }
-          description
-            "Rx Threshold Mode";
-        }
-        leaf rc-rx-thresh {
-          default "100";
-          type ciena-6500-types:STRING;
-          description
-            "Rx Threshold";
-        }
-        leaf repeater-system-type {
-          type enumeration {
-            enum "FAMILY_A" {
-              description
-                "Repeater System Family A";
-            }
-            enum "FAMILY_B" {
-              description
-                "Repeater System Family B";
-            }
-            enum "FAMILY_C" {
-              description
-                "Repeater System Family C";
-            }
-            enum "UNKNOWN" {
-              description
-                "Repeater System Type Unknown";
-            }
-          }
-          description
-            "Repeater System Type";
-        }
-        leaf repeater-system-desc {
-          type ciena-6500-types:STRING;
-          description
-            "Repeater Description";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf cond-type {
-          type ciena-6500-enums:OTM_CONDTYPE;
-          description
-            "The type of conditioning";
-        }
-        leaf dm-enable {
-          type enumeration {
-            enum "YES" {
-              description
-                "Delay measurement is enabled.";
-            }
-            enum "NO" {
-              description
-                "Delay measurement is disabled.";
-            }
-          }
-          description
-            "Indicates whether delay measurement is enabled or disabled.";
-        }
-        leaf dm-count {
-          type ciena-6500-types:STRING;
-          description
-            "Most recent delay measurement count.";
-        }
-        leaf fec-sf-monitor {
-          type enumeration {
-            enum "NO" {
-              description
-                "Do Not Monitor FECSF";
-            }
-            enum "YES" {
-              description
-                "Monitor FECSF";
-            }
-          }
-          description
-            "Indicates whether to monitor Far-End client signal";
-        }
-        leaf encr-tcm {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..6";
-          }
-          description
-            "Active TCM Level for Encryption";
-        }
-        leaf manual-trib-slots {
-          type enumeration {
-            enum "NO" {
-              description
-                "Manual tributary slots assignment is supported.";
-            }
-            enum "YES" {
-              description
-                "Manual tributary slots assignment is not supported.";
-            }
-          }
-          description
-            "Indicates whether tributary slot assignment is supported.";
-        }
-        leaf ts-assigned {
-          type ciena-6500-types:STRING;
-          description
-            "Assigned tributary slot(HEX) associated with this port.";
-        }
-        leaf encr-odu1 {
-          type ciena-6500-types:INT;
-          description
-            "ODU Reserve Byte 1 for Encryption";
-        }
-        leaf encr-odu2 {
-          type ciena-6500-types:INT;
-          description
-            "ODU Reserve Byte 2 for Encryption";
-        }
-        leaf otu-oh-non-term {
-          type enumeration {
-            enum "NONE" {
-              description
-                "Entire GCC OH terminated";
-            }
-            enum "GCC0" {
-              description
-                "GCC0 portion of OTU OH not terminated";
-            }
-          }
-          description
-            "Indicating whether to termiate GCC OH or not";
-        }
-        leaf spli-mgmt {
-          type ciena-6500-enums:spliMgmt;
-          description
-            "Identify if Port is Manageable by SPLI";
-        }
-        leaf spli-managed {
-          type ciena-6500-enums:spliManaged;
-          description
-            "Identify if Port is Currently Managed by SPLI";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "FLT" {
-              description
-                "Fault detected";
-            }
-            enum "SGEO" {
-              description
-                "Supporting Entity Outage (based on PSTQ of OOS-AU, OOS-AUMA only)";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected. (no transparent traffic connection on this facility)";
-            }
-            enum "TSGEN" {
-              description
-                "Test set generation";
-            }
-            enum "TSMON" {
-              description
-                "Test set monitor";
-            }
-          }
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-otm2 {
-    description
-      "Remove an OTM2 Facility";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, OTM2-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-otm2 {
-    description
-      "Restore an OTM2 Facility";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, OTM2-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-init-dispscan-otm2 {
-    description
-      "Test dispersion scan against OTM2 facility";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-measure-rawber-otm2 {
-    description
-      "Allow 1 second BER (Bit Error Rate) test on the specific port (done at a port level and not a card level). Feature turns off Digital noise at the upstream Transmitter so true pre-FEC BER can be monitored for 1 second. Mechanism is done through the firmware. This test is not supposed to hit traffic and can be run at any time (not only during SLAT time). The user could however see PM hits during this test. Command could take up to 10 seconds to complete. The State of the port must be in SS Optimization for this command to be run. Otherwise it will be denied.";
-    input {
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf otm2aid {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf rx-raw-ber {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "RAW Bit Error Rate";
-        }
-      }
-    }
-  }
-  rpc port-show-otm3 {
-    description
-      "Retrieve parameters against the OTM3 Facility";
-    input {
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf tti-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include TTI information in the response";
-          }
-          enum "YES" {
-            description
-              "Include TTI information in the response";
-          }
-        }
-        description
-          "Specify if TTI Information is to be included in the response (default is NO).";
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Dynamic Status information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Dynamic Status information in the response";
-          }
-        }
-        description
-          "Specify if Dynamic Status Information is to be included in the response (default is YES).";
-      }
-      leaf otm-flags {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include detailed OTM (OTU, OPU, ODU) termination and monitoring information in the response";
-          }
-          enum "YES" {
-            description
-              "Include detailed OTM (OTU, OPU, ODU) termination and monitoring in the response";
-          }
-        }
-        description
-          "Specify if OTM (OPU, ODU, OTU) Layer termination and monitoring indicators are to be included in the response (default is NO).";
-      }
-    }
-    output {
-      list output {
-        leaf otm3aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf osid {
-          type string {
-            length "0..8";
-          }
-          description
-            "8 Byte OSID identifier";
-        }
-        leaf tx-fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "NO FEC";
-            }
-            enum "RS8" {
-              description
-                "Reed Solomon 8";
-            }
-            enum "PFEC" {
-              description
-                "Product FEC";
-            }
-          }
-          description
-            "TX Supported FEC";
-        }
-        leaf rx-fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "NO FEC";
-            }
-            enum "RS8" {
-              description
-                "Reed Solomon 8";
-            }
-            enum "PFEC" {
-              description
-                "Product FEC";
-            }
-          }
-          description
-            "RX Supported FEC";
-        }
-        leaf odu-term {
-          type enumeration {
-            enum "YES" {
-              description
-                "Indicates that ODU TTI is terminated on this OTM3 facility.";
-            }
-            enum "NO" {
-              description
-                "Indicates that ODU TTI is not terminated on this OTM3 facility.";
-            }
-          }
-          description
-            "ODUTTITERM parameter values indicate:?YES?: means that ODU TTI is terminated on this particular OTM3 facility and Site Manager should display ODU TTI and allow provisioning / monitoring of all ODU TTI parameters.?NO?: means that ODU TTI is not terminated on this port and SM should not display the ODU TTI parameters except the ODU TTI RX Incoming value. The 6500 BB circuit packs that act as regen will passthrough ODU TTI but will allow for the monitoring of ODU TTI RX Incoming value.When there is no client facility, ODU TTI is not terminated. Default is NO since the client facility does not autoprov. If client facility is not an OTM3, then this port terminates ODU TTI (Terminal). If client facility is OTM3, then this port does not terminate ODU TTI (Regen).";
-        }
-        leaf otu-tx-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted TTI 32B. TTI =OTU Trail Trace Identifier";
-        }
-        leaf odu-tx-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted TTI 32B. TTI =ODU Trail Trace Identifier";
-        }
-        leaf otu-rx-exp-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Expected 32 Characters OTU TTI";
-        }
-        leaf odu-rx-exp-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Expected 32 Characters ODU TTI";
-        }
-        leaf otu-tx-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf otu-tx-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf otu-exp-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Expected SAPI TTI (15 Characters)";
-        }
-        leaf otu-exp-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Expected DAPI TTI (15 Characters)";
-        }
-        leaf odu-tx-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf odu-tx-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf odu-exp-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Expected SAPI TTI (15 Characters)";
-        }
-        leaf odu-exp-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Expected DAPI TTI (15 Characters)";
-        }
-        leaf tx-path-id {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..254";
-          }
-          description
-            "TX path identifier";
-        }
-        leaf tx-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned TX Power in dBm (xx.x)";
-        }
-        leaf tx-act-high-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX Actual High Power Value in dBm (xx.x)";
-        }
-        leaf tx-act-low-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX Actual Low Power Value in dBm (xx.x)";
-        }
-        leaf tx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf tx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf rx-act-high-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX Actual High Power Value in dBm (xx.x)";
-        }
-        leaf rx-act-low-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX Actual Low Power Value in dBm (xx.x)";
-        }
-        leaf rx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf rx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf rx-ch-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel actual power in dBm (xx.x)";
-        }
-        leaf rx-ch-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel minimum power in dBm (xx.x)";
-        }
-        leaf rx-ch-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel maximum power in dBm (xx.x)";
-        }
-        leaf pwr-bal-ctlr {
-          type enumeration {
-            enum "DISABLED" {
-              description
-                "Power Balance Controller Disabled";
-            }
-            enum "ENABLED" {
-              description
-                "Power Balance Controller Enabled";
-            }
-          }
-          description
-            "Provisioned Power Balance Controller Operating Mode";
-        }
-        leaf pwr-bal-offset {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Power Balance Offset in dB (xx.x)";
-        }
-        leaf pwr-bal-act-offset {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Power Balance Actual Offset in dB (xx.x)";
-        }
-        leaf tx-wvlngth-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Wavelength in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-min {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-max {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Maximum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-spacing {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Wavelength Spacing";
-        }
-        leaf tuning-mode {
-          type enumeration {
-            enum "NORMAL" {
-              description
-                "Normal Tuning Mode";
-            }
-            enum "ACCELERATED" {
-              description
-                "Accelerated Tuning Mode";
-            }
-          }
-          description
-            "Provisioned Tuning Mode";
-        }
-        leaf differential-encoding {
-          type enumeration {
-            enum "NONE" {
-              description
-                "TR Control NONE";
-            }
-            enum "HARD" {
-              description
-                "TR Control HARD";
-            }
-            enum "SOFT" {
-              description
-                "TR Control SOFT";
-            }
-          }
-          description
-            "OCH Differential Encoding";
-        }
-        leaf spectral-occupancy {
-          type enumeration {
-            enum "NONE";
-            enum "NARROW";
-            enum "WIDE20";
-            enum "WIDE25";
-            enum "WIDE30";
-            enum "WIDE40";
-            enum "WIDE50";
-            enum "MINSPACE20";
-            enum "MINSPACE25";
-          }
-          description
-            "OCH Spectral Occupancy setting";
-        }
-        leaf rx-act-disp {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "TR Control RX Last Acquired Dispersion";
-        }
-        leaf max-pmd {
-          type ciena-6500-types:STRING;
-          description
-            "Supported Mean DGD (Differential Group Delay) value";
-        }
-        leaf rx-act-pmd {
-          type ciena-6500-types:STRING;
-          description
-            "Estimated Instance of DGD (Differential Group Delay) value";
-        }
-        leaf reach-spec {
-          type ciena-6500-types:STRING;
-          description
-            "Reach Specification";
-        }
-        leaf est-length {
-          type ciena-6500-types:STRING;
-          description
-            "Estimated fiber length";
-        }
-        leaf rtd {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Round Trip Delay.";
-        }
-        leaf uni-latency {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Unidirectional Latency.";
-        }
-        leaf rx-echo-trace {
-          type ciena-6500-types:STRING;
-          description
-            "TR Transmit Identifier Received";
-        }
-        leaf tx-trace {
-          type ciena-6500-types:STRING;
-          description
-            "TR Transmit Identifier Received Expected";
-        }
-        leaf tx-assoc-far-end-rx {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitter associated far end receiver";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "Optical port Market preference";
-        }
-        leaf tf-mode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-          }
-          description
-            "OTU Trace Fail Mode";
-        }
-        leaf odu-tf-mode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-          }
-          description
-            "ODU Trace Fail Mode";
-        }
-        leaf otu-timen {
-          type enumeration {
-            enum "OPERATOR" {
-              description
-                "Monitor OTU Operator Specific TTI mismatch";
-            }
-            enum "SAPI" {
-              description
-                "Monitor OTU SAPI TTI mismatch";
-            }
-            enum "DAPI" {
-              description
-                "Monitor OTU DAPI TTI mismatch";
-            }
-            enum "SAPI_DAPI" {
-              description
-                "Monitor OTU SAPI and DAPI TTI mismatch";
-            }
-          }
-          description
-            "OTU TTI Mismatch Detection";
-        }
-        leaf odu-timen {
-          type enumeration {
-            enum "OPERATOR" {
-              description
-                "Monitor ODU Operator Specific TTI mismatch";
-            }
-            enum "SAPI" {
-              description
-                "Monitor ODU SAPI TTI mismatch";
-            }
-            enum "DAPI" {
-              description
-                "Monitor ODU DAPI TTI mismatch";
-            }
-            enum "SAPI_DAPI" {
-              description
-                "Monitor ODU SAPI and DAPI TTI mismatch";
-            }
-          }
-          description
-            "ODU TTI Mismatch Detection";
-        }
-        leaf odu-monitor {
-          type enumeration {
-            enum "NO" {
-              description
-                "ODU Monitoring off";
-            }
-            enum "YES" {
-              description
-                "ODU Monitoring on";
-            }
-          }
-          description
-            "ODU Monitor";
-        }
-        leaf pre-fec-sf-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Level (decimal value in dbQ). Parameter applies when FEC is ON";
-        }
-        leaf otu-sd-th-lev {
-          type ciena-6500-types:INT;
-          description
-            "OTU Signal Degrade Threshold Level, only applies when FEC is OFF";
-        }
-        leaf odu-sf-th-lev {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "ODU Post-FEC Signal Fail Threshold Level";
-        }
-        leaf odu-sd-th-lev {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "ODU Post-FEC Signal Degrade Threshold Level";
-        }
-        leaf exp-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Expected PT.";
-        }
-        leaf tx-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Transmitted PT.";
-        }
-        leaf pre-fec-sf-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sd-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Level (decimal value in dbQ). Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sd-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        }
-        leaf otu-rate {
-          type enumeration {
-            enum "44G5" {
-              description
-                "44.5 G connection - Typically OTU3 Mapping";
-            }
-            enum "43G018" {
-              description
-                "43.018 G connection - Typically OTU3 40G rate";
-            }
-          }
-          description
-            "OTMn Rate";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf otm-term {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Termination per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf otm-flt-mon {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Fault Monitoring per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf otm-prf-mon {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Performance Monitoring per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf odu-handoff {
-          type enumeration {
-            enum "AUTO" {
-              description
-                "Automatic Mapping";
-            }
-            enum "ODU3" {
-              description
-                "ODU3 Mapping";
-            }
-            enum "OC768" {
-              description
-                "OC768 Mapping";
-            }
-            enum "ETH40G" {
-              description
-                "ETH40G Mapping";
-            }
-            enum "4X10G1" {
-              description
-                "4X10G Mapping Mode 1";
-            }
-            enum "4X10G2" {
-              description
-                "4X10G Mapping Mode 2";
-            }
-            enum "4X10G3" {
-              description
-                "4X10G Mapping Mode 3";
-            }
-            enum "4X10G4" {
-              description
-                "4X10G Mapping Mode 4";
-            }
-            enum "4X10G5" {
-              description
-                "4X10G Mapping Mode 5";
-            }
-            enum "4X10G6" {
-              description
-                "4X10G Mapping Mode 6";
-            }
-          }
-          description
-            "ODU Handoff Mapping Mode";
-        }
-        leaf line-type {
-          type ciena-6500-enums:linetype;
-          description
-            "OCH Line Sys Type";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf cond-type {
-          type ciena-6500-enums:OTM_CONDTYPE;
-          description
-            "The type of conditioning";
-        }
-        leaf laser-off-far-end-fail {
-          type ciena-6500-enums:Laserofffarendfail;
-          description
-            "Enabled or Disabled LOL (Loss of Light) feature";
-        }
-        leaf frr {
-          type enumeration {
-            enum "DISABLED" {
-              description
-                "DISABLED Mode";
-            }
-            enum "ENABLED" {
-              description
-                "ENABLED Mode";
-            }
-          }
-          description
-            "OCH Fast Receiver Recovery";
-        }
-        leaf frr-config {
-          type enumeration {
-            enum "MATCHEDCD" {
-              description
-                "Matched Chromatic Dispersion";
-            }
-            enum "DIVERSECD2" {
-              description
-                "Diverse Chromatic Dispersion 2 Paths";
-            }
-          }
-          description
-            "OCH FRR Network Configuration";
-        }
-        leaf frr-path1-disp {
-          type ciena-6500-types:STRING;
-          description
-            "OCH FRR Link Dispersion for Path 1";
-        }
-        leaf frr-path2-disp {
-          type ciena-6500-types:STRING;
-          description
-            "OCH FRR Link Dispersion for Path 2";
-        }
-        leaf dm-enable {
-          type enumeration {
-            enum "YES" {
-              description
-                "Delay measurement is enabled.";
-            }
-            enum "NO" {
-              description
-                "Delay measurement is disabled.";
-            }
-          }
-          description
-            "Indicates whether delay measurement is enabled or disabled.";
-        }
-        leaf dm-count {
-          type ciena-6500-types:STRING;
-          description
-            "Most recent delay measurement count.";
-        }
-        leaf hold-off {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "HoldOff signal conditioning timer";
-        }
-        leaf hold-on {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "HoldOn signal conditioning timer";
-        }
-        leaf spli-mgmt {
-          type ciena-6500-enums:spliMgmt;
-          description
-            "Identify if Port is Manageable by SPLI";
-        }
-        leaf crs-rate {
-          type enumeration {
-            enum "NIL" {
-              description
-                "crsRate is not supported";
-            }
-            enum "4XODU2E" {
-              description
-                "The connection rate is 4XODU2E";
-            }
-            enum "ODU3" {
-              description
-                "The connection rate is ODU3";
-            }
-          }
-          description
-            "ODU connection rate";
-        }
-        leaf spli-managed {
-          type ciena-6500-enums:spliManaged;
-          description
-            "Identify if Port is Currently Managed by SPLI";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "FLT" {
-              description
-                "Fault detected";
-            }
-            enum "SGEO" {
-              description
-                "Supporting Entity Outage (based on PSTQ of OOS-AU, OOS-AUMA only)";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected. (no transparent traffic connection on this facility)";
-            }
-            enum "TSGEN" {
-              description
-                "Test set generation";
-            }
-            enum "TSMON" {
-              description
-                "Test set monitor";
-            }
-          }
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-otm3 {
-    description
-      "Remove an OTM3 Facility";
-    input {
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-otm3 {
-    description
-      "Restore an OTM3 Facility";
-    input {
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-otm {
-    description
-      "Retrieve parameters against the OTM Facility";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, OTM0-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf tti-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include TTI information in the response";
-          }
-          enum "YES" {
-            description
-              "Include TTI information in the response";
-          }
-        }
-        description
-          "Specify if TTI Information is to be included in the response (default is NO).";
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Dynamic Status information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Dynamic Status information in the response";
-          }
-        }
-        description
-          "Specify if Dynamic Status Information is to be included in the response (default is YES).";
-      }
-      leaf otm-flags {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include detailed OTM (OTU, OPU, ODU) termination and monitoring information in the response";
-          }
-          enum "YES" {
-            description
-              "Include detailed OTM (OTU, OPU, ODU) termination and monitoring in the response";
-          }
-        }
-        description
-          "Specify if OTM (OPU, ODU, OTU) Layer termination and monitoring indicators are to be included in the response (default is NO).";
-      }
-      leaf disp-scan-info {
-        type enumeration {
-          enum "YES" {
-            description
-              "Do not include SFROM,STO, SSTEP, SDWELL, SCAN, OCHTXDISPFOUND and OCHASSOCQ in the response";
-          }
-          enum "NO" {
-            description
-              "Include SFROM,STO, SSTEP, SDWELL, SCAN, OCHTXDISPFOUND and OCHASSOCQ in the response";
-          }
-        }
-        description
-          "Indicates whether to include SFROM,STO, SSTEP, SDWELL, SCAN, OCHASSOCQ, OCHTXDISPFOUND in the response";
-      }
-    }
-    output {
-      list output {
-        leaf otmaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf osid {
-          type string {
-            length "0..8";
-          }
-          description
-            "8 Byte OSID identifier";
-        }
-        leaf tx-fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "NO FEC";
-            }
-            enum "RS8" {
-              description
-                "Reed Solomon 8";
-            }
-            enum "PFEC" {
-              description
-                "Product FEC";
-            }
-            enum "QFEC" {
-              description
-                "QFEC";
-            }
-          }
-          description
-            "TX Supported FEC";
-        }
-        leaf rx-fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "NO FEC";
-            }
-            enum "RS8" {
-              description
-                "Reed Solomon 8";
-            }
-            enum "PFEC" {
-              description
-                "Product FEC";
-            }
-            enum "QFEC" {
-              description
-                "QFEC";
-            }
-          }
-          description
-            "RX Supported FEC";
-        }
-        leaf odu-term {
-          type enumeration {
-            enum "YES" {
-              description
-                "Indicates that ODU TTI is terminated on this OTM facility.";
-            }
-            enum "NO" {
-              description
-                "Indicates that ODU TTI is not terminated on this OTM facility.";
-            }
-          }
-          description
-            "ODUTTITERM parameter values indicate:?YES?: means that ODU TTI is terminated on this particular OTM facility and Site Manager should display ODU TTI and allow provisioning / monitoring of all ODU TTI parameters.?NO?: means that ODU TTI is not terminated on this port and SM should not display the ODU TTI parameters except the ODU TTI RX Incoming value. The 6500 BB circuit packs that act as regen will passthrough ODU TTI but will allow for the monitoring of ODU TTI RX Incoming value.When there is no client facility, ODU TTI is not terminated. Default is NO since the client facility does not autoprov. If client facility is not an OTM, then this port terminates ODU TTI (Terminal). If client facility is OTM, then this port does not terminate ODU TTI (Regen).";
-        }
-        leaf otu-tx-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted TTI 32B. TTI =OTU Trail Trace Identifier";
-        }
-        leaf odu-tx-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted TTI 32B. TTI =ODU Trail Trace Identifier";
-        }
-        leaf otu-rx-exp-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Expected 32 Characters OTU TTI";
-        }
-        leaf odu-rx-exp-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Expected 32 Characters ODU TTI";
-        }
-        leaf otu-tx-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf otu-tx-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf otu-exp-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Expected SAPI TTI (15 Characters)";
-        }
-        leaf otu-exp-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "OTU Expected DAPI TTI (15 Characters)";
-        }
-        leaf odu-tx-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf odu-tx-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf odu-exp-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Expected SAPI TTI (15 Characters)";
-        }
-        leaf odu-exp-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Expected DAPI TTI (15 Characters)";
-        }
-        leaf tx-path-id {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..254";
-          }
-          description
-            "TX path identifier";
-        }
-        leaf tx-mode {
-          type enumeration {
-            enum "MANUAL" {
-              description
-                "Manual Precompensation Mode";
-            }
-            enum "AUTOMATIC" {
-              description
-                "Automatic Precompensation Mode";
-            }
-            enum "CUSTOM1" {
-              description
-                "Custom1 Precompensation Mode";
-            }
-            enum "OFF" {
-              description
-                "No Precompensation Mode";
-            }
-            enum "OFFSETAUTO" {
-              description
-                "Offset Automatic Precompensation Mode";
-            }
-            enum "EXTENDEDMANUAL" {
-              description
-                "Extended Manual Precompensation Mode";
-            }
-          }
-          description
-            "Transmitter Dispersion Mode";
-        }
-        leaf tx-disp-prov {
-          type ciena-6500-types:INT;
-          description
-            "Transmitter Dispersion Provisioned Value";
-        }
-        leaf tx-act-disp {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Transmitter total actual link dispersion in the near-to-far direction";
-        }
-        leaf tx-disp-min {
-          type ciena-6500-types:INT;
-          description
-            "Minimum Transmitter Dispersion Value";
-        }
-        leaf tx-disp-max {
-          type ciena-6500-types:INT;
-          description
-            "Maximum Transmitter Dispersion Value";
-        }
-        leaf rx-act-disp {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Receiver total actual link dispersion in the far-to-near direction";
-        }
-        leaf tx-pre-disp {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Tx Precompensation Dispersion Value.";
-        }
-        leaf rx-post-disp {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Rx Postcompensation Dispersion Value.";
-        }
-        leaf rotation {
-          type enumeration {
-            enum "DISABLED" {
-              description
-                "Disabled OCH Jones Rotation feature ";
-            }
-            enum "ENABLED" {
-              description
-                "Enabled OCH Jones Rotation feature";
-            }
-          }
-          description
-            "OCH Jones Rotation feature";
-        }
-        leaf tx-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned TX Power in dBm (xx.x)";
-        }
-        leaf tx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf tx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf tx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf rx-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf rx-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf rx-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf rx-ch-act-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel actual power in dBm (xx.x)";
-        }
-        leaf rx-ch-min-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel minimum power in dBm (xx.x)";
-        }
-        leaf rx-ch-max-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel maximum power in dBm (xx.x)";
-        }
-        leaf pwr-bal-ctlr {
-          type enumeration {
-            enum "DISABLED" {
-              description
-                "Power Balance Controller Disabled";
-            }
-            enum "ENABLED" {
-              description
-                "Power Balance Controller Enabled";
-            }
-          }
-          description
-            "Provisioned Power Balance Controller Operating Mode";
-        }
-        leaf pwr-bal-offset {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Power Balance Offset in dB (xx.x)";
-        }
-        leaf pwr-bal-act-offset {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Power Balance Actual Offset in dB (xx.x)";
-        }
-        leaf tx-act-high-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX Actual High Power Value in dBm (xx.x)";
-        }
-        leaf tx-act-low-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "TX Actual Low Power Value in dBm (xx.x)";
-        }
-        leaf rx-act-high-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX Actual High Power Value in dBm (xx.x)";
-        }
-        leaf rx-act-low-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "RX Actual Low Power Value in dBm (xx.x)";
-        }
-        leaf-list tx-act-ln-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Lane TX Power Value in dBm (xx.x)";
-        }
-        leaf-list rx-act-ln-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Lane RX Power Value in dBm (xx.x)";
-        }
-        leaf tx-wvlngth-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Wavelength in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-min {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-max {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Maximum Wavelength value in nm (xxxx.xx)";
-        }
-        leaf tx-wvlngth-spacing {
-          type enumeration {
-            enum "50" {
-              description
-                "50GHz";
-            }
-            enum "FLEXGRID" {
-              description
-                "FLEXGRID";
-            }
-          }
-          description
-            "OCH Wavelength Spacing";
-        }
-        leaf differential-encoding {
-          type enumeration {
-            enum "NONE" {
-              description
-                "TR Control NONE";
-            }
-            enum "HARD" {
-              description
-                "TR Control HARD";
-            }
-            enum "SOFT" {
-              description
-                "TR Control SOFT";
-            }
-            enum "XD" {
-              description
-                "TR Control XD";
-            }
-          }
-          description
-            "OCH Differential Encoding";
-        }
-        leaf spectral-occupancy {
-          type enumeration {
-            enum "NONE";
-            enum "NARROW";
-            enum "WIDE20";
-            enum "WIDE25";
-            enum "WIDE30";
-            enum "WIDE40";
-            enum "WIDE50";
-            enum "MINSPACE20";
-            enum "MINSPACE25";
-          }
-          description
-            "OCH Spectral Occupancy setting";
-        }
-        leaf odu-handoff {
-          type enumeration {
-            enum "AUTO" {
-              description
-                "Automatic Mapping";
-            }
-            enum "ODU3" {
-              description
-                "ODU3 Mapping";
-            }
-            enum "OC768" {
-              description
-                "OC768 Mapping";
-            }
-            enum "ETH40G" {
-              description
-                "ETH40G Mapping";
-            }
-            enum "4X10G1" {
-              description
-                "4X10G Mapping Mode 1";
-            }
-            enum "4X10G2" {
-              description
-                "4X10G Mapping Mode 2";
-            }
-            enum "4X10G3" {
-              description
-                "4X10G Mapping Mode 3";
-            }
-            enum "4X10G4" {
-              description
-                "4X10G Mapping Mode 4";
-            }
-            enum "4X10G5" {
-              description
-                "4X10G Mapping Mode 5";
-            }
-            enum "4X10G6" {
-              description
-                "4X10G Mapping Mode 6";
-            }
-            enum "HALFODUALIGN" {
-              description
-                "Master Slave - Half ODU Align Mapping Mode";
-            }
-          }
-          description
-            "ODU Handoff Mapping Mode";
-        }
-        leaf tuning-mode {
-          type enumeration {
-            enum "NORMAL" {
-              description
-                "Normal Tuning Mode";
-            }
-            enum "ACCELERATED" {
-              description
-                "Accelerated Tuning Mode";
-            }
-          }
-          description
-            "Provisioned Tuning Mode";
-        }
-        leaf optimize-mode {
-          type ciena-6500-enums:optimizeMode;
-          description
-            "Performance Optimization Mode";
-        }
-        leaf max-pmd {
-          type ciena-6500-types:STRING;
-          description
-            "Supported Mean DGD (Differential Group Delay) value";
-        }
-        leaf rx-act-pmd {
-          type ciena-6500-types:STRING;
-          description
-            "Estimated Instance of DGD (Differential Group Delay) value";
-        }
-        leaf reach-spec {
-          type ciena-6500-types:STRING;
-          description
-            "Reach Specification";
-        }
-        leaf est-length {
-          type ciena-6500-types:STRING;
-          description
-            "Estimated fiber length";
-        }
-        leaf rtd {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Round Trip Delay.";
-        }
-        leaf uni-latency {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Unidirectional Latency.";
-        }
-        leaf rx-echo-trace {
-          type ciena-6500-types:STRING;
-          description
-            "TR Transmit Identifier Received";
-        }
-        leaf tx-trace {
-          type ciena-6500-types:STRING;
-          description
-            "TR Transmit Identifier Received Expected";
-        }
-        leaf tx-assoc-far-end-rx {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitter associated far end receiver";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "Optical port Market preference";
-        }
-        leaf tf-mode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-          }
-          description
-            "OTU Trace Fail Mode";
-        }
-        leaf odu-tf-mode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-          }
-          description
-            "ODU Trace Fail Mode";
-        }
-        leaf otu-timen {
-          type enumeration {
-            enum "OPERATOR" {
-              description
-                "Monitor OTU Operator Specific TTI mismatch";
-            }
-            enum "SAPI" {
-              description
-                "Monitor OTU SAPI TTI mismatch";
-            }
-            enum "DAPI" {
-              description
-                "Monitor OTU DAPI TTI mismatch";
-            }
-            enum "SAPI_DAPI" {
-              description
-                "Monitor OTU SAPI and DAPI TTI mismatch";
-            }
-          }
-          description
-            "OTU TTI Mismatch Detection";
-        }
-        leaf odu-timen {
-          type enumeration {
-            enum "OPERATOR" {
-              description
-                "Monitor ODU Operator Specific TTI mismatch";
-            }
-            enum "SAPI" {
-              description
-                "Monitor ODU SAPI TTI mismatch";
-            }
-            enum "DAPI" {
-              description
-                "Monitor ODU DAPI TTI mismatch";
-            }
-            enum "SAPI_DAPI" {
-              description
-                "Monitor ODU SAPI and DAPI TTI mismatch";
-            }
-          }
-          description
-            "ODU TTI Mismatch Detection";
-        }
-        leaf laser-off-far-end-fail {
-          type ciena-6500-enums:Laserofffarendfail;
-          description
-            "Enabled or Disabled LOL (Loss of Light) feature";
-        }
-        leaf tx-chrip {
-          type enumeration {
-            enum "POSITIVE";
-            enum "NEGATIVE";
-          }
-          description
-            "Positive or Negative Chirp setting";
-        }
-        leaf frr {
-          type enumeration {
-            enum "DISABLED" {
-              description
-                "DISABLED Mode";
-            }
-            enum "ENABLED" {
-              description
-                "ENABLED Mode";
-            }
-          }
-          description
-            "OCH Fast Receiver Recovery";
-        }
-        leaf frr-config {
-          type enumeration {
-            enum "MATCHEDCD" {
-              description
-                "Matched Chromatic Dispersion";
-            }
-            enum "DIVERSECD2" {
-              description
-                "Diverse Chromatic Dispersion 2 Paths";
-            }
-          }
-          description
-            "OCH FRR Network Configuration";
-        }
-        leaf frr-path1-disp {
-          type ciena-6500-types:STRING;
-          description
-            "OCH FRR Link Dispersion for Path 1";
-        }
-        leaf frr-path2-disp {
-          type ciena-6500-types:STRING;
-          description
-            "OCH FRR Link Dispersion for Path 2";
-        }
-        leaf odu-monitor {
-          type enumeration {
-            enum "NO" {
-              description
-                "ODU Monitoring off";
-            }
-            enum "YES" {
-              description
-                "ODU Monitoring on";
-            }
-          }
-          description
-            "ODU Monitor";
-        }
-        leaf pre-fec-sf-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Level (decimal value in dbQ). Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sf-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sd-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Level (decimal value in dbQ). Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sd-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        }
-        leaf otu-sd-th-lev {
-          type ciena-6500-types:INT;
-          description
-            "OTU Signal Degrade Threshold Level, only applies when FEC is OFF";
-        }
-        leaf odu-sf-th-lev {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "ODU Post-FEC Signal Fail Threshold Level";
-        }
-        leaf odu-sd-th-lev {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "ODU Post-FEC Signal Degrade Threshold Level";
-        }
-        leaf otu-rate {
-          type enumeration {
-            enum "1G244" {
-              description
-                "1.244 G connection - OTM0";
-            }
-            enum "2G7" {
-              description
-                "2.7 G connection - OTM1";
-            }
-            enum "5G02" {
-              description
-                "5.02 G connection - OTMFLEX";
-            }
-            enum "112G" {
-              description
-                "112 G connection - Typically OTU4 Mapping";
-            }
-            enum "OTUC4-60" {
-              description
-                "OTUC4-60 Rate connection";
-            }
-            enum "2xOTU4" {
-              description
-                "2 x OTU4(112G) Rate connection";
-            }
-          }
-          description
-            "OTMn Rate";
-        }
-        leaf exp-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Expected PT.";
-        }
-        leaf tx-pt {
-          type ciena-6500-types:STRING;
-          description
-            "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Transmitted PT.";
-        }
-        leaf otm-term {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Termination per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf otm-flt-mon {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Fault Monitoring per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf otm-prf-mon {
-          type ciena-6500-types:STRING;
-          description
-            "OTM Performance Monitoring per layer (OPU and/or ODU and/or OTU)";
-        }
-        leaf cond-type {
-          type ciena-6500-enums:OTM_CONDTYPE;
-          description
-            "The type of conditioning";
-        }
-        leaf line-type {
-          type ciena-6500-enums:linetype;
-          description
-            "OCH Line Sys Type";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        }
-        leaf dm-enable {
-          type enumeration {
-            enum "YES" {
-              description
-                "Delay measurement is enabled.";
-            }
-            enum "NO" {
-              description
-                "Delay measurement is disabled.";
-            }
-          }
-          description
-            "Indicates whether delay measurement is enabled or disabled.";
-        }
-        leaf dm-count {
-          type ciena-6500-types:STRING;
-          description
-            "Most recent delay measurement count.";
-        }
-        leaf hold-off {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "HoldOff signal conditioning timer";
-        }
-        leaf hold-on {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "HoldOn signal conditioning timer";
-        }
-        leaf tx-disp-found {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Found the optimum Pre-dispersion compensation from the scanning, ps/nm";
-        }
-        leaf assoc-q {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Q associated with the found optimum precomp";
-        }
-        leaf scan {
-          type enumeration {
-            enum "START" {
-              description
-                "Triggers Q-based Pre-dispersion compensation Scanning";
-            }
-            enum "STOP" {
-              description
-                "Cancels Q-based Pre-dispersion compensation Scanning";
-            }
-            enum "COMPLETE" {
-              description
-                "Indicates completion of Scanning, only for RTRV ";
-            }
-          }
-          description
-            "Q-based Pre-dispersion compensation Scanning";
-        }
-        leaf s-from {
-          type ciena-6500-types:INT;
-          description
-            "FROM point of scanning range, ps/nm";
-        }
-        leaf s-to {
-          type ciena-6500-types:INT;
-          description
-            "TO point of scanning range, ps/nm";
-        }
-        leaf s-step {
-          type ciena-6500-types:INT;
-          description
-            "Compensation optimization scanning step size , ps/nm";
-        }
-        leaf s-dwell {
-          type ciena-6500-types:INT;
-          description
-            "Scanning dwell time, second";
-        }
-        leaf tx-freq-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned TX Frequency in THz (xxx.xxxx)";
-        }
-        leaf tx-freq-min {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum TX Frequency value in THz (xxx.xxxx)";
-        }
-        leaf tx-freq-max {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Maximum TX Frequency value in THz (xxx.xxxx)";
-        }
-        leaf enm-prov {
-          type enumeration {
-            enum "MODE1" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) mode 1";
-            }
-            enum "MODE2" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) mode 2";
-            }
-            enum "AUTO" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) auto";
-            }
-          }
-          description
-            "Provisioned Enhanced Non-linear Mitigation mode";
-        }
-        leaf rx-enm {
-          type enumeration {
-            enum "MODE1" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) mode 1";
-            }
-            enum "MODE2" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) mode 2";
-            }
-            enum "UNKNOWN" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) default";
-            }
-          }
-          description
-            "Enhanced Non-linear Mitigation mode";
-        }
-        leaf tx-enm {
-          type enumeration {
-            enum "MODE1" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) mode 1";
-            }
-            enum "MODE2" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) mode 2";
-            }
-            enum "UNKNOWN" {
-              description
-                "ENM (Enhanced Non-linear Mitigation) default";
-            }
-          }
-          description
-            "Enhanced Non-linear Mitigation mode";
-        }
-        leaf carrier-centering-mode {
-          type ciena-6500-enums:ochCarrierCenteringMode;
-          description
-            "Laser centering mode";
-        }
-        leaf ccda {
-          type ciena-6500-enums:ccda;
-          description
-            "TX Channel Contention Detection and Avoidance";
-        }
-        leaf txb {
-          type ciena-6500-enums:txb;
-          description
-            "TX Power in Reduced State";
-        }
-        leaf secure-oh {
-          type ciena-6500-enums:SecureOH;
-          description
-            "Secure Overhead Bytes";
-        }
-        leaf spli-mgmt {
-          type ciena-6500-enums:spliMgmt;
-          description
-            "Identify if Port is Manageable by SPLI";
-        }
-        leaf encr-tcm {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..6";
-          }
-          description
-            "Active TCM Level for Encryption";
-        }
-        leaf encr-odu1 {
-          type ciena-6500-types:INT;
-          description
-            "ODU Reserve Byte 1 for Encryption";
-        }
-        leaf encr-odu2 {
-          type ciena-6500-types:INT;
-          description
-            "ODU Reserve Byte 2 for Encryption";
-        }
-        leaf spli-managed {
-          type ciena-6500-enums:spliManaged;
-          description
-            "Identify if Port is Currently Managed by SPLI";
-        }
-        leaf role {
-          type enumeration {
-            enum "PRIME" {
-              description
-                "Prime of the group.";
-            }
-            enum "MEMBER2" {
-              description
-                "Member of the group.";
-            }
-          }
-          description
-            "Indicates whether this OTM facility is the prime or member in a FLEX4 2X8QAM300G CP group";
-        }
-        leaf p-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "FLEX4 OCLD 2X8QAM300G CP group prime line port AID";
-        }
-        leaf m-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "FLEX4 OCLD 2X8QAM300G CP group member line port AID";
-        }
-        leaf odu-rate {
-          type enumeration {
-            enum "ODUC2" {
-              description
-                "ODU layer rate is 2xODU4";
-            }
-            enum "ODUC4" {
-              description
-                "ODU layer rate is 4xODU4";
-            }
-          }
-          description
-            " Number of ODU4s contained by the ODUCn layer in a 8QAM CP group";
-        }
-        leaf rx-pwr-l-thr {
-          default "0";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Rx Power OOR low threshold";
-        }
-        leaf rx-pwr-h-thr {
-          default "0";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Rx Power OOR high threshold";
-        }
-        leaf rx-ch-pwr-l-thr {
-          default "0";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Rx channel Power OOR low threshold";
-        }
-        leaf rx-ch-pwr-h-thr {
-          default "0";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Rx channel Power OOR high threshold";
-        }
-        leaf rx-pwr-thr-prov {
-          type enumeration {
-            enum "ON" {
-              description
-                "Use of provisioned thresholds is on";
-            }
-            enum "OFF" {
-              description
-                "Use of provisioned thresholds is off";
-            }
-          }
-          description
-            "Enable to use provisioned thresholds";
-        }
-        leaf prtl-srv {
-          type enumeration {
-            enum "ON" {
-              description
-                "Partial survivability is supported";
-            }
-            enum "OFF" {
-              description
-                "Partial survivability is not supported";
-            }
-          }
-          description
-            "Indicates partial survivability support";
-        }
-        leaf ttops {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Transponder Triggered Switching Mode Enabled";
-        }
-        leaf ochtxsigbw3db {
-          type ciena-6500-types:STRING;
-          description
-            "Supported 3dB bandwidth value";
-        }
-        leaf ochtxsigbw10db {
-          type ciena-6500-types:STRING;
-          description
-            "Supported 10dB bandwidth value";
-        }
-        leaf ochtxminspecwth {
-          type ciena-6500-types:STRING;
-          description
-            "Minimum spectral width";
-        }
-        leaf ochtxfreqres {
-          type ciena-6500-types:STRING;
-          description
-            "Supported frequency resolution";
-        }
-        leaf laser-centering-range {
-          type ciena-6500-types:STRING;
-          description
-            "Sets laser centering range";
-        }
-        leaf laser-freq-thr {
-          type decimal64 {
-            range "0..3.0";
-            fraction-digits 1;
-          }
-          description
-            "Laser Frequency Threshold";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "AINS" {
-              description
-                "Auto-In-Service";
-            }
-            enum "MT" {
-              description
-                "Maintenance";
-            }
-            enum "FLT" {
-              description
-                "Fault detected";
-            }
-            enum "SGEO" {
-              description
-                "Supporting Entity Outage (based on PSTQ of OOS-AU, OOS-AUMA only)";
-            }
-            enum "LPBK" {
-              description
-                "Loopback";
-            }
-            enum "DISCD" {
-              description
-                "Disconnected. (no transparent traffic connection on this facility)";
-            }
-            enum "TSGEN" {
-              description
-                "Test set generation";
-            }
-            enum "TSMON" {
-              description
-                "Test set monitor";
-            }
-          }
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-otm {
-    description
-      "Remove an OTM Facility";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-otm {
-    description
-      "Restore an OTM Facility";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-init-dispscan-otm {
-    description
-      "Dispersion scanning against OTM facility";
-    input {
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf scan {
-        type enumeration {
-          enum "START" {
-            description
-              "Triggers Q-based Pre-dispersion compensation Scanning";
-          }
-          enum "STOP" {
-            description
-              "Cancels Q-based Pre-dispersion compensation Scanning";
-          }
-        }
-        mandatory true;
-        description
-          "Q-based Pre-dispersion compensation Scanning";
-      }
-      leaf s-from {
-        type ciena-6500-types:INT;
-        description
-          "FROM point of scanning range, ps/nm";
-      }
-      leaf s-to {
-        type ciena-6500-types:INT;
-        description
-          "TO point of scanning range, ps/nm";
-      }
-      leaf s-step {
-        type ciena-6500-types:INT;
-        description
-          "Compensation optimization scanning step size , ps/nm";
-      }
-      leaf s-dwell {
-        type ciena-6500-types:INT;
-        description
-          "Scanning dwell time, second";
-      }
-    }
-  }
-  rpc port-show-sts192c {
-    description
-      "Retrieve Payload Facility: view the signal label parameters of an STS192C facility.";
-    input {
-      leaf sts192c {
-        mandatory true;
-        description
-          "AID in format STS192C-shelf-slot-port-sts";
-        type ciena-6500-types:aid;
-      }
-      leaf incsglbl {
-        type enumeration {
-          enum "Y" {
-            description
-              "Display Incoming Signal Label";
-          }
-          enum "N" {
-            description
-              "Exclude Incoming Signal Label";
-          }
-        }
-        description
-          "Omit querying the INCSGLBL value to improve retrieve time";
-      }
-    }
-    output {
-      list output {
-        leaf sts192c {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf term {
-          type enumeration {
-            enum "Y" {
-              description
-                "Y=Terminated";
-            }
-            enum "N" {
-              description
-                "N=Not terminated";
-            }
-          }
-          description
-            "Y=Terminated/N=Not terminated";
-        }
-        leaf expsglbl {
-          type ciena-6500-types:INT;
-          description
-            "Expected incoming signal label (C2) value";
-        }
-        leaf incsglbl {
-          type enumeration {
-            enum "Y" {
-              description
-                "Display Incoming Signal Label";
-            }
-            enum "N" {
-              description
-                "Exclude Incoming Signal Label";
-            }
-          }
-          description
-            "Omit querying the INCSGLBL value to improve retrieve time";
-        }
-        leaf sglbl {
-          type ciena-6500-types:INT;
-          description
-            "Outgoing signal label (C2) value";
-        }
-        leaf trcformat {
-          type enumeration {
-            enum "16BYTE";
-            enum "64BYTE";
-          }
-          description
-            "Path trace format.";
-        }
-        leaf prime {
-          type enumeration {
-            enum "OSS" {
-              description
-                "Operation Support System Owned";
-            }
-            enum "CPS" {
-              description
-                "Control Plane System Owned";
-            }
-          }
-          description
-            "The owner of the payload facility";
-        }
-      }
-    }
-  }
-  rpc port-show-tti-odu {
-    description
-      "Retrieve Trail Trace Identifier";
-    input {
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU0-shelf-slot-port-payloadindex, ODU1-shelf-slot-port-payloadindex, ODUFLEX-shelf-slot-port-payloadindex, ODU4-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-      leaf msg-type {
-        type ciena-6500-enums:ODUTTI;
-        description
-          "Message type to display";
-      }
-    }
-    output {
-      list output {
-        leaf odun {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf tti-message {
-          type ciena-6500-types:STRING;
-          description
-            "Trail Trace Identifier message";
-        }
-      }
-    }
-  }
-  rpc port-show-trace-flex {
-    description
-      "Retrieve Flex Trace Message";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf msg-type {
-        default "TRC";
-        type ciena-6500-enums:FTraceType;
-        description
-          "Message type to display";
-      }
-    }
-    output {
-      list output {
-        leaf flex {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf flex-trace-message {
-          type ciena-6500-types:STRING;
-          description
-            "Section trace message";
-        }
-      }
-    }
-  }
-  rpc port-show-ptp {
-    description
-      "Retrieve the PTP facility parameters";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port, PTP-shelf-slot-portSsubport, PTP-shelf-slot-portPsubport, PTP-shelf-slot-ALL, PTP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type ciena-6500-enums:StatsInfoDefYes;
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-      leaf disp-scan-info {
-        type ciena-6500-enums:DispScanInfo;
-        description
-          "Indicates whether to include SFROM, STO, SSTEP, SDWELL, SCAN, OCHASSOCQ, OCHTXDISPFOUND in the response";
-      }
-    }
-    output {
-      list output {
-        leaf ptp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf service-type {
-          type ciena-6500-enums:ptpServiceType;
-          description
-            "Configured Service Type";
-        }
-        leaf role {
-          type ciena-6500-enums:PtpRole;
-          description
-            "Role type in OTUCn-M configuration";
-        }
-        leaf bit-rate {
-          type ciena-6500-enums:PtpRate;
-          description
-            "PTP Bit Rate";
-        }
-        leaf mod {
-          type ciena-6500-enums:PtpMod;
-          description
-            "Modulation scheme(Param is applicable only on T-Series shelf.)";
-        }
-        leaf baud {
-          type ciena-6500-enums:ptpBaud;
-          description
-            "OTSi Baud rate (35G or 56G)";
-        }
-        leaf p-aid {
-          type ciena-6500-types:aid;
-          description
-            "Specify the Prime PTP AID.";
-        }
-        leaf-list m-aid {
-          type ciena-6500-types:aid;
-          description
-            "Specify the Member PTP AID List. Format: Member2&Member3&...";
-        }
-        leaf rx-fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "No FEC";
-            }
-            enum "PFEC" {
-              description
-                "Product FEC";
-            }
-            enum "RS8" {
-              description
-                "Reed Solomon 8";
-            }
-            enum "SCFEC" {
-              description
-                "Super Concatenated FEC";
-            }
-            enum "UFEC" {
-              description
-                "UFEC";
-            }
-            enum "QFEC" {
-              description
-                "QFEC";
-            }
-          }
-          description
-            "Type of Forward Error Correction on RX";
-        }
-        leaf tx-fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "No FEC";
-            }
-            enum "PFEC" {
-              description
-                "Product FEC";
-            }
-            enum "RS8" {
-              description
-                "Reed Solomon 8";
-            }
-            enum "SCFEC" {
-              description
-                "Super ConcatenatedFEC";
-            }
-            enum "UFEC" {
-              description
-                "UFEC";
-            }
-            enum "QFEC" {
-              description
-                "QFEC";
-            }
-          }
-          description
-            "Type of Forward Error Correction on TX";
-        }
-        leaf tx-path-id {
-          type ciena-6500-types:INT {
-            range "1..254";
-          }
-          description
-            "TX path identifier";
-        }
-        leaf cond-type {
-          type enumeration {
-            enum "LASEROFF" {
-              description
-                "The conditioning is to turn off the laser";
-            }
-            enum "NONE" {
-              description
-                "There is no conditioning";
-            }
-          }
-          description
-            "The type of Tx conditioning to do in response to certain faults";
-        }
-        leaf tx-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned TX Power in dBm (xx.x)";
-        }
-        leaf tx-wvlngth-prov {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Wavelength";
-        }
-        leaf differential-encoding {
-          type enumeration {
-            enum "NONE" {
-              description
-                "TR Control NONE";
-            }
-            enum "HARD" {
-              description
-                "TR Control HARD";
-            }
-            enum "SOFT" {
-              description
-                "TR Control SOFT";
-            }
-            enum "XD" {
-              description
-                "TR Control XD";
-            }
-          }
-          description
-            "OCH Differential Encoding";
-        }
-        leaf tx-spctrl-occp {
-          type enumeration {
-            enum "NONE" {
-              description
-                "NONE";
-            }
-            enum "NARROW" {
-              description
-                "NARROW";
-            }
-            enum "WIDE20" {
-              description
-                "WIDE20";
-            }
-            enum "WIDE25" {
-              description
-                "WIDE25";
-            }
-            enum "WIDE30" {
-              description
-                "WIDE30";
-            }
-            enum "WIDE40" {
-              description
-                "WIDE40";
-            }
-            enum "WIDE50" {
-              description
-                "WIDE50";
-            }
-            enum "MINSPACE20" {
-              description
-                "MINSPACE20";
-            }
-            enum "MINSPACE25" {
-              description
-                "MINSPACE25";
-            }
-          }
-          description
-            "OCH Spectral Occupancy setting";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "User specified Label";
-        }
-        leaf-list rx-act-ln-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Lane RX Power in dBm (xx.x) (Format: Lane1|Lane2|...)";
-        }
-        leaf-list tx-act-ln-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Lane TX Power in dBm (xx.x) (Format: Lane1|Lane2|...)";
-        }
-        leaf och-tx-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX actual power in dBm (xx.x)";
-        }
-        leaf och-tx-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX minimum power in dBm (xx.x)";
-        }
-        leaf och-tx-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX maximum power in dBm (xx.x)";
-        }
-        leaf och-rx-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX actual power in dBm (xx.x)";
-        }
-        leaf och-rx-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX minimum power in dBm (xx.x)";
-        }
-        leaf och-rx-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX maximum power in dBm (xx.x)";
-        }
-        leaf och-tx-act-high-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX active high power in dBm (xx.x)";
-        }
-        leaf och-tx-act-low-power {
-          type ciena-6500-types:STRING;
-          description
-            "TX active low power in dBm (xx.x)";
-        }
-        leaf och-rx-act-high-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX active high power in dBm (xx.x)";
-        }
-        leaf och-rx-act-low-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX active low power in dBm (xx.x)";
-        }
-        leaf tx-wvlngth-min {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum Wavelength Range";
-        }
-        leaf tx-wvlngth-max {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Maximum Wavelength Range";
-        }
-        leaf tx-wvlngth-spacing {
-          type ciena-6500-enums:ochTxWvlngthSpacing;
-          description
-            "OCH Wavelength Spacing, in nm";
-        }
-        leaf och-rx-ch-act-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel actual power in dBm (xx.x)";
-        }
-        leaf och-rx-ch-min-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel minimum power in dBm (xx.x)";
-        }
-        leaf och-rx-ch-max-power {
-          type ciena-6500-types:STRING;
-          description
-            "RX channel maximum power in dBm (xx.x)";
-        }
-        leaf och-rx-echo-trace {
-          type ciena-6500-types:STRING;
-          description
-            "TR Transmit Identifier Received";
-        }
-        leaf och-tx-trace {
-          type ciena-6500-types:STRING;
-          description
-            "TR Transmit Identifier Received Expected";
-        }
-        leaf och-tx-assoc-far-end-rx {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitter associated far end receiver";
-        }
-        leaf och-max-pmd {
-          type ciena-6500-types:STRING;
-          description
-            "Supported Mean DGD (Differential Group Delay) value";
-        }
-        leaf och-rx-act-pmd {
-          type ciena-6500-types:STRING;
-          description
-            "Estimated Instance of DGD (Differential Group Delay) value";
-        }
-        leaf est-length {
-          type ciena-6500-types:STRING;
-          description
-            "Estimated fiber length";
-        }
-        leaf laser-bias-end-of-life {
-          type ciena-6500-types:STRING;
-          description
-            "Laser Bias Current.";
-        }
-        leaf rtd {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Round Trip Delay.";
-        }
-        leaf uni-latency {
-          type ciena-6500-types:STRING;
-          description
-            "OCH Unidirectional Latency.";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf line-type {
-          type ciena-6500-enums:linetype;
-          description
-            "OCH Line Sys Type";
-        }
-        leaf pwr-bal-ctlr {
-          type enumeration {
-            enum "DISABLED" {
-              description
-                "Power Balance Controller Disabled";
-            }
-            enum "ENABLED" {
-              description
-                "Power Balance Controller Enabled";
-            }
-          }
-          description
-            "Provisioned Power Balance Controller Operating Mode";
-        }
-        leaf pwr-bal-offset {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Power Balance Offset in dB (xx.x)";
-        }
-        leaf pwr-bal-act-offset {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Power Balance Actual Offset in dB (xx.x)";
-        }
-        leaf tuning-mode {
-          type enumeration {
-            enum "NORMAL" {
-              description
-                "Normal Tuning Mode";
-            }
-            enum "ACCELERATED" {
-              description
-                "Accelerated Tuning Mode";
-            }
-          }
-          description
-            "Provisioned Tuning Mode";
-        }
-        leaf frr {
-          type enumeration {
-            enum "DISABLED" {
-              description
-                "DISABLED Mode";
-            }
-            enum "ENABLED" {
-              description
-                "ENABLED Mode";
-            }
-          }
-          description
-            "OCH Fast Receiver Recovery";
-        }
-        leaf frr-config {
-          type enumeration {
-            enum "MATCHEDCD" {
-              description
-                "Matched Chromatic Dispersion";
-            }
-            enum "DIVERSECD2" {
-              description
-                "Diverse Chromatic Dispersion 2 Paths";
-            }
-          }
-          description
-            "OCH FRR Network Configuration";
-        }
-        leaf frr-path1-disp {
-          default "AUTO";
-          type ciena-6500-types:STRING;
-          description
-            "OCH FRR Link Dispersion for Path 1";
-        }
-        leaf frr-path2-disp {
-          default "AUTO";
-          type ciena-6500-types:STRING;
-          description
-            "OCH FRR Link Dispersion for Path 2";
-        }
-        leaf optimize-mode {
-          type ciena-6500-enums:optimizeMode;
-          description
-            "Performance Optimization Mode";
-        }
-        leaf tx-mode {
-          type ciena-6500-enums:TxMode;
-          description
-            "Transmitter Dispersion Mode";
-        }
-        leaf tx-disp-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitter Dispersion Provisioned Value";
-        }
-        leaf path-disp-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Path Dispersion Value";
-        }
-        leaf och-tx-act-disp {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitter total actual link dispersion in the near-to-far direction";
-        }
-        leaf tx-disp-min {
-          type ciena-6500-types:STRING;
-          description
-            "Minimum Transmitter Dispersion Value";
-        }
-        leaf tx-disp-max {
-          type ciena-6500-types:STRING;
-          description
-            "Maximum Transmitter Dispersion Value";
-        }
-        leaf och-rx-act-disp {
-          type ciena-6500-types:STRING;
-          description
-            "Receiver total actual link dispersion in the far-to-near direction";
-        }
-        leaf och-tx-pre-disp {
-          type ciena-6500-types:STRING;
-          description
-            "Tx Precompensation Dispersion Value.";
-        }
-        leaf och-rx-post-disp {
-          type ciena-6500-types:STRING;
-          description
-            "Rx Postcompensation Dispersion Value.";
-        }
-        leaf reach-spec {
-          type ciena-6500-types:STRING;
-          description
-            "Reach Specification";
-        }
-        leaf tx-chrip {
-          default "AUTO";
-          type enumeration {
-            enum "AUTO" {
-              description
-                "Automatic";
-            }
-            enum "POSITIVE" {
-              description
-                "Positive";
-            }
-            enum "NEGATIVE" {
-              description
-                "Negative";
-            }
-          }
-          description
-            "Positive or Negative Chirp setting";
-        }
-        leaf enm-prov {
-          type ciena-6500-enums:ochenm;
-          description
-            "OCH ENM provisioning mode";
-        }
-        leaf tx-enm {
-          type ciena-6500-enums:ochenm;
-          description
-            "OCH transmit ENM mode";
-        }
-        leaf rx-enm {
-          type ciena-6500-enums:ochenm;
-          description
-            "OCH receive ENM mode";
-        }
-        leaf ccda {
-          type ciena-6500-enums:ccda;
-          description
-            "TX Channel Contention Detection and Avoidance";
-        }
-        leaf och-tx-blanking {
-          type ciena-6500-enums:txb;
-          description
-            "Manually force the Line port TX power in reduced state.";
-        }
-        leaf tx-freq-prov {
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned TX Frequency in THz (xxx.xxxx)";
-        }
-        leaf tx-freq-min {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum TX Frequency value in THz (xxx.xxxx)";
-        }
-        leaf tx-freq-max {
-          default "0.00";
-          type ciena-6500-types:STRING;
-          description
-            "Maximum TX Frequency value in THz (xxx.xxxx)";
-        }
-        leaf carrier-centering-mode {
-          type ciena-6500-enums:ochCarrierCenteringMode;
-          description
-            "Laser centering mode";
-        }
-        leaf rotation {
-          type ciena-6500-enums:rotation;
-          description
-            "Jones Rotation Setting";
-        }
-        leaf tx-disp-found {
-          type ciena-6500-types:STRING;
-          description
-            "Found the optimum Pre-dispersion compensation from the scanning, ps/nm";
-        }
-        leaf assoc-q {
-          type ciena-6500-types:STRING;
-          description
-            "Q associated with the found optimum precomp";
-        }
-        leaf scan {
-          type ciena-6500-enums:ScanState;
-          description
-            "Q-based Pre-dispersion compensation Scanning";
-        }
-        leaf s-from {
-          type ciena-6500-types:STRING;
-          description
-            "FROM point of scanning range, ps/nm";
-        }
-        leaf s-to {
-          type ciena-6500-types:STRING;
-          description
-            "TO point of scanning range, ps/nm";
-        }
-        leaf s-step {
-          type ciena-6500-types:STRING;
-          description
-            "Compensation optimization scanning step size , ps/nm";
-        }
-        leaf s-dwell {
-          type ciena-6500-types:STRING;
-          description
-            "Scanning dwell time, second";
-        }
-        leaf spli-mgmt {
-          type ciena-6500-enums:spliMgmt;
-          description
-            "Identify if Port is Manageable by SPLI";
-        }
-        leaf spli-managed {
-          type ciena-6500-enums:spliManaged;
-          description
-            "Identify if Port is Currently Managed by SPLI";
-        }
-        leaf rx-pwr-thr-prov {
-          type enumeration {
-            enum "ON" {
-              description
-                "Use of provisioned thresholds is on";
-            }
-            enum "OFF" {
-              description
-                "Use of provisioned thresholds is off";
-            }
-          }
-          description
-            "Enable to use provisioned thresholds";
-        }
-        leaf rx-pwr-l-thr {
-          default "-22.5";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Rx Power OOR low threshold";
-        }
-        leaf rx-pwr-h-thr {
-          default "5.5";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Rx Power OOR high threshold";
-        }
-        leaf rx-ch-pwr-l-thr {
-          default "-18.5";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Rx channel Power OOR low threshold";
-        }
-        leaf rx-ch-pwr-h-thr {
-          default "7";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned Rx channel Power OOR high threshold";
-        }
-        leaf och-tx-sig-bw-3db {
-          default "35.0";
-          type ciena-6500-types:STRING;
-          description
-            "Supported 3dB bandwidth value";
-        }
-        leaf och-tx-sig-bw-10db {
-          default "38.6";
-          type ciena-6500-types:STRING;
-          description
-            "Supported 10dB bandwidth value";
-        }
-        leaf och-tx-min-spec-width {
-          default "37.5";
-          type ciena-6500-types:STRING;
-          description
-            "Minimum spectral width";
-        }
-        leaf och-tx-freqr-es {
-          default "0.1";
-          type ciena-6500-types:STRING;
-          description
-            "Supported frequency resolution";
-        }
-        leaf laser-centering-range {
-          default "2.5";
-          type ciena-6500-types:STRING;
-          description
-            "Provisioned laser centering range";
-        }
-        leaf ttops {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Transponder Triggered Switching Mode Enabled";
-        }
-        leaf fec-frmt {
-          type enumeration {
-            enum "QFEC" {
-              description
-                "QFEC";
-            }
-            enum "RS8" {
-              description
-                "RS8";
-            }
-          }
-          description
-            "Tx/Rx FEC Format";
-        }
-        leaf trans-mode {
-          type ciena-6500-enums:ptpTransMode;
-          description
-            "Transmission Mode";
-        }
-        leaf act_trans-mode {
-          type ciena-6500-enums:ptpTransMode;
-          description
-            "Actual Transmission Mode";
-        }
-        leaf pre-fec-sf-th-lev {
-          default "0.0";
-          type decimal64 {
-            range "-1.00..1.00";
-            fraction-digits 2;
-          }
-          description
-            "Pre-FEC Signal Fail Threshold";
-        }
-        leaf pre-fec-sd-th-lev {
-          default "0.5";
-          type decimal64 {
-            range "-1.00..3.50";
-            fraction-digits 2;
-          }
-          description
-            "Pre-FEC Signal Degrade Threshold";
-        }
-        leaf tx-oas {
-          default "OFF";
-          type ciena-6500-enums:BOOL_ON_OFF;
-          description
-            "Tx OAS Mode";
-        }
-        leaf rx-oas {
-          default "OFF";
-          type ciena-6500-enums:BOOL_ON_OFF;
-          description
-            "Rx OAS Mode";
-        }
-        leaf tx-pid {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-          description
-            "Tx Physical Layer ID";
-        }
-        leaf tx-gid {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..31";
-          }
-          description
-            "Tx Group ID";
-        }
-        leaf pre-fec-sf-th-ber {
-          default "0.0";
-          type ciena-6500-types:STRING;
-          description
-            "The corresponding BER for a given Pre-FEC SF Threshold setting in dDQ";
-        }
-        leaf pre-fec-sd-th-ber {
-          default "0.0";
-          type ciena-6500-types:STRING;
-          description
-            "The corresponding BER for a given Pre-FEC SD Threshold setting in dDQ";
-        }
-        leaf rx-pid {
-          default "0";
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT {
-              range "0..7";
-            }
-          }
-          description
-            "Rx Physical Layer ID";
-        }
-        leaf rx-gid {
-          default "0";
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT {
-              range "0..31";
-            }
-          }
-          description
-            "Rx Group ID";
-        }
-        leaf tx-phy-map {
-          type ciena-6500-types:STRING;
-          description
-            "Tx Physical Mapping Bitmap";
-        }
-        leaf rx-phy-map {
-          type ciena-6500-types:STRING;
-          description
-            "Rx Physical Mapping Bitmap";
-        }
-        leaf modem-class {
-          type ciena-6500-enums:ptpModemClass;
-          description
-            "Modem Class";
-        }
-        leaf reach-class {
-          type ciena-6500-enums:ptpReachClass;
-          description
-            "Reach Class";
-        }
-        leaf linkOpt-mode {
-          type ciena-6500-enums:ptpLnkOptMode;
-          description
-            "Link Optimization Mode";
-        }
-        leaf reach-type {
-          type ciena-6500-enums:ptpReachType;
-          description
-            "Reach Type";
-        }
-        leaf lnkCustom1 {
-          type ciena-6500-enums:ptpLnkCustom1;
-          description
-            "Link Custom1";
-        }
-        leaf lnkCustom2 {
-          type ciena-6500-enums:ptpLnkCustom2;
-          description
-            "Link Custom2";
-        }
-        leaf allocated-spec-width {
-          type ciena-6500-types:STRING;
-          description
-            "Allocated Spectral Width";
-        }
-        leaf laser-off-mode {
-          type ciena-6500-enums:ptpLaserOffMode;
-          description
-            "Laser Off Mode";
-        }
-        leaf laser-freq-thr {
-          type decimal64 {
-            range "0..3.0";
-            fraction-digits 1;
-          }
-          description
-            "Laser Frequency Threshold";
-        }
-        leaf rqst-trans-mode {
-          type ciena-6500-enums:ptpTransMode;
-          description
-            "Requested Transmission Mode";
-        }
-        leaf saved-trans-mode {
-          type ciena-6500-enums:ptpTransMode;
-          description
-            "Saved Actual Applied Transmission Mode";
-        }
-        leaf rqst-linkOpt-mode {
-          type ciena-6500-enums:ptpLnkOptMode;
-          description
-            "Requested Link Optimization Mode";
-        }
-        leaf act-linkOpt-mode {
-          type ciena-6500-enums:ptpLnkOptMode;
-          description
-            "Actual Applied Link Optimization Mode";
-        }
-        leaf saved-linkOpt-mode {
-          type ciena-6500-enums:ptpLnkOptMode;
-          description
-            "Saved Actual Applied Link Optimization Mode";
-        }
-        leaf rqst-tx-wvlngth {
-          type ciena-6500-types:STRING;
-          description
-            "Requested Wavelength";
-        }
-        leaf act-tx-wvlngth {
-          type ciena-6500-types:STRING;
-          description
-            "Actual Applied Wavelength";
-        }
-        leaf rqst-tx-wvlngth-spacing {
-          type ciena-6500-enums:ochTxWvlngthSpacing;
-          description
-            "Requested Wavelength Spacing, in nm";
-        }
-        leaf rqst-tx-freq {
-          type ciena-6500-types:STRING;
-          description
-            "Requested TX Frequency in THz (xxx.xxxx)";
-        }
-        leaf act-tx-freq {
-          type ciena-6500-types:STRING;
-          description
-            "Actual Applied TX Frequency in THz (xxx.xxxx)";
-        }
-        leaf rqst-tx-pwr {
-          type ciena-6500-types:STRING;
-          description
-            "Requested TX Power in dBm (xx.x)";
-        }
-        leaf rqst-tx-mode {
-          type ciena-6500-enums:TxMode;
-          description
-            "Requested Transmitter Dispersion Mode";
-        }
-        leaf act-tx-mode {
-          type ciena-6500-enums:TxMode;
-          description
-            "Actual Applied Transmitter Dispersion Mode";
-        }
-        leaf rqst-tx-disp {
-          type ciena-6500-types:STRING;
-          description
-            "Requested Transmitter Dispersion Value";
-        }
-        leaf act-tx-disp {
-          type ciena-6500-types:STRING;
-          description
-            "Actual Applied Transmitter Dispersion Value";
-        }
-        leaf rqst-path-disp {
-          type ciena-6500-types:STRING;
-          description
-            "Requested Path Dispersion Value";
-        }
-        leaf act-path-disp {
-          type ciena-6500-types:STRING;
-          description
-            "Actual Applied Path Dispersion Value";
-        }
-        leaf rqst-carrier-centering-mode {
-          type ciena-6500-enums:ochCarrierCenteringMode;
-          description
-            "Requested Laser centering mode";
-        }
-        leaf act-carrier-centering-mode {
-          type ciena-6500-enums:ochCarrierCenteringMode;
-          description
-            "Actual Applied Laser centering mode";
-        }
-        leaf rqst-laser-centering-range {
-          type ciena-6500-types:STRING;
-          description
-            "Requested laser centering range";
-        }
-        leaf act-laser-centering-range {
-          type ciena-6500-types:STRING;
-          description
-            "Actual Applied laser centering range";
-        }
-        leaf rqst-ccda {
-          type ciena-6500-enums:ccda;
-          description
-            "Requested Channel Contention Detection and Avoidance";
-        }
-        leaf act-ccda {
-          type ciena-6500-enums:ccda;
-          description
-            "Actual Applied Channel Contention Detection and Avoidance";
-        }
-        leaf rqst-och-tx-blanking {
-          type ciena-6500-enums:txb;
-          description
-            "Requested TX power in reduced state.";
-        }
-        leaf act-och-tx-blanking {
-          type ciena-6500-enums:txb;
-          description
-            "Actual Applied TX power in reduced state.";
-        }
-        leaf rqst-line-type {
-          type ciena-6500-enums:linetype;
-          description
-            "Requested Line Sys Type";
-        }
-        leaf rqst-allocated-spec-width {
-          type ciena-6500-types:STRING;
-          description
-            "Requested Allocated Spectral Width";
-        }
-        leaf rqst-exp-res-time {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Requested Acquisition Holdoff Time";
-        }
-        leaf exp-res-time-prov {
-          default "10";
-          type ciena-6500-types:INT;
-          description
-            "Provisioned Acquisition Holdoff Time";
-        }
-        leaf act-exp-res-time {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT;
-          }
-          description
-            "Actual Applied Acquisition Holdoff Time";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-ptp {
-    description
-      "Switch PTP Facility Out of Service";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port, PTP-shelf-slot-portSsubport, PTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Remove facility from Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-ptp {
-    description
-      "Switch PTP Facility In Service";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port, PTP-shelf-slot-portSsubport, PTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-init-dispscan-ptp {
-    description
-      "Dispersion scanning against PTP facility";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port, PTP-shelf-slot-portSsubport, PTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf scan {
-        type ciena-6500-enums:ScanState;
-        mandatory true;
-        description
-          "Q-based Pre-dispersion compensation Scanning";
-      }
-      leaf s-from {
-        type ciena-6500-types:STRING;
-        description
-          "FROM point of scanning range, ps/nm";
-      }
-      leaf s-to {
-        type ciena-6500-types:STRING;
-        description
-          "TO point of scanning range, ps/nm";
-      }
-      leaf s-step {
-        type ciena-6500-types:STRING;
-        description
-          "Compensation optimization scanning step size , ps/nm";
-      }
-      leaf s-dwell {
-        type ciena-6500-types:STRING;
-        description
-          "Scanning dwell time, second";
-      }
-    }
-  }
-  rpc port-show-otuttp {
-    description
-      "Retrieve the OTUTTP facility parameters";
-    input {
-      leaf otu {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portSsubport, OTUTTP-shelf-slot-ALL, OTUTTP-shelf-ALL, OTUTTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type ciena-6500-enums:StatsInfoDefYes;
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf otu {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf rate {
-          type ciena-6500-enums:OtuRate;
-          description
-            "OTUCn Rate";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "User specified Label";
-        }
-        leaf rout-sig-disabled {
-          type enumeration {
-            enum "NO" {
-              description
-                "Routing signalling enabled";
-            }
-            enum "YES" {
-              description
-                "Routing signalling disabled";
-            }
-          }
-          description
-            "Specifies whether Routing Signalling is disabled on this TTP. When to NO, the OSRP will have control over the ODUs created under this TTP and no user created ODU will be allowed.";
-        }
-        leaf otu-sd-th-lev {
-          type ciena-6500-types:INT;
-          description
-            "OTU Signal Degrade Threshold Level";
-        }
-        leaf otu-sf-th-lev {
-          type ciena-6500-types:INT;
-          description
-            "OTU Signal Fail Threshold Level";
-        }
-        leaf rx-fec-frmt {
-          type ciena-6500-enums:OTU_FECFrmt;
-          description
-            "Type of Forward Error Correction on RX";
-        }
-        leaf tx-fec-frmt {
-          type ciena-6500-enums:OTU_FECFrmt;
-          description
-            "Type of Forward Error Correction on TX";
-        }
-        leaf tx-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Source Access Point Identifier (SAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        }
-        leaf tx-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Destination Access Point Identifier (DAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        }
-        leaf tx-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        }
-        leaf ex-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The expected Source Access Point Identifier (SAPI), provisioned by the managing system, to be compared with the received SAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        }
-        leaf ex-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The expected Destination Access Point Identifier (DAPI), provisioned by the managing system, to be compared with the received DAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        }
-        leaf ex-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The expected operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        }
-        leaf rx-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Source Access Point Identifier (SAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        }
-        leaf rx-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Destination Access Point Identifier (DAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        }
-        leaf rx-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The operator specific part of the Trail Trace Identifier (TTI) information, recovered from the TTI overhead position at the sink of a trail.";
-        }
-        leaf tf-mode {
-          type ciena-6500-enums:otntfMode;
-          description
-            "Trace Fail Mode";
-        }
-        leaf tim-enable {
-          type ciena-6500-enums:TIMEN;
-          description
-            "The Trail Trace Identifier Mismatch (TIM) controls checking for Trace Identifier Mismatch fault detection. ";
-        }
-        leaf osrp-tcm-level {
-          type ciena-6500-types:INT {
-            range "1..6";
-          }
-          description
-            "This attribute specifies the TCM level for the OSRP created ODUs under this OTUTTP. The value of 0 indicates that no TCM will be created. The default value is specified by the attribute OSRPTCMLEVEL in the command ED-SYS.";
-        }
-        leaf num-ts {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..160";
-          }
-          description
-            "Used to identify the number of tributaries comprising this TTP. For on OTN TTP, this can change based on potential configuration of desired payload type (e.g. for ODU1 with OPVC payload, this value is 16; with CBR it is 1).";
-        }
-        leaf osrp-channel {
-          type enumeration {
-            enum "NONE";
-            enum "GCC0";
-            enum "GCC1";
-            enum "GCC2";
-          }
-          description
-            "The OSRP channel";
-        }
-        leaf pre-fec-sf-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Level. Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sf-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sd-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Level. Parameter applies when FEC is ON";
-        }
-        leaf pre-fec-sd-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        }
-        leaf supported-term-pt {
-          type ciena-6500-types:aid;
-          description
-            "The supporting Termination Point.";
-        }
-        leaf local-sup-cacline-id {
-          type ciena-6500-types:STRING;
-          description
-            "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        }
-        leaf timing-reference {
-          type enumeration {
-            enum "N" {
-              description
-                "Not a timing reference";
-            }
-            enum "Y" {
-              description
-                "Is a timing reference";
-            }
-          }
-          description
-            "Indicates whether the facility is being used as a timing reference";
-        }
-        leaf secure-oh {
-          type ciena-6500-enums:SecureOH;
-          description
-            "Secure Overhead Bytes";
-        }
-        leaf otu-oh-non-term {
-          type enumeration {
-            enum "NONE" {
-              description
-                "Entire GCC OH terminated";
-            }
-            enum "GCC0" {
-              description
-                "GCC0 portion of OTU OH not terminated";
-            }
-          }
-          description
-            "Indicating whether to termiate GCC OH or not";
-        }
-        leaf encryption-tcm {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..6";
-          }
-          description
-            "This attribute specifies the TCM level for encryption.";
-        }
-        leaf encr-odu1 {
-          type ciena-6500-enums:EncrByte;
-          description
-            "Encryption Byte1";
-        }
-        leaf hold-off {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0 | 10 | 20..1000";
-          }
-          description
-            "HoldOff signal conditioning timer";
-        }
-        leaf hold-on {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0 | 2 | 4..500";
-          }
-          description
-            "HoldOn signal conditioning timer";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be HH-MM for the time left in AINS timeout.";
-        }
-        leaf otu-act-rate {
-          type ciena-6500-enums:OtuActRate;
-          description
-            "Actual OTUCn rate, OTUCn(n=1..8)";
-        }
-        leaf act-num-ts {
-          default "20";
-          type ciena-6500-types:INT {
-            range "20..160";
-          }
-          description
-            "";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-otuttp {
-    description
-      "Switch OTUTTP Facility Out of Service";
-    input {
-      leaf otu {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-enable-otuttp {
-    description
-      "Delete OTU facility (System command)";
-    input {
-      leaf otu {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-operate-loopback-otuttp {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf otu {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portSsubport, OTUTTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc port-release-loopback-otuttp {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf otu {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portSsubport, OTUTTP-shelf-slot-portPsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-sttp {
-    description
-      "Retrieve the STTP facility parameters";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port, STTP-shelf-slot-ALL, STTP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type ciena-6500-enums:StatsInfoDefYes;
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf sttp {
-          type ciena-6500-types:aid;
-          description
-            "aid";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "User specified Label";
-        }
-        leaf rate {
-          type ciena-6500-enums:SttpRate;
-          description
-            "";
-        }
-        leaf supported-term-pt {
-          type ciena-6500-types:aid;
-          description
-            "The supporting Termination Point.";
-        }
-        leaf mapping {
-          type ciena-6500-enums:SttpMapping;
-          description
-            "";
-        }
-        leaf port-mode {
-          type ciena-6500-enums:STTPportmode;
-          description
-            "Optical Port Market Preference";
-        }
-        leaf sd-th {
-          default "6";
-          type ciena-6500-types:INT {
-            range "5..9";
-          }
-          description
-            "Signal Degrade Threshold value";
-        }
-        leaf eber-thresh {
-          default "3";
-          type ciena-6500-types:INT {
-            range "3 | 4 | 5";
-          }
-          description
-            "Excessive bit error threshold value";
-        }
-        leaf exp-trc {
-          type string {
-            length "0..16";
-          }
-          description
-            "Expected section trace";
-        }
-        leaf local-sup-cacline-id {
-          type ciena-6500-types:STRING;
-          description
-            "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-sttp {
-    description
-      "Switch STTP Facility Out of Service";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-enable-sttp {
-    description
-      "Switch STTP Facility In Service";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-operate-loopback-sttp {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc port-release-loopback-sttp {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-ettp {
-    description
-      "Retrieve the ETTP facility parameters";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-ALL, ETTP-shelf-ALL, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ETTP-shelf-slot-port-ALL, ETTP-shelf-slot-port-rt1Ptp1-ALL, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ETTP-shelf-slot-portSsubport-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type ciena-6500-enums:StatsInfoDefYes;
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf ettp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "User specified Label";
-        }
-        leaf rate {
-          type ciena-6500-enums:EthRate;
-          description
-            "";
-        }
-        leaf mapping {
-          type ciena-6500-enums:EttpMapping;
-          description
-            "Defines the mapping of this facility and the children that it will have.";
-        }
-        leaf cond-type {
-          type ciena-6500-enums:EttpCondType;
-          description
-            "Specifies ethernet specific client conditioning behaviour.";
-        }
-        leaf flow-ctrl {
-          type enumeration {
-            enum "NONE";
-            enum "ASYM";
-            enum "PREE";
-            enum "SYM";
-          }
-          description
-            "Flow control mechanism.";
-        }
-        leaf hold-off {
-          default "100";
-          type ciena-6500-types:INT {
-            range "0 | 10 | 20..1000";
-          }
-          description
-            "Conditioning holdoff time in seconds.";
-        }
-        leaf max-transmit-unit {
-          type enumeration {
-            enum "1600";
-            enum "9600";
-            enum "2000";
-          }
-          description
-            "Maximum Transmission Unit (actually MRU)";
-        }
-        leaf supported-term-pt {
-          type ciena-6500-types:aid;
-          description
-            "The supporting Termination Point.";
-        }
-        leaf mode {
-          type enumeration {
-            enum "TERMINATED";
-            enum "MONITORED";
-          }
-          description
-            "MAC or PHY layer terminated or monitored";
-        }
-        leaf local-sup-cacline-id {
-          type ciena-6500-types:STRING;
-          description
-            "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        }
-        leaf if-type {
-          type enumeration {
-            enum "UNI";
-            enum "E-NNI";
-            enum "I-NNI";
-          }
-          description
-            "Interface Type";
-        }
-        leaf l2-in-use-act {
-          type enumeration {
-            enum "NO" {
-              description
-                "The facility is not used by Layer 2 active configuration ";
-            }
-            enum "YES" {
-              description
-                "The facility is used by Layer 2 active configuration";
-            }
-          }
-          description
-            "In use in Layer 2 Active Configuration";
-        }
-        leaf l2-in-use-sav {
-          type enumeration {
-            enum "NO" {
-              description
-                "The facility is not used by Layer 2 saved configuration ";
-            }
-            enum "YES" {
-              description
-                "The facility is used by Layer 2 saved configuration ";
-            }
-          }
-          description
-            "In use in Layer 2 Saved Configuration";
-        }
-        leaf timing-reference {
-          type enumeration {
-            enum "N" {
-              description
-                "Not a timing reference";
-            }
-            enum "Y" {
-              description
-                "Is a timing reference";
-            }
-          }
-          description
-            "Indicates whether the facility is being used as a timing reference";
-        }
-        leaf service-rate {
-          type ciena-6500-types:INT {
-            range "0 | 50 | 100..100000";
-          }
-          description
-            "Service rate of the Ethernet Flex in Mbps.";
-        }
-        leaf transport-rate {
-          type ciena-6500-types:INT {
-            range "0..104117";
-          }
-          description
-            "Transport rate of the Ethernet Flex in Mbps. The ODUFlex rate.";
-        }
-        leaf reserved {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specify if the facility is being reserved for packet SNC's";
-        }
-        leaf rsrvd-oper {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Indicates if the reservation is operational for reserved ETTP's";
-        }
-        leaf fec-frmt {
-          type enumeration {
-            enum "OFF" {
-              description
-                "NO FEC";
-            }
-            enum "RS10" {
-              description
-                "RS10 FEC";
-            }
-          }
-          description
-            "FEC Format";
-        }
-        leaf pre-fec-sf-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Level.";
-        }
-        leaf pre-fec-sf-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Fail Threshold Bit Error Rate.";
-        }
-        leaf pre-fec-sd-th-lev {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Level.";
-        }
-        leaf pre-fec-sd-th-ber {
-          type ciena-6500-types:STRING;
-          description
-            "Pre-FEC Signal Degrade Threshold Bit Error Rate.";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be HH-MM for the time left in AINS timeout.";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-ettp {
-    description
-      "Switch ETTP Facility Out of Service";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-enable-ettp {
-    description
-      "Switch ETTP Facility In Service";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-operate-loopback-ettp {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc port-release-loopback-ettp {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-oduttp {
-    description
-      "Retrieve the ODUTTP facility parameters";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-ALL, ODUTTP-shelf-slot-port-ALL, ODUTTP-shelf-slot-ALL, ODUTTP-shelf-slot-portPsubport-ALL, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ODUTTP-shelf-ALL, ODUTTP-shelf-slot-portSsubport-ALL, ODUTTP-shelf-slot-portPsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type ciena-6500-enums:StatsInfoDefNo;
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf oduttp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf rate {
-          type ciena-6500-enums:OduTtpRate;
-          description
-            "Rate";
-        }
-        leaf trib-slot-assignment {
-          type string {
-            length "1..24";
-          }
-          description
-            "The tributary slots used by this ODU.";
-        }
-        leaf num-ts {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..160";
-          }
-          description
-            "Used to identify the number of tributaries comprising this TTP. For on OTN TTP, this can change based on potential configuration of desired payload type (e.g. for ODU1 with OPVC payload, this value is 16; with CBR it is 1).";
-        }
-        leaf ts-size {
-          type enumeration {
-            enum "ODU0" {
-              description
-                "ODU0 is the tributary slot size (unit)";
-            }
-            enum "ODU1" {
-              description
-                "ODU1 is the tributary slot size (unit)";
-            }
-          }
-          description
-            "The tributary slot size";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "User specified Label";
-        }
-        leaf tx-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Source Access Point Identifier (SAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        }
-        leaf tx-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Destination Access Point Identifier (DAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        }
-        leaf tx-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        }
-        leaf ex-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The expected Source Access Point Identifier (SAPI), provisioned by the managing system, to be compared with the received SAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        }
-        leaf ex-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The expected Destination Access Point Identifier (DAPI), provisioned by the managing system, to be compared with the received DAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        }
-        leaf ex-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The expected operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        }
-        leaf rx-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Source Access Point Identifier (SAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        }
-        leaf rx-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Destination Access Point Identifier (DAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        }
-        leaf rx-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The operator specific part of the Trail Trace Identifier (TTI) information, recovered from the TTI overhead position at the sink of a trail.";
-        }
-        leaf ex-pt {
-          type string {
-            length "2";
-          }
-          description
-            "The expected payload type.";
-        }
-        leaf rx-pt {
-          type string {
-            length "2";
-          }
-          description
-            "The received payload type.";
-        }
-        leaf tf-mode {
-          type ciena-6500-enums:otntfMode;
-          description
-            "Trace Fail Mode";
-        }
-        leaf tim-enable {
-          type enumeration {
-            enum "TIM_SAPI_ONLY" {
-              description
-                "Only checks for SAPI mismatch";
-            }
-            enum "TIM_DAPI_ONLY" {
-              description
-                "Only checks for DAPI mismatch";
-            }
-            enum "TIM_SAPI_DAPI" {
-              description
-                "Checks for SAPI and DAPI mismatch";
-            }
-            enum "TIM_OPER_SPEC" {
-              description
-                "Checks for Operator Specific mismatch";
-            }
-          }
-          description
-            "The Trail Trace Identifier Mismatch (TIM) controls checking for Trace Identifier Mismatch fault detection. ";
-        }
-        leaf-list cond-type {
-          type ciena-6500-enums:OduCtpCondType;
-          description
-            "Conditioning behaviour on client faults. ";
-        }
-        leaf dm-count {
-          type ciena-6500-types:STRING;
-          description
-            "Value of delay measurement of ODU in micro seconds.";
-        }
-        leaf line-prot-group {
-          type ciena-6500-types:aid;
-          description
-            "Line Protection Group in AID format";
-        }
-        leaf line-prot-role {
-          type enumeration {
-            enum "UNPROTECTED";
-            enum "WORK";
-            enum "PROTECT";
-            enum "WORK_PROTECT";
-          }
-          description
-            "Line Protection Role";
-        }
-        leaf line-prot-type {
-          type enumeration {
-            enum "NOT_PROTECTED";
-            enum "APS_PROTECTED";
-          }
-          description
-            "Line Protection Type";
-        }
-        leaf owner {
-          type ciena-6500-enums:Owner;
-          description
-            "Specifies who created this TTP.";
-        }
-        leaf supported-term-pt {
-          type ciena-6500-types:aid;
-          description
-            "The supporting Termination Point.";
-        }
-        leaf client-type {
-          type ciena-6500-enums:clientTypeTtp;
-          description
-            "Server layer client type";
-        }
-        leaf dm-enable {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specify if delay measurement is enable.";
-        }
-        leaf odu1-interop {
-          type enumeration {
-            enum "OTHER" {
-              description
-                "Interop with equipment other than 2G5 MOTR";
-            }
-            enum "2G5MOTR" {
-              description
-                "Interop with equipment 2G5 MOTR";
-            }
-          }
-          description
-            "Required Interop Equipment Type";
-        }
-        leaf rx-ts-mode {
-          type ciena-6500-enums:rxtsMode;
-          description
-            "Receive Tributary Slot Mode";
-        }
-        leaf rx-ts {
-          type string {
-            length "1..24";
-          }
-          description
-            "Received tributary slots.";
-        }
-        leaf ex-rx-ts {
-          type string {
-            length "1..24";
-          }
-          description
-            "Expected Receive tributary slots.";
-        }
-        leaf flex-type {
-          type ciena-6500-enums:flexType;
-          description
-            "ODU flex type";
-        }
-        leaf resizeable {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "ODUFlex is resizeable";
-        }
-        leaf base-ho {
-          type ciena-6500-enums:baseHO;
-          description
-            "Base HO ODUk";
-        }
-        leaf bit-rate {
-          type string {
-            length "0..19";
-          }
-          description
-            "Define the bit rate of flex.";
-        }
-        leaf tolerance {
-          type string {
-            length "0..64";
-          }
-          description
-            "Define the tolerance in ppm of oduflex payload.";
-        }
-        leaf local-sup-cacline-id {
-          type ciena-6500-types:STRING;
-          description
-            "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        }
-        leaf anchor-ts {
-          type ciena-6500-types:INT {
-            range "1..80";
-          }
-          description
-            "Anchor of tx triburtary slot";
-        }
-        leaf trib-slot-prov {
-          type ciena-6500-enums:TsProv;
-          description
-            "tribSlot provision";
-        }
-        leaf sd-th {
-          type ciena-6500-types:INT {
-            range "5..9";
-          }
-          description
-            "Signal Degrade Threshold Value";
-        }
-        leaf sf-th {
-          type ciena-6500-types:INT {
-            range "0..9";
-          }
-          description
-            "Signal Fail Threshold Level.";
-        }
-        leaf prov-msi {
-          type string {
-            length "1..800";
-          }
-          description
-            "Provisioned MSI for all tributary slots.";
-        }
-        leaf rx-msi {
-          type string {
-            length "1..800";
-          }
-          description
-            "Actual received MSI for all tributary slots.";
-        }
-        leaf timing-reference {
-          type enumeration {
-            enum "N" {
-              description
-                "Not a timing reference";
-            }
-            enum "Y" {
-              description
-                "Is a timing reference";
-            }
-          }
-          description
-            "Indicates whether the facility is being used as a timing reference";
-        }
-        leaf reserved {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specify if the facility is being reserved for packet SNC's";
-        }
-        leaf act-avail-ts {
-          type string {
-            length "1..160";
-          }
-          description
-            "Actual available TS supported by the TRANSMODE.";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-oduttp {
-    description
-      "Switch ODUTTP Facility Out of Service";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-enable-oduttp {
-    description
-      "Switch ODUTTP Facility In Service";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-operate-loopback-oduttp {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        default "FACILITY";
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc port-release-loopback-oduttp {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-oductp {
-    description
-      "Retrieve the ODUCTP facility parameters";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-ALL, ODUCTP-shelf-slot-port-ALL, ODUCTP-shelf-slot-ALL, ODUCTP-shelf-ALL, ODUCTP-shelf-slot-portPsubport-ALL, ODUCTP-shelf-slot-portSsubport-ALL, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-ALL, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type ciena-6500-enums:StatsInfoDefNo;
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf oductp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf rate {
-          type ciena-6500-enums:OduCtpRate;
-          description
-            "Rate";
-        }
-        leaf ctp-mode {
-          type enumeration {
-            enum "TRANSPARENT";
-            enum "MONITOR";
-            enum "TERMINATED";
-          }
-          description
-            "The mode of the ODUCTP.";
-        }
-        leaf trib-slot-assignment {
-          type string {
-            length "1..51";
-          }
-          description
-            "The tributary slots used by this ODU.";
-        }
-        leaf num-ts {
-          type ciena-6500-types:INT {
-            range "1..80";
-          }
-          description
-            "Used to identify the number of tributaries comprising this CTP.";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "User specified Label";
-        }
-        leaf tx-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Source Access Point Identifier (SAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        }
-        leaf tx-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Destination Access Point Identifier (DAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        }
-        leaf tx-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        }
-        leaf ex-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The expected Source Access Point Identifier (SAPI), provisioned by the managing system, to be compared with the received SAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        }
-        leaf ex-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The expected Destination Access Point Identifier (DAPI), provisioned by the managing system, to be compared with the received DAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        }
-        leaf ex-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The expected operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        }
-        leaf rx-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Source Access Point Identifier (SAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        }
-        leaf rx-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Destination Access Point Identifier (DAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        }
-        leaf rx-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The operator specific part of the Trail Trace Identifier (TTI) information, recovered from the TTI overhead position at the sink of a trail.";
-        }
-        leaf ex-pt {
-          type string {
-            length "2";
-          }
-          description
-            "The expected payload type.";
-        }
-        leaf rx-pt {
-          type string {
-            length "2";
-          }
-          description
-            "The received payload type.";
-        }
-        leaf tf-mode {
-          type ciena-6500-enums:otntfMode;
-          description
-            "Trace Fail Mode";
-        }
-        leaf tim-enable {
-          type enumeration {
-            enum "TIM_SAPI_ONLY" {
-              description
-                "Only checks for SAPI mismatch";
-            }
-            enum "TIM_DAPI_ONLY" {
-              description
-                "Only checks for DAPI mismatch";
-            }
-            enum "TIM_SAPI_DAPI" {
-              description
-                "Checks for SAPI and DAPI mismatch";
-            }
-            enum "TIM_OPER_SPEC" {
-              description
-                "Checks for Operator Specific mismatch";
-            }
-          }
-          description
-            "The Trail Trace Identifier Mismatch (TIM) controls checking for Trace Identifier Mismatch fault detection. ";
-        }
-        leaf-list cond-type {
-          type ciena-6500-enums:OduCtpCondType;
-          description
-            "Conditioning behaviour on client faults. ";
-        }
-        leaf dm-count {
-          type ciena-6500-types:STRING;
-          description
-            "Value of delay measurement of ODU in micro seconds.";
-        }
-        leaf owner {
-          type ciena-6500-enums:Owner;
-          description
-            "Specifies who created this CTP.";
-        }
-        leaf supported-term-pt {
-          type ciena-6500-types:aid;
-          description
-            "The supporting Termination Point.";
-        }
-        leaf dm-enable {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specify if delay measurement is enable.";
-        }
-        leaf rx-ts-mode {
-          type ciena-6500-enums:rxtsMode;
-          description
-            "Received Tributary Slot Mode";
-        }
-        leaf rx-ts {
-          type string {
-            length "1..24";
-          }
-          description
-            "Received tributary slots.";
-        }
-        leaf ex-rx-ts {
-          type string {
-            length "1..24";
-          }
-          description
-            "Expected receive tributary slots.";
-        }
-        leaf flex-type {
-          type ciena-6500-enums:flexType;
-          description
-            "ODU flex type";
-        }
-        leaf resizeable {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "ODUFlex is resizeable";
-        }
-        leaf base-ho {
-          type ciena-6500-enums:baseHO;
-          description
-            "Base HO ODUk";
-        }
-        leaf client-type {
-          type ciena-6500-enums:clientTypeCtp;
-          description
-            "Indicate the type of client signal";
-        }
-        leaf bit-rate {
-          type string {
-            length "0..19";
-          }
-          description
-            "Define the bit rate of flex.";
-        }
-        leaf tolerance {
-          type string {
-            length "0..64";
-          }
-          description
-            "Define the tolerance in ppm of oduflex payload.";
-        }
-        leaf gep {
-          type enumeration {
-            enum "YES";
-            enum "NO";
-          }
-          description
-            "Specifies whether the end-point facility accepts Generict End Point (GEP) method.";
-        }
-        leaf gep-name {
-          type string {
-            length "1..64";
-          }
-          description
-            "Specifies the Generict End Point (GEP) name for this facility.";
-        }
-        leaf trib-slot-prov {
-          type ciena-6500-enums:TsProv;
-          description
-            "tribSlot provision";
-        }
-        leaf sd-th {
-          type ciena-6500-types:INT {
-            range "6..9";
-          }
-          description
-            "Signal degrade threshold value";
-        }
-        leaf sf-th {
-          type ciena-6500-types:INT {
-            range "0..9";
-          }
-          description
-            "Signal Fail Threshold Level.";
-        }
-        leaf act-avail-ts {
-          type string {
-            length "1..160";
-          }
-          description
-            "Actual available TS supported by the TRANSMODE.";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-delete-oductp {
-    description
-      "Delete an ODUCTP Facility";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf parent {
-        type enumeration {
-          enum "NO" {
-            description
-              "immediate ODUTTP parent facility is not to be deleted";
-          }
-          enum "YES" {
-            description
-              "immediate ODUTTP parent facility is to be deleted";
-          }
-        }
-        description
-          "Specifies if its immediate ODUTTP parent is to be deleted";
-      }
-    }
-  }
-  rpc port-disable-oductp {
-    description
-      "Switch ODUCTP Facility Out of Service";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf parent {
-        type enumeration {
-          enum "NO" {
-            description
-              "immediate ODUTTP parent facility is not to be removed from service";
-          }
-          enum "YES" {
-            description
-              "immediate ODUTTP parent facility is to be removed from service";
-          }
-        }
-        default "NO";
-        description
-          "Specifies if its immediate ODUTTP parent facility is to be removed from service";
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Remove facility from Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-oductp {
-    description
-      "Switch ODUTTP Facility In Service";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-operate-loopback-oductp {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc port-release-loopback-oductp {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-tcm {
-    description
-      "Retrieve the TCM facility parameters";
-    input {
-      leaf tcm {
-        mandatory true;
-        description
-          "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, TCMTTP-shelf-slot-port-rt1Ptp1-ALL, TCMTTP-shelf-slot-port-ALL, TCMTTP-shelf-slot-ALL, TCMTTP-shelf-ALL, TCMTTP-shelf-slot-portSsubport-ALL, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMCTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, TCMCTP-shelf-slot-port-rt1Ptp1-ALL, TCMCTP-shelf-slot-port-ALL, TCMCTP-shelf-slot-ALL, TCMCTP-shelf-ALL, TCMCTP-shelf-slot-portSsubport-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type ciena-6500-enums:StatsInfoDefNo;
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf tcm {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "User specified Label";
-        }
-        leaf tcm-mode {
-          type enumeration {
-            enum "MONITOR" {
-              description
-                "Monitor. This mode cannot be used by TCMTTPs.";
-            }
-            enum "TERMINATED" {
-              description
-                "Terminated.";
-            }
-          }
-          description
-            "Identifies the mode of the TCM. ";
-        }
-        leaf tx-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Source Access Point Identifier (SAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        }
-        leaf tx-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Destination Access Point Identifier (DAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        }
-        leaf tx-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        }
-        leaf ex-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The expected Source Access Point Identifier (SAPI), provisioned by the managing system, to be compared with the received SAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        }
-        leaf ex-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The expected Destination Access Point Identifier (DAPI), provisioned by the managing system, to be compared with the received DAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        }
-        leaf ex-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The expected operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        }
-        leaf rx-sapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Source Access Point Identifier (SAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        }
-        leaf rx-dapi {
-          type string {
-            length "0..15";
-          }
-          description
-            "The Destination Access Point Identifier (DAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        }
-        leaf rx-oper {
-          type string {
-            length "0..32";
-          }
-          description
-            "The operator specific part of the Trail Trace Identifier (TTI) information, recovered from the TTI overhead position at the sink of a trail.";
-        }
-        leaf tf-mode {
-          type ciena-6500-enums:otntfMode;
-          description
-            "Trace Fail Mode";
-        }
-        leaf tim-enable {
-          type enumeration {
-            enum "TIM_SAPI_ONLY" {
-              description
-                "Only checks for SAPI mismatch";
-            }
-            enum "TIM_DAPI_ONLY" {
-              description
-                "Only checks for DAPI mismatch";
-            }
-            enum "TIM_SAPI_DAPI" {
-              description
-                "Checks for SAPI and DAPI mismatch";
-            }
-          }
-          description
-            "The Trail Trace Identifier Mismatch (TIM) controls checking for Trace Identifier Mismatch fault detection. ";
-        }
-        leaf dm-count {
-          type ciena-6500-types:STRING;
-          description
-            "Value of delay measurement in micro seconds.";
-        }
-        leaf owner {
-          type ciena-6500-enums:Owner;
-          description
-            "Specifies who created this facility.";
-        }
-        leaf supported-term-pt {
-          type ciena-6500-types:aid;
-          description
-            "The supporting Termination Point.";
-        }
-        leaf dm-enable {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specify if delay measurement is enable.";
-        }
-        leaf sd-th {
-          default "9";
-          type ciena-6500-types:INT {
-            range "5..9";
-          }
-          description
-            "Signal degrade threshold value";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be HH-MM for the time left in AINS timeout.";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-tcm {
-    description
-      "Switch TCM Facility Out of Service";
-    input {
-      leaf tcm {
-        mandatory true;
-        description
-          "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMCTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Place the facility in Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-tcm {
-    description
-      "Switch TCM Facility In Service";
-    input {
-      leaf tcm {
-        mandatory true;
-        description
-          "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMCTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-disable-cbrttp {
-    description
-      "Switch CBRTTP Facility Out of Service";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-enable-cbrttp {
-    description
-      "Switch CBRTTP Facility In Service";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-cbrttp {
-    description
-      "Retrieve the CBRTTP facility parameters";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port, CBRTTP-shelf-slot-ALL, CBRTTP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type ciena-6500-enums:StatsInfoDefYes;
-        description
-          "Specify if Dynamic Status Information is to be included in the response.";
-      }
-    }
-    output {
-      list output {
-        leaf cbrttp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf rate {
-          type string {
-            length "0..11";
-          }
-          description
-            "";
-        }
-        leaf protocol {
-          type ciena-6500-enums:CbrTtpProtocol;
-          description
-            "";
-        }
-        leaf an {
-          type ciena-6500-enums:AUTO_NEGOTIATION;
-          description
-            "Indicating whether to perform speed Auto-negotiation";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "User specified Label";
-        }
-        leaf mapping {
-          type ciena-6500-enums:CbrMapping;
-          description
-            "Defines the mapping of this facility and the children that it will have.";
-        }
-        leaf hold-off {
-          default "100";
-          type ciena-6500-types:INT {
-            range "0 | 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | 90 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-          }
-          description
-            "Conditioning holdoff time in seconds.";
-        }
-        leaf fec-frmt {
-          type ciena-6500-enums:CbrFECFrmt;
-          description
-            "FEC Format";
-        }
-        leaf pre-fec-sf-th-lev {
-          default "0.0";
-          type decimal64 {
-            range "-1.00..1.00";
-            fraction-digits 2;
-          }
-          description
-            "Pre-FEC Signal Fail Threshold";
-        }
-        leaf pre-fec-sd-th-lev {
-          default "0.5";
-          type decimal64 {
-            range "-1.00..2.00";
-            fraction-digits 2;
-          }
-          description
-            "Pre-FEC Signal Degrade Threshold";
-        }
-        leaf cond-type {
-          type ciena-6500-enums:CbrTtpCondType;
-          description
-            "Specifies ethernet specific client conditioning behaviour.";
-        }
-        leaf supported-term-pt {
-          type ciena-6500-types:aid;
-          description
-            "The supporting Termination Point.";
-        }
-        leaf pre-fec-sf-th-ber {
-          default "0.0";
-          type ciena-6500-types:STRING;
-          description
-            "The corresponding BER for a given Pre-FEC SF Threshold setting in dDQ";
-        }
-        leaf pre-fec-sd-th-ber {
-          default "0.0";
-          type ciena-6500-types:STRING;
-          description
-            "The corresponding BER for a given Pre-FEC SD Threshold setting in dDQ";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTfac;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-operate-loopback-cbrttp {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc port-release-loopback-cbrttp {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc port-show-odu {
-    description
-      "Retrieve parameters against the ODU Facility";
-    input {
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU0-shelf-slot-port-payloadindex, ODU1-shelf-slot-port-payloadindex, ODUFLEX-shelf-slot-port-payloadindex, ODU4-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-      leaf tti-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include TTI information in the response";
-          }
-          enum "YES" {
-            description
-              "Include TTI information in the response";
-          }
-        }
-        description
-          "Specify if TTI Information is to be included in the response (default is NO).";
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include actual RX tribslots in the response";
-          }
-          enum "YES" {
-            description
-              "Include actual RX tribslots in the response";
-          }
-        }
-        description
-          "Specify if the actual RX tribslots is to be included in the response (default is NO).";
-      }
-      leaf odu-flags {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include detailed ODU termination and monitoring information in the response";
-          }
-          enum "YES" {
-            description
-              "Include detailed ODU termination and monitoring in the response";
-          }
-        }
-        description
-          "Specify if ODU Layer termination and monitoring indicators are to be included in the response (default is NO).";
-      }
-    }
-    output {
-      list output {
-        leaf odun {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf odu-tx-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Transmitted TTI 32B. TTI =ODU Trail Trace Identifier";
-        }
-        leaf odu-rx-exp-tti {
-          type ciena-6500-types:STRING;
-          description
-            "Expected 32 Characters ODU TTI";
-        }
-        leaf odu-tx-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf odu-tx-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        }
-        leaf odu-ex-sapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Expected SAPI TTI (15 Characters)";
-        }
-        leaf odu-term {
-          type enumeration {
-            enum "YES" {
-              description
-                "Terminate ODU Layer";
-            }
-            enum "NO" {
-              description
-                "Not terminate ODU Layer";
-            }
-          }
-          description
-            "Indicating whether to terminate ODU Layer";
-        }
-        leaf odu-ex-dapi {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Expected DAPI TTI (15 Characters)";
-        }
-        leaf port-mode {
-          type enumeration {
-            enum "SONET";
-            enum "SDH";
-          }
-          description
-            "Optical port Market preference";
-        }
-        leaf odu-tf-mode {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Alarms off, no traffic protection";
-            }
-            enum "ALMONLY" {
-              description
-                "Alarms on, no traffic protection";
-            }
-          }
-          description
-            "ODU Trace Fail Mode";
-        }
-        leaf trib-slot-assignment {
-          type enumeration {
-            enum "HEX value 00-FF";
-          }
-          description
-            "This attribute is used to specify the value of transmitted tributary slots.";
-        }
-        leaf ex-ts {
-          type enumeration {
-            enum "HEX value 00-FF";
-          }
-          description
-            "This attribute is used to specify the value of expected tributary slots.";
-        }
-        leaf rx-ts {
-          type enumeration {
-            enum "HEX value 00-FF";
-          }
-          description
-            "This attribute is used to specify the value of actual received tributary slots.";
-        }
-        leaf odu-timen {
-          type enumeration {
-            enum "OPERATOR" {
-              description
-                "Monitor ODU Operator Specific TTI mismatch";
-            }
-            enum "SAPI" {
-              description
-                "Monitor ODU SAPI TTI mismatch";
-            }
-            enum "DAPI" {
-              description
-                "Monitor ODU DAPI TTI mismatch";
-            }
-            enum "SAPI_DAPI" {
-              description
-                "Monitor ODU SAPI and DAPI TTI mismatch";
-            }
-          }
-          description
-            "ODU TTI Mismatch Detection";
-        }
-        leaf odu-monitor {
-          type enumeration {
-            enum "NO" {
-              description
-                "ODU Monitoring off";
-            }
-            enum "YES" {
-              description
-                "ODU Monitoring on";
-            }
-          }
-          description
-            "ODU Monitor";
-        }
-        leaf trib-slot-prov {
-          type enumeration {
-            enum "AUTO" {
-              description
-                "The Rx trib slot is auto-detected by system. ";
-            }
-            enum "MANUAL" {
-              description
-                "The Rx trib slot is user specified. ";
-            }
-          }
-          description
-            "tribSlots provisioning mode";
-        }
-        leaf odu-flt-mon {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Fault Monitoring";
-        }
-        leaf odu-prf-mon {
-          type ciena-6500-types:STRING;
-          description
-            "ODU Performance Monitoring";
-        }
-        leaf encryption-tcm {
-          default "1";
-          type ciena-6500-types:INT {
-            range "1..6";
-          }
-          description
-            "Active TCM Level for Encryption";
-        }
-        leaf encr-odu1 {
-          type ciena-6500-types:INT;
-          description
-            "ODU Reserve Byte 1 for Encryption";
-        }
-        leaf ains-time-left {
-          type ciena-6500-types:TIME;
-          description
-            "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        }
-        leaf clfi {
-          type ciena-6500-types:STRING;
-          description
-            "Common Language Facility Identifier. Customer provisionable label for an ODU facility.";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Identify the primary State";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:SSTODU;
-          description
-            "Secondary State";
-        }
-      }
-    }
-  }
-  rpc port-disable-odu {
-    description
-      "Remove an ODU Facility";
-    input {
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU0-shelf-slot-port-payloadindex, ODU1-shelf-slot-port-payloadindex, ODUFLEX-shelf-slot-port-payloadindex, ODU4-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Identify the Maintenance State";
-      }
-    }
-  }
-  rpc port-enable-odu {
-    description
-      "Restore an ODU Facility";
-    input {
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU0-shelf-slot-port-payloadindex, ODU1-shelf-slot-port-payloadindex, ODUFLEX-shelf-slot-port-payloadindex, ODU4-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container port {
-    container loopback {
-      list otuttp {
-        key "otu";
-        config false;
-        leaf otu {
-          mandatory true;
-          description
-            "AID in format OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portSsubport, OTUTTP-shelf-slot-ALL, OTUTTP-shelf-ALL, OTUTTP-shelf-slot-portPsubport";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type enumeration {
-            enum "FACILITY" {
-              description
-                "Signal looped toward the equipment";
-            }
-            enum "TERMINAL" {
-              description
-                "Signal looped away from the equipment";
-            }
-          }
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list sttp {
-        key "sttp";
-        config false;
-        leaf sttp {
-          mandatory true;
-          description
-            "AID in format STTP-shelf-slot-port, STTP-shelf-slot-ALL, STTP-shelf-ALL, STTP-shelf-slot-portSsubport";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type enumeration {
-            enum "FACILITY" {
-              description
-                "Signal looped toward the equipment";
-            }
-            enum "TERMINAL" {
-              description
-                "Signal looped away from the equipment";
-            }
-          }
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list ettp {
-        key "ettp";
-        config false;
-        leaf ettp {
-          mandatory true;
-          description
-            "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-ALL, ETTP-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type enumeration {
-            enum "FACILITY" {
-              description
-                "Signal looped toward the equipment";
-            }
-            enum "TERMINAL" {
-              description
-                "Signal looped away from the equipment";
-            }
-          }
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list oduttp {
-        key "oduttp";
-        config false;
-        leaf oduttp {
-          mandatory true;
-          description
-            "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-ALL, ODUTTP-shelf-slot-port-ALL, ODUTTP-shelf-slot-ALL, ODUTTP-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type enumeration {
-            enum "FACILITY" {
-              description
-                "Signal looped toward the equipment";
-            }
-            enum "TERMINAL" {
-              description
-                "Signal looped away from the equipment";
-            }
-          }
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list oductp {
-        key "oductp";
-        config false;
-        leaf oductp {
-          mandatory true;
-          description
-            "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-rt2Ptp2";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type enumeration {
-            enum "FACILITY" {
-              description
-                "Signal looped toward the equipment";
-            }
-            enum "TERMINAL" {
-              description
-                "Signal looped away from the equipment";
-            }
-          }
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list cbrttp {
-        key "cbrttp";
-        config false;
-        leaf cbrttp {
-          mandatory true;
-          description
-            "AID in format CBRTTP-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type enumeration {
-            enum "FACILITY" {
-              description
-                "Signal looped toward the equipment";
-            }
-            enum "TERMINAL" {
-              description
-                "Signal looped away from the equipment";
-            }
-          }
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-    }
-    container trace {
-      list flex {
-        key "flex";
-        config false;
-        leaf flex {
-          mandatory true;
-          description
-            "AID in format FLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf flex-trace-message {
-          type ciena-6500-types:STRING;
-          description
-            "Section trace message";
-          config false;
-        }
-      }
-    }
-    container tti {
-      list odu {
-        key "odun";
-        config false;
-        leaf odun {
-          mandatory true;
-          description
-            "AID in format ODU0-shelf-slot-port-payloadindex, ODU1-shelf-slot-port-payloadindex, ODUFLEX-shelf-slot-port-payloadindex, ODU4-shelf-slot-port-index";
-          type ciena-6500-types:aid;
-        }
-        leaf tti-message {
-          type ciena-6500-types:STRING;
-          description
-            "Trail Trace Identifier message";
-          config false;
-        }
-      }
-    }
-    container wavelength {
-      list rules {
-        key "otsaid";
-        config false;
-        leaf otsaid {
-          mandatory true;
-          description
-            "AID in format OTS-shelf-instance, SHELF-shelf-ALL, OTS-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf wl {
-          type ciena-6500-types:INT {
-            range "152877..156672";
-          }
-          description
-            "Wavelength";
-          config false;
-        }
-        leaf-list permit {
-          type ciena-6500-enums:WLRULES;
-          description
-            "Wavelength Provisioning Rules";
-          config false;
-        }
-      }
-    }
-    list eth {
-      key "eth";
-      config true;
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf auto-neg {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Auto-negotiation. Default=ENABLE";
-        config true;
-      }
-      leaf flow-ctrl {
-        type enumeration {
-          enum "NONE";
-          enum "ASYM";
-          enum "SYM";
-        }
-        default "ASYM";
-        description
-          "Advertised flow control capabilities. Ignored if AN is disabled.";
-        config true;
-      }
-      leaf pause-tx {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Controls PAUSE transmission when AN is disabled. Ignored when AN is enabled. Default=ENABLE. For L2MOTR cannot be set to DISABLE if the RATE is less than the SPEED.";
-        config true;
-      }
-      leaf mtu {
-        type ciena-6500-enums:MTU;
-        description
-          "Not Editable for L2SS";
-        config true;
-      }
-      leaf dst-addr {
-        default "01:00:75:AB:CD:EF";
-        type ciena-6500-types:IDENT;
-        description
-          "48-bit Ethernet MAC address displayed as 12 alphanumeric characters.";
-        config true;
-      }
-      leaf pass-ctrl {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "Not supported for L2SS, not editable for L2MOTR";
-        config true;
-      }
-      leaf speed {
-        type enumeration {
-          enum "1000";
-        }
-        default "1000";
-        description
-          "Not Editable for L2SS or L2MOTR";
-        config true;
-      }
-      leaf eth-duplex {
-        type enumeration {
-          enum "FULL";
-        }
-        default "FULL";
-        description
-          "Advertised duplex operation capabilities if AN is enabled.";
-        config true;
-      }
-      leaf tx-con {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Control the port conditioning.";
-        config true;
-      }
-      leaf tx-con-hb {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-          enum "TXONLY";
-        }
-        default "DISABLE";
-        description
-          "Used to control conditioning of client ports through Heartbeat mechanism with remote using Y.1731 CCM PDUs.";
-        config true;
-      }
-      leaf tx-con-hb-interval {
-        type enumeration {
-          enum "100MSEC";
-          enum "1SEC";
-        }
-        default "1SEC";
-        description
-          "Tx Conditioning Heartbeat Interval";
-        config true;
-      }
-      leaf tx-con-md-level {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..7";
-        }
-        description
-          "Tx Conditioning MD Level";
-        config true;
-      }
-      leaf tx-cond-network-flt-sig {
-        type enumeration {
-          enum "TLV";
-          enum "EXPLICIT";
-          enum "CFM";
-        }
-        default "EXPLICIT";
-        description
-          "Tx Conditioning Network Fault Signal";
-        config true;
-      }
-      leaf pause-tx-override {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "Control the pause frame transmission. If AN is disabled, PAUSETXOVERRIDE has no effect. If AN is enabled, setting PAUSETXOVERRIDE to ENABLE means the state of ANPAUSETX will be equal to PAUSETX, irrelevant of what FLOWCTRL is set to, and irrelevant of what the link partner supports. This effectively allows to control pause frame transmission (PAUSETX) even if AN is enabled and the link parameter does not support flow control. ";
-        config true;
-      }
-      leaf policing {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Indicates whether policing will be done on the given port";
-        config true;
-      }
-      leaf e-type {
-        type string {
-          length "1..4";
-        }
-        description
-          "Encapsulation scheme used in customer frames";
-        config true;
-      }
-      leaf p-mode {
-        type enumeration {
-          enum "PBITS";
-          enum "TOS";
-        }
-        default "PBITS";
-        description
-          "(DEPRECATED) Priority Mode";
-        config true;
-      }
-      leaf dm-prf {
-        type ciena-6500-types:STRING;
-        description
-          "(DEPRECATED) Discard Marking Profile";
-        config true;
-      }
-      leaf cf-prf {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port Control Frame Profile (CFPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf sch-prf {
-        type ciena-6500-types:STRING;
-        description
-          "(DEPRECATED) Scheduler Profiler";
-        config true;
-      }
-      leaf bw-threshld {
-        type ciena-6500-types:INT {
-          range "1..100";
-        }
-        description
-          "The bandwidth utilization percentage threshold ";
-        config true;
-      }
-      leaf rx-idle {
-        type enumeration {
-          enum "0";
-          enum "1";
-          enum "2";
-          enum "3";
-          enum "4";
-          enum "5";
-          enum "10";
-          enum "60";
-          enum "120";
-          enum "300";
-        }
-        default "0";
-        description
-          "Determines hold-off on Rx Ethernet Idle defect. The value 0 disables detection. Units are seconds";
-        config true;
-      }
-      leaf pbt-list-sup {
-        type ciena-6500-types:INT {
-          range "0 | 1";
-        }
-        description
-          "Indicates the PBT VID list support on Ethernet facility";
-        config true;
-      }
-      leaf rx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port RX COS Profile (RXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf tx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port TX COS Profile (TXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf user-rx-cos {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The IPHB value to map the untagged frames";
-        config true;
-      }
-      leaf q-grp-1 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 1.";
-        config true;
-      }
-      leaf q-grp-2 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 2.";
-        config true;
-      }
-      leaf port-bw {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the bandwidth profile (BWPRF-shelf-profileNo).";
-        config true;
-      }
-      leaf rate {
-        type ciena-6500-types:INT {
-          range "10 | 20 | 30..1000";
-        }
-        description
-          "The EVPL bandwidth rate.";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf tx-inter-pkt-gap {
-        type enumeration {
-          enum "DEFAULT";
-          enum "10";
-          enum "11";
-          enum "12";
-        }
-        description
-          "Tx Inter-Packet Gap";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "TS" {
-            description
-              "Test Access(This value can be used in create and edit operations)";
-          }
-          enum "TS-DEA" {
-            description
-              "Test Access Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "ACT" {
-            description
-              "Active, carrying traffic";
-          }
-          enum "DISCD" {
-            description
-              "Idle, not carrying traffic";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "WRKRX" {
-            description
-              "Working in the receive direction";
-          }
-          enum "WRKTX" {
-            description
-              "Working in the transmit direction";
-          }
-          enum "DSBLD" {
-            description
-              "Missing layer 2 connection; Idle, not carrying traffic";
-          }
-        }
-        description
-          "Identify the secondary and auto-in-service state";
-        config true;
-      }
-      leaf if-type {
-        type enumeration {
-          enum "UNI";
-          enum "NNI";
-        }
-        description
-          "The interface type of the ETH facility being created.";
-        config true;
-      }
-      leaf mode {
-        type enumeration {
-          enum "L2";
-          enum "EVPL";
-        }
-        default "L2";
-        description
-          "The MODE of service.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf an-status {
-        type enumeration {
-          enum "INPROGRESS";
-          enum "COMPLETED";
-          enum "DISABLED";
-        }
-        description
-          "Auto-negotiation status";
-        config false;
-      }
-      leaf pause-rx {
-        type enumeration {
-          enum "DISABLE";
-        }
-        description
-          "Controls PAUSE reception when AN is disabled. Ignored when AN is enabled.";
-        config false;
-      }
-      leaf pause-rx-override {
-        type enumeration {
-          enum "ENABLE";
-        }
-        description
-          "If AN is enabled, and ANPAUSERX is negotiated to enable, setting this attribute to enable means received PAUSE frames will not be acted upon. They will either be discarded or pass through transparently (based on the PASSCTRL setting).";
-        config false;
-      }
-      leaf an-eth-duplex {
-        type enumeration {
-          enum "HALF";
-          enum "FULL";
-        }
-        description
-          "Negotiated Duplex Operation, when AN is enabled.";
-        config false;
-      }
-      leaf an-speed {
-        type enumeration {
-          enum "1000";
-        }
-        description
-          "Negotiated speed, when AN is enabled.";
-        config false;
-      }
-      leaf an-pause-tx {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Negotiated PAUSE transmit, when AN is enabled.";
-        config false;
-      }
-      leaf an-pause-rx {
-        type enumeration {
-          enum "DISABLE";
-        }
-        description
-          "Negotiated PAUSE receive, when AN is enabled.";
-        config false;
-      }
-      leaf adv-eth-duplex {
-        type enumeration {
-          enum "HALF";
-          enum "FULL";
-          enum "BOTH";
-        }
-        description
-          "Link partner advertised Duplex capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf adv-speed {
-        type enumeration {
-          enum "1000";
-        }
-        description
-          "Link partner advertised speed capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf adv-flow-ctrl {
-        type enumeration {
-          enum "NONE";
-          enum "ASYM";
-          enum "SYM";
-          enum "BOTH";
-        }
-        description
-          "Link partner advertised flow control capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf phys-addr {
-        type ciena-6500-types:IDENT;
-        description
-          "48-bit Ethernet MAC address displayed as 12 alphanumeric characters. Used as SA in PAUSE frames.";
-        config false;
-      }
-      leaf bw-remain {
-        type ciena-6500-types:INT {
-          range "1..1000000";
-        }
-        description
-          "The unused bandwidth remained for a given port (in KBIT)";
-        config false;
-      }
-      leaf bw-utl {
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "The port bandwidth utilization percentage";
-        config false;
-      }
-      leaf lag-id {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the LAG to which the given ETH port belongs";
-        config false;
-      }
-      leaf snmp-index {
-        type ciena-6500-types:INT {
-          range "0..4294967295";
-        }
-        description
-          "Identifies the index of the equivalent entry in the SNMP interfaces MIB group";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-    }
-    list eth100 {
-      key "ethn";
-      config true;
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf auto-neg {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Auto-negotiation. ";
-        config true;
-      }
-      leaf flow-ctrl {
-        type enumeration {
-          enum "NONE";
-          enum "ASYM";
-          enum "SYM";
-        }
-        default "ASYM";
-        description
-          "Advertised flow control capabilities. Ignored if AN is disabled.";
-        config true;
-      }
-      leaf pause-tx {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Controls PAUSE transmission when AN is disabled. Ignored when AN is enabled. ";
-        config true;
-      }
-      leaf mtu {
-        type ciena-6500-enums:MTU;
-        description
-          "Not Editable for L2SS";
-        config true;
-      }
-      leaf speed {
-        type enumeration {
-          enum "10";
-          enum "100";
-          enum "10/100";
-        }
-        default "100";
-        description
-          "Not Editable for 20GL2SS";
-        config true;
-      }
-      leaf eth-duplex {
-        type enumeration {
-          enum "FULL";
-          enum "HALF";
-          enum "BOTH";
-        }
-        default "FULL";
-        description
-          "Advertised duplex operation capabilities if AN is enabled.";
-        config true;
-      }
-      leaf tx-con {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Control the port conditioning.";
-        config true;
-      }
-      leaf tx-con-hb {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-          enum "TXONLY";
-        }
-        default "DISABLE";
-        description
-          "Used to control conditioning of client ports through Heartbeat mechanism with remote using Y.1731 CCM PDUs.";
-        config true;
-      }
-      leaf tx-con-hb-interval {
-        type enumeration {
-          enum "100MSEC";
-          enum "1SEC";
-        }
-        default "1SEC";
-        description
-          "Tx Conditioning Heartbeat Interval";
-        config true;
-      }
-      leaf tx-con-md-level {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..7";
-        }
-        description
-          "Tx Conditioning MD Level";
-        config true;
-      }
-      leaf tx-cond-network-flt-sig {
-        type enumeration {
-          enum "TLV";
-          enum "EXPLICIT";
-          enum "CFM";
-        }
-        default "EXPLICIT";
-        description
-          "Tx Conditioning Network Fault Signal";
-        config true;
-      }
-      leaf pause-tx-override {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "control the pause frame transmission. If AN is disabled, PAUSETXOVERRIDE has no effect. If AN is enabled, setting PAUSETXOVERRIDE to ENABLE means the state of ANPAUSETX will be equal to PAUSETX, irrelevant of what FLOWCTRL is set to, and irrelevant of what the link partner supports. This effectively allows to control pause frame transmission (PAUSETX) even if AN is enabled and the link parameter does not support flow control.";
-        config true;
-      }
-      leaf policing {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Indicates whether policing will be done on the given port";
-        config true;
-      }
-      leaf e-type {
-        type string {
-          length "1..4";
-        }
-        description
-          "Encapsulation scheme used in customer frames";
-        config true;
-      }
-      leaf cf-prf {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port Control Frame Profile (CFPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf rx-idle {
-        type enumeration {
-          enum "0";
-          enum "1";
-          enum "2";
-          enum "3";
-          enum "4";
-          enum "5";
-          enum "10";
-          enum "60";
-          enum "120";
-          enum "300";
-        }
-        default "0";
-        description
-          "Determines hold-off on Rx Ethernet Idle defect. The value 0 disables detection. Units are seconds";
-        config true;
-      }
-      leaf pbt-list-sup {
-        type ciena-6500-types:INT {
-          range "0 | 1";
-        }
-        description
-          "Indicates the PBT VID list support on Ethernet facility";
-        config true;
-      }
-      leaf rx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port RX COS Profile (RXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf tx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port TX COS Profile (TXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf user-rx-cos {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The IPHB value to map the untagged frames";
-        config true;
-      }
-      leaf q-grp-1 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 1.";
-        config true;
-      }
-      leaf q-grp-2 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 2.";
-        config true;
-      }
-      leaf port-bw {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the bandwidth profile (BWPRF-shelf-profileNo).";
-        config true;
-      }
-      leaf rate {
-        type ciena-6500-types:INT {
-          range "10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | 90 | 100";
-        }
-        description
-          "The EVPL bandwidth rate.";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf tx-inter-pkt-gap {
-        type enumeration {
-          enum "DEFAULT";
-          enum "10";
-          enum "11";
-          enum "12";
-        }
-        description
-          "Tx Inter-Packet Gap";
-        config true;
-      }
-      leaf pass-ctrl {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Controls whether received Ethernet Control Frames (T/L=8808) are passed transparently (Enable), or removed from the flow (Disable).";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DISCD" {
-            description
-              "Idle, not carrying traffic";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-        }
-        description
-          "Identify the secondary and auto-in-service state";
-        config true;
-      }
-      leaf eqpt {
-        type enumeration {
-          enum "IOP";
-          enum "SFP";
-        }
-        default "IOP";
-        description
-          "Interface equipment type";
-        config true;
-      }
-      leaf if-type {
-        type enumeration {
-          enum "UNI";
-          enum "NNI";
-        }
-        description
-          "The interface type of the ETH100 facility being created.";
-        config true;
-      }
-      leaf mode {
-        type enumeration {
-          enum "L2";
-          enum "EVPL";
-        }
-        default "L2";
-        description
-          "The MODE of service.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf an-status {
-        type enumeration {
-          enum "INPROGRESS";
-          enum "COMPLETED";
-          enum "DISABLED";
-        }
-        description
-          "Auto-negotiation status";
-        config false;
-      }
-      leaf pause-rx {
-        type enumeration {
-          enum "DISABLE";
-        }
-        description
-          "Controls PAUSE reception when AN is disabled. Ignored when AN is enabled.";
-        config false;
-      }
-      leaf pause-rx-override {
-        type enumeration {
-          enum "ENABLE";
-        }
-        description
-          "If AN is enabled, and ANPAUSERX is negotiated to enable, setting this attribute to enable means received PAUSE frames will not be acted upon. They will either be discarded or pass through transparently (based on the PASSCTRL setting).";
-        config false;
-      }
-      leaf an-eth-duplex {
-        type enumeration {
-          enum "HALF";
-          enum "FULL";
-          enum "BOTH";
-        }
-        description
-          "Negotiated Duplex Operation, when AN is enabled.";
-        config false;
-      }
-      leaf an-speed {
-        type enumeration {
-          enum "10";
-          enum "100";
-          enum "10/100";
-        }
-        description
-          "Negotiated speed, when AN is enabled.";
-        config false;
-      }
-      leaf an-pause-tx {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Negotiated PAUSE transmit, when AN is enabled.";
-        config false;
-      }
-      leaf an-pause-rx {
-        type enumeration {
-          enum "DISABLE";
-        }
-        description
-          "Negotiated PAUSE receive, when AN is enabled.";
-        config false;
-      }
-      leaf adv-eth-duplex {
-        type enumeration {
-          enum "HALF";
-          enum "FULL";
-          enum "BOTH";
-          enum "UNKNOWN";
-        }
-        description
-          "Link partner advertised Duplex capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf adv-speed {
-        type enumeration {
-          enum "10";
-          enum "100";
-          enum "10/100";
-          enum "UNKNOWN";
-        }
-        description
-          "Link partner advertised speed capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf adv-flow-ctrl {
-        type enumeration {
-          enum "NONE";
-          enum "ASYM";
-          enum "SYM";
-          enum "BOTH";
-          enum "UNKNOWN";
-        }
-        description
-          "Link partner advertised flow control capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf phys-addr {
-        type ciena-6500-types:IDENT;
-        description
-          "48-bit Ethernet MAC address displayed as 12 alphanumeric characters. Used as SA in PAUSE frames.";
-        config false;
-      }
-      leaf bw-remain {
-        type ciena-6500-types:INT {
-          range "1..1000000";
-        }
-        description
-          "The unused bandwidth remained for a given port (in KBIT)";
-        config false;
-      }
-      leaf bw-utl {
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "The port bandwidth utilization percentage";
-        config false;
-      }
-      leaf lag-id {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the LAG to which the given ETH port belongs";
-        config false;
-      }
-      leaf snmp-index {
-        type ciena-6500-types:INT {
-          range "0..4294967295";
-        }
-        description
-          "Identifies the index of the equivalent entry in the SNMP interfaces MIB group";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-    }
-    list wan {
-      key "wan";
-      config true;
-      leaf wan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port, WAN-shelf-slot-portSsubport, WAN-shelf-slot-port-rt1Ptp1, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, WAN-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, WAN10G-shelf-slot-portSsubport, WAN-shelf-slot-portSsubport-rt1Ptp1, WAN-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2";
-        type ciena-6500-types:aid;
-      }
-      leaf magic-num {
-        type enumeration {
-          enum "DISABLE";
-          enum "ENABLE";
-        }
-        description
-          "Enables or disables the use of a magic number to distinguish between two peers and detect error conditions. Can be used to determine whether trying to establish a link with one self. Default value is Enable for MAPPING=POS, and Disable for MAPPING=GFP-F or GFP-T. For MAPPING=GFP-F or GFP-T, only possible value is Disable.";
-        config true;
-      }
-      leaf fcs {
-        type enumeration {
-          enum "0";
-          enum "16";
-          enum "32";
-        }
-        default "0";
-        description
-          "Frame Checksum. For MAPPING=POS, value can be 16 or 32. For MAPPING=GFP-F, value can be 0 or 32. For MAPPING=GFP-T, the only possible value is 0.";
-        config true;
-      }
-      leaf scramble {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Used to control payload X^43+1 payload scrambling.";
-        config true;
-      }
-      leaf lcm {
-        type enumeration {
-          enum "DISABLE";
-          enum "ENABLE";
-        }
-        description
-          "Link Connectivity Monitor. In some circumstances it may be desirable to disable the link continuity monitor (LCM). When enabled, LCM sends an echo request every second. If more than five echo requests are transmitted without receiving an echo response, the PPP operational OSI state becomes disabled, and PPP attempts to re-establish the link connection via LCP configuration request packets. Default value is Enable for MAPPING=POS, and Disable for MAPPING=GFP-F or GFP-T. For MAPPING=GFP-F or GFP-T, only possible value is Disable.";
-        config true;
-      }
-      leaf mapping {
-        type enumeration {
-          enum "POS";
-          enum "GFP-F";
-          enum "GFP-T";
-        }
-        default "GFP-F";
-        description
-          "Sonnet Mapping Protocol - Editing of this attribute will be rejected.";
-        config true;
-      }
-      leaf-list vcat {
-        type enumeration {
-          enum "DISABLE";
-          enum "ENABLE";
-          enum "GROUPED" {
-            description
-              "Grouped switching enabled (from dual sources).";
-          }
-        }
-        description
-          "Virtual SONET/SDH concatenation";
-        config true;
-      }
-      leaf lcas {
-        type enumeration {
-          enum "DISABLE" {
-            description
-              "Default";
-          }
-          enum "ENABLE" {
-            description
-              "ENABLE can only be set if vcat is enable";
-          }
-        }
-        default "DISABLE";
-        description
-          "Link Capacity Adjustment Scheme Mode";
-        config true;
-      }
-      leaf lan-fcs {
-        type enumeration {
-          enum "DISABLE";
-          enum "ENABLE";
-        }
-        description
-          "Indicates whether the LAN FCS is included in the encapsulated frame (for both the ingress and egress direction). Enable indicates the LAN FCS is included. Default value is Enable for MAPPING=POS, and Disable for MAPPING=GFP-F or GFP-T. For MAPPING=GFP-F or GFP-T, only possible value is Disable.";
-        config true;
-      }
-      leaf cond-type {
-        type enumeration {
-          enum "NONE" {
-            description
-              "Only valid value for 10GOTR/10GOTSC";
-          }
-          enum "GFPCMF" {
-            description
-              "GFP CMF is transmitted for conditioning";
-          }
-          enum "GFPCMFUSER" {
-            description
-              "Transmit user specified GFP CMF and GFP IDLE toward line";
-          }
-          enum "GFP10BERR" {
-            description
-              "Transmit GFP 10B_ERR symbols in the GFP frame";
-          }
-          enum "UNEQ" {
-            description
-              "P-UNEQ is transmitted on WAN for conditioning";
-          }
-          enum "NILTR" {
-            description
-              "Nil (empty) path trace will be sent to the backplane when WAN conditioning is required.";
-          }
-          enum "AIS" {
-            description
-              "AIS will transmit SONET/SDH Path AIS on WAN when conditioning is required.";
-          }
-          enum "GFPCSF" {
-            description
-              "GFP CSF is transmitted for conditioning";
-          }
-        }
-        description
-          "This attribute is used to control the type of WAN conditioning applied to WAN upon LAN defects (Rx Loss of Signal, Rx Loss of Sync, AN time-out, Rx Idle, Link Down) and CP Fail. Possible values are NONE or a combination of: GFPCMF,GFPCMFUSER, GFP10BERR, UNEQ, AIS and NILTR.";
-        config true;
-      }
-      leaf gfp-cmf-upi {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x03-0xFF. UPI to be transmitted in GFP client management frames.";
-        config true;
-      }
-      leaf if-type {
-        type enumeration {
-          enum "UNI";
-          enum "NNI";
-        }
-        mandatory true;
-        description
-          "The interface type of the WAN facility being created.";
-        config true;
-      }
-      leaf policing {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Indicates whether policing will be done on the given port";
-        config true;
-      }
-      leaf e-type {
-        type string {
-          length "1..4";
-        }
-        description
-          "Encapsulation scheme used in customer frames";
-        config true;
-      }
-      leaf dm-prf {
-        type ciena-6500-types:STRING;
-        description
-          "(DEPRECATED) Discard Marking Profile";
-        config true;
-      }
-      leaf cf-prf {
-        type ciena-6500-types:STRING;
-        description
-          "Control Frame Profile (CFPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf sch-prf {
-        type ciena-6500-types:STRING;
-        description
-          "(DEPRECATED) Scheduler Profile";
-        config true;
-      }
-      leaf loop-detect {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "Loopback Detection using SONMP.";
-        config true;
-      }
-      leaf p-mode {
-        type enumeration {
-          enum "PBITS";
-          enum "TOS";
-        }
-        description
-          "(DEPRECATED) Priority mode";
-        config true;
-      }
-      leaf bw-threshld {
-        type ciena-6500-types:INT {
-          range "1..100";
-        }
-        description
-          "The bandwidth utilization percentage threshold ";
-        config true;
-      }
-      leaf gfp-rfi {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "Transmit GFP RFI CMF on WAN link down";
-          }
-          enum "DISABLE" {
-            description
-              " Do not transmit CMF UPI on WAN link down(only possible value for FC)";
-          }
-          enum "CMFCSF" {
-            description
-              "Transmit GFP CSF CMF on WAN link down";
-          }
-          enum "USERDEF" {
-            description
-              "Transmit userdefined UPI value one WAN link down.";
-          }
-        }
-        description
-          "Control the transmission of GFP Client Signal Fail (CSF) CMFs. ENABLE is the default for Ethernet. Disable is the defaults and only possible value for FC";
-        config true;
-      }
-      leaf gfp-rfi-upi {
-        type ciena-6500-types:INT {
-          range "3..255";
-        }
-        description
-          "Transmits user defined UPI value on WAN link down. ";
-        config true;
-      }
-      leaf gfp-rt-delay {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "GFP round trip delay. Setting to DISABLE means the ping CMFs used for RTDELAY calculation and Distance Exceeded Alarm will no longer be sent. This implies RTDELAY will always display UNKNOWN and the Distance Exceeded Alarm will never raise. This is a way to disable the usage of the proprietary CMFs. Default=ENABLE";
-        config true;
-      }
-      leaf opu2-resvd {
-        type enumeration {
-          enum "YES" {
-            description
-              "Use 7 unused bytes of the OPU2 overhead for payload.";
-          }
-          enum "NO" {
-            description
-              "Do not use 7 unused bytes of the OPU2 overhead for payload";
-          }
-        }
-        description
-          "This attribute is used to specify whether to use the 7 unused bytes of the OPU2 overhead for payload or not.";
-        config true;
-      }
-      leaf fcs-err-frames {
-        type enumeration {
-          enum "KEEP" {
-            description
-              "Keep FCS-errored frames end-to-end.";
-          }
-          enum "DISCARD" {
-            description
-              "Discard FCS-errored frames end-to-end.";
-          }
-        }
-        description
-          "This attribute is used to specify whether to keep FCS-errored frames or Ethernet frames end-to-end or to discard them.";
-        config true;
-      }
-      leaf-list pdh-type {
-        type ciena-6500-enums:PDHTYPE_LIST;
-        description
-          "PDH channel type associated with WAN. Supported on L2SS-PDH only.";
-        config true;
-      }
-      leaf exp-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Expected PT.";
-        config true;
-      }
-      leaf tx-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Transmitted PT.";
-        config true;
-      }
-      leaf expected-upi {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Expected UPI.";
-        config true;
-      }
-      leaf tx-upi {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Transmitted UPI.";
-        config true;
-      }
-      leaf q-grp-1 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 1.";
-        config true;
-      }
-      leaf q-grp-2 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 2.";
-        config true;
-      }
-      leaf tx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port TX COS Profile (TXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf rx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port RX COS Profile (RXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf user-rx-cos {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The IPHB value to map the untagged frames";
-        config true;
-      }
-      leaf pbt-list-sup {
-        type ciena-6500-types:INT {
-          range "0 | 1";
-        }
-        description
-          "Indicates the PBT VID list support on WAN facility";
-        config true;
-      }
-      leaf pdh-vli {
-        type enumeration {
-          enum "DISABLE" {
-            description
-              "Default - VLI overhead octet used for data";
-          }
-          enum "ENABLE" {
-            description
-              "VLI overhead octet set to zeros.";
-          }
-        }
-        description
-          "This attribute is used to specify VLI octet usage for PDH WANs. VLI=Vcat Lcas Interworking, the concatenation overhead octet.";
-        config true;
-      }
-      leaf mac-option {
-        type enumeration {
-          enum "NONE" {
-            description
-              "No MAC provisioned on the facility.";
-          }
-          enum "MANUAL" {
-            description
-              "MAC manually provisioned on the facility.";
-          }
-          enum "AUTO" {
-            description
-              "MAC automatically assigned to the facility.";
-          }
-        }
-        description
-          "The MAC provisioning option";
-        config true;
-      }
-      leaf mac {
-        type ciena-6500-types:IDENT;
-        description
-          "48-bit Ethernet MAC address displayed as 12 alphanumeric characters. Unique to each facility.";
-        config true;
-      }
-      leaf os-tran {
-        type enumeration {
-          enum "NONE" {
-            description
-              "None";
-          }
-          enum "LEGACYCMF" {
-            description
-              "Proprietary Legacy Client Managed Frame.";
-          }
-          enum "G7041CMF" {
-            description
-              "G704.1 standard GFP Client Management Frame.";
-          }
-          enum "G7041CDF" {
-            description
-              "G704.1 standard GFP Client Data Frame.";
-          }
-        }
-        description
-          "This attribute is used to specify whether the WAN facility supports Ordered Set Transparency for G704.1 compliance.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        default "OOS-MA";
-        description
-          "Primary State of the WAN object";
-        config true;
-      }
-      leaf mode {
-        type enumeration {
-          enum "SDH";
-          enum "SONET";
-        }
-        description
-          "Indicates the current mode (either SONET or SDH).";
-        config false;
-      }
-      leaf rate {
-        type enumeration {
-          enum "NONE" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "STS1" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "STS3C" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "STS6C" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "STS9C" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "STS12C" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "STS24C" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "STS48C" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "STS192C" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "VT1" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-          enum "VT2" {
-            description
-              "SONET/SDH Basic rate derived from SONET/SDH cross-connections";
-          }
-        }
-        description
-          "SONET/SDH Basic rate (derived from SONET/SDH cross-connections)";
-        config false;
-      }
-      leaf prov-units {
-        type ciena-6500-types:INT {
-          range "0..64";
-        }
-        description
-          "Used to indicate the number of provisioned bandwidth units (of rate specified by the RATE attribute). Number of provisioned bandwidth units (RATE attributes). For contiguous concatenation, allowable values are either 0 or 1. The information is derived from the cross connection(s).";
-        config false;
-      }
-      leaf prov-rx-units {
-        type ciena-6500-types:INT {
-          range "0..64";
-        }
-        description
-          "Indicate the current number of provisioned members in the receive direction.";
-        config false;
-      }
-      leaf actual-units {
-        type ciena-6500-types:INT {
-          range "0..64";
-        }
-        description
-          "Indicates the number of bandwidth units actually carrying traffic. For contiguous concatenation, or for virtual concatenation without LCAS enabled, allowable values are either 0 or PROVUNITS. With LCAS enabled, allowable values are 0 to PROVUNITS. If the value cannot be retrieved, UNKNOWN will be displayed.";
-        config false;
-      }
-      leaf ncp {
-        type enumeration {
-          enum "NONE";
-          enum "BCP";
-        }
-        description
-          "Used to indicate the Network Control Protocol used. BCP is returned when MAPPING=POS, and NONE is returned when MAPPING=GFP=F or GFP-T.";
-        config false;
-      }
-      leaf max-vc-del {
-        type ciena-6500-types:INT {
-          range "0..256000";
-        }
-        description
-          "Maximum differential delay supported by the port in microseconds. If the value cannot be retrieved, UNKNOWN will be displayed.";
-        config false;
-      }
-      leaf curr-vc-del {
-        type ciena-6500-types:INT {
-          range "0..256000";
-        }
-        description
-          "Current differential delay in microseconds. If the value cannot be retrieved, UNKNOWN will be displayed. If VCAT is disabled or if WAN is not cross-connected, NA (Not Applicable) will be displayed.";
-        config false;
-      }
-      leaf round-trip-delay {
-        type ciena-6500-types:INT {
-          range "0..220000";
-        }
-        description
-          "Round Trip Delay in microseconds. If the value cannot be retrieved, UNKNOWN will be displayed.";
-        config false;
-      }
-      leaf actual-rx-units {
-        type ciena-6500-types:INT {
-          range "0..64";
-        }
-        description
-          "Current number of active members in the receive direction. When LCAS is disabled, allowable values are either 0 or PROVRXUNITS. With LCAS enabled, allowable values are 0 to PROVRXUNITS. If the value cannot be retrieved, UNKNOWN will be displayed.";
-        config false;
-      }
-      leaf-list available-rate {
-        type enumeration {
-          enum "RATE" {
-            description
-              "The available bandwidth for a given port (in SONET/SDH Basic RATE) For Ex : In GE card VCAT=ENABLE. AVLBLRATE on all WAN ports is STS1LO/STS1HO/STS3C ";
-          }
-        }
-        description
-          "Used to indicate the available bandwidth rate in the wan port.";
-        config false;
-      }
-      leaf bw-remain {
-        type ciena-6500-types:INT {
-          range "1..2500000";
-        }
-        description
-          "The unused bandwidth remained for a given port (in KBIT)";
-        config false;
-      }
-      leaf bw-utl {
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "The port bandwidth utilization percentage";
-        config false;
-      }
-      leaf snmp-index {
-        type ciena-6500-types:INT {
-          range "0..4294967295";
-        }
-        description
-          "Identifies the index of the equivalent entry in the SNMP interfaces MIB group";
-        config false;
-      }
-      leaf preamble {
-        type enumeration {
-          enum "KEEP" {
-            description
-              "Keep Ethernet preamble.";
-          }
-          enum "DISCARD" {
-            description
-              "Discard Ethernet preamble.";
-          }
-        }
-        description
-          "This attribute is used to specify whether to use the preamble at beginning of GFP frame or throw it away. The preamble is 8 bytes in total (7 bytes + 1 byte sfd).";
-        config false;
-      }
-      leaf received-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used for Received PT";
-        config false;
-      }
-      leaf received-upi {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used for Received UPI";
-        config false;
-      }
-      leaf wan-cap {
-        type enumeration {
-          enum "HICAP" {
-            description
-              "WAN port supports rate up to STS-192";
-          }
-          enum "MEDCAP" {
-            description
-              "WAN port supports rate up to STS-24";
-          }
-          enum "LOCAP" {
-            description
-              "WAN port supports rate up to STS-3";
-          }
-        }
-        description
-          "This attribute indicates the capacity of the WAN port";
-        config false;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:STRING;
-        description
-          "Facility AID format. The supporting Termination Point.";
-        config false;
-      }
-      leaf direction {
-        type enumeration {
-          enum "RX" {
-            description
-              "Monitoring receive direction";
-          }
-          enum "TX" {
-            description
-              "Monitoring transmit direction";
-          }
-        }
-        description
-          "Monitoring GFP layer in receive or transmit direction";
-        config false;
-      }
-      leaf reserved {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specify if the facility is being reserved for packet SNC's";
-        config false;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service";
-          }
-          enum "MT" {
-            description
-              "Maintenance";
-          }
-          enum "ACT" {
-            description
-              "Active, carrying traffic";
-          }
-          enum "DISCD" {
-            description
-              "Idle, not carrying traffic";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "WRKRX" {
-            description
-              "Working in the receive direction";
-          }
-          enum "WRKTX" {
-            description
-              "Working in the transmit direction";
-          }
-          enum "UEQ" {
-            description
-              "Unequipped";
-          }
-          enum "MEA" {
-            description
-              "Mismatched equipment attributes";
-          }
-          enum "DSBLD" {
-            description
-              "Missing layer 2 connection; Idle, not carrying traffic";
-          }
-          enum "UAS" {
-            description
-              "RPR WAN only, Not associated to an RPR SPAN";
-          }
-        }
-        description
-          "Identify the secondary state";
-        config false;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do Not Force Edit";
-          }
-          enum "YES" {
-            description
-              "Force Traffic Impacting Edit";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to force an edit when facility still in service (traffic impacting)";
-        config true;
-      }
-    }
-    list eth10g {
-      key "eth10g";
-      config true;
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port, ETH10G-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Enable or Disable LOL (Loss of Light) feature";
-        config true;
-      }
-      leaf mtu {
-        type ciena-6500-enums:MTU;
-        description
-          "Maximum Ethernet frame size supported. Setting the MTU size will influence the distance lossless local flow control is supported (the smaller the MTU, the larger the lossless distance).";
-        config true;
-      }
-      leaf flow-ctrl {
-        type ciena-6500-enums:FLOWCTRL;
-        description
-          "Advertised flow control capabilities.";
-        config true;
-      }
-      leaf auto-neg {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE" {
-            description
-              "Always Disable for 10GE.";
-          }
-        }
-        default "DISABLE";
-        description
-          "Auto-negotiation, R/W, only one value supported=DISABLE on 10GE.";
-        config true;
-      }
-      leaf pause-tx {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Controls PAUSE transmission when AN is disabled. Ignored when AN is enabled.";
-        config true;
-      }
-      leaf speed {
-        type enumeration {
-          enum "10G" {
-            description
-              "Always 10G for 10GE";
-          }
-        }
-        default "10G";
-        description
-          "Only one value is allowed, Always 10G.";
-        config true;
-      }
-      leaf eth-duplex {
-        type enumeration {
-          enum "FULL" {
-            description
-              "Always FULL for 10GE";
-          }
-          enum "HALF";
-          enum "BOTH";
-        }
-        default "FULL";
-        description
-          "Advertised duplex operation capabilities if AN is enabled.";
-        config true;
-      }
-      leaf tx-con {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Control the EPL conditioning. Enabling will turn off the GigE laser when Ethernet conditioning is required. Disabling will prevent Ethernet conditioning (i.e. the GigE laser will remain enabled) as a result of SONET/SDH path failure, as well as GFP failures and GFP RFI/CSF client management frame reception.";
-        config true;
-      }
-      leaf tx-inter-pkt-gap {
-        type enumeration {
-          enum "11";
-          enum "12";
-        }
-        default "12";
-        description
-          "Tx Inter-Packet Gap. 12 is the default value.";
-        config true;
-      }
-      leaf tx-con-hb {
-        type enumeration {
-          enum "DISABLE";
-          enum "ENABLE";
-          enum "TXONLY";
-        }
-        default "ENABLE";
-        description
-          "Used to control conditioning of client ports through Heartbeat mechanism with remote using Y.1731 CCM PDUs.";
-        config true;
-      }
-      leaf tx-con-hb-interval {
-        type enumeration {
-          enum "100MSEC";
-          enum "1SEC";
-        }
-        default "1SEC";
-        description
-          "Tx Conditioning Heartbeat Interval";
-        config true;
-      }
-      leaf tx-con-md-level {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..7";
-        }
-        description
-          "Tx Conditioning MD Level";
-        config true;
-      }
-      leaf tx-cond-network-flt-sig {
-        type enumeration {
-          enum "TLV";
-          enum "EXPLICIT";
-          enum "CFM";
-        }
-        default "EXPLICIT";
-        description
-          "Tx Conditioning Network Fault Signal";
-        config true;
-      }
-      leaf eqpt {
-        type enumeration {
-          enum "XGELAN";
-          enum "XGEWAN";
-        }
-        default "XGELAN";
-        description
-          "Interface equipment type.";
-        config true;
-      }
-      leaf pause-tx-override {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE" {
-            description
-              "Always DISABLE for 10GE";
-          }
-        }
-        default "DISABLE";
-        description
-          "Controls PAUSE reception when AN is disabled. Ignored when AN is enabled.";
-        config true;
-      }
-      leaf rx-idle {
-        type enumeration {
-          enum "0";
-          enum "1";
-          enum "2";
-          enum "3";
-          enum "4";
-          enum "5";
-          enum "10";
-          enum "60";
-          enum "120";
-          enum "300";
-        }
-        default "0";
-        description
-          "Always 0 for 10GE.";
-        config true;
-      }
-      leaf dm-prf {
-        type ciena-6500-types:STRING;
-        description
-          "(DEPRECATED) Discard Marking Profile";
-        config true;
-      }
-      leaf cf-prf {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port Control Frame Profile (CFPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf sch-prf {
-        type ciena-6500-types:STRING;
-        description
-          "(DEPRECATED) Scheduler Profiler";
-        config true;
-      }
-      leaf policing {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Indicates whether policing will be done on the given port";
-        config true;
-      }
-      leaf e-type {
-        type string {
-          length "1..4";
-        }
-        description
-          "Encapsulation scheme used in customer frames";
-        config true;
-      }
-      leaf latency-opt {
-        type enumeration {
-          enum "MINIMUM";
-          enum "MEDIUM";
-          enum "MAXIMUM";
-        }
-        description
-          "Latency Optimization";
-        config true;
-      }
-      leaf sync-status-msg-transmit {
-        type ciena-6500-enums:SSMTRANSMIT;
-        description
-          "Synchronized Status Messaging Transmit.";
-        config true;
-      }
-      leaf dus-override {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS.";
-        config true;
-      }
-      leaf rx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port RX COS Profile (RXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf tx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port TX COS Profile (TXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf user-rx-cos {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The IPHB value to map the untagged frames";
-        config true;
-      }
-      leaf q-grp-1 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 1.";
-        config true;
-      }
-      leaf q-grp-2 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 2.";
-        config true;
-      }
-      leaf port-bw {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the bandwidth profile (BWPRF-shelf-profileNo).";
-        config true;
-      }
-      leaf pbt-list-sup {
-        type ciena-6500-types:INT {
-          range "0 | 1";
-        }
-        description
-          "Indicates the PBT VID list support on Ethernet facility";
-        config true;
-      }
-      leaf rate {
-        type ciena-6500-types:INT {
-          range "10 | 20 | 30..10000";
-        }
-        description
-          "The EVPL bandwidth rate.";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf hold-off {
-        type ciena-6500-types:INT {
-          range "0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-        }
-        description
-          "Conditioning holdoff time in milliseconds.";
-        config true;
-      }
-      leaf tx-wvlngth-prov {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Wavelength in nm (xxxx.xx)";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected. (no transparent traffic connection on this facility)";
-          }
-          enum "TSGEN" {
-            description
-              "Test set generation";
-          }
-          enum "TSMON" {
-            description
-              "Test set monitor";
-          }
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf if-type {
-        type enumeration {
-          enum "UNI";
-          enum "NNI";
-        }
-        description
-          "The type of the ETH10G facility being queried";
-        config true;
-      }
-      leaf mapping {
-        type enumeration {
-          enum "PROP237" {
-            description
-              "proportional 11.09";
-          }
-          enum "PROP238" {
-            description
-              "proportional 11.05";
-          }
-          enum "GFPMACTR" {
-            description
-              "GFP-F mapped, MAC transparent";
-          }
-          enum "GFPSTD" {
-            description
-              "GFP-F mapped, Standard WAN";
-          }
-          enum "GFPMACTR192" {
-            description
-              "GFP-F mapped, MAC transparent, port mode of layer facility is SONET";
-          }
-          enum "GFPSTD192" {
-            description
-              "GFP-F mapped, Standard WAN, port mode of layer facility is SONET";
-          }
-          enum "GFPMACTR64" {
-            description
-              "GFP-F mapped, MAC transparent, port mode of layer facility is SDH";
-          }
-          enum "GFPSTD64" {
-            description
-              "GFP-F mapped, Standard WAN, port mode of layer facility is SDH";
-          }
-          enum "GFPMACOSTR" {
-            description
-              "GFP-F mapped, Ordered Set MAC transparent";
-          }
-          enum "GFPMACOSTR192" {
-            description
-              "GFP-F mapped, Ordered Set MAC transparent, port mode of layer facility is SONET";
-          }
-          enum "GFPMACOSTR64" {
-            description
-              "GFP-F mapped, Ordered Set MAC transparent, port mode of layer facility is SDH";
-          }
-          enum "NONE" {
-            description
-              "Not mapped";
-          }
-          enum "ULL" {
-            description
-              "Ultra Low Latency";
-          }
-        }
-        default "GFPSTD";
-        description
-          "The mapping layer OTM2 OTURATE and client mapping";
-        config true;
-      }
-      leaf mode {
-        type enumeration {
-          enum "L2";
-          enum "EVPL";
-        }
-        default "L2";
-        description
-          "The mode of service.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal";
-          }
-        }
-        default "IS";
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf tx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf an-status {
-        type enumeration {
-          enum "INPROGRESS";
-          enum "COMPLETED";
-          enum "DISABLED";
-          enum "UNKNOWN" {
-            description
-              "Always UNKNOWN for 10GE.";
-          }
-        }
-        description
-          "Auto-negotiation status";
-        config false;
-      }
-      leaf pause-rx {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE" {
-            description
-              "Always DISABLE for 10GE";
-          }
-        }
-        description
-          "Controls PAUSE reception when AN is disabled. Ignored when AN is enabled.";
-        config false;
-      }
-      leaf pause-rx-override {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "If AN is enabled, and ANPAUSERX is negotiated to enable, setting this attribute to enable means received PAUSE frames will not be acted upon. They will either be discarded or pass through transparently (based on the PASSCTRL setting).";
-        config false;
-      }
-      leaf an-eth-duplex {
-        type enumeration {
-          enum "FULL";
-          enum "HALF";
-          enum "BOTH";
-          enum "UNKNOWN" {
-            description
-              "Always UNKNOWN for 10GE";
-          }
-        }
-        description
-          "Negotiated Duplex Operation, when AN is enabled.";
-        config false;
-      }
-      leaf an-speed {
-        type enumeration {
-          enum "10G";
-          enum "UNKNOWN" {
-            description
-              "Always UNKNOWN for 10GE.";
-          }
-        }
-        description
-          "Negotiated speed, when AN is enabled.";
-        config false;
-      }
-      leaf an-pause-tx {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-          enum "UNKNOWN" {
-            description
-              "Always UNKNOWN for 10GE.";
-          }
-        }
-        description
-          "Negotiated PAUSE transmit, when AN is enabled.";
-        config false;
-      }
-      leaf an-pause-rx {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-          enum "UNKNOWN" {
-            description
-              "Always UNKNOWN for 10GE.";
-          }
-        }
-        description
-          "Negotiated PAUSE receive, when AN is enabled.";
-        config false;
-      }
-      leaf adv-eth-duplex {
-        type enumeration {
-          enum "FULL";
-          enum "HALF";
-          enum "BOTH";
-          enum "UNKNOWN" {
-            description
-              "Always UNKNOWN for 10GE.";
-          }
-        }
-        description
-          "Link partner advertised Duplex capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf adv-speed {
-        type enumeration {
-          enum "10G";
-          enum "UNKNOWN" {
-            description
-              "Always UNKNOWN for 10GE.";
-          }
-        }
-        description
-          "Link partner advertised speed capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf adv-flow-ctrl {
-        type enumeration {
-          enum "NONE";
-          enum "ASYM";
-          enum "SYM";
-          enum "UNKNOWN" {
-            description
-              "Always UNKNOWN for 10GE";
-          }
-        }
-        description
-          "Link partner advertised flow control capabilities. Only valid when ANSTATUS is COMPLETED.";
-        config false;
-      }
-      leaf pass-ctrl {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE" {
-            description
-              "Always DISABLE for 10GE.";
-          }
-        }
-        description
-          "Controls whether transmitted Ethernet Control Frames (T/L=8808) are passed transparently (Enable), or removed from the flow (Disable).";
-        config false;
-      }
-      leaf phys-addr {
-        type ciena-6500-types:IDENT;
-        description
-          "48-bit Ethernet MAC address displayed as 12 alphanumeric characters. Used as SA in PAUSE frames.";
-        config false;
-      }
-      leaf cbr-bw-remain {
-        type ciena-6500-types:STRING;
-        description
-          "CBR Bandwidth Remain";
-        config false;
-      }
-      leaf lag-id {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the LAG to which the given ETH10G port belongs.";
-        config false;
-      }
-      leaf timing-ref {
-        type enumeration {
-          enum "N" {
-            description
-              "Not a timing reference";
-          }
-          enum "Y" {
-            description
-              "Is a timing reference";
-          }
-        }
-        description
-          "Indicates whether the ETH10G facility is a timing reference";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-      leaf tx-wvlngth-min {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-max {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-spacing {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Wavelength Spacing in Ghz";
-        config false;
-      }
-      leaf spli-mgmt {
-        type ciena-6500-enums:spliMgmt;
-        description
-          "Identify if Port is Manageable by SPLI";
-        config false;
-      }
-      leaf spli-managed {
-        type ciena-6500-enums:spliManaged;
-        description
-          "Identify if Port is Currently Managed by SPLI";
-        config false;
-      }
-    }
-    list ethn {
-      key "ethn";
-      config true;
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Enable the feature of laser off far end fail";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NO FEC";
-          }
-          enum "RS10" {
-            description
-              "RS10 FEC";
-          }
-        }
-        description
-          "FEC Format";
-        config true;
-      }
-      leaf pre-fec-sf-th-lev {
-        type decimal64 {
-          range "-1.00..1.00";
-          fraction-digits 2;
-        }
-        description
-          "Pre-FEC Signal Fail Threshold Level (in dBQ).";
-        config true;
-      }
-      leaf pre-fec-sd-th-lev {
-        type decimal64 {
-          range "-1.00..2.00";
-          fraction-digits 2;
-        }
-        description
-          "Pre-FEC Signal Degrade Threshold Level (in dBQ).";
-        config true;
-      }
-      leaf hold-off {
-        type ciena-6500-types:INT {
-          range "0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-        }
-        description
-          "Hold Off signal conditioning timer (in increments of 100).";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected (no transparent traffic connection on this facility)";
-          }
-          enum "TSGEN" {
-            description
-              "Test set generation";
-          }
-          enum "TSMON" {
-            description
-              "Test set monitor";
-          }
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf mapping {
-        type enumeration {
-          enum "GMP" {
-            description
-              "GMP";
-          }
-          enum "GFPFLEX" {
-            description
-              "GFPFLEX mapping";
-          }
-          enum "PROPRIETARY" {
-            description
-              "PROPRIETARY";
-          }
-        }
-        description
-          "Mapping";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal";
-          }
-        }
-        default "IS";
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list tx-act-ln-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Lanes TX Power(Format:Lane1|Lane2|...)";
-        config false;
-      }
-      leaf tx-act-high-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX Actual High Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-act-low-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX Actual Low Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf-list rx-act-ln-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Lanes RX Power(Format:Lane1|Lane2|...)";
-        config false;
-      }
-      leaf rx-act-high-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX Actual High Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-low-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX Actual Low Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-      leaf member-1 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of member 1 (FLEX-shelf-slot-port).";
-        config false;
-      }
-      leaf member-2 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of member 2 (FLEX-shelf-slot-port).";
-        config false;
-      }
-      leaf member-3 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of member 3 (FLEX-shelf-slot-port).";
-        config false;
-      }
-      leaf member-4 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of member 4 (FLEX-shelf-slot-port).";
-        config false;
-      }
-      leaf pre-fec-sf-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Bit Error Rate.";
-        config false;
-      }
-      leaf pre-fec-sd-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Bit Error Rate.";
-        config false;
-      }
-      leaf spli-mgmt {
-        type ciena-6500-enums:spliMgmt;
-        description
-          "Identify if Port is Manageable by SPLI";
-        config false;
-      }
-      leaf spli-managed {
-        type ciena-6500-enums:spliManaged;
-        description
-          "Identify if Port is Currently Managed by SPLI";
-        config false;
-      }
-    }
-    list lag {
-      key "lag";
-      config true;
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-      leaf desc {
-        type string {
-          length "0..20";
-        }
-        description
-          "Descriptive name";
-        config true;
-      }
-      leaf lag-mode {
-        type enumeration {
-          enum "PMAX" {
-            description
-              "Maximize Protection, by leaving one port in the standby state ready to take over in case of failure.";
-          }
-          enum "BMAX" {
-            description
-              "Maximize Bandwidth, by using all available bandwidth with nothing reserved for protection.";
-          }
-        }
-        default "PMAX";
-        description
-          "LAG Operational Mode";
-        config true;
-      }
-      leaf algorithm {
-        type enumeration {
-          enum "MAC";
-        }
-        default "MAC";
-        description
-          "Load distribution algorithm";
-        config true;
-      }
-      leaf if-type {
-        type enumeration {
-          enum "UNI";
-          enum "NNI";
-        }
-        mandatory true;
-        description
-          "The interface type of the LAG facility being created";
-        config true;
-      }
-      leaf policing {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Indicates whether policing will be done on the given port";
-        config true;
-      }
-      leaf e-type {
-        type string {
-          length "1..4";
-        }
-        description
-          "Encapsulation scheme used in customer frames";
-        config true;
-      }
-      leaf p-mode {
-        type enumeration {
-          enum "PBITS";
-          enum "TOS";
-        }
-        default "PBITS";
-        description
-          "(DEPRECATED) Priority Mode";
-        config true;
-      }
-      leaf dm-prf {
-        type ciena-6500-types:STRING;
-        description
-          "(DEPRECATED) Discard Marking Profile";
-        config true;
-      }
-      leaf cf-prf {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port Control Frame Profile (CFPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf sch-prf {
-        type ciena-6500-types:STRING;
-        description
-          "(DEPRECATED) Scheduler Profiler";
-        config true;
-      }
-      leaf bw-threshld {
-        default "80";
-        type ciena-6500-types:INT {
-          range "1..100";
-        }
-        description
-          "The bandwidth utilization percentage threshold. Supported on L2SS only.";
-        config true;
-      }
-      leaf mtu {
-        type ciena-6500-enums:MTU;
-        description
-          "Maximum Ethernet frame size supported. Setting the MTU size will influence the distance that lossless local flow control is supported (the smaller the MTU, the larger the lossless distance).";
-        config true;
-      }
-      leaf rx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port RX COS Profile (RXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf tx-cos-profile {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the port TX COS Profile (TXCOSPRF-shelf-profileNo)";
-        config true;
-      }
-      leaf user-rx-cos {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "The IPHB value to map the untagged frames";
-        config true;
-      }
-      leaf q-grp-1 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 1.";
-        config true;
-      }
-      leaf q-grp-2 {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the queue group profile (QGRP-shelf-profileNo) to be used for queue group 2.";
-        config true;
-      }
-      leaf lacp {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "Indicates whether Link Aggregation Control Protocol will be enabled on a given LAG.";
-        config true;
-      }
-      leaf lacp-poll-period {
-        type enumeration {
-          enum "1 second" {
-            description
-              "FAST polling period.";
-          }
-          enum "30 seconds" {
-            description
-              "SLOW polling period.";
-          }
-        }
-        description
-          "The LACP polling period (in seconds)";
-        config true;
-      }
-      leaf mac-option {
-        type enumeration {
-          enum "NONE" {
-            description
-              "No MAC provisioned on the facility.";
-          }
-          enum "MANUAL" {
-            description
-              "MAC manually provisioned on the facility.";
-          }
-          enum "AUTO" {
-            description
-              "MAC automatically assigned to the facility.";
-          }
-        }
-        description
-          "The MAC provisioning option";
-        config true;
-      }
-      leaf mac {
-        type ciena-6500-types:IDENT;
-        description
-          "48-bit Ethernet MAC address displayed as 12 alphanumeric characters. Unique to each facility.";
-        config true;
-      }
-      leaf mode {
-        type enumeration {
-          enum "L2";
-          enum "EVPL";
-        }
-        default "L2";
-        description
-          "The MODE of service.";
-        config true;
-      }
-      leaf port-member-rate {
-        default "1000";
-        type ciena-6500-types:INT {
-          range "10 | 20 | 30..10000";
-        }
-        description
-          "The port member EVPL bandwidth rate.";
-        config true;
-      }
-      leaf tx-con {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "ENABLE";
-        description
-          "Used to control the EPL conditioning. TXCON=ENABLE will turn off the GigE laser when port conditioning is required. TXCON=DISABLE will disable port conditioning (i.e. the port laser will remain enabled) as a result of SONET/SDH path failure, as well as GFP failures and GFP RFI/CSF client management frame reception.";
-        config true;
-      }
-      leaf tx-con-hb {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-          enum "TXONLY";
-        }
-        default "DISABLE";
-        description
-          "Used to control conditioning of client ports through Heartbeat mechanism with remote using Y.1731 CCM PDUs. TXCONHB=ENABLE will turn on the Heartbeat functionality with remote. TXCONHB=DISABLE will turn off Heartbeat functionality with remote.";
-        config true;
-      }
-      leaf tx-con-hb-interval {
-        type enumeration {
-          enum "100MSEC";
-          enum "1SEC";
-        }
-        default "1SEC";
-        description
-          "Tx Conditioning Heartbeat Interval";
-        config true;
-      }
-      leaf tx-con-md-level {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..7";
-        }
-        description
-          "Tx Conditioning MD Level";
-        config true;
-      }
-      leaf tx-cond-network-flt-sig {
-        type enumeration {
-          enum "TLV";
-          enum "EXPLICIT";
-        }
-        default "EXPLICIT";
-        description
-          "Tx Conditioning Network Fault Signal";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "OOS-MA" {
-            description
-              "(This value can be used in create operation)";
-          }
-          enum "IS" {
-            description
-              "(This value can be used in create operation)";
-          }
-          enum "IS-ANR";
-          enum "OOS-AU";
-          enum "OOS-AUMA";
-          enum "OOS-MAANR";
-        }
-        default "OOS-MA";
-        description
-          "LAG primary state";
-        config true;
-      }
-      leaf bw-remain {
-        type ciena-6500-types:INT {
-          range "0..2000000";
-        }
-        description
-          "The total of unused bandwidth remaining on all of LAG members (in kilobits).";
-        config false;
-      }
-      leaf bw-utl {
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "The combined bandwidth utilization of all LAG members (as a percentage of maximum LAG bandwidth).";
-        config false;
-      }
-      leaf snmp-index {
-        type ciena-6500-types:INT {
-          range "0..4294967295";
-        }
-        description
-          "Range from 0.. 2^32-1. Identifies the index of the equivalent entry in the SNMP interfaces MIB group";
-        config false;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "FLT" {
-            description
-              "Fault detected";
-          }
-          enum "SGEO" {
-            description
-              "Supporting Entity Outage (based on PSTQ of OOS-AU, OOS-AUMA only)";
-          }
-          enum "SDEA" {
-            description
-              "Supported Entity Absent";
-          }
-          enum "DSBLD" {
-            description
-              "Disabled";
-          }
-        }
-        description
-          "Secondary State";
-        config false;
-      }
-      leaf pbt-list-sup {
-        type ciena-6500-types:INT {
-          range "0 | 1";
-        }
-        description
-          "Indicates the PBT VID list support on Ethernet facility";
-        config true;
-      }
-    }
-    list lag-port {
-      key "lag";
-      config true;
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-      leaf port-aid {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "Member port AID";
-        config true;
-      }
-      leaf lacp-poll-period {
-        type enumeration {
-          enum "1 second" {
-            description
-              "FAST polling period.";
-          }
-          enum "30 seconds" {
-            description
-              "SLOW polling period.";
-          }
-        }
-        description
-          "The LACP polling period (in seconds)";
-        config true;
-      }
-    }
-    list fiber-channel {
-      key "fc";
-      config true;
-      leaf fc {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf service {
-        type ciena-6500-enums:Service;
-        description
-          "FC (default) or FICON";
-        config true;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Enable or Disable LOL (Loss of Light) feature";
-        config true;
-      }
-      leaf mtu {
-        type ciena-6500-enums:MTU;
-        description
-          "Maximum Ethernet frame size supported. Setting the MTU size will influence the distance lossless local flow control is supported (the smaller the MTU, the larger the lossless distance).";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected. (no transparent traffic connection on this facility)";
-          }
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal";
-          }
-        }
-        default "IS";
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf tx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-    }
-    list flex {
-      key "flex";
-      config true;
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port, FLEX-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf protocol {
-        type ciena-6500-enums:PROTOCOL;
-        mandatory true;
-        description
-          "Protocol";
-        config true;
-      }
-      leaf rate {
-        type ciena-6500-types:STRING;
-        description
-          "Protocol Rate, in Mbps. Supported values are 1000, 1062.5, 1250, 2125, 4250, 8500, and 10500.";
-        config true;
-      }
-      leaf mapping {
-        type ciena-6500-enums:FLEX_MAPPING;
-        description
-          "Mapping type";
-        config true;
-      }
-      leaf latency-opt {
-        type enumeration {
-          enum "MINIMUM";
-          enum "MEDIUM";
-          enum "MAXIMUM";
-        }
-        default "MEDIUM";
-        description
-          "Latency Optimization";
-        config true;
-      }
-      leaf tx-con {
-        type enumeration {
-          enum "LOFEF" {
-            description
-              "Laser Off Far End Fail";
-          }
-          enum "8B10B" {
-            description
-              "8B10B";
-          }
-          enum "NOS" {
-            description
-              "NOS";
-          }
-          enum "K30_7" {
-            description
-              "K30_7";
-          }
-          enum "LF" {
-            description
-              "Local Fault";
-          }
-        }
-        description
-          "TX conditioning";
-        config true;
-      }
-      leaf hold-off {
-        type ciena-6500-types:INT {
-          range "0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-        }
-        description
-          "Conditioning holdoff time in seconds.";
-        config true;
-      }
-      leaf tf-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-          enum "LINEFAIL" {
-            description
-              "Alarms on, with traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "Trace Fail Mode";
-        config true;
-      }
-      leaf trc {
-        type string {
-          length "1..48";
-        }
-        description
-          "Outgoing Trace Message";
-        config true;
-      }
-      leaf exp-trc {
-        type string {
-          length "1..48";
-        }
-        description
-          "Expected Trace Message";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf ing-police {
-        type enumeration {
-          enum "ENABLED" {
-            description
-              "Enable Ingress Policing";
-          }
-          enum "DISABLED" {
-            description
-              "Disable Ingress Policing";
-          }
-        }
-        default "DISABLED";
-        description
-          "Ingress Policing. Only supported on the OTN FlexMOTR.";
-        config true;
-      }
-      leaf cir {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..1000000";
-        }
-        description
-          "Committed Information Rate. Measured in kb/s.";
-        config true;
-      }
-      leaf cbs {
-        default "12176";
-        type ciena-6500-types:INT {
-          range "1..131071";
-        }
-        description
-          "Committed Burst Size";
-        config true;
-      }
-      leaf cbs-units {
-        type enumeration {
-          enum "BYTE" {
-            description
-              "Commited Burst Size is measured in Bytes";
-          }
-          enum "KBYTE" {
-            description
-              "Commited Burst Size is measured in KBytes";
-          }
-        }
-        default "BYTE";
-        description
-          "Committed Burst Size Units. Only supported when CBS is supported. Only supported on the OTN FlexMOTR.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning manual administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected. (no transparent traffic connection on this facility)";
-          }
-          enum "TSGEN" {
-            description
-              "Test set generation";
-          }
-          enum "TSMON" {
-            description
-              "Test set monitor";
-          }
-        }
-        description
-          "Identify the secondary state.";
-        config true;
-      }
-      leaf mappedrate {
-        type ciena-6500-types:INT;
-        description
-          "Mapped Rate, in Mbps";
-        config false;
-      }
-      leaf defrag-hit {
-        type enumeration {
-          enum "YES" {
-            description
-              "Traffic is impacted on this port";
-          }
-          enum "NO" {
-            description
-              "No Traffic impact on this port";
-          }
-        }
-        description
-          "Determine if this port will be impacted by Bandwidth Defragmenation";
-        config false;
-      }
-      leaf tx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-      leaf prime {
-        type ciena-6500-types:STRING;
-        description
-          "The AID of the prime (ETH40G-shelf-slot-port).";
-        config false;
-      }
-      leaf defrag {
-        type enumeration {
-          enum "YES" {
-            description
-              "Allow internal Bandwidth Re-allocations / Defragmentation";
-          }
-          enum "NO" {
-            description
-              "No Effect";
-          }
-        }
-        description
-          "Allow internal Bandwidth Re-allocations / Defragmentation";
-        config true;
-      }
-    }
-    list oc3 {
-      key "oc3";
-      config true;
-      leaf oc3 {
-        mandatory true;
-        description
-          "AID in format OC3-shelf-slot-port, OC3-slot-1-%HLINK-facility-shelf-hslot-hport";
-        type ciena-6500-types:aid;
-      }
-      leaf sd-th {
-        default "6";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Signal degrade threshold value";
-        config true;
-      }
-      leaf stformat {
-        type enumeration {
-          enum "NUM" {
-            description
-              "1 byte";
-          }
-          enum "STRING" {
-            description
-              "16 byte";
-          }
-        }
-        description
-          "Section Trace Format";
-        config true;
-      }
-      leaf strc {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted section trace";
-        config true;
-      }
-      leaf exp-trc {
-        type ciena-6500-types:STRING;
-        description
-          "Expected section trace";
-        config true;
-      }
-      leaf stfmode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-          enum "LINEFAIL" {
-            description
-              "Alarms on, with traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "Section Trace Fail Mode";
-        config true;
-      }
-      leaf als {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "ENABLED";
-        description
-          "Automatic Laser Shutdown";
-        config true;
-      }
-      leaf eber-thresh {
-        default "3";
-        type ciena-6500-types:INT {
-          range "3 | 4 | 5";
-        }
-        description
-          "Excessive bit error threshold value";
-        config true;
-      }
-      leaf ssbitmde {
-        type ciena-6500-enums:SSBITMDE;
-        description
-          "SS Bit mode (facility personality)";
-        config true;
-      }
-      leaf dus-override {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS.";
-        config true;
-      }
-      leaf uneqmode {
-        type enumeration {
-          enum "UNKNOWN" {
-            description
-              "Unknown unequipped insertion mode";
-          }
-          enum "STS1" {
-            description
-              "Insert STS1 Unequipped";
-          }
-          enum "VC4" {
-            description
-              "Insert VC4 Unequipped";
-          }
-        }
-        description
-          "Unequipped Insertion Mode";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in edit operation)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in edit operation)";
-          }
-          enum "TS" {
-            description
-              "Test Access(This value can be used in edit operation)";
-          }
-          enum "TS-DEA" {
-            description
-              "Test Access Deactivate(This value can be used in edit operation)";
-          }
-          enum "MT" {
-            description
-              "Maintenance";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected (no cross-connects exist on facility)";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "WRKRX" {
-            description
-              "Working in the receive direction";
-          }
-          enum "WRKTX" {
-            description
-              "Working in the transmit direction";
-          }
-        }
-        description
-          "Identify the secondary state's auto-in-service/Test Access state";
-        config true;
-      }
-      leaf timing-reference {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Facility is a Timing Reference.";
-        config false;
-      }
-      leaf dcc {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Facility has DCC enabled";
-        config false;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "Optical Port market preference";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf dsminfo {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-          enum "NONE" {
-            description
-              "Not a DSM provisioned link";
-          }
-          enum "HOSTSIDE" {
-            description
-              "Host located intermediate line facility";
-          }
-          enum "DSMSIDE" {
-            description
-              "DSM located intermediate line facility";
-          }
-        }
-        description
-          "Specify if the DSM information is to be included in the response.";
-        config false;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config false;
-      }
-    }
-    list oc12 {
-      key "oc12";
-      config true;
-      leaf oc12 {
-        mandatory true;
-        description
-          "AID in format OC12-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sd-th {
-        default "6";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Signal degrade threshold value";
-        config true;
-      }
-      leaf stformat {
-        type enumeration {
-          enum "NUM" {
-            description
-              "1 byte";
-          }
-          enum "STRING" {
-            description
-              "16 byte";
-          }
-        }
-        description
-          "Section Trace Format";
-        config true;
-      }
-      leaf strc {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted section trace";
-        config true;
-      }
-      leaf exp-trc {
-        type ciena-6500-types:STRING;
-        description
-          "Expected section trace";
-        config true;
-      }
-      leaf stfmode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-          enum "LINEFAIL" {
-            description
-              "Alarms on, with traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "Section Trace Fail Mode";
-        config true;
-      }
-      leaf als {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "ENABLED";
-        description
-          "Automatic Laser Shutdown";
-        config true;
-      }
-      leaf eber-thresh {
-        default "3";
-        type ciena-6500-types:INT {
-          range "3 | 4 | 5";
-        }
-        description
-          "Excessive bit error threshold value";
-        config true;
-      }
-      leaf ssbitmde {
-        type ciena-6500-enums:SSBITMDE;
-        description
-          "SS Bit mode (facility personality)";
-        config true;
-      }
-      leaf dus-override {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS";
-        config true;
-      }
-      leaf uneqmode {
-        type enumeration {
-          enum "UNKNOWN" {
-            description
-              "Unknown unequipped insertion mode";
-          }
-          enum "STS1" {
-            description
-              "Insert STS1 Unequipped";
-          }
-          enum "VC4" {
-            description
-              "Insert VC4 Unequipped";
-          }
-        }
-        description
-          "Unequipped Insertion Mode";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in edit operation)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in edit operation)";
-          }
-          enum "TS" {
-            description
-              "Test Access(This value can be used in edit operation)";
-          }
-          enum "TS-DEA" {
-            description
-              "Test Access Deactivate(This value can be used in edit operation)";
-          }
-          enum "MT" {
-            description
-              "Maintenance";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected (no cross-connects exist on facility)";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "WRKRX" {
-            description
-              "Working in the receive direction";
-          }
-          enum "WRKTX" {
-            description
-              "Working in the transmit direction";
-          }
-        }
-        description
-          "Identify the secondary state's auto-in-service/Test Access state";
-        config true;
-      }
-      leaf timing-reference {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Facility is a Timing Reference.";
-        config false;
-      }
-      leaf dcc {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Facility has DCC enabled";
-        config false;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "Optical Port market preference";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config false;
-      }
-    }
-    list oc48 {
-      key "oc48";
-      config true;
-      leaf oc48 {
-        mandatory true;
-        description
-          "AID in format OC48-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sd-th {
-        default "6";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Signal degrade threshold value";
-        config true;
-      }
-      leaf stformat {
-        type enumeration {
-          enum "NUM" {
-            description
-              "1 byte";
-          }
-          enum "STRING" {
-            description
-              "16 byte";
-          }
-        }
-        description
-          "Section Trace Format";
-        config true;
-      }
-      leaf strc {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted section trace";
-        config true;
-      }
-      leaf exp-trc {
-        type ciena-6500-types:STRING;
-        description
-          "Expected section trace";
-        config true;
-      }
-      leaf stfmode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-          enum "LINEFAIL" {
-            description
-              "Alarms on, traffic protection (OC48 facilities only)";
-          }
-        }
-        default "OFF";
-        description
-          "Section Trace Fail Mode";
-        config true;
-      }
-      leaf als {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "ENABLED";
-        description
-          "Automatic Laser Shutdown";
-        config true;
-      }
-      leaf ssbitmde {
-        type ciena-6500-enums:SSBITMDE;
-        description
-          "SS Bit mode (facility personality)";
-        config true;
-      }
-      leaf eber-thresh {
-        default "3";
-        type ciena-6500-types:INT {
-          range "3 | 4 | 5";
-        }
-        description
-          "Excessive bit error threshold value";
-        config true;
-      }
-      leaf dus-override {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS";
-        config true;
-      }
-      leaf uneqmode {
-        type enumeration {
-          enum "UNKNOWN" {
-            description
-              "Unknown unequipped insertion mode";
-          }
-          enum "STS1" {
-            description
-              "Insert STS1 Unequipped";
-          }
-          enum "VC4" {
-            description
-              "Insert VC4 Unequipped";
-          }
-        }
-        description
-          "Unequipped Insertion Mode";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf rout-sig-disabled {
-        type enumeration {
-          enum "NO" {
-            description
-              "Used by control plane";
-          }
-          enum "YES" {
-            description
-              "Not used by control plane";
-          }
-        }
-        default "YES";
-        description
-          "This attribute controls whether the underlying interface will be used by control plane for I-NNI routing and signaling purposes.";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in edit operation)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in edit operation)";
-          }
-          enum "MT" {
-            description
-              "Maintenance";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected (no cross-connects exist on facility)";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "TS" {
-            description
-              "Test";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "WRKRX" {
-            description
-              "Working in the receive direction";
-          }
-          enum "WRKTX" {
-            description
-              "Working in the transmit direction";
-          }
-        }
-        description
-          "Identify the secondary state's auto-in-service state";
-        config true;
-      }
-      leaf timing-reference {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Facility is a Timing Reference.";
-        config false;
-      }
-      leaf dcc {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Facility has DCC enabled";
-        config false;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "Optical Port market preference";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf rx-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config false;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Loss of light feature";
-        config true;
-      }
-    }
-    list oc192 {
-      key "oc192";
-      config true;
-      leaf oc192 {
-        mandatory true;
-        description
-          "AID in format OC192-shelf-slot-port, OC192-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf sd-th {
-        default "6";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Signal degrade threshold value";
-        config true;
-      }
-      leaf stformat {
-        type enumeration {
-          enum "NUM" {
-            description
-              "1 byte";
-          }
-          enum "STRING" {
-            description
-              "16 byte";
-          }
-        }
-        description
-          "Section Trace Format";
-        config true;
-      }
-      leaf strc {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted section trace";
-        config true;
-      }
-      leaf exp-trc {
-        type ciena-6500-types:STRING;
-        description
-          "Expected section trace";
-        config true;
-      }
-      leaf stfmode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-          enum "LINEFAIL" {
-            description
-              "Alarms on, with traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "Section Trace Fail Mode";
-        config true;
-      }
-      leaf als {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "ENABLED";
-        description
-          "Automatic Laser Shutdown";
-        config true;
-      }
-      leaf ssbitmde {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "SS Bit mode (facility personality)";
-        config true;
-      }
-      leaf fec {
-        type ciena-6500-enums:FEC;
-        default "RS8";
-        description
-          "FEC";
-        config true;
-      }
-      leaf nls {
-        type ciena-6500-enums:BOOL_ON_OFF;
-        description
-          "Non Linear Supression compensation";
-        config true;
-      }
-      leaf eber-thresh {
-        default "3";
-        type ciena-6500-types:INT {
-          range "3 | 4 | 5";
-        }
-        description
-          "Excessive bit error threshold value";
-        config true;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Loss of light feature";
-        config true;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "Optical Port market preference";
-        config true;
-      }
-      leaf dus-override {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        description
-          "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS";
-        config true;
-      }
-      leaf uneqmode {
-        type enumeration {
-          enum "UNKNOWN" {
-            description
-              "Unknown unequipped insertion mode";
-          }
-          enum "STS1" {
-            description
-              "Insert STS1 Unequipped";
-          }
-          enum "VC4" {
-            description
-              "Insert VC4 Unequipped";
-          }
-        }
-        description
-          "Unequipped Insertion Mode";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf rout-sig-disabled {
-        type enumeration {
-          enum "NO" {
-            description
-              "Used by control plane";
-          }
-          enum "YES" {
-            description
-              "Not used by control plane";
-          }
-        }
-        default "YES";
-        description
-          "This attribute controls whether the underlying interface will be used by control plane for I-NNI routing and signaling purposes.";
-        config true;
-      }
-      leaf tx-wvlngth-prov {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Wavelength in nm (xxxx.xx)";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected (no cross-connects exist on facility)";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "TS" {
-            description
-              "Test";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "WRKRX" {
-            description
-              "Working in the receive direction";
-          }
-          enum "WRKTX" {
-            description
-              "Working in the transmit direction";
-          }
-          enum "TSGEN" {
-            description
-              "Test set generation";
-          }
-          enum "TSMON" {
-            description
-              "Test set monitor";
-          }
-        }
-        description
-          "Identify the secondary state's auto-in-service state";
-        config true;
-      }
-      leaf mapping {
-        type enumeration {
-          enum "NONE" {
-            description
-              "Not Mapped";
-          }
-          enum "AMP" {
-            description
-              "AMP Mapping";
-          }
-          enum "BMP" {
-            description
-              "BMP Mapping";
-          }
-        }
-        description
-          "Signal Mapping";
-        config true;
-      }
-      leaf ste {
-        type enumeration {
-          enum "YES" {
-            description
-              "Facility is section terminating.";
-          }
-          enum "NO" {
-            description
-              "Facility is section transparent.";
-          }
-        }
-        description
-          "Section Terminating";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf timing-reference {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Facility is a Timing Reference.";
-        config false;
-      }
-      leaf dcc {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Facility has DCC enabled";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf rx-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-wvlngth-min {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-max {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-spacing {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Wavelength Spacing in Ghz";
-        config false;
-      }
-      leaf splimgmt {
-        type ciena-6500-enums:spliMgmt;
-        description
-          "Identify if Port is Manageable by SPLI";
-        config false;
-      }
-      leaf splimanaged {
-        type ciena-6500-enums:spliManaged;
-        description
-          "Identify if Port is Currently Managed by SPLI";
-        config false;
-      }
-      leaf sf-th {
-        default "4";
-        type ciena-6500-types:INT {
-          range "4..8";
-        }
-        description
-          "Signal Fail Threshold value";
-        config false;
-      }
-    }
-    list oc768 {
-      key "oc768";
-      config true;
-      leaf oc768 {
-        mandatory true;
-        description
-          "AID in format OC768-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf stformat {
-        type enumeration {
-          enum "NUM" {
-            description
-              "1 byte";
-          }
-          enum "STRING" {
-            description
-              "16 byte";
-          }
-        }
-        description
-          "Section Trace Format";
-        config true;
-      }
-      leaf exp-trc {
-        type ciena-6500-types:STRING;
-        description
-          "Expected section trace";
-        config true;
-      }
-      leaf stfmode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "Section Trace Fail Mode";
-        config true;
-      }
-      leaf strc {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted section trace";
-        config true;
-      }
-      leaf eber-thresh {
-        default "3";
-        type ciena-6500-types:INT {
-          range "3 | 4 | 5";
-        }
-        description
-          "Excessive bit error threshold value";
-        config true;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Loss of light feature. Under certain failure scenarios insert Loss of Light (i.e. turn off the TX laser).";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf hold-off {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-        }
-        description
-          "HoldOff signal conditioning timer";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "FLT" {
-            description
-              "Fault detected in equipment";
-          }
-          enum "SGEO" {
-            description
-              "Supporting entity outage";
-          }
-          enum "TSGEN" {
-            description
-              "Test set generation";
-          }
-          enum "TSMON" {
-            description
-              "Test set monitor";
-          }
-        }
-        description
-          "Identify the secondary state's auto-in-service state";
-        config true;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "Optical Port market preference";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf rx-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf sd-th {
-        default "6";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Signal degrade threshold value";
-        config true;
-      }
-    }
-    list otm2 {
-      key "otm2aid";
-      config true;
-      leaf otm2aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, OTM2-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf osid {
-        type string {
-          length "0..8";
-        }
-        description
-          "8 Byte OSID identifier";
-        config true;
-      }
-      leaf tx-sbs {
-        type enumeration {
-          enum "ON" {
-            description
-              "SBS Dither";
-          }
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "Stimulated Brillouin Scattering compensation Dither";
-        config true;
-      }
-      leaf tx-am-frmt {
-        type enumeration {
-          enum "OFF";
-          enum "AM2IDLER";
-          enum "AM1IDLER";
-          enum "AM2";
-          enum "AM1";
-        }
-        default "AM2";
-        description
-          "TX AM Format";
-        config true;
-      }
-      leaf tx-fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NO FEC";
-          }
-          enum "PFEC" {
-            description
-              "Product FEC";
-          }
-          enum "RS8" {
-            description
-              "Reed Solomon 8";
-          }
-          enum "UFEC" {
-            description
-              "7% UFEC";
-          }
-          enum "SCFEC" {
-            description
-              "Super Concatenated FEC";
-          }
-          enum "BCH20" {
-            description
-              "BCH20 FEC";
-          }
-        }
-        description
-          "TX Supported FEC";
-        config true;
-      }
-      leaf rx-fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NO FEC";
-          }
-          enum "PFEC" {
-            description
-              "Product FEC";
-          }
-          enum "RS8" {
-            description
-              "Reed Solomon 8";
-          }
-          enum "UFEC" {
-            description
-              "7% UFEC";
-          }
-          enum "SCFEC" {
-            description
-              "Super Concatenated FEC";
-          }
-          enum "BCH20" {
-            description
-              "BCH20 FEC";
-          }
-        }
-        description
-          "RX Supported FEC";
-        config true;
-      }
-      leaf otu-tx-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted TTI 32B. TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-tx-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted TTI 32B. TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-rx-exp-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Expected 32 Characters OTU TTI";
-        config true;
-      }
-      leaf odu-rx-exp-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Expected 32 Characters ODU TTI";
-        config true;
-      }
-      leaf otu-tx-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-tx-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-exp-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Expected SAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf otu-exp-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Expected DAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf odu-tx-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-tx-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-exp-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Expected SAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf odu-exp-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Expected DAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf tx-path-id {
-        type ciena-6500-types:INT {
-          range "1..254";
-        }
-        description
-          "TX path identifier";
-        config true;
-      }
-      leaf tx-tr-cont {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Dispersion Control";
-          }
-          enum "ON";
-        }
-        default "ON";
-        description
-          "TR Control";
-        config true;
-      }
-      leaf tx-mode {
-        type enumeration {
-          enum "ED" {
-            description
-              "Extended Dispersion";
-          }
-          enum "EP" {
-            description
-              "Extended Power";
-          }
-        }
-        default "ED";
-        description
-          "Transmitter Dispersion Mode";
-        config true;
-      }
-      leaf tx-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned TX Power in dBm (xx.x)";
-        config true;
-      }
-      leaf tx-wvlngth-prov {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Wavelength in nm (xxxx.xx)";
-        config true;
-      }
-      leaf tx-disp-prov {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "Transmitter Dispersion Value";
-        config true;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET" {
-            description
-              "Optical port market";
-          }
-          enum "SDH";
-        }
-        description
-          "Optical port Market preference";
-        config true;
-      }
-      leaf tf-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-          enum "LINEFAIL" {
-            description
-              "Alarms on, with traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "OTU Trace Fail Mode";
-        config true;
-      }
-      leaf odu-tf-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "ODU Trace Fail Mode";
-        config true;
-      }
-      leaf otu-timen {
-        type enumeration {
-          enum "OPERATOR" {
-            description
-              "Monitor OTU Operator Specific TTI mismatch";
-          }
-          enum "SAPI" {
-            description
-              "Monitor OTU SAPI TTI mismatch";
-          }
-          enum "DAPI" {
-            description
-              "Monitor OTU DAPI TTI mismatch";
-          }
-          enum "SAPI_DAPI" {
-            description
-              "Monitor OTU SAPI and DAPI TTI mismatch";
-          }
-        }
-        default "OPERATOR";
-        description
-          "OTU TTI Mismatch Detection";
-        config true;
-      }
-      leaf odu-timen {
-        type enumeration {
-          enum "OPERATOR" {
-            description
-              "Monitor ODU Operator Specific TTI mismatch";
-          }
-          enum "SAPI" {
-            description
-              "Monitor ODU SAPI TTI mismatch";
-          }
-          enum "DAPI" {
-            description
-              "Monitor ODU DAPI TTI mismatch";
-          }
-          enum "SAPI_DAPI" {
-            description
-              "Monitor ODU SAPI and DAPI TTI mismatch";
-          }
-        }
-        default "OPERATOR";
-        description
-          "ODU TTI Mismatch Detection";
-        config true;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Enabled or Disabled LOL (Loss of Light) feature";
-        config true;
-      }
-      leaf tx-chrip {
-        type enumeration {
-          enum "POSITIVE";
-          enum "NEGATIVE";
-        }
-        default "NEGATIVE";
-        description
-          "Positive or Negative Chirp setting";
-        config true;
-      }
-      leaf pre-fec-sf-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Level. Parameter applies when FEC is ON";
-        config true;
-      }
-      leaf pre-fec-sd-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Level. Parameter applies when FEC is ON";
-        config true;
-      }
-      leaf otu-rate {
-        type enumeration {
-          enum "9G95" {
-            description
-              "9.95 G connection - Typically OC192 sonet";
-          }
-          enum "10G709" {
-            description
-              "10.70 G connection - Typically OTU2/OC192/STM64/10GE WAN";
-          }
-          enum "11G05" {
-            description
-              "11.05 G connection - Typically 10GE/OTU2 Mapping";
-          }
-          enum "11G09" {
-            description
-              "11.09 G connection - Typically 10GE/OTU2 Mapping";
-          }
-          enum "11G27" {
-            description
-              "11.27 G connection - Typically Fibre Channel 1200";
-          }
-        }
-        default "10G709";
-        description
-          "Rate of OTU Connection";
-        config true;
-      }
-      leaf odu-monitor {
-        type enumeration {
-          enum "NO" {
-            description
-              "Not monitor ODU Layer";
-          }
-          enum "YES" {
-            description
-              "Monitor ODU Layer";
-          }
-        }
-        description
-          "Indicating whether to monitor ODU Layer";
-        config true;
-      }
-      leaf otu-sd-th-lev {
-        type ciena-6500-types:INT;
-        description
-          "OTU Signal Degrade Threshold Level, only applies when FEC is OFF";
-        config true;
-      }
-      leaf odu-sf-th-lev {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "ODU Post-FEC Signal Fail Threshold Level";
-        config true;
-      }
-      leaf odu-sd-th-lev {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "ODU Post-FEC Signal Degrade Threshold Level";
-        config true;
-      }
-      leaf cc-tx-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Tx Sub-carrier Frequency";
-        config true;
-      }
-      leaf cc-tx-mod-depth {
-        type ciena-6500-types:STRING;
-        description
-          "Tx Modulation Depth";
-        config true;
-      }
-      leaf cc-tx-msg-len {
-        default "16";
-        type ciena-6500-types:STRING;
-        description
-          "Tx Message Length";
-        config true;
-      }
-      leaf cc-tx-ask-baud-rate {
-        type enumeration {
-          enum "333.33" {
-            description
-              "Baud Rate(This value can be used in create and edit operations)";
-          }
-          enum "1667" {
-            description
-              "Baud Rate(This value can be used in create and edit operations)";
-          }
-          enum "150" {
-            description
-              "Baud Rate(This value can be used in create and edit operations)";
-          }
-          enum "1000" {
-            description
-              "Baud Rate(This value can be used in create and edit operations)";
-          }
-          enum "UNKNOWN" {
-            description
-              "Baud Rate";
-          }
-        }
-        description
-          "Tx ASK Baud Rate";
-        config true;
-      }
-      leaf cc-tx-encode-frmt {
-        type enumeration {
-          enum "NRZ" {
-            description
-              "Encoding Format(This value can be used in create and edit operations)";
-          }
-          enum "NRZ2" {
-            description
-              "Encoding Format(This value can be used in create and edit operations)";
-          }
-          enum "3SB1" {
-            description
-              "Encoding Format(This value can be used in create and edit operations)";
-          }
-          enum "3SB2" {
-            description
-              "Encoding Format(This value can be used in create and edit operations)";
-          }
-          enum "UNKNOWN" {
-            description
-              "UNKNOWN Encoding Format";
-          }
-        }
-        description
-          "Tx Encoding Format";
-        config true;
-      }
-      leaf rc-rx-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Rx Sub-carrier Frequency";
-        config true;
-      }
-      leaf rc-rx-msg-len {
-        default "28";
-        type ciena-6500-types:STRING;
-        description
-          "Rx Message Length of repeater system family A, C";
-        config true;
-      }
-      leaf rc-rx-ask-baud-rate {
-        type enumeration {
-          enum "16.67" {
-            description
-              "Baud Rate(This value can be used in create and edit operations)";
-          }
-          enum "83.33" {
-            description
-              "Baud Rate(This value can be used in create and edit operations)";
-          }
-          enum "50" {
-            description
-              "Baud Rate(This value can be used in create and edit operations)";
-          }
-          enum "UNKNOWN" {
-            description
-              "UNKNOWN Baud Rate";
-          }
-        }
-        default "16.67";
-        description
-          "Rx ASK Baud Rate";
-        config true;
-      }
-      leaf rc-rx-decode-frmt {
-        type enumeration {
-          enum "NRZ" {
-            description
-              "Encoding Format(This value can be used in create and edit operations)";
-          }
-          enum "NRZ2" {
-            description
-              "Encoding Format(This value can be used in create and edit operations)";
-          }
-          enum "3SB1" {
-            description
-              "Encoding Format(This value can be used in create and edit operations)";
-          }
-          enum "3SB2" {
-            description
-              "Encoding Format(This value can be used in create and edit operations)";
-          }
-          enum "UNKNOWN" {
-            description
-              "UNKNOWN Encoding Format";
-          }
-        }
-        default "3SB1";
-        description
-          "Rx Decoding Format";
-        config true;
-      }
-      leaf repeater-system-desc {
-        type ciena-6500-types:STRING;
-        description
-          "Repeater Description";
-        config true;
-      }
-      leaf rc-rx-thresh-mode {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "Threshold Mode AUTO(This value can be used in create and edit operations)";
-          }
-          enum "MANUAL" {
-            description
-              "Threshold Mode MANUAL(This value can be used in create and edit operations)";
-          }
-          enum "UNKNOWN" {
-            description
-              "Threshold Mode UNKNOWN";
-          }
-        }
-        default "AUTO";
-        description
-          "Rx Threshold Mode";
-        config true;
-      }
-      leaf rc-rx-thresh {
-        default "100";
-        type ciena-6500-types:STRING;
-        description
-          "Rx Threshold";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf dm-enable {
-        type enumeration {
-          enum "YES" {
-            description
-              "Delay measurement is enabled.";
-          }
-          enum "NO" {
-            description
-              "Delay measurement is disabled.";
-          }
-        }
-        default "NO";
-        description
-          "Enable or disable delay measurement.";
-        config true;
-      }
-      leaf fec-sf-monitor {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do Not monitor FECSF";
-          }
-          enum "YES" {
-            description
-              "Monitor FECSF";
-          }
-        }
-        description
-          "Indicates whether to monitor Far-End client signal";
-        config true;
-      }
-      leaf otu-oh-non-term {
-        type enumeration {
-          enum "NONE" {
-            description
-              "Entire GCC OH terminated";
-          }
-          enum "GCC0" {
-            description
-              "GCC0 portion of OTU OH not terminated";
-          }
-        }
-        description
-          "Indicating whether to termiate GCC OH or not";
-        config true;
-      }
-      leaf encr-tcm {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..6";
-        }
-        description
-          "Active TCM Level for Encryption";
-        config true;
-      }
-      leaf encr-odu1 {
-        type ciena-6500-types:INT;
-        description
-          "ODU Reserve Byte 1 for Encryption";
-        config true;
-      }
-      leaf encr-odu2 {
-        type ciena-6500-types:INT;
-        description
-          "ODU Reserve Byte 2 for Encryption";
-        config true;
-      }
-      leaf spli-mgmt {
-        type ciena-6500-enums:spliMgmt;
-        default "ON";
-        description
-          "Identify if Port is Manageable by SPLI";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning manual administration(This value can be used in create operation)";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        default "IS";
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "FLT" {
-            description
-              "Fault detected";
-          }
-          enum "SGEO" {
-            description
-              "Supporting Entity Outage (based on PSTQ of OOS-AU, OOS-AUMA only)";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected. (no transparent traffic connection on this facility)";
-          }
-          enum "TSGEN" {
-            description
-              "Test set generation";
-          }
-          enum "TSMON" {
-            description
-              "Test set monitor";
-          }
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf exp-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Expected PT.";
-        config true;
-      }
-      leaf tx-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Transmitted PT.";
-        config true;
-      }
-      leaf rc-rx-bpsk-baud-rate {
-        type enumeration {
-          enum "150" {
-            description
-              "Baud Rate(This value can be used in edit operation)";
-          }
-          enum "5" {
-            description
-              "Baud Rate(This value can be used in edit operation)";
-          }
-          enum "UNKNOWN" {
-            description
-              "UNKNOWN Baud Rate";
-          }
-        }
-        description
-          "Rx BPSK Baud Rate";
-        config true;
-      }
-      leaf repeater-system-type {
-        type enumeration {
-          enum "FAMILY_A" {
-            description
-              "Repeater System Family A";
-          }
-          enum "FAMILY_B" {
-            description
-              "Repeater System Family B";
-          }
-          enum "FAMILY_C" {
-            description
-              "Repeater System Family C";
-          }
-          enum "UNKNOWN" {
-            description
-              "Repeater System Type Unknown";
-          }
-        }
-        description
-          "Repeater System Type";
-        config true;
-      }
-      leaf cond-type {
-        type ciena-6500-enums:OTM_CONDTYPE;
-        description
-          "The type of conditioning";
-        config true;
-      }
-      leaf odu-term {
-        type enumeration {
-          enum "YES" {
-            description
-              "Indicates that ODU TTI is terminated on this OTM2 facility.";
-          }
-          enum "NO" {
-            description
-              "Indicates that ODU TTI is not terminated on this OTM2 facility.";
-          }
-        }
-        description
-          "ODUTTITERM parameter has been introduced in the RTRV-OTM2 TL-1 commands. Values it takes on are ?YES? and ?NO?. ODUTTITERM values:?YES?: means that ODU TTI is terminated on this particular OTM2 facility and Site Manager should display ODU TTI and allow provisioning / monitoring of all ODU TTI parameters.?NO?: means that ODU TTI is not terminated on this port and SM should not display the ODU TTI parameters except the ODU TTI RX Incoming value. The 6500 BB packs (10GOTR/10GOTSC, 40GMUX, 2x10G OTR, 4x10G OTR, and OTNWT) that act as a regen will passthrough ODU TTI but will allow for the monitoring of ODU TTI RX Incoming value.When there is no client facilty, ODU TTI is not terminated. Default is NO since the client facility does not autoprov. If client facility is not an OTM2, then this port terminates ODU TTI (Terminal). If client facility is OTM2, then this port does not terminate ODU TTI (Regen).";
-        config false;
-      }
-      leaf tx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-wvlngth-min {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-max {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-spacing {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Wavelength Spacing";
-        config false;
-      }
-      leaf tx-tr-cont-state {
-        type enumeration {
-          enum "TRCONTOFF" {
-            description
-              "TR Control OFF";
-          }
-          enum "IDLE" {
-            description
-              "TX Wavelength not provisioned.";
-          }
-          enum "UNKNOWN";
-          enum "DISPSCANINPROG" {
-            description
-              "Dispersion Scan in progress";
-          }
-          enum "OOSOPTIMIZATION" {
-            description
-              "Out of service optimization";
-          }
-          enum "ISOPTIMIZATION" {
-            description
-              "In service optimization";
-          }
-          enum "ISOPTIMIZATIONHOLDOVER" {
-            description
-              "In service optimization in Holdover";
-          }
-          enum "SSOPTIMIZATION" {
-            description
-              "Steady State Optimization";
-          }
-        }
-        description
-          "TR Control State";
-        config false;
-      }
-      leaf tx-act-disp {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Transmitter actual Dispersion Value";
-        config false;
-      }
-      leaf tx-disp-min {
-        type ciena-6500-types:INT;
-        description
-          "Minimum Transmitter Dispersion Value";
-        config false;
-      }
-      leaf tx-disp-max {
-        type ciena-6500-types:INT;
-        description
-          "Maximum Transmitter Dispersion Value";
-        config false;
-      }
-      leaf rx-act-disp {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "TR Control RX Last Acquired Dispersion";
-        config false;
-      }
-      leaf rx-echo-trace {
-        type ciena-6500-types:STRING;
-        description
-          "TR Transmit Identifier Received";
-        config false;
-      }
-      leaf tx-trace {
-        type ciena-6500-types:STRING;
-        description
-          "TR Transmit Identifier Received Expected";
-        config false;
-      }
-      leaf tx-assoc-far-end-rx {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitter associated far end receiver";
-        config false;
-      }
-      leaf pre-fec-sf-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        config false;
-      }
-      leaf pre-fec-sd-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        config false;
-      }
-      leaf opu2-resvd {
-        type enumeration {
-          enum "YES" {
-            description
-              "Use 7 unused bytes of the OPU2 overhead for payload";
-          }
-          enum "NO";
-        }
-        description
-          "This attribute is used to specify whether to use the 7 unused bytes of the OPU2 overhead for payload or not.";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf otm-term {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Termination per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf otm-flt-mon {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Fault Monitoring per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf otm-prf-mon {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Performance Monitoring per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf dm-count {
-        type ciena-6500-types:STRING;
-        description
-          "Most recent delay measurement count.";
-        config false;
-      }
-      leaf manual-trib-slots {
-        type enumeration {
-          enum "NO" {
-            description
-              "Manual tributary slots assignment is supported.";
-          }
-          enum "YES" {
-            description
-              "Manual tributary slots assignment is not supported.";
-          }
-        }
-        description
-          "Indicates whether tributary slot assignment is supported.";
-        config false;
-      }
-      leaf ts-assigned {
-        type ciena-6500-types:STRING;
-        description
-          "Assigned tributary slot(HEX) associated with this port.";
-        config false;
-      }
-      leaf spli-managed {
-        type ciena-6500-enums:spliManaged;
-        description
-          "Identify if Port is Currently Managed by SPLI";
-        config false;
-      }
-      leaf differential-encoding {
-        type enumeration {
-          enum "NONE" {
-            description
-              "TR Control NONE";
-          }
-          enum "HARD" {
-            description
-              "TR Control HARD";
-          }
-          enum "SOFT" {
-            description
-              "TR Control SOFT";
-          }
-        }
-        description
-          "OCH Differential Encoding";
-        config true;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do Not Force Edit";
-          }
-          enum "YES" {
-            description
-              "Force Traffic Impacting Edit";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to force a traffic impacting edit to happen";
-        config true;
-      }
-    }
-    list otm3 {
-      key "otm3aid";
-      config true;
-      leaf otm3aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf osid {
-        type string {
-          length "0..8";
-        }
-        description
-          "8 Byte OSID identifier";
-        config true;
-      }
-      leaf tx-fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NO FEC(This value can be used in create and edit operations)";
-          }
-          enum "RS8" {
-            description
-              "Reed Solomon 8(This value can be used in create and edit operations)";
-          }
-          enum "PFEC" {
-            description
-              "Product FEC";
-          }
-        }
-        description
-          "TX Supported FEC";
-        config true;
-      }
-      leaf rx-fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NO FEC(This value can be used in create and edit operations)";
-          }
-          enum "RS8" {
-            description
-              "Reed Solomon 8(This value can be used in create and edit operations)";
-          }
-          enum "PFEC" {
-            description
-              "Product FEC";
-          }
-        }
-        description
-          "RX Supported FEC";
-        config true;
-      }
-      leaf otu-tx-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted OTU TTI 32B. TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-tx-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted ODU TTI 32B. TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-rx-exp-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Expected 32 Characters OTU TTI";
-        config true;
-      }
-      leaf odu-rx-exp-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Expected 32 Characters ODU TTI";
-        config true;
-      }
-      leaf otu-tx-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-tx-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-exp-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Expected SAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf otu-exp-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Expected DAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf odu-tx-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-tx-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-exp-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Expected SAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf odu-exp-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Expected DAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf tx-path-id {
-        type ciena-6500-types:INT {
-          range "1..254";
-        }
-        description
-          "TX path identifier";
-        config true;
-      }
-      leaf tx-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned TX Power in dBm (xx.x)";
-        config true;
-      }
-      leaf tx-wvlngth-prov {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Wavelength in nm (xxxx.xx)";
-        config true;
-      }
-      leaf odu-monitor {
-        type enumeration {
-          enum "NO" {
-            description
-              "Not monitor ODU Layer";
-          }
-          enum "YES" {
-            description
-              "Monitor ODU Layer";
-          }
-        }
-        description
-          "Indicating whether to monitor ODU Layer";
-        config true;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "Optical port Market preference. Default is from ED-SYS NEMODE";
-        config true;
-      }
-      leaf tf-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-          enum "LINEFAIL" {
-            description
-              "Alarms on, with traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "OTU Trace Fail Mode";
-        config true;
-      }
-      leaf odu-tf-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "ODU Trace Fail Mode";
-        config true;
-      }
-      leaf otu-timen {
-        type enumeration {
-          enum "OPERATOR" {
-            description
-              "Monitor OTU Operator Specific TTI mismatch";
-          }
-          enum "SAPI" {
-            description
-              "Monitor OTU SAPI TTI mismatch";
-          }
-          enum "DAPI" {
-            description
-              "Monitor OTU DAPI TTI mismatch";
-          }
-          enum "SAPI_DAPI" {
-            description
-              "Monitor OTU SAPI and DAPI TTI mismatch";
-          }
-        }
-        default "OPERATOR";
-        description
-          "OTU TTI Mismatch Detection";
-        config true;
-      }
-      leaf odu-timen {
-        type enumeration {
-          enum "OPERATOR" {
-            description
-              "Monitor ODU Operator Specific TTI mismatch";
-          }
-          enum "SAPI" {
-            description
-              "Monitor ODU SAPI TTI mismatch";
-          }
-          enum "DAPI" {
-            description
-              "Monitor ODU DAPI TTI mismatch";
-          }
-          enum "SAPI_DAPI" {
-            description
-              "Monitor ODU SAPI and DAPI TTI mismatch";
-          }
-        }
-        default "OPERATOR";
-        description
-          "ODU TTI Mismatch Detection";
-        config true;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Enabled or Disabled LOL (Loss of Light) feature";
-        config true;
-      }
-      leaf pwr-bal-ctlr {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "Power Balance Controller Disabled";
-          }
-          enum "ENABLED" {
-            description
-              "Power Balance Controller Enabled";
-          }
-        }
-        default "DISABLED";
-        description
-          "Provisioned Power Balance Controller Operating Mode";
-        config true;
-      }
-      leaf pwr-bal-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Power Balance Offset in dB (xx.x)";
-        config true;
-      }
-      leaf tuning-mode {
-        type enumeration {
-          enum "NORMAL" {
-            description
-              "Normal Tuning Mode";
-          }
-          enum "ACCELERATED" {
-            description
-              "Accelerated Tuning Mode";
-          }
-        }
-        default "NORMAL";
-        description
-          "Provisioned Tuning Mode";
-        config true;
-      }
-      leaf pre-fec-sf-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Level (decimal value in dBQ). Parameter applies when FEC is ON";
-        config true;
-      }
-      leaf pre-fec-sd-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Level (decimal value in dBQ). Parameter applies when FEC is ON";
-        config true;
-      }
-      leaf spectral-occupancy {
-        type enumeration {
-          enum "NONE";
-          enum "NARROW";
-          enum "WIDE20";
-          enum "WIDE25";
-          enum "WIDE30";
-          enum "WIDE40";
-          enum "WIDE50";
-          enum "MINSPACE20";
-          enum "MINSPACE25";
-        }
-        description
-          "OCH Spectral Occupancy setting";
-        config true;
-      }
-      leaf odu-handoff {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "Automatic Mapping";
-          }
-          enum "ODU3" {
-            description
-              "ODU3 Mapping";
-          }
-          enum "OC768" {
-            description
-              "OC768 Mapping";
-          }
-          enum "ETH40G" {
-            description
-              "ETH40G Mapping";
-          }
-          enum "4X10G1" {
-            description
-              "4X10G Mapping Mode 1";
-          }
-          enum "4X10G2" {
-            description
-              "4X10G Mapping Mode 2";
-          }
-          enum "4X10G3" {
-            description
-              "4X10G Mapping Mode 3";
-          }
-          enum "4X10G4" {
-            description
-              "4X10G Mapping Mode 4";
-          }
-          enum "4X10G5" {
-            description
-              "4X10G Mapping Mode 5";
-          }
-          enum "4X10G6" {
-            description
-              "4X10G Mapping Mode 6";
-          }
-        }
-        default "AUTO";
-        description
-          "ODU Handoff Mapping Mode";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf frr {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "DISABLED Mode";
-          }
-          enum "ENABLED" {
-            description
-              "ENABLED Mode";
-          }
-        }
-        default "DISABLED";
-        description
-          "OCH Fast Receiver Recovery";
-        config true;
-      }
-      leaf frr-config {
-        type enumeration {
-          enum "MATCHEDCD" {
-            description
-              "Matched Chromatic Dispersion";
-          }
-          enum "DIVERSECD2" {
-            description
-              "Diverse Chromatic Dispersion 2 Paths";
-          }
-        }
-        default "MATCHEDCD";
-        description
-          "OCH FRR Network Configuration";
-        config true;
-      }
-      leaf frr-path1-disp {
-        default "AUTO";
-        type ciena-6500-types:STRING;
-        description
-          "OCH FRR Link Dispersion for Path 1";
-        config true;
-      }
-      leaf frr-path2-disp {
-        default "AUTO";
-        type ciena-6500-types:STRING;
-        description
-          "OCH FRR Link Dispersion for Path 2";
-        config true;
-      }
-      leaf dm-enable {
-        type enumeration {
-          enum "YES" {
-            description
-              "Delay measurement is enabled.";
-          }
-          enum "NO" {
-            description
-              "Delay measurement is disabled.";
-          }
-        }
-        default "NO";
-        description
-          "Enable or disable delay measurement.";
-        config true;
-      }
-      leaf spli-mgmt {
-        type ciena-6500-enums:spliMgmt;
-        default "ON";
-        description
-          "Identify if Port is Manageable by SPLI";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning manual administration(This value can be used in create operation)";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        default "IS";
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "FLT" {
-            description
-              "Fault detected";
-          }
-          enum "SGEO" {
-            description
-              "Supporting Entity Outage (based on PSTQ of OOS-AU, OOS-AUMA only)";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected. (no transparent traffic connection on this facility)";
-          }
-          enum "TSGEN" {
-            description
-              "Test set generation";
-          }
-          enum "TSMON" {
-            description
-              "Test set monitor";
-          }
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf cond-type {
-        type ciena-6500-enums:OTM_CONDTYPE;
-        description
-          "The type of conditioning";
-        config true;
-      }
-      leaf line-type {
-        type ciena-6500-enums:linetype;
-        description
-          "OCH Line Sys Type";
-        config true;
-      }
-      leaf odu-term {
-        type enumeration {
-          enum "YES" {
-            description
-              "Indicates that ODU TTI is terminated on this OTM3 facility.";
-          }
-          enum "NO" {
-            description
-              "Indicates that ODU TTI is not terminated on this OTM3 facility.";
-          }
-        }
-        description
-          "ODUTTITERM parameter values indicate:?YES?: means that ODU TTI is terminated on this particular OTM3 facility and Site Manager should display ODU TTI and allow provisioning / monitoring of all ODU TTI parameters.?NO?: means that ODU TTI is not terminated on this port and SM should not display the ODU TTI parameters except the ODU TTI RX Incoming value. The 6500 BB circuit packs that act as regen will passthrough ODU TTI but will allow for the monitoring of ODU TTI RX Incoming value.When there is no client facility, ODU TTI is not terminated. Default is NO since the client facility does not autoprov. If client facility is not an OTM3, then this port terminates ODU TTI (Terminal). If client facility is OTM3, then this port does not terminate ODU TTI (Regen).";
-        config false;
-      }
-      leaf tx-act-high-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX Actual High Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-act-low-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX Actual Low Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-high-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX Actual High Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-low-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX Actual Low Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-ch-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-ch-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-ch-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf pwr-bal-act-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Power Balance Actual Offset in dB (xx.x)";
-        config false;
-      }
-      leaf tx-wvlngth-min {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-max {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-spacing {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Wavelength Spacing";
-        config false;
-      }
-      leaf differential-encoding {
-        type enumeration {
-          enum "NONE" {
-            description
-              "TR Control NONE";
-          }
-          enum "HARD" {
-            description
-              "TR Control HARD";
-          }
-          enum "SOFT" {
-            description
-              "TR Control SOFT";
-          }
-        }
-        description
-          "OCH Differential Encoding";
-        config false;
-      }
-      leaf rx-act-disp {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "TR Control RX Last Acquired Dispersion";
-        config false;
-      }
-      leaf max-pmd {
-        type ciena-6500-types:STRING;
-        description
-          "Supported Mean DGD (Differential Group Delay) value";
-        config false;
-      }
-      leaf rx-act-pmd {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated Instance of DGD (Differential Group Delay) value";
-        config false;
-      }
-      leaf reach-spec {
-        type ciena-6500-types:STRING;
-        description
-          "Reach Specification";
-        config false;
-      }
-      leaf est-length {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated fiber length";
-        config false;
-      }
-      leaf rtd {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Round Trip Delay.";
-        config false;
-      }
-      leaf uni-latency {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Unidirectional Latency.";
-        config false;
-      }
-      leaf rx-echo-trace {
-        type ciena-6500-types:STRING;
-        description
-          "TR Transmit Identifier Received";
-        config false;
-      }
-      leaf tx-trace {
-        type ciena-6500-types:STRING;
-        description
-          "TR Transmit Identifier Received Expected";
-        config false;
-      }
-      leaf tx-assoc-far-end-rx {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitter associated far end receiver";
-        config false;
-      }
-      leaf otu-sd-th-lev {
-        type ciena-6500-types:INT;
-        description
-          "OTU Signal Degrade Threshold Level, only applies when FEC is OFF";
-        config false;
-      }
-      leaf odu-sf-th-lev {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "ODU Post-FEC Signal Fail Threshold Level";
-        config false;
-      }
-      leaf odu-sd-th-lev {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "ODU Post-FEC Signal Degrade Threshold Level";
-        config false;
-      }
-      leaf exp-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Expected PT.";
-        config false;
-      }
-      leaf tx-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Transmitted PT.";
-        config false;
-      }
-      leaf pre-fec-sf-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        config false;
-      }
-      leaf pre-fec-sd-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        config false;
-      }
-      leaf otu-rate {
-        type enumeration {
-          enum "44G5" {
-            description
-              "44.5 G connection - Typically OTU3 Mapping";
-          }
-          enum "43G018" {
-            description
-              "43.018 G connection - Typically OTU3 40G rate";
-          }
-        }
-        description
-          "OTMn Rate";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf otm-term {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Termination per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf otm-flt-mon {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Fault Monitoring per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf otm-prf-mon {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Performance Monitoring per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf dm-count {
-        type ciena-6500-types:STRING;
-        description
-          "Most recent delay measurement count.";
-        config false;
-      }
-      leaf hold-off {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "HoldOff signal conditioning timer";
-        config false;
-      }
-      leaf hold-on {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "HoldOn signal conditioning timer";
-        config false;
-      }
-      leaf crs-rate {
-        type enumeration {
-          enum "NIL" {
-            description
-              "crsRate is not supported";
-          }
-          enum "4XODU2E" {
-            description
-              "The connection rate is 4XODU2E";
-          }
-          enum "ODU3" {
-            description
-              "The connection rate is ODU3";
-          }
-        }
-        description
-          "ODU connection rate";
-        config false;
-      }
-      leaf spli-managed {
-        type ciena-6500-enums:spliManaged;
-        description
-          "Identify if Port is Currently Managed by SPLI";
-        config false;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do Not Force Edit";
-          }
-          enum "YES" {
-            description
-              "Force Traffic Impacting Edit";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to force a traffic impacting edit to happen";
-        config true;
-      }
-    }
-    list otminfo {
-      key "otmnaid";
-      config false;
-      leaf otmnaid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, OTM2-shelf-slot-portSsubport, OTM3-shelf-slot-port, OTM4-shelf-slot-port, OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf otu-rate-rx {
-        type enumeration {
-          enum "10G709" {
-            description
-              "10.70 G connection";
-          }
-          enum "11G05" {
-            description
-              "11.05 G connection";
-          }
-          enum "11G09" {
-            description
-              "11.09 G connection";
-          }
-          enum "112G" {
-            description
-              "112 G connection";
-          }
-          enum "UNAVAILABLE" {
-            description
-              "Not Retreivable, Circuit pack missing or not ready";
-          }
-          enum "UNKNOWN" {
-            description
-              "Not Retreivable, Circuit pack cannot retrieve value";
-          }
-        }
-        description
-          "RX OTU Rate";
-        config false;
-      }
-      leaf received-pt {
-        type ciena-6500-types:STRING;
-        description
-          "Received Payload Type. HEX value in the range 0x00-0xFF";
-        config false;
-      }
-    }
-    list otm {
-      key "otmaid";
-      config true;
-      leaf otmaid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, OTM0-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf osid {
-        type string {
-          length "0..8";
-        }
-        description
-          "8 Byte OSID identifier";
-        config true;
-      }
-      leaf tx-fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NO FEC(This value can be used in create and edit operations)";
-          }
-          enum "RS8" {
-            description
-              "Reed Solomon 8(This value can be used in create and edit operations)";
-          }
-          enum "PFEC" {
-            description
-              "Product FEC";
-          }
-          enum "QFEC" {
-            description
-              "QFEC";
-          }
-        }
-        description
-          "TX Supported FEC";
-        config true;
-      }
-      leaf rx-fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NO FEC(This value can be used in create and edit operations)";
-          }
-          enum "RS8" {
-            description
-              "Reed Solomon 8(This value can be used in create and edit operations)";
-          }
-          enum "PFEC" {
-            description
-              "Product FEC";
-          }
-          enum "QFEC" {
-            description
-              "QFEC";
-          }
-        }
-        description
-          "RX Supported FEC";
-        config true;
-      }
-      leaf otu-tx-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted OTU TTI 32B. TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-rx-exp-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Expected 32 Characters OTU TTI";
-        config true;
-      }
-      leaf otu-tx-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-tx-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf otu-exp-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Expected SAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf otu-exp-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "OTU Expected DAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf odu-tx-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-tx-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-exp-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Expected SAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf odu-exp-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Expected DAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf tx-path-id {
-        type ciena-6500-types:INT {
-          range "1..254";
-        }
-        description
-          "TX path identifier";
-        config true;
-      }
-      leaf tx-mode {
-        type enumeration {
-          enum "MANUAL" {
-            description
-              "Manual Precompensation Mode";
-          }
-          enum "AUTOMATIC" {
-            description
-              "Automatic Precompensation Mode";
-          }
-          enum "CUSTOM1" {
-            description
-              "Custom1 Precompensation Mode";
-          }
-          enum "OFF" {
-            description
-              "No Precompensation Mode";
-          }
-          enum "OFFSETAUTO" {
-            description
-              "Offset Automatic Precompensation Mode";
-          }
-          enum "EXTENDEDMANUAL" {
-            description
-              "Extended Manual Precompensation Mode";
-          }
-        }
-        description
-          "Transmitter Dispersion Mode";
-        config true;
-      }
-      leaf tx-disp-prov {
-        type ciena-6500-types:INT;
-        description
-          "Transmitter Dispersion Value";
-        config true;
-      }
-      leaf rotation {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "Disabled OCH Jones Rotation feature ";
-          }
-          enum "ENABLED" {
-            description
-              "Enabled OCH Jones Rotation feature";
-          }
-        }
-        description
-          "OCH Jones Rotation feature";
-        config true;
-      }
-      leaf tx-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned TX Power in dBm (xx.x)";
-        config true;
-      }
-      leaf tx-wvlngth-prov {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Wavelength in nm (xxxx.xx)";
-        config true;
-      }
-      leaf tx-wvlngth-spacing {
-        type enumeration {
-          enum "50" {
-            description
-              "50GHz";
-          }
-          enum "FLEXGRID" {
-            description
-              "FLEXGRID";
-          }
-        }
-        default "50";
-        description
-          "OCH Wavelength Spacing";
-        config true;
-      }
-      leaf differential-encoding {
-        type enumeration {
-          enum "NONE" {
-            description
-              "TR Control NONE";
-          }
-          enum "HARD" {
-            description
-              "TR Control HARD";
-          }
-          enum "SOFT" {
-            description
-              "TR Control SOFT";
-          }
-          enum "XD" {
-            description
-              "TR Control XD";
-          }
-        }
-        description
-          "OCH Differential Encoding";
-        config true;
-      }
-      leaf odu-monitor {
-        type enumeration {
-          enum "NO" {
-            description
-              "Not monitor ODU Layer";
-          }
-          enum "YES" {
-            description
-              "Monitor ODU Layer";
-          }
-        }
-        description
-          "Indicating whether to monitor ODU Layer";
-        config true;
-      }
-      leaf spectral-occupancy {
-        type enumeration {
-          enum "NONE";
-          enum "NARROW";
-          enum "WIDE20";
-          enum "WIDE25";
-          enum "WIDE30";
-          enum "WIDE40";
-          enum "WIDE50";
-          enum "MINSPACE20";
-          enum "MINSPACE25";
-        }
-        description
-          "OCH Spectral Occupancy setting";
-        config true;
-      }
-      leaf odu-handoff {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "Automatic Mapping";
-          }
-          enum "ODU3" {
-            description
-              "ODU3 Mapping";
-          }
-          enum "OC768" {
-            description
-              "OC768 Mapping";
-          }
-          enum "ETH40G" {
-            description
-              "ETH40G Mapping";
-          }
-          enum "4X10G1" {
-            description
-              "4X10G Mapping Mode 1";
-          }
-          enum "4X10G2" {
-            description
-              "4X10G Mapping Mode 2";
-          }
-          enum "4X10G3" {
-            description
-              "4X10G Mapping Mode 3";
-          }
-          enum "4X10G4" {
-            description
-              "4X10G Mapping Mode 4";
-          }
-          enum "4X10G5" {
-            description
-              "4X10G Mapping Mode 5";
-          }
-          enum "4X10G6" {
-            description
-              "4X10G Mapping Mode 6";
-          }
-          enum "HALFODUALIGN" {
-            description
-              "Master Slave - Half ODU Align Mapping Mode";
-          }
-        }
-        default "AUTO";
-        description
-          "ODU Handoff Mapping Mode";
-        config true;
-      }
-      leaf tuning-mode {
-        type enumeration {
-          enum "NORMAL" {
-            description
-              "Normal Tuning Mode";
-          }
-          enum "ACCELERATED" {
-            description
-              "Accelerated Tuning Mode";
-          }
-        }
-        description
-          "Provisioned Tuning Mode";
-        config true;
-      }
-      leaf optimize-mode {
-        type ciena-6500-enums:optimizeMode;
-        description
-          "Performance Optimization Mode";
-        config true;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "Optical port Market preference. Default is from ED-SYS NEMODE";
-        config true;
-      }
-      leaf tf-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-          enum "LINEFAIL" {
-            description
-              "Alarms on, with traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "OTU Trace Fail Mode";
-        config true;
-      }
-      leaf odu-tf-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "ODU Trace Fail Mode";
-        config true;
-      }
-      leaf otu-timen {
-        type enumeration {
-          enum "OPERATOR" {
-            description
-              "Monitor OTU Operator Specific TTI mismatch";
-          }
-          enum "SAPI" {
-            description
-              "Monitor OTU SAPI TTI mismatch";
-          }
-          enum "DAPI" {
-            description
-              "Monitor OTU DAPI TTI mismatch";
-          }
-          enum "SAPI_DAPI" {
-            description
-              "Monitor OTU SAPI and DAPI TTI mismatch";
-          }
-        }
-        default "OPERATOR";
-        description
-          "OTU TTI Mismatch Detection";
-        config true;
-      }
-      leaf odu-timen {
-        type enumeration {
-          enum "OPERATOR" {
-            description
-              "Monitor ODU Operator Specific TTI mismatch";
-          }
-          enum "SAPI" {
-            description
-              "Monitor ODU SAPI TTI mismatch";
-          }
-          enum "DAPI" {
-            description
-              "Monitor ODU DAPI TTI mismatch";
-          }
-          enum "SAPI_DAPI" {
-            description
-              "Monitor ODU SAPI and DAPI TTI mismatch";
-          }
-        }
-        default "OPERATOR";
-        description
-          "ODU TTI Mismatch Detection";
-        config true;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Enabled or Disabled LOL (Loss of Light) feature";
-        config true;
-      }
-      leaf frr {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "DISABLED Mode";
-          }
-          enum "ENABLED" {
-            description
-              "ENABLED Mode";
-          }
-        }
-        default "DISABLED";
-        description
-          "OCH Fast Receiver Recovery";
-        config true;
-      }
-      leaf frr-config {
-        type enumeration {
-          enum "MATCHEDCD" {
-            description
-              "Matched Chromatic Dispersion";
-          }
-          enum "DIVERSECD2" {
-            description
-              "Diverse Chromatic Dispersion 2 Paths";
-          }
-        }
-        default "MATCHEDCD";
-        description
-          "OCH FRR Network Configuration";
-        config true;
-      }
-      leaf frr-path1-disp {
-        default "AUTO";
-        type ciena-6500-types:STRING;
-        description
-          "OCH FRR Link Dispersion for Path 1";
-        config true;
-      }
-      leaf frr-path2-disp {
-        default "AUTO";
-        type ciena-6500-types:STRING;
-        description
-          "OCH FRR Link Dispersion for Path 2";
-        config true;
-      }
-      leaf pre-fec-sf-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Level (decimal value in dBQ). Parameter applies when FEC is ON";
-        config true;
-      }
-      leaf pre-fec-sd-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Level (decimal value in dBQ). Parameter applies when FEC is ON";
-        config true;
-      }
-      leaf otu-sd-th-lev {
-        type ciena-6500-types:INT;
-        description
-          "OTU Signal Degrade Threshold Level, only applies when FEC is OFF";
-        config true;
-      }
-      leaf odu-sf-th-lev {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "ODU Post-FEC Signal Fail Threshold Level";
-        config true;
-      }
-      leaf odu-sd-th-lev {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "ODU Post-FEC Signal Degrade Threshold Level";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier.Customer provisionable label for a facility.";
-        config true;
-      }
-      leaf otu-rate {
-        type enumeration {
-          enum "2G7" {
-            description
-              "2.7 G - OTM1(This value can be used in create operation)";
-          }
-          enum "112G" {
-            description
-              "112 G connection - Typically OTU4 Mapping(This value can be used in create operation)";
-          }
-          enum "OTUC2" {
-            description
-              "OTUC2 - 2x8QAM300G(This value can be used in create operation)";
-          }
-          enum "1G244" {
-            description
-              "1.244 G connection - OTM0";
-          }
-          enum "5G02" {
-            description
-              "5.02 G connection - OTMFLEX";
-          }
-          enum "OTUC4-60" {
-            description
-              "OTUC4-60 Rate connection";
-          }
-          enum "2xOTU4" {
-            description
-              "2 x OTU4(112G) Rate connection";
-          }
-        }
-        description
-          "Rate of OTU Connection";
-        config true;
-      }
-      leaf dm-enable {
-        type enumeration {
-          enum "YES" {
-            description
-              "Delay measurement is enabled.";
-          }
-          enum "NO" {
-            description
-              "Delay measurement is disabled.";
-          }
-        }
-        default "NO";
-        description
-          "Enable or disable delay measurement.";
-        config true;
-      }
-      leaf tx-freq-prov {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned TX Frequency in THz (xxx.xxxx)";
-        config true;
-      }
-      leaf enm-prov {
-        type enumeration {
-          enum "MODE1" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) mode 1(This value can be used in create and edit operations)";
-          }
-          enum "MODE2" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) mode 2(This value can be used in create and edit operations)";
-          }
-          enum "AUTO" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) auto";
-          }
-        }
-        description
-          "Provisioned Enhanced Non-linear Mitigation mode";
-        config true;
-      }
-      leaf carrier-centering-mode {
-        type ciena-6500-enums:ochCarrierCenteringMode;
-        description
-          "Laser centering mode";
-        config true;
-      }
-      leaf ccda {
-        type ciena-6500-enums:ccda;
-        description
-          "TX Channel Contention Detection and Avoidance";
-        config true;
-      }
-      leaf secure-oh {
-        type ciena-6500-enums:SecureOH;
-        description
-          "Secure Overhead Bytes";
-        config true;
-      }
-      leaf spli-mgmt {
-        type ciena-6500-enums:spliMgmt;
-        default "ON";
-        description
-          "Identify if Port is Manageable by SPLI";
-        config true;
-      }
-      leaf encr-tcm {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..6";
-        }
-        description
-          "Active TCM Level for Encryption";
-        config true;
-      }
-      leaf encr-odu1 {
-        type ciena-6500-types:INT;
-        description
-          "ODU Reserve Byte 1 for Encryption";
-        config true;
-      }
-      leaf encr-odu2 {
-        type ciena-6500-types:INT;
-        description
-          "ODU Reserve Byte 2 for Encryption";
-        config true;
-      }
-      leaf role {
-        type enumeration {
-          enum "PRIME" {
-            description
-              "Prime of the group.";
-          }
-          enum "MEMBER2" {
-            description
-              "Member of the group.";
-          }
-        }
-        description
-          "Indicates whether this OTM facility is the prime or member in a 2X8QA3M00G group";
-        config true;
-      }
-      leaf p-aid {
-        type ciena-6500-types:IDENT;
-        description
-          "FLEX4 OCLD 2X8QAM300G CP group prime line port AID";
-        config true;
-      }
-      leaf rx-pwr-l-thr {
-        default "0";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Rx Power OOR low threshold";
-        config true;
-      }
-      leaf rx-pwr-h-thr {
-        default "0";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Rx Power OOR high threshold";
-        config true;
-      }
-      leaf rx-ch-pwr-l-thr {
-        default "0";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Rx channel Power OOR low threshold";
-        config true;
-      }
-      leaf rx-ch-pwr-h-thr {
-        default "0";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Rx channel Power OOR high threshold";
-        config true;
-      }
-      leaf rx-pwr-thr-prov {
-        type enumeration {
-          enum "ON" {
-            description
-              "Use of provisioned thresholds is on";
-          }
-          enum "OFF" {
-            description
-              "Use of provisioned thresholds is off";
-          }
-        }
-        default "OFF";
-        description
-          "Enable to use provisioned thresholds";
-        config true;
-      }
-      leaf ttops {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Transponder Triggered Switching Mode Enabled";
-        config true;
-      }
-      leaf laser-centering-range {
-        default "2.5 Ghz";
-        type ciena-6500-types:STRING;
-        description
-          "Sets laser centering range";
-        config true;
-      }
-      leaf laser-freq-thr {
-        default "1.6";
-        type decimal64 {
-          range "0..3.0";
-          fraction-digits 1;
-        }
-        description
-          "Laser Frequency Threshold";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning manual administration(This value can be used in create operation)";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        default "IS";
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "FLT" {
-            description
-              "Fault detected";
-          }
-          enum "SGEO" {
-            description
-              "Supporting Entity Outage (based on PSTQ of OOS-AU, OOS-AUMA only)";
-          }
-          enum "LPBK" {
-            description
-              "Loopback";
-          }
-          enum "DISCD" {
-            description
-              "Disconnected. (no transparent traffic connection on this facility)";
-          }
-          enum "TSGEN" {
-            description
-              "Test set generation";
-          }
-          enum "TSMON" {
-            description
-              "Test set monitor";
-          }
-        }
-        description
-          "Identify the secondary state.";
-        config true;
-      }
-      leaf odu-tx-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted ODU TTI (Trail Trace Identifier), 32B. Last 32 bytes of the allocated 64 byte TTI allocation are used.";
-        config true;
-      }
-      leaf odu-rx-exp-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Expected 32 Characters ODU TTI";
-        config true;
-      }
-      leaf exp-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Expected PT.";
-        config true;
-      }
-      leaf tx-pt {
-        type ciena-6500-types:STRING;
-        description
-          "HEX value in the range 0x00-0xFF. This attribute is used to specify the value of Transmitted PT.";
-        config true;
-      }
-      leaf txb {
-        type ciena-6500-enums:txb;
-        description
-          "TX Power in Reduced State";
-        config true;
-      }
-      leaf line-type {
-        type ciena-6500-enums:linetype;
-        description
-          "OCH Line Sys Type";
-        config true;
-      }
-      leaf odu-term {
-        type enumeration {
-          enum "YES" {
-            description
-              "Indicates that ODU TTI is terminated on this OTM facility.";
-          }
-          enum "NO" {
-            description
-              "Indicates that ODU TTI is not terminated on this OTM facility.";
-          }
-        }
-        description
-          "ODUTTITERM parameter values indicate:?YES?: means that ODU TTI is terminated on this particular OTM facility and Site Manager should display ODU TTI and allow provisioning / monitoring of all ODU TTI parameters.?NO?: means that ODU TTI is not terminated on this port and SM should not display the ODU TTI parameters except the ODU TTI RX Incoming value. The 6500 BB circuit packs that act as regen will passthrough ODU TTI but will allow for the monitoring of ODU TTI RX Incoming value.When there is no client facility, ODU TTI is not terminated. Default is NO since the client facility does not autoprov. If client facility is not an OTM, then this port terminates ODU TTI (Terminal). If client facility is OTM, then this port does not terminate ODU TTI (Regen).";
-        config false;
-      }
-      leaf tx-act-disp {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Transmitter total actual link dispersion in the near-to-far direction";
-        config false;
-      }
-      leaf tx-disp-min {
-        type ciena-6500-types:INT;
-        description
-          "Minimum Transmitter Dispersion Value";
-        config false;
-      }
-      leaf tx-disp-max {
-        type ciena-6500-types:INT;
-        description
-          "Maximum Transmitter Dispersion Value";
-        config false;
-      }
-      leaf rx-act-disp {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Receiver total actual link dispersion in the far-to-near direction";
-        config false;
-      }
-      leaf tx-pre-disp {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Tx Precompensation Dispersion Value.";
-        config false;
-      }
-      leaf rx-post-disp {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Rx Postcompensation Dispersion Value.";
-        config false;
-      }
-      leaf tx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-ch-act-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-ch-min-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-ch-max-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf pwr-bal-ctlr {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "Power Balance Controller Disabled";
-          }
-          enum "ENABLED" {
-            description
-              "Power Balance Controller Enabled";
-          }
-        }
-        description
-          "Provisioned Power Balance Controller Operating Mode";
-        config false;
-      }
-      leaf pwr-bal-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Power Balance Offset in dB (xx.x)";
-        config false;
-      }
-      leaf pwr-bal-act-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Power Balance Actual Offset in dB (xx.x)";
-        config false;
-      }
-      leaf tx-act-high-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX Actual High Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-act-low-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "TX Actual Low Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-high-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX Actual High Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf rx-act-low-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "RX Actual Low Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf-list tx-act-ln-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Lane TX Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf-list rx-act-ln-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Lane RX Power Value in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-wvlngth-min {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf tx-wvlngth-max {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Wavelength value in nm (xxxx.xx)";
-        config false;
-      }
-      leaf max-pmd {
-        type ciena-6500-types:STRING;
-        description
-          "Supported Mean DGD (Differential Group Delay) value";
-        config false;
-      }
-      leaf rx-act-pmd {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated Instance of DGD (Differential Group Delay) value";
-        config false;
-      }
-      leaf reach-spec {
-        type ciena-6500-types:STRING;
-        description
-          "Reach Specification";
-        config false;
-      }
-      leaf est-length {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated fiber length";
-        config false;
-      }
-      leaf rtd {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Round Trip Delay.";
-        config false;
-      }
-      leaf uni-latency {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Unidirectional Latency.";
-        config false;
-      }
-      leaf rx-echo-trace {
-        type ciena-6500-types:STRING;
-        description
-          "TR Transmit Identifier Received";
-        config false;
-      }
-      leaf tx-trace {
-        type ciena-6500-types:STRING;
-        description
-          "TR Transmit Identifier Received Expected";
-        config false;
-      }
-      leaf tx-assoc-far-end-rx {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitter associated far end receiver";
-        config false;
-      }
-      leaf tx-chrip {
-        type enumeration {
-          enum "POSITIVE";
-          enum "NEGATIVE";
-        }
-        description
-          "Positive or Negative Chirp setting";
-        config false;
-      }
-      leaf pre-fec-sf-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        config false;
-      }
-      leaf pre-fec-sd-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        config false;
-      }
-      leaf otm-term {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Termination per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf otm-flt-mon {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Fault Monitoring per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf otm-prf-mon {
-        type ciena-6500-types:STRING;
-        description
-          "OTM Performance Monitoring per layer (OPU and/or ODU and/or OTU)";
-        config false;
-      }
-      leaf cond-type {
-        type ciena-6500-enums:OTM_CONDTYPE;
-        description
-          "The type of conditioning";
-        config false;
-      }
-      leaf dm-count {
-        type ciena-6500-types:STRING;
-        description
-          "Most recent delay measurement count.";
-        config false;
-      }
-      leaf hold-off {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "HoldOff signal conditioning timer";
-        config false;
-      }
-      leaf hold-on {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "HoldOn signal conditioning timer";
-        config false;
-      }
-      leaf tx-disp-found {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Found the optimum Pre-dispersion compensation from the scanning, ps/nm";
-        config false;
-      }
-      leaf assoc-q {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Q associated with the found optimum precomp";
-        config false;
-      }
-      leaf scan {
-        type enumeration {
-          enum "START" {
-            description
-              "Triggers Q-based Pre-dispersion compensation Scanning";
-          }
-          enum "STOP" {
-            description
-              "Cancels Q-based Pre-dispersion compensation Scanning";
-          }
-          enum "COMPLETE" {
-            description
-              "Indicates completion of Scanning, only for RTRV ";
-          }
-        }
-        description
-          "Q-based Pre-dispersion compensation Scanning";
-        config false;
-      }
-      leaf s-from {
-        type ciena-6500-types:INT;
-        description
-          "FROM point of scanning range, ps/nm";
-        config false;
-      }
-      leaf s-to {
-        type ciena-6500-types:INT;
-        description
-          "TO point of scanning range, ps/nm";
-        config false;
-      }
-      leaf s-step {
-        type ciena-6500-types:INT;
-        description
-          "Compensation optimization scanning step size , ps/nm";
-        config false;
-      }
-      leaf s-dwell {
-        type ciena-6500-types:INT;
-        description
-          "Scanning dwell time, second";
-        config false;
-      }
-      leaf tx-freq-min {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum TX Frequency value in THz (xxx.xxxx)";
-        config false;
-      }
-      leaf tx-freq-max {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum TX Frequency value in THz (xxx.xxxx)";
-        config false;
-      }
-      leaf rx-enm {
-        type enumeration {
-          enum "MODE1" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) mode 1";
-          }
-          enum "MODE2" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) mode 2";
-          }
-          enum "UNKNOWN" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) default";
-          }
-        }
-        description
-          "Enhanced Non-linear Mitigation mode";
-        config false;
-      }
-      leaf tx-enm {
-        type enumeration {
-          enum "MODE1" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) mode 1";
-          }
-          enum "MODE2" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) mode 2";
-          }
-          enum "UNKNOWN" {
-            description
-              "ENM (Enhanced Non-linear Mitigation) default";
-          }
-        }
-        description
-          "Enhanced Non-linear Mitigation mode";
-        config false;
-      }
-      leaf spli-managed {
-        type ciena-6500-enums:spliManaged;
-        description
-          "Identify if Port is Currently Managed by SPLI";
-        config false;
-      }
-      leaf m-aid {
-        type ciena-6500-types:IDENT;
-        description
-          "FLEX4 OCLD 2X8QAM300G CP group member line port AID";
-        config false;
-      }
-      leaf odu-rate {
-        type enumeration {
-          enum "ODUC2" {
-            description
-              "ODU layer rate is 2xODU4";
-          }
-          enum "ODUC4" {
-            description
-              "ODU layer rate is 4xODU4";
-          }
-        }
-        description
-          " Number of ODU4s contained by the ODUCn layer in a 8QAM CP group";
-        config false;
-      }
-      leaf prtl-srv {
-        type enumeration {
-          enum "ON" {
-            description
-              "Partial survivability is supported";
-          }
-          enum "OFF" {
-            description
-              "Partial survivability is not supported";
-          }
-        }
-        description
-          "Indicates partial survivability support";
-        config false;
-      }
-      leaf ochtxsigbw3db {
-        type ciena-6500-types:STRING;
-        description
-          "Supported 3dB bandwidth value";
-        config false;
-      }
-      leaf ochtxsigbw10db {
-        type ciena-6500-types:STRING;
-        description
-          "Supported 10dB bandwidth value";
-        config false;
-      }
-      leaf ochtxminspecwth {
-        type ciena-6500-types:STRING;
-        description
-          "Minimum spectral width";
-        config false;
-      }
-      leaf ochtxfreqres {
-        type ciena-6500-types:STRING;
-        description
-          "Supported frequency resolution";
-        config false;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do Not Force Edit";
-          }
-          enum "YES" {
-            description
-              "Force Traffic Impacting Edit";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to force a traffic impacting edit to happen";
-        config true;
-      }
-    }
-    list sts192c {
-      key "sts192c";
-      config true;
-      leaf sts192c {
-        mandatory true;
-        description
-          "AID in format STS192C-shelf-slot-port-sts";
-        type ciena-6500-types:aid;
-      }
-      leaf trcformat {
-        type enumeration {
-          enum "16BYTE";
-          enum "64BYTE";
-        }
-        description
-          "Path trace format.";
-        config true;
-      }
-      leaf expsglbl {
-        type ciena-6500-types:INT;
-        description
-          "Expected incoming signal label (C2) value";
-        config true;
-      }
-      leaf sglbl {
-        type ciena-6500-types:INT;
-        description
-          "Outgoing signal label (C2) value";
-        config true;
-      }
-      leaf prime {
-        type enumeration {
-          enum "OSS" {
-            description
-              "Operation Support System Owned";
-          }
-          enum "CPS" {
-            description
-              "Control Plane System Owned";
-          }
-        }
-        description
-          "The owner of the payload facility";
-        config true;
-      }
-      leaf term {
-        type enumeration {
-          enum "Y" {
-            description
-              "Y=Terminated";
-          }
-          enum "N" {
-            description
-              "N=Not terminated";
-          }
-        }
-        description
-          "Y=Terminated/N=Not terminated";
-        config false;
-      }
-      leaf incsglbl {
-        type enumeration {
-          enum "Y" {
-            description
-              "Display Incoming Signal Label";
-          }
-          enum "N" {
-            description
-              "Exclude Incoming Signal Label";
-          }
-        }
-        description
-          "Omit querying the INCSGLBL value to improve retrieve time";
-        config false;
-      }
-      leaf mon {
-        type ciena-6500-enums:BOOL_ON_OFF_defaultOFF;
-        default "OFF";
-        description
-          "Path trace monitoring";
-        config true;
-      }
-      leaf exptrc {
-        type ciena-6500-types:STRING;
-        description
-          "Expected incoming path trace message (ASCII printable character string supporting values 20 to 7E, up to 15 characters in length if TRCFORMAT=16BYTE, or up to 62 characters in length if TRCFORMAT=64BYTE. If fewer characters are entered, the string is padded with ASCII NULLs)";
-        config true;
-      }
-      leaf trc {
-        type ciena-6500-types:STRING;
-        description
-          "Outgoing path trace message (ASCII printable character string supporting values 20 to 7E, up to 15 characters in length if TRCFORMAT=16BYTE, or up to 62 characters in length if TRCFORMAT=64BYTE. If fewer characters are entered, the string is padded with ASCII NULLs)";
-        config true;
-      }
-    }
-    list ptp {
-      key "ptp";
-      config true;
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port, PTP-shelf-slot-portSsubport, PTP-shelf-slot-portPsubport, PTP-shelf-slot-ALL, PTP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf service-type {
-        type ciena-6500-enums:ptpServiceType;
-        description
-          "Configured Service Type";
-        config true;
-      }
-      leaf role {
-        type ciena-6500-enums:PtpRole;
-        description
-          "Role type in OTUCn-M configuration";
-        config true;
-      }
-      leaf p-aid {
-        type ciena-6500-types:aid;
-        description
-          "Specify the Prime PTP AID.";
-        config true;
-      }
-      leaf tx-path-id {
-        type ciena-6500-types:INT {
-          range "1..254";
-        }
-        description
-          "TX path identifier";
-        config true;
-      }
-      leaf cond-type {
-        type enumeration {
-          enum "LASEROFF" {
-            description
-              "The conditioning is to turn off the laser";
-          }
-          enum "NONE" {
-            description
-              "There is no conditioning";
-          }
-        }
-        description
-          "The type of Tx conditioning to do in response to certain faults";
-        config true;
-      }
-      leaf tx-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned TX Power in dBm (xx.x)";
-        config true;
-      }
-      leaf tx-wvlngth-prov {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Wavelength";
-        config true;
-      }
-      leaf differential-encoding {
-        type enumeration {
-          enum "NONE" {
-            description
-              "TR Control NONE";
-          }
-          enum "HARD" {
-            description
-              "TR Control HARD";
-          }
-          enum "SOFT" {
-            description
-              "TR Control SOFT";
-          }
-          enum "XD" {
-            description
-              "TR Control XD";
-          }
-        }
-        description
-          "OCH Differential Encoding";
-        config true;
-      }
-      leaf tx-spctrl-occp {
-        type enumeration {
-          enum "NONE" {
-            description
-              "NONE";
-          }
-          enum "NARROW" {
-            description
-              "NARROW";
-          }
-          enum "WIDE20" {
-            description
-              "WIDE20";
-          }
-          enum "WIDE25" {
-            description
-              "WIDE25";
-          }
-          enum "WIDE30" {
-            description
-              "WIDE30";
-          }
-          enum "WIDE40" {
-            description
-              "WIDE40";
-          }
-          enum "WIDE50" {
-            description
-              "WIDE50";
-          }
-          enum "MINSPACE20" {
-            description
-              "MINSPACE20";
-          }
-          enum "MINSPACE25" {
-            description
-              "MINSPACE25";
-          }
-        }
-        description
-          "OCH Spectral Occupancy setting";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf pwr-bal-ctlr {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "Power Balance Controller Disabled";
-          }
-          enum "ENABLED" {
-            description
-              "Power Balance Controller Enabled";
-          }
-        }
-        default "DISABLED";
-        description
-          "Provisioned Power Balance Controller Operating Mode";
-        config true;
-      }
-      leaf pwr-bal-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Power Balance Offset in dB (xx.x)";
-        config true;
-      }
-      leaf tuning-mode {
-        type enumeration {
-          enum "NORMAL" {
-            description
-              "Normal Tuning Mode";
-          }
-          enum "ACCELERATED" {
-            description
-              "Accelerated Tuning Mode";
-          }
-        }
-        default "NORMAL";
-        description
-          "Provisioned Tuning Mode";
-        config true;
-      }
-      leaf frr {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "DISABLED Mode";
-          }
-          enum "ENABLED" {
-            description
-              "ENABLED Mode";
-          }
-        }
-        default "DISABLED";
-        description
-          "OCH Fast Receiver Recovery";
-        config true;
-      }
-      leaf frr-config {
-        type enumeration {
-          enum "MATCHEDCD" {
-            description
-              "Matched Chromatic Dispersion";
-          }
-          enum "DIVERSECD2" {
-            description
-              "Diverse Chromatic Dispersion 2 Paths";
-          }
-        }
-        default "MATCHEDCD";
-        description
-          "OCH FRR Network Configuration";
-        config true;
-      }
-      leaf frr-path1-disp {
-        default "AUTO";
-        type ciena-6500-types:STRING;
-        description
-          "OCH FRR Link Dispersion for Path 1";
-        config true;
-      }
-      leaf frr-path2-disp {
-        default "AUTO";
-        type ciena-6500-types:STRING;
-        description
-          "OCH FRR Link Dispersion for Path 2";
-        config true;
-      }
-      leaf optimize-mode {
-        type ciena-6500-enums:optimizeMode;
-        description
-          "Performance Optimization Mode";
-        config true;
-      }
-      leaf tx-mode {
-        type ciena-6500-enums:TxMode;
-        description
-          "Transmitter Dispersion Mode";
-        config true;
-      }
-      leaf tx-disp-prov {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitter Dispersion Value";
-        config true;
-      }
-      leaf path-disp-prov {
-        type ciena-6500-types:STRING;
-        description
-          "Path Dispersion Value";
-        config true;
-      }
-      leaf tx-chrip {
-        default "AUTO";
-        type enumeration {
-          enum "AUTO" {
-            description
-              "Automatic";
-          }
-          enum "POSITIVE" {
-            description
-              "Positive";
-          }
-          enum "NEGATIVE" {
-            description
-              "Negative";
-          }
-        }
-        description
-          "Positive or Negative Chirp setting";
-        config true;
-      }
-      leaf enm-prov {
-        type ciena-6500-enums:ochenm;
-        description
-          "OCH ENM provisioning mode";
-        config true;
-      }
-      leaf ccda {
-        type ciena-6500-enums:ccda;
-        description
-          "TX Channel Contention Detection and Avoidance";
-        config true;
-      }
-      leaf carrier-centering-mode {
-        type ciena-6500-enums:ochCarrierCenteringMode;
-        description
-          "Laser centering mode";
-        config true;
-      }
-      leaf tx-wvlngth-spacing {
-        type ciena-6500-enums:ochTxWvlngthSpacing;
-        description
-          "OCH Wavelength Spacing, in nm";
-        config true;
-      }
-      leaf tx-freq-prov {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned TX Frequency in THz (xxx.xxxx)";
-        config true;
-      }
-      leaf rotation {
-        type ciena-6500-enums:rotation;
-        description
-          "Jones Rotation Setting";
-        config true;
-      }
-      leaf spli-mgmt {
-        type ciena-6500-enums:spliMgmt;
-        default "ON";
-        description
-          "Identify if Port is Manageable by SPLI";
-        config true;
-      }
-      leaf rx-pwr-thr-prov {
-        type enumeration {
-          enum "ON" {
-            description
-              "Use of provisioned thresholds is on";
-          }
-          enum "OFF" {
-            description
-              "Use of provisioned thresholds is off";
-          }
-        }
-        default "OFF";
-        description
-          "Enable to use provisioned Rx Power thresholds";
-        config true;
-      }
-      leaf rx-pwr-l-thr {
-        default "-22.5";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Rx Power OOR low threshold";
-        config true;
-      }
-      leaf rx-pwr-h-thr {
-        default "5.5";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Rx Power OOR high threshold";
-        config true;
-      }
-      leaf rx-ch-pwr-l-thr {
-        default "-18.5";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Rx channel Power OOR low threshold";
-        config true;
-      }
-      leaf rx-ch-pwr-h-thr {
-        default "7";
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Rx channel Power OOR high threshold";
-        config true;
-      }
-      leaf laser-centering-range {
-        default "2.5";
-        type ciena-6500-types:STRING;
-        description
-          "Sets laser centering range";
-        config true;
-      }
-      leaf och-tx-blanking {
-        default "OFF";
-        type ciena-6500-enums:txb;
-        description
-          "Manually force the Line port TX power in reduced state.";
-        config true;
-      }
-      leaf ttops {
-        default "NO";
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Transponder Triggered Switching Mode Enabled";
-        config true;
-      }
-      leaf fec-frmt {
-        type enumeration {
-          enum "QFEC" {
-            description
-              "QFEC";
-          }
-          enum "RS8" {
-            description
-              "RS8";
-          }
-        }
-        description
-          "Tx/Rx FEC Format";
-        config true;
-      }
-      leaf pre-fec-sf-th-lev {
-        default "0.0";
-        type decimal64 {
-          range "-1.00..1.00";
-          fraction-digits 2;
-        }
-        description
-          "Pre-FEC Signal Fail Threshold";
-        config true;
-      }
-      leaf pre-fec-sd-th-lev {
-        default "0.5";
-        type decimal64 {
-          range "-1.00..3.50";
-          fraction-digits 2;
-        }
-        description
-          "Pre-FEC Signal Degrade Threshold";
-        config true;
-      }
-      leaf trans-mode {
-        type ciena-6500-enums:ptpTransMode;
-        description
-          "Transmission Mode";
-        config true;
-      }
-      leaf tx-pid {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..7";
-        }
-        description
-          "Tx Physical Layer ID";
-        config true;
-      }
-      leaf tx-gid {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..31";
-        }
-        description
-          "Tx Group ID";
-        config true;
-      }
-      leaf tx-phy-map {
-        type ciena-6500-types:STRING;
-        description
-          "Tx Physical Mapping Bitmap";
-        config true;
-      }
-      leaf modem-class {
-        type ciena-6500-enums:ptpModemClass;
-        description
-          "Modem Class";
-        config true;
-      }
-      leaf reach-class {
-        type ciena-6500-enums:ptpReachClass;
-        description
-          "Reach Class";
-        config true;
-      }
-      leaf linkOpt-mode {
-        type ciena-6500-enums:ptpLnkOptMode;
-        description
-          "Link Optimization Mode";
-        config true;
-      }
-      leaf reach-type {
-        type ciena-6500-enums:ptpReachType;
-        description
-          "Reach Type";
-        config true;
-      }
-      leaf lnkCustom1 {
-        type ciena-6500-enums:ptpLnkCustom1;
-        description
-          "Link Custom1";
-        config true;
-      }
-      leaf lnkCustom2 {
-        type ciena-6500-enums:ptpLnkCustom2;
-        description
-          "Link Custom2";
-        config true;
-      }
-      leaf laser-off-mode {
-        type ciena-6500-enums:ptpLaserOffMode;
-        description
-          "Laser Off Mode";
-        config true;
-      }
-      leaf laser-freq-thr {
-        default "1.6";
-        type decimal64 {
-          range "0..3.0";
-          fraction-digits 1;
-        }
-        description
-          "Laser Frequency Threshold";
-        config true;
-      }
-      leaf exp-res-time-prov {
-        default "10";
-        type ciena-6500-types:INT;
-        description
-          "Provisioned Acquisition Holdoff Time";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf line-type {
-        type ciena-6500-enums:linetype;
-        description
-          "OCH Line Sys Type";
-        config true;
-      }
-      leaf mod {
-        type ciena-6500-enums:PtpMod;
-        description
-          "Modulation scheme(Param is applicable only on T-Series shelf.)";
-        config true;
-      }
-      leaf tx-oas {
-        default "OFF";
-        type ciena-6500-enums:BOOL_ON_OFF;
-        description
-          "Tx OAS Mode";
-        config true;
-      }
-      leaf rx-oas {
-        default "OFF";
-        type ciena-6500-enums:BOOL_ON_OFF;
-        description
-          "Rx OAS Mode";
-        config true;
-      }
-      leaf bit-rate {
-        type ciena-6500-enums:PtpRate;
-        description
-          "PTP Bit Rate";
-        config false;
-      }
-      leaf baud {
-        type ciena-6500-enums:ptpBaud;
-        description
-          "OTSi Baud rate (35G or 56G)";
-        config false;
-      }
-      leaf-list m-aid {
-        type ciena-6500-types:aid;
-        description
-          "Specify the Member PTP AID List. Format: Member2&Member3&...";
-        config false;
-      }
-      leaf rx-fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "No FEC";
-          }
-          enum "PFEC" {
-            description
-              "Product FEC";
-          }
-          enum "RS8" {
-            description
-              "Reed Solomon 8";
-          }
-          enum "SCFEC" {
-            description
-              "Super Concatenated FEC";
-          }
-          enum "UFEC" {
-            description
-              "UFEC";
-          }
-          enum "QFEC" {
-            description
-              "QFEC";
-          }
-        }
-        description
-          "Type of Forward Error Correction on RX";
-        config false;
-      }
-      leaf tx-fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "No FEC";
-          }
-          enum "PFEC" {
-            description
-              "Product FEC";
-          }
-          enum "RS8" {
-            description
-              "Reed Solomon 8";
-          }
-          enum "SCFEC" {
-            description
-              "Super ConcatenatedFEC";
-          }
-          enum "UFEC" {
-            description
-              "UFEC";
-          }
-          enum "QFEC" {
-            description
-              "QFEC";
-          }
-        }
-        description
-          "Type of Forward Error Correction on TX";
-        config false;
-      }
-      leaf-list rx-act-ln-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Lane RX Power in dBm (xx.x) (Format: Lane1|Lane2|...)";
-        config false;
-      }
-      leaf-list tx-act-ln-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Lane TX Power in dBm (xx.x) (Format: Lane1|Lane2|...)";
-        config false;
-      }
-      leaf och-tx-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-tx-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-tx-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-rx-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-rx-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-rx-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-tx-act-high-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX active high power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-tx-act-low-power {
-        type ciena-6500-types:STRING;
-        description
-          "TX active low power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-rx-act-high-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX active high power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-rx-act-low-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX active low power in dBm (xx.x)";
-        config false;
-      }
-      leaf tx-wvlngth-min {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Wavelength Range";
-        config false;
-      }
-      leaf tx-wvlngth-max {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Wavelength Range";
-        config false;
-      }
-      leaf och-rx-ch-act-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel actual power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-rx-ch-min-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel minimum power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-rx-ch-max-power {
-        type ciena-6500-types:STRING;
-        description
-          "RX channel maximum power in dBm (xx.x)";
-        config false;
-      }
-      leaf och-rx-echo-trace {
-        type ciena-6500-types:STRING;
-        description
-          "TR Transmit Identifier Received";
-        config false;
-      }
-      leaf och-tx-trace {
-        type ciena-6500-types:STRING;
-        description
-          "TR Transmit Identifier Received Expected";
-        config false;
-      }
-      leaf och-tx-assoc-far-end-rx {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitter associated far end receiver";
-        config false;
-      }
-      leaf och-max-pmd {
-        type ciena-6500-types:STRING;
-        description
-          "Supported Mean DGD (Differential Group Delay) value";
-        config false;
-      }
-      leaf och-rx-act-pmd {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated Instance of DGD (Differential Group Delay) value";
-        config false;
-      }
-      leaf est-length {
-        type ciena-6500-types:STRING;
-        description
-          "Estimated fiber length";
-        config false;
-      }
-      leaf laser-bias-end-of-life {
-        type ciena-6500-types:STRING;
-        description
-          "Laser Bias Current.";
-        config false;
-      }
-      leaf rtd {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Round Trip Delay.";
-        config false;
-      }
-      leaf uni-latency {
-        type ciena-6500-types:STRING;
-        description
-          "OCH Unidirectional Latency.";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf pwr-bal-act-offset {
-        type ciena-6500-types:STRING;
-        description
-          "Provisioned Power Balance Actual Offset in dB (xx.x)";
-        config false;
-      }
-      leaf och-tx-act-disp {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitter total actual link dispersion in the near-to-far direction";
-        config false;
-      }
-      leaf tx-disp-min {
-        type ciena-6500-types:STRING;
-        description
-          "Minimum Transmitter Dispersion Value";
-        config false;
-      }
-      leaf tx-disp-max {
-        type ciena-6500-types:STRING;
-        description
-          "Maximum Transmitter Dispersion Value";
-        config false;
-      }
-      leaf och-rx-act-disp {
-        type ciena-6500-types:STRING;
-        description
-          "Receiver total actual link dispersion in the far-to-near direction";
-        config false;
-      }
-      leaf och-tx-pre-disp {
-        type ciena-6500-types:STRING;
-        description
-          "Tx Precompensation Dispersion Value.";
-        config false;
-      }
-      leaf och-rx-post-disp {
-        type ciena-6500-types:STRING;
-        description
-          "Rx Postcompensation Dispersion Value.";
-        config false;
-      }
-      leaf reach-spec {
-        type ciena-6500-types:STRING;
-        description
-          "Reach Specification";
-        config false;
-      }
-      leaf tx-enm {
-        type ciena-6500-enums:ochenm;
-        description
-          "OCH transmit ENM mode";
-        config false;
-      }
-      leaf rx-enm {
-        type ciena-6500-enums:ochenm;
-        description
-          "OCH receive ENM mode";
-        config false;
-      }
-      leaf tx-freq-min {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum TX Frequency value in THz (xxx.xxxx)";
-        config false;
-      }
-      leaf tx-freq-max {
-        default "0.00";
-        type ciena-6500-types:STRING;
-        description
-          "Maximum TX Frequency value in THz (xxx.xxxx)";
-        config false;
-      }
-      leaf tx-disp-found {
-        type ciena-6500-types:STRING;
-        description
-          "Found the optimum Pre-dispersion compensation from the scanning, ps/nm";
-        config false;
-      }
-      leaf assoc-q {
-        type ciena-6500-types:STRING;
-        description
-          "Q associated with the found optimum precomp";
-        config false;
-      }
-      leaf scan {
-        type ciena-6500-enums:ScanState;
-        description
-          "Q-based Pre-dispersion compensation Scanning";
-        config false;
-      }
-      leaf s-from {
-        type ciena-6500-types:STRING;
-        description
-          "FROM point of scanning range, ps/nm";
-        config false;
-      }
-      leaf s-to {
-        type ciena-6500-types:STRING;
-        description
-          "TO point of scanning range, ps/nm";
-        config false;
-      }
-      leaf s-step {
-        type ciena-6500-types:STRING;
-        description
-          "Compensation optimization scanning step size , ps/nm";
-        config false;
-      }
-      leaf s-dwell {
-        type ciena-6500-types:STRING;
-        description
-          "Scanning dwell time, second";
-        config false;
-      }
-      leaf spli-managed {
-        type ciena-6500-enums:spliManaged;
-        description
-          "Identify if Port is Currently Managed by SPLI";
-        config false;
-      }
-      leaf och-tx-sig-bw-3db {
-        default "35.0";
-        type ciena-6500-types:STRING;
-        description
-          "Supported 3dB bandwidth value";
-        config false;
-      }
-      leaf och-tx-sig-bw-10db {
-        default "38.6";
-        type ciena-6500-types:STRING;
-        description
-          "Supported 10dB bandwidth value";
-        config false;
-      }
-      leaf och-tx-min-spec-width {
-        default "37.5";
-        type ciena-6500-types:STRING;
-        description
-          "Minimum spectral width";
-        config false;
-      }
-      leaf och-tx-freqr-es {
-        default "0.1";
-        type ciena-6500-types:STRING;
-        description
-          "Supported frequency resolution";
-        config false;
-      }
-      leaf act_trans-mode {
-        type ciena-6500-enums:ptpTransMode;
-        description
-          "Actual Transmission Mode";
-        config false;
-      }
-      leaf pre-fec-sf-th-ber {
-        default "0.0";
-        type ciena-6500-types:STRING;
-        description
-          "The corresponding BER for a given Pre-FEC SF Threshold setting in dDQ";
-        config false;
-      }
-      leaf pre-fec-sd-th-ber {
-        default "0.0";
-        type ciena-6500-types:STRING;
-        description
-          "The corresponding BER for a given Pre-FEC SD Threshold setting in dDQ";
-        config false;
-      }
-      leaf rx-pid {
-        default "0";
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT {
-            range "0..7";
-          }
-        }
-        description
-          "Rx Physical Layer ID";
-        config false;
-      }
-      leaf rx-gid {
-        default "0";
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT {
-            range "0..31";
-          }
-        }
-        description
-          "Rx Group ID";
-        config false;
-      }
-      leaf rx-phy-map {
-        type ciena-6500-types:STRING;
-        description
-          "Rx Physical Mapping Bitmap";
-        config false;
-      }
-      leaf allocated-spec-width {
-        type ciena-6500-types:STRING;
-        description
-          "Allocated Spectral Width";
-        config false;
-      }
-      leaf rqst-trans-mode {
-        type ciena-6500-enums:ptpTransMode;
-        description
-          "Requested Transmission Mode";
-        config false;
-      }
-      leaf saved-trans-mode {
-        type ciena-6500-enums:ptpTransMode;
-        description
-          "Saved Actual Applied Transmission Mode";
-        config false;
-      }
-      leaf rqst-linkOpt-mode {
-        type ciena-6500-enums:ptpLnkOptMode;
-        description
-          "Requested Link Optimization Mode";
-        config false;
-      }
-      leaf act-linkOpt-mode {
-        type ciena-6500-enums:ptpLnkOptMode;
-        description
-          "Actual Applied Link Optimization Mode";
-        config false;
-      }
-      leaf saved-linkOpt-mode {
-        type ciena-6500-enums:ptpLnkOptMode;
-        description
-          "Saved Actual Applied Link Optimization Mode";
-        config false;
-      }
-      leaf rqst-tx-wvlngth {
-        type ciena-6500-types:STRING;
-        description
-          "Requested Wavelength";
-        config false;
-      }
-      leaf act-tx-wvlngth {
-        type ciena-6500-types:STRING;
-        description
-          "Actual Applied Wavelength";
-        config false;
-      }
-      leaf rqst-tx-wvlngth-spacing {
-        type ciena-6500-enums:ochTxWvlngthSpacing;
-        description
-          "Requested Wavelength Spacing, in nm";
-        config false;
-      }
-      leaf rqst-tx-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Requested TX Frequency in THz (xxx.xxxx)";
-        config false;
-      }
-      leaf act-tx-freq {
-        type ciena-6500-types:STRING;
-        description
-          "Actual Applied TX Frequency in THz (xxx.xxxx)";
-        config false;
-      }
-      leaf rqst-tx-pwr {
-        type ciena-6500-types:STRING;
-        description
-          "Requested TX Power in dBm (xx.x)";
-        config false;
-      }
-      leaf rqst-tx-mode {
-        type ciena-6500-enums:TxMode;
-        description
-          "Requested Transmitter Dispersion Mode";
-        config false;
-      }
-      leaf act-tx-mode {
-        type ciena-6500-enums:TxMode;
-        description
-          "Actual Applied Transmitter Dispersion Mode";
-        config false;
-      }
-      leaf rqst-tx-disp {
-        type ciena-6500-types:STRING;
-        description
-          "Requested Transmitter Dispersion Value";
-        config false;
-      }
-      leaf act-tx-disp {
-        type ciena-6500-types:STRING;
-        description
-          "Actual Applied Transmitter Dispersion Value";
-        config false;
-      }
-      leaf rqst-path-disp {
-        type ciena-6500-types:STRING;
-        description
-          "Requested Path Dispersion Value";
-        config false;
-      }
-      leaf act-path-disp {
-        type ciena-6500-types:STRING;
-        description
-          "Actual Applied Path Dispersion Value";
-        config false;
-      }
-      leaf rqst-carrier-centering-mode {
-        type ciena-6500-enums:ochCarrierCenteringMode;
-        description
-          "Requested Laser centering mode";
-        config false;
-      }
-      leaf act-carrier-centering-mode {
-        type ciena-6500-enums:ochCarrierCenteringMode;
-        description
-          "Actual Applied Laser centering mode";
-        config false;
-      }
-      leaf rqst-laser-centering-range {
-        type ciena-6500-types:STRING;
-        description
-          "Requested laser centering range";
-        config false;
-      }
-      leaf act-laser-centering-range {
-        type ciena-6500-types:STRING;
-        description
-          "Actual Applied laser centering range";
-        config false;
-      }
-      leaf rqst-ccda {
-        type ciena-6500-enums:ccda;
-        description
-          "Requested Channel Contention Detection and Avoidance";
-        config false;
-      }
-      leaf act-ccda {
-        type ciena-6500-enums:ccda;
-        description
-          "Actual Applied Channel Contention Detection and Avoidance";
-        config false;
-      }
-      leaf rqst-och-tx-blanking {
-        type ciena-6500-enums:txb;
-        description
-          "Requested TX power in reduced state.";
-        config false;
-      }
-      leaf act-och-tx-blanking {
-        type ciena-6500-enums:txb;
-        description
-          "Actual Applied TX power in reduced state.";
-        config false;
-      }
-      leaf rqst-line-type {
-        type ciena-6500-enums:linetype;
-        description
-          "Requested Line Sys Type";
-        config false;
-      }
-      leaf rqst-allocated-spec-width {
-        type ciena-6500-types:STRING;
-        description
-          "Requested Allocated Spectral Width";
-        config false;
-      }
-      leaf rqst-exp-res-time {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Requested Acquisition Holdoff Time";
-        config false;
-      }
-      leaf act-exp-res-time {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT;
-        }
-        description
-          "Actual Applied Acquisition Holdoff Time";
-        config false;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do Not Force Edit";
-          }
-          enum "YES" {
-            description
-              "Force Traffic Impacting Edit";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to force an edit when facility still in service (traffic impacting)";
-        config true;
-      }
-    }
-    list otuttp {
-      key "otu";
-      config true;
-      leaf otu {
-        mandatory true;
-        description
-          "AID in format OTUTTP-shelf-slot-port, OTUTTP-shelf-slot-portPsubport, OTUTTP-shelf-slot-portSsubport, OTUTTP-shelf-slot-ALL, OTUTTP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf rout-sig-disabled {
-        type enumeration {
-          enum "NO" {
-            description
-              "Routing signalling enabled. The OSRP will have control over the ODUs created under this TTP and no user created ODU will be allowed.";
-          }
-          enum "YES" {
-            description
-              "Routing signalling disabled";
-          }
-        }
-        default "NO";
-        description
-          "Specifies whether Routing Signalling is disabled on this TTP.";
-        config true;
-      }
-      leaf rx-fec-frmt {
-        type ciena-6500-enums:OTU_FECFrmt;
-        description
-          "Type of Forward Error Correction on RX";
-        config true;
-      }
-      leaf tx-fec-frmt {
-        type ciena-6500-enums:OTU_FECFrmt;
-        description
-          "Type of Forward Error Correction on TX";
-        config true;
-      }
-      leaf tx-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Source Access Point Identifier (SAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tx-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Destination Access Point Identifier (DAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tx-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        config true;
-      }
-      leaf ex-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The expected Source Access Point Identifier (SAPI), provisioned by the managing system, to be compared with the received SAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        config true;
-      }
-      leaf ex-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The expected Destination Access Point Identifier (DAPI), provisioned by the managing system, to be compared with the received DAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        config true;
-      }
-      leaf ex-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The expected operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tf-mode {
-        type ciena-6500-enums:otntfMode;
-        default "OFF";
-        description
-          "Trace Fail Mode";
-        config true;
-      }
-      leaf tim-enable {
-        type ciena-6500-enums:TIMEN;
-        description
-          "The Trail Trace Identifier Mismatch (TIM) controls checking for Trace Identifier Mismatch fault detection. ";
-        config true;
-      }
-      leaf pre-fec-sf-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Level. Parameter applies when FEC is ON";
-        config true;
-      }
-      leaf pre-fec-sd-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Level. Parameter applies when FEC is ON";
-        config true;
-      }
-      leaf otu-sd-th-lev {
-        default "6";
-        type ciena-6500-types:INT {
-          range "6..9";
-        }
-        description
-          "OTU Signal Degrade Threshold Level";
-        config true;
-      }
-      leaf hold-off {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0 | 10 | 20..1000";
-        }
-        description
-          "HoldOff signal conditioning timer";
-        config true;
-      }
-      leaf hold-on {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0 | 2 | 4..500";
-        }
-        description
-          "HoldOn signal conditioning timer";
-        config true;
-      }
-      leaf rate {
-        type ciena-6500-enums:OtuRate;
-        description
-          "OTUCn Rate";
-        config true;
-      }
-      leaf num-ts {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..160";
-        }
-        description
-          "Used to identify the number of tributaries comprising this TTP. For on OTN TTP, this can change based on potential configuration of desired payload type (e.g. for ODU1 with OPVC payload, this value is 16; with CBR it is 1).";
-        config true;
-      }
-      leaf otu-oh-non-term {
-        type enumeration {
-          enum "NONE" {
-            description
-              "Entire GCC OH terminated";
-          }
-          enum "GCC0" {
-            description
-              "GCC0 portion of OTU OH not terminated";
-          }
-        }
-        description
-          "Indicating whether to terminate GCC OH or not";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf osrp-tcm-level {
-        type ciena-6500-types:INT {
-          range "1..6";
-        }
-        description
-          "This attribute specifies the TCM level for the OSRP created ODUs under this OTUTTP. The default value is from the attribute OSRPLNTTCMLVL of ED-OSRP-NODE.";
-        config true;
-      }
-      leaf otu-sf-th-lev {
-        default "6";
-        type ciena-6500-types:INT {
-          range "6..9";
-        }
-        description
-          "OTU Signal Fail Threshold Level";
-        config true;
-      }
-      leaf encryption-tcm {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..6";
-        }
-        description
-          "This attribute specifies the TCM level for encryption.";
-        config true;
-      }
-      leaf encr-odu1 {
-        type ciena-6500-enums:EncrByte;
-        description
-          "Encryption Byte1";
-        config true;
-      }
-      leaf secure-oh {
-        type ciena-6500-enums:SecureOH;
-        description
-          "Secure Overhead Bytes";
-        config true;
-      }
-      leaf rx-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Source Access Point Identifier (SAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Destination Access Point Identifier (DAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The operator specific part of the Trail Trace Identifier (TTI) information, recovered from the TTI overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf osrp-channel {
-        type enumeration {
-          enum "NONE";
-          enum "GCC0";
-          enum "GCC1";
-          enum "GCC2";
-        }
-        description
-          "The OSRP channel";
-        config false;
-      }
-      leaf pre-fec-sf-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        config false;
-      }
-      leaf pre-fec-sd-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Bit Error Rate. Parameter applies when FEC is ON";
-        config false;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:aid;
-        description
-          "The supporting Termination Point.";
-        config false;
-      }
-      leaf local-sup-cacline-id {
-        type ciena-6500-types:STRING;
-        description
-          "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        config false;
-      }
-      leaf timing-reference {
-        type enumeration {
-          enum "N" {
-            description
-              "Not a timing reference";
-          }
-          enum "Y" {
-            description
-              "Is a timing reference";
-          }
-        }
-        description
-          "Indicates whether the facility is being used as a timing reference";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-      leaf otu-act-rate {
-        type ciena-6500-enums:OtuActRate;
-        description
-          "Actual OTUCn rate, OTUCn(n=1..8)";
-        config false;
-      }
-      leaf act-num-ts {
-        default "20";
-        type ciena-6500-types:INT {
-          range "20..160";
-        }
-        description
-          "";
-        config false;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do Not Force Edit";
-          }
-          enum "YES" {
-            description
-              "Force Traffic Impacting Edit";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to force an edit when facility still in service (traffic impacting)";
-        config true;
-      }
-    }
-    list fttp {
-      key "fttp";
-      config false;
-      leaf fttp {
-        mandatory true;
-        description
-          "AID in format FTTP-shelf-slot-port, FTTP-shelf-slot-ALL, FTTP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:aid;
-        description
-          "The supporting Termination Point.";
-        config false;
-      }
-      leaf local-sup-cacline-id {
-        type ciena-6500-types:STRING;
-        description
-          "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        config false;
-      }
-    }
-    list sttp {
-      key "sttp";
-      config true;
-      leaf sttp {
-        mandatory true;
-        description
-          "AID in format STTP-shelf-slot-port, STTP-shelf-slot-portSsubport, STTP-shelf-slot-ALL, STTP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf rate {
-        type ciena-6500-enums:SttpRate;
-        mandatory true;
-        description
-          "";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf eber-thresh {
-        default "3";
-        type ciena-6500-types:INT {
-          range "3 | 4 | 5";
-        }
-        description
-          "Excessive bit error rate threshold value";
-        config true;
-      }
-      leaf sd-th {
-        default "6";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Signal Degrade Threshold value";
-        config true;
-      }
-      leaf mapping {
-        type ciena-6500-enums:SttpMapping;
-        description
-          "Defines the mapping of this facility and the children that it will have.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf exp-trc {
-        type string {
-          length "0..16";
-        }
-        description
-          "";
-        config true;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:aid;
-        description
-          "The supporting Termination Point.";
-        config false;
-      }
-      leaf port-mode {
-        type ciena-6500-enums:STTPportmode;
-        description
-          "Optical Port Market Preference";
-        config false;
-      }
-      leaf local-sup-cacline-id {
-        type ciena-6500-types:STRING;
-        description
-          "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:SSTfac;
-        description
-          "Secondary State";
-        config false;
-      }
-    }
-    list ettp {
-      key "ettp";
-      config true;
-      leaf ettp {
-        mandatory true;
-        description
-          "AID in format ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ETTP-shelf-slot-portSsubport-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-ALL, ETTP-shelf-ALL, ETTP-shelf-slot-port-ALL, ETTP-shelf-slot-port-rt1Ptp1-ALL, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ETTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf mapping {
-        type enumeration {
-          enum "NONE" {
-            description
-              "No mapping(This value can be used in edit operation)";
-          }
-          enum "GFPSTD" {
-            description
-              "GFP Standard/MAC transparent(This value can be used in edit operation)";
-          }
-          enum "GFPMACTR" {
-            description
-              "GFP Preamble/MAC transparent(This value can be used in edit operation)";
-          }
-          enum "GFPMACOSTR" {
-            description
-              "GFP Preamble/Ordered Set/MAC transparent(This value can be used in edit operation)";
-          }
-          enum "PROP237" {
-            description
-              "Fully transparent(This value can be used in edit operation)";
-          }
-          enum "GMP" {
-            description
-              "Generic Mapping Procedure.(This value can be used in create and edit operations)";
-          }
-          enum "BMP" {
-            description
-              "Bit-synchronous Mapping Procedure(This value can be used in create and edit operations)";
-          }
-          enum "IMP" {
-            description
-              "Idle Mapping Procedure(This value can be used in create and edit operations)";
-          }
-        }
-        description
-          "Defines the mapping of this facility and the children that it will have.";
-        config true;
-      }
-      leaf hold-off {
-        default "100";
-        type ciena-6500-types:INT {
-          range "0 | 10 | 20..1000";
-        }
-        description
-          "Conditioning holdoff time in seconds.";
-        config true;
-      }
-      leaf max-transmit-unit {
-        type enumeration {
-          enum "1600" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "9600" {
-            description
-              "(This value can be used in create and edit operations)";
-          }
-          enum "2000" {
-            description
-              "(This value can be used in edit operation)";
-          }
-        }
-        description
-          "Maximum Transmission Unit (actually MRU)";
-        config true;
-      }
-      leaf fec-frmt {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NO FEC";
-          }
-          enum "RS10" {
-            description
-              "RS10 FEC";
-          }
-        }
-        description
-          "FEC Format";
-        config true;
-      }
-      leaf pre-fec-sf-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Level.";
-        config true;
-      }
-      leaf pre-fec-sd-th-lev {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Level.";
-        config true;
-      }
-      leaf cond-type {
-        type ciena-6500-enums:EttpCondType;
-        description
-          "Specifies ethernet specific client conditioning behaviour.";
-        config true;
-      }
-      leaf rate {
-        type ciena-6500-enums:EthRate;
-        description
-          "";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create and edit operations)";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf flow-ctrl {
-        type enumeration {
-          enum "NONE";
-          enum "ASYM";
-          enum "PREE";
-          enum "SYM";
-        }
-        default "NONE";
-        description
-          "Flow control mechanism.";
-        config true;
-      }
-      leaf if-type {
-        type enumeration {
-          enum "UNI";
-          enum "E-NNI";
-          enum "I-NNI";
-        }
-        description
-          "Interface Type";
-        config true;
-      }
-      leaf pre-fec-sf-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Fail Threshold Bit Error Rate.";
-        config true;
-      }
-      leaf pre-fec-sd-th-ber {
-        type ciena-6500-types:STRING;
-        description
-          "Pre-FEC Signal Degrade Threshold Bit Error Rate.";
-        config true;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:aid;
-        description
-          "The supporting Termination Point.";
-        config false;
-      }
-      leaf mode {
-        type enumeration {
-          enum "TERMINATED";
-          enum "MONITORED";
-        }
-        description
-          "MAC or PHY layer terminated or monitored";
-        config false;
-      }
-      leaf local-sup-cacline-id {
-        type ciena-6500-types:STRING;
-        description
-          "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        config false;
-      }
-      leaf l2-in-use-act {
-        type enumeration {
-          enum "NO" {
-            description
-              "The facility is not used by Layer 2 active configuration ";
-          }
-          enum "YES" {
-            description
-              "The facility is used by Layer 2 active configuration";
-          }
-        }
-        description
-          "In use in Layer 2 Active Configuration";
-        config false;
-      }
-      leaf l2-in-use-sav {
-        type enumeration {
-          enum "NO" {
-            description
-              "The facility is not used by Layer 2 saved configuration ";
-          }
-          enum "YES" {
-            description
-              "The facility is used by Layer 2 saved configuration ";
-          }
-        }
-        description
-          "In use in Layer 2 Saved Configuration";
-        config false;
-      }
-      leaf timing-reference {
-        type enumeration {
-          enum "N" {
-            description
-              "Not a timing reference";
-          }
-          enum "Y" {
-            description
-              "Is a timing reference";
-          }
-        }
-        description
-          "Indicates whether the facility is being used as a timing reference";
-        config false;
-      }
-      leaf service-rate {
-        type ciena-6500-types:INT {
-          range "0 | 50 | 100..100000";
-        }
-        description
-          "Service rate of the Ethernet Flex in Mbps.";
-        config false;
-      }
-      leaf transport-rate {
-        type ciena-6500-types:INT {
-          range "0..104117";
-        }
-        description
-          "Transport rate of the Ethernet Flex in Mbps. The ODUFlex rate.";
-        config false;
-      }
-      leaf reserved {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specify if the facility is being reserved for packet SNC's";
-        config false;
-      }
-      leaf rsrvd-oper {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates if the reservation is operational for reserved ETTP's";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do Not Force Edit";
-          }
-          enum "YES" {
-            description
-              "Force Traffic Impacting Edit";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to force an edit when facility still in service (traffic impacting)";
-        config true;
-      }
-    }
-    list oduttp {
-      key "oduttp";
-      config true;
-      leaf oduttp {
-        mandatory true;
-        description
-          "AID in format ODUTTP-shelf-slot-port-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUTTP-shelf-slot-portSsubport-rt1Ptp1, ODUTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUTTP-shelf-slot-portPsubport-rt1Ptp1, ODUTTP-shelf-slot-port-rt1Ptp1-ALL, ODUTTP-shelf-slot-port-ALL, ODUTTP-shelf-slot-ALL, ODUTTP-shelf-slot-portPsubport-ALL, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ODUTTP-shelf-ALL, ODUTTP-shelf-slot-portSsubport-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf rate {
-        type ciena-6500-enums:OduTtpRate;
-        description
-          "Rate";
-        config true;
-      }
-      leaf trib-slot-assignment {
-        type string {
-          length "1..24";
-        }
-        description
-          "The tributary slots used by this ODU.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf tx-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Source Access Point Identifier (SAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tx-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Destination Access Point Identifier (DAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tx-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        config true;
-      }
-      leaf ex-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The expected Source Access Point Identifier (SAPI), provisioned by the managing system, to be compared with the received SAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        config true;
-      }
-      leaf ex-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The expected Destination Access Point Identifier (DAPI), provisioned by the managing system, to be compared with the received DAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        config true;
-      }
-      leaf ex-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The expected operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        config true;
-      }
-      leaf ts-size {
-        type enumeration {
-          enum "ODU0" {
-            description
-              "ODU0 is the tributary slot size (unit)";
-          }
-          enum "ODU1" {
-            description
-              "ODU1 is the tributary slot size (unit)";
-          }
-        }
-        description
-          "The tributary slot size";
-        config true;
-      }
-      leaf tf-mode {
-        type ciena-6500-enums:otntfMode;
-        default "OFF";
-        description
-          "Trace Fail Mode";
-        config true;
-      }
-      leaf tim-enable {
-        type enumeration {
-          enum "TIM_SAPI_ONLY" {
-            description
-              "Only checks for SAPI mismatch";
-          }
-          enum "TIM_DAPI_ONLY" {
-            description
-              "Only checks for DAPI mismatch";
-          }
-          enum "TIM_SAPI_DAPI" {
-            description
-              "Checks for SAPI and DAPI mismatch";
-          }
-          enum "TIM_OPER_SPEC" {
-            description
-              "Checks for Operator Specific mismatch";
-          }
-        }
-        description
-          "The Trail Trace Identifier Mismatch (TIM) controls checking for Trace Identifier Mismatch fault detection. ";
-        config true;
-      }
-      leaf-list cond-type {
-        type ciena-6500-enums:OduCtpCondType;
-        description
-          "Conditioning behaviour on client faults. ";
-        config true;
-      }
-      leaf dm-enable {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "YES";
-        description
-          "Specify if delay measurement is enable.";
-        config true;
-      }
-      leaf odu1-interop {
-        type enumeration {
-          enum "OTHER" {
-            description
-              "Interop with equipment other than 2G5 MOTR";
-          }
-          enum "2G5MOTR" {
-            description
-              "Interop with equipment 2G5 MOTR";
-          }
-        }
-        description
-          "Required Interop Equipment Type";
-        config true;
-      }
-      leaf rx-ts-mode {
-        type ciena-6500-enums:rxtsMode;
-        default "OFF";
-        description
-          "Received Tributary Slot Mode";
-        config true;
-      }
-      leaf client-type {
-        type ciena-6500-enums:clientTypeTtp;
-        description
-          "Server layer client type";
-        config true;
-      }
-      leaf base-ho {
-        type ciena-6500-enums:baseHO;
-        description
-          "Base HO ODUk";
-        config true;
-      }
-      leaf bit-rate {
-        type string {
-          length "0..19";
-        }
-        description
-          "Define the bit rate of flex.";
-        config true;
-      }
-      leaf tolerance {
-        type string {
-          length "0..64";
-        }
-        description
-          "Define the tolerance in ppm of oduflex payload.";
-        config true;
-      }
-      leaf sd-th {
-        default "9";
-        type ciena-6500-types:INT {
-          range "6..9";
-        }
-        description
-          "Signal Degrade Threshold Value";
-        config true;
-      }
-      leaf sf-th {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..9";
-        }
-        description
-          "Signal Fail Threshold Level.";
-        config true;
-      }
-      leaf trib-slot-prov {
-        type ciena-6500-enums:TsProv;
-        description
-          "tribSlot provision";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf num-ts {
-        type ciena-6500-types:INT {
-          range "1..160";
-        }
-        description
-          "Used to identify the number of tributaries comprising this TTP.";
-        config true;
-      }
-      leaf rx-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Source Access Point Identifier (SAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Destination Access Point Identifier (DAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The operator specific part of the Trail Trace Identifier (TTI) information, recovered from the TTI overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf ex-pt {
-        type string {
-          length "2";
-        }
-        description
-          "The expected payload type.";
-        config false;
-      }
-      leaf rx-pt {
-        type string {
-          length "2";
-        }
-        description
-          "The received payload type.";
-        config false;
-      }
-      leaf dm-count {
-        type ciena-6500-types:STRING;
-        description
-          "Value of delay measurement of ODU in micro seconds.";
-        config false;
-      }
-      leaf line-prot-group {
-        type ciena-6500-types:aid;
-        description
-          "Line Protection Group in AID format";
-        config false;
-      }
-      leaf line-prot-role {
-        type enumeration {
-          enum "UNPROTECTED";
-          enum "WORK";
-          enum "PROTECT";
-          enum "WORK_PROTECT";
-        }
-        description
-          "Line Protection Role";
-        config false;
-      }
-      leaf line-prot-type {
-        type enumeration {
-          enum "NOT_PROTECTED";
-          enum "APS_PROTECTED";
-        }
-        description
-          "Line Protection Type";
-        config false;
-      }
-      leaf owner {
-        type ciena-6500-enums:Owner;
-        description
-          "Specifies who created this TTP.";
-        config false;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:aid;
-        description
-          "The supporting Termination Point.";
-        config false;
-      }
-      leaf rx-ts {
-        type string {
-          length "1..24";
-        }
-        description
-          "Received tributary slots.";
-        config false;
-      }
-      leaf ex-rx-ts {
-        type string {
-          length "1..24";
-        }
-        description
-          "Expected Receive tributary slots.";
-        config false;
-      }
-      leaf flex-type {
-        type ciena-6500-enums:flexType;
-        description
-          "ODU flex type";
-        config false;
-      }
-      leaf resizeable {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "ODUFlex is resizeable";
-        config false;
-      }
-      leaf local-sup-cacline-id {
-        type ciena-6500-types:STRING;
-        description
-          "The generic cacline end point representing this facility shown in 54xx nomenclature (<bay>-<A|C>-<slot>-<port>)";
-        config false;
-      }
-      leaf anchor-ts {
-        type ciena-6500-types:INT {
-          range "1..80";
-        }
-        description
-          "Anchor of tx triburtary slot";
-        config false;
-      }
-      leaf prov-msi {
-        type string {
-          length "1..800";
-        }
-        description
-          "Provisioned MSI for all tributary slots.";
-        config false;
-      }
-      leaf rx-msi {
-        type string {
-          length "1..800";
-        }
-        description
-          "Actual received MSI for all tributary slots.";
-        config false;
-      }
-      leaf timing-reference {
-        type enumeration {
-          enum "N" {
-            description
-              "Not a timing reference";
-          }
-          enum "Y" {
-            description
-              "Is a timing reference";
-          }
-        }
-        description
-          "Indicates whether the facility is being used as a timing reference";
-        config false;
-      }
-      leaf reserved {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specify if the facility is being reserved for packet SNC's";
-        config false;
-      }
-      leaf act-avail-ts {
-        type string {
-          length "1..160";
-        }
-        description
-          "Actual available TS supported by the TRANSMODE.";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:SSTfac;
-        description
-          "Secondary State";
-        config false;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not override/preempt";
-          }
-          enum "YES" {
-            description
-              "Override/preempt reserved ODUTTP with the same tribport";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to override/preempt a reserved ODUTTP";
-        config true;
-      }
-    }
-    list oductp {
-      key "oductp";
-      config true;
-      leaf oductp {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-ALL, ODUCTP-shelf-slot-port-ALL, ODUCTP-shelf-slot-ALL, ODUCTP-shelf-ALL, ODUCTP-shelf-slot-portPsubport-ALL, ODUCTP-shelf-slot-portSsubport-ALL, ODUCTP-shelf-slot-portPsubport-rt1Ptp1-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf rate {
-        type ciena-6500-enums:OduCtpRate;
-        description
-          "Rate";
-        config true;
-      }
-      leaf ctp-mode {
-        type enumeration {
-          enum "TRANSPARENT";
-          enum "MONITOR";
-          enum "TERMINATED";
-        }
-        description
-          "The mode of the ODUCTP.";
-        config true;
-      }
-      leaf trib-slot-assignment {
-        type string {
-          length "1..51";
-        }
-        description
-          "The tributary slots used by this ODU.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf tim-enable {
-        type enumeration {
-          enum "TIM_SAPI_ONLY" {
-            description
-              "Only checks for SAPI mismatch";
-          }
-          enum "TIM_DAPI_ONLY" {
-            description
-              "Only checks for DAPI mismatch";
-          }
-          enum "TIM_SAPI_DAPI" {
-            description
-              "Checks for SAPI and DAPI mismatch";
-          }
-          enum "TIM_OPER_SPEC" {
-            description
-              "Checks for Operator Specific mismatch";
-          }
-        }
-        default "TIM_OPER_SPEC";
-        description
-          "The Trail Trace Identifier Mismatch (TIM) controls checking for Trace Identifier Mismatch fault detection. ";
-        config true;
-      }
-      leaf tf-mode {
-        type ciena-6500-enums:otntfMode;
-        default "OFF";
-        description
-          "Trace Fail Mode";
-        config true;
-      }
-      leaf rx-ts-mode {
-        type ciena-6500-enums:rxtsMode;
-        default "OFF";
-        description
-          "Received Tributary Slot Mode";
-        config true;
-      }
-      leaf client-type {
-        type ciena-6500-enums:clientTypeCtp;
-        description
-          "Indicate the type of client signal";
-        config true;
-      }
-      leaf bit-rate {
-        type string {
-          length "0..19";
-        }
-        description
-          "Define the bit rate of flex.";
-        config true;
-      }
-      leaf tolerance {
-        type string {
-          length "0..64";
-        }
-        description
-          "Define the tolerance in ppm of oduflex payload.";
-        config true;
-      }
-      leaf flex-type {
-        type ciena-6500-enums:flexType;
-        description
-          "ODU flex type";
-        config true;
-      }
-      leaf gep {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "NO";
-        description
-          "Specifies whether the end-point facility accepts Generict End Point (GEP) method.";
-        config true;
-      }
-      leaf gep-name {
-        type string {
-          length "1..64";
-        }
-        description
-          "Specifies the Generict End Point (GEP) name.";
-        config true;
-      }
-      leaf trib-slot-prov {
-        type ciena-6500-enums:TsProv;
-        description
-          "tribSlot provision";
-        config true;
-      }
-      leaf sd-th {
-        default "9";
-        type ciena-6500-types:INT {
-          range "6..9";
-        }
-        description
-          "Signal degrade threshold value";
-        config true;
-      }
-      leaf sf-th {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..9";
-        }
-        description
-          "Signal Fail Threshold Level.";
-        config true;
-      }
-      leaf tx-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Source Access Point Identifier (SAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tx-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Destination Access Point Identifier (DAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tx-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        config true;
-      }
-      leaf ex-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The expected Source Access Point Identifier (SAPI), provisioned by the managing system, to be compared with the received SAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        config true;
-      }
-      leaf ex-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The expected Destination Access Point Identifier (DAPI), provisioned by the managing system, to be compared with the received DAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        config true;
-      }
-      leaf ex-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The expected operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        config true;
-      }
-      leaf-list cond-type {
-        type ciena-6500-enums:OduCtpCondType;
-        description
-          "Conditioning behaviour on client faults. ";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf ex-pt {
-        type string {
-          length "2";
-        }
-        description
-          "The expected payload type.";
-        config true;
-      }
-      leaf dm-enable {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Specify if delay measurement is enable.";
-        config true;
-      }
-      leaf num-ts {
-        type ciena-6500-types:INT {
-          range "1..80";
-        }
-        description
-          "Used to identify the number of tributaries comprising this CTP.";
-        config true;
-      }
-      leaf rx-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Source Access Point Identifier (SAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Destination Access Point Identifier (DAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The operator specific part of the Trail Trace Identifier (TTI) information, recovered from the TTI overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-pt {
-        type string {
-          length "2";
-        }
-        description
-          "The received payload type.";
-        config false;
-      }
-      leaf dm-count {
-        type ciena-6500-types:STRING;
-        description
-          "Value of delay measurement of ODU in micro seconds.";
-        config false;
-      }
-      leaf owner {
-        type ciena-6500-enums:Owner;
-        description
-          "Specifies who created this CTP.";
-        config false;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:aid;
-        description
-          "The supporting Termination Point.";
-        config false;
-      }
-      leaf rx-ts {
-        type string {
-          length "1..24";
-        }
-        description
-          "Received tributary slots.";
-        config false;
-      }
-      leaf ex-rx-ts {
-        type string {
-          length "1..24";
-        }
-        description
-          "Expected receive tributary slots.";
-        config false;
-      }
-      leaf resizeable {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "ODUFlex is resizeable";
-        config false;
-      }
-      leaf base-ho {
-        type ciena-6500-enums:baseHO;
-        description
-          "Base HO ODUk";
-        config false;
-      }
-      leaf act-avail-ts {
-        type string {
-          length "1..160";
-        }
-        description
-          "Actual available TS supported by the TRANSMODE.";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:SSTfac;
-        description
-          "Secondary State";
-        config false;
-      }
-      leaf force {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not override/preempt";
-          }
-          enum "YES" {
-            description
-              "Override/preempt reserved ODUTTP with the same tribport";
-          }
-        }
-        default "NO";
-        description
-          "Indicating whether to override/preempt a reserved ODUTTP";
-        config true;
-      }
-    }
-    list tcm {
-      key "tcm";
-      config true;
-      leaf tcm {
-        mandatory true;
-        description
-          "AID in format TCMTTP-shelf-slot-port-rt1Ptp1Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMTTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3Ttcm, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4Ttcm, TCMCTP-shelf-slot-portSsubport-rt1Ptp1Ttcm, TCMCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2Ttcm, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, TCMTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, TCMTTP-shelf-slot-port-rt1Ptp1-ALL, TCMTTP-shelf-slot-port-ALL, TCMTTP-shelf-slot-ALL, TCMTTP-shelf-ALL, TCMTTP-shelf-slot-portSsubport-ALL, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, TCMCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, TCMCTP-shelf-slot-port-rt1Ptp1-ALL, TCMCTP-shelf-slot-port-ALL, TCMCTP-shelf-slot-ALL, TCMCTP-shelf-ALL, TCMCTP-shelf-slot-portSsubport-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf tcm-mode {
-        type enumeration {
-          enum "MONITOR" {
-            description
-              "Monitor (default for TCMCTP). This mode cannot be used by TCMTTPs.";
-          }
-          enum "TERMINATED" {
-            description
-              "Terminated (default for TCMTTP).";
-          }
-        }
-        description
-          "Identifies the mode of the TCM. ";
-        config true;
-      }
-      leaf sd-th {
-        default "9";
-        type ciena-6500-types:INT {
-          range "6..9";
-        }
-        description
-          "Signal degrade threshold value";
-        config true;
-      }
-      leaf tx-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Source Access Point Identifier (SAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tx-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Destination Access Point Identifier (DAPI), provisioned by the managing system at the termination source, to be placed in the Trail Trace Identifier (TTI) overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tx-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        config true;
-      }
-      leaf ex-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The expected Source Access Point Identifier (SAPI), provisioned by the managing system, to be compared with the received SAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        config true;
-      }
-      leaf ex-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The expected Destination Access Point Identifier (DAPI), provisioned by the managing system, to be compared with the received DAPI at the overhead position of the sink for the purpose of checking the integrity of connectivity. ";
-        config true;
-      }
-      leaf ex-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The expected operator specific part of the Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail.";
-        config true;
-      }
-      leaf tim-enable {
-        type enumeration {
-          enum "TIM_SAPI_ONLY" {
-            description
-              "Only checks for SAPI mismatch";
-          }
-          enum "TIM_DAPI_ONLY" {
-            description
-              "Only checks for DAPI mismatch";
-          }
-          enum "TIM_SAPI_DAPI" {
-            description
-              "Checks for SAPI and DAPI mismatch";
-          }
-        }
-        description
-          "The Trail Trace Identifier Mismatch (TIM) controls checking for Trace Identifier Mismatch fault detection. ";
-        config true;
-      }
-      leaf dm-enable {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "NO";
-        description
-          "Specify if delay measurement is enable.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf tf-mode {
-        type ciena-6500-enums:otntfMode;
-        default "OFF";
-        description
-          "Trace Fail Mode";
-        config true;
-      }
-      leaf rx-sapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Source Access Point Identifier (SAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-dapi {
-        type string {
-          length "0..15";
-        }
-        description
-          "The Destination Access Point Identifier (DAPI) recovered from the Trail Trace Identifier (TTI) overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf rx-oper {
-        type string {
-          length "0..32";
-        }
-        description
-          "The operator specific part of the Trail Trace Identifier (TTI) information, recovered from the TTI overhead position at the sink of a trail.";
-        config false;
-      }
-      leaf dm-count {
-        type ciena-6500-types:STRING;
-        description
-          "Value of delay measurement in micro seconds.";
-        config false;
-      }
-      leaf owner {
-        type ciena-6500-enums:Owner;
-        description
-          "Specifies who created this facility.";
-        config false;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:aid;
-        description
-          "The supporting Termination Point.";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be HH-MM for the time left in AINS timeout.";
-        config false;
-      }
-    }
-    list cbrttp {
-      key "cbrttp";
-      config true;
-      leaf cbrttp {
-        mandatory true;
-        description
-          "AID in format CBRTTP-shelf-slot-port, CBRTTP-shelf-slot-ALL, CBRTTP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf rate {
-        type string {
-          length "0..10";
-        }
-        description
-          "User specified Rate";
-        config true;
-      }
-      leaf protocol {
-        type ciena-6500-enums:CbrTtpProtocol;
-        description
-          "";
-        config true;
-      }
-      leaf an {
-        default "ON";
-        type ciena-6500-enums:AUTO_NEGOTIATION;
-        description
-          "Indicating whether to perform speed Auto-negotiation";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "User specified Label";
-        config true;
-      }
-      leaf mapping {
-        type ciena-6500-enums:CbrMapping;
-        description
-          "Defines the mapping of this facility and the children that it will have.";
-        config true;
-      }
-      leaf hold-off {
-        default "100";
-        type ciena-6500-types:INT {
-          range "0 | 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | 90 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 1000";
-        }
-        description
-          "Conditioning holdoff time in seconds.";
-        config true;
-      }
-      leaf fec-frmt {
-        type ciena-6500-enums:CbrFECFrmt;
-        description
-          "FEC Format";
-        config true;
-      }
-      leaf pre-fec-sf-th-lev {
-        default "0.0";
-        type decimal64 {
-          range "-1.00..1.00";
-          fraction-digits 2;
-        }
-        description
-          "Pre-FEC Signal Fail Threshold";
-        config true;
-      }
-      leaf pre-fec-sd-th-lev {
-        default "0.5";
-        type decimal64 {
-          range "-1.00..2.00";
-          fraction-digits 2;
-        }
-        description
-          "Pre-FEC Signal Degrade Threshold";
-        config true;
-      }
-      leaf cond-type {
-        type ciena-6500-enums:CbrTtpCondType;
-        description
-          "Specifies ethernet specific client conditioning behaviour.";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf supported-term-pt {
-        type ciena-6500-types:aid;
-        description
-          "The supporting Termination Point.";
-        config false;
-      }
-      leaf pre-fec-sf-th-ber {
-        default "0.0";
-        type ciena-6500-types:STRING;
-        description
-          "The corresponding BER for a given Pre-FEC SF Threshold setting in dDQ";
-        config false;
-      }
-      leaf pre-fec-sd-th-ber {
-        default "0.0";
-        type ciena-6500-types:STRING;
-        description
-          "The corresponding BER for a given Pre-FEC SD Threshold setting in dDQ";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:SSTfac;
-        description
-          "Secondary State";
-        config false;
-      }
-    }
-    list odu {
-      key "odun";
-      config true;
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU0-shelf-slot-port-payloadindex, ODU1-shelf-slot-port-payloadindex, ODUFLEX-shelf-slot-port-payloadindex, ODU4-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-      leaf odu-tx-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitted ODU TTI 32B. TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-rx-exp-tti {
-        type ciena-6500-types:STRING;
-        description
-          "Expected 32 Characters ODU TTI";
-        config true;
-      }
-      leaf odu-tx-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Transmitted SAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-tx-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Transmitted DAPI TTI (15 Characters). TTI = Trail Trace Identifier";
-        config true;
-      }
-      leaf odu-ex-sapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Expected SAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf odu-ex-dapi {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Expected DAPI TTI (15 Characters)";
-        config true;
-      }
-      leaf odu-tf-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Alarms off, no traffic protection";
-          }
-          enum "ALMONLY" {
-            description
-              "Alarms on, no traffic protection";
-          }
-        }
-        default "OFF";
-        description
-          "ODU Trace Fail Mode";
-        config true;
-      }
-      leaf odu-timen {
-        type enumeration {
-          enum "OPERATOR" {
-            description
-              "Monitor ODU Operator Specific TTI mismatch";
-          }
-          enum "SAPI" {
-            description
-              "Monitor ODU SAPI TTI mismatch";
-          }
-          enum "DAPI" {
-            description
-              "Monitor ODU DAPI TTI mismatch";
-          }
-          enum "SAPI_DAPI" {
-            description
-              "Monitor ODU SAPI and DAPI TTI mismatch";
-          }
-        }
-        default "OPERATOR";
-        description
-          "ODU TTI Mismatch Detection";
-        config true;
-      }
-      leaf odu-monitor {
-        type enumeration {
-          enum "NO" {
-            description
-              "ODU Monitoring off";
-          }
-          enum "YES" {
-            description
-              "ODU Monitoring on";
-          }
-        }
-        default "NO";
-        description
-          "ODU Monitor";
-        config true;
-      }
-      leaf clfi {
-        type ciena-6500-types:STRING;
-        description
-          "Common Language Facility Identifier. Customer provisionable label for an ODU facility.";
-        config true;
-      }
-      leaf encryption-tcm {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1..6";
-        }
-        description
-          "Active TCM Level for Encryption";
-        config true;
-      }
-      leaf encr-odu1 {
-        type ciena-6500-types:INT;
-        description
-          "ODU Reserve Byte 1 for Encryption";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in edit operation)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in edit operation)";
-          }
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "FLT";
-          enum "MEA";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "UAS";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance";
-          }
-          enum "DSBLD";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf odu-term {
-        type enumeration {
-          enum "YES" {
-            description
-              "Terminate ODU Layer";
-          }
-          enum "NO" {
-            description
-              "Not terminate ODU Layer";
-          }
-        }
-        description
-          "Indicating whether to terminate ODU Layer";
-        config false;
-      }
-      leaf port-mode {
-        type enumeration {
-          enum "SONET";
-          enum "SDH";
-        }
-        description
-          "Optical port Market preference";
-        config false;
-      }
-      leaf trib-slot-assignment {
-        type enumeration {
-          enum "HEX value 00-FF";
-        }
-        description
-          "This attribute is used to specify the value of transmitted tributary slots.";
-        config false;
-      }
-      leaf ex-ts {
-        type enumeration {
-          enum "HEX value 00-FF";
-        }
-        description
-          "This attribute is used to specify the value of expected tributary slots.";
-        config false;
-      }
-      leaf rx-ts {
-        type enumeration {
-          enum "HEX value 00-FF";
-        }
-        description
-          "This attribute is used to specify the value of actual received tributary slots.";
-        config false;
-      }
-      leaf trib-slot-prov {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "The Rx trib slot is auto-detected by system. ";
-          }
-          enum "MANUAL" {
-            description
-              "The Rx trib slot is user specified. ";
-          }
-        }
-        description
-          "tribSlots provisioning mode";
-        config false;
-      }
-      leaf odu-flt-mon {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Fault Monitoring";
-        config false;
-      }
-      leaf odu-prf-mon {
-        type ciena-6500-types:STRING;
-        description
-          "ODU Performance Monitoring";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary State";
-        config false;
-      }
-    }
-    list pc {
-      key "pc";
-      config true;
-      leaf pc {
-        mandatory true;
-        description
-          "AID in format PC-shelf-slot-port, PC-shelf-slotSsubslot-port, PC-shelf-ALL, PC-shelf-slot-ALL, PC-shelf-slotSsubslot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf port-select {
-        type ciena-6500-types:STRING;
-        description
-          "The provisioned port of the CP to direct traffic towards";
-        config true;
-      }
-      leaf port-label {
-        type ciena-6500-types:STRING;
-        description
-          "Port Label";
-        config false;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary state";
-        config false;
-      }
-      leaf-list sst {
-        type ciena-6500-enums:SSTfac;
-        description
-          "Identify the secondary state";
-        config false;
-      }
-    }
-    list vcp {
-      key "vcp";
-      config true;
-      leaf vcp {
-        mandatory true;
-        description
-          "AID in format VCP-shelf-vcpIdx, VCP-shelf-vcpIdx-dir, VCP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf vcp-type {
-        type ciena-6500-enums:EnumVCPTYPE;
-        mandatory true;
-        description
-          "This attribute indicates the type of ctps that can be connected to this VCP.";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "This attribute is a customized description";
-        config true;
-      }
-      leaf gep {
-        type enumeration {
-          enum "YES";
-          enum "NO";
-        }
-        default "NO";
-        description
-          "Specifies whether this VCP end-point facility accepts Generict End Point (GEP) method.";
-        config true;
-      }
-      leaf gep-name {
-        type string {
-          length "1..64";
-        }
-        description
-          "Specifies the Generict End Point (GEP) name.";
-        config true;
-      }
-      leaf vcp-dir {
-        type ciena-6500-types:aid;
-        description
-          "VCP";
-        config false;
-      }
-      leaf application-type {
-        type enumeration {
-          enum "NONE";
-          enum "SNCP";
-          enum "UNI_SNCP";
-        }
-        description
-          "The Application Type which identifies whether it is used in a protection scheme or not";
-        config false;
-      }
-      leaf selector {
-        type enumeration {
-          enum "FALSE" {
-            description
-              "VCP is not acting as a selector";
-          }
-          enum "TRUE" {
-            description
-              "VCP is acting as a selector";
-          }
-        }
-        description
-          "Indicates if the VCP is acting as a selector or not";
-        config false;
-      }
-      leaf size {
-        type ciena-6500-types:INT {
-          range "1..80";
-        }
-        description
-          "Indicates the number of rate based timeslots that can be connected to the VCP. This attribute has a value of 1 when the VCP is not part of a GTP.";
-        config false;
-      }
-      leaf fcc {
-        type ciena-6500-types:aid;
-        description
-          "Reference to associated FCC, if applicable.";
-        config false;
-      }
-      leaf usage-state {
-        type enumeration {
-          enum "IDLE";
-          enum "BUSY";
-          enum "ACTIVE";
-        }
-        description
-          "The type for Usage State.";
-        config false;
-      }
-      leaf bit-rate {
-        type string {
-          length "0..64";
-        }
-        description
-          "Define the bit rate of flex in bps.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-protection.yang b/models/ciena-6500-protection.yang
deleted file mode 100644
index 5e2a79f171f6e171c7444fec00565e3e8319a6c2..0000000000000000000000000000000000000000
--- a/models/ciena-6500-protection.yang
+++ /dev/null
@@ -1,2587 +0,0 @@
-module ciena-6500-protection {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-protection";
-  prefix protection;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's protection object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container protection
-           container ffp
-             list protgrp
-             - Added leaf: ttops
-         rpc protection-show-ffp-protgrp
-           output
-             list output
-             - Added leaf: ttops";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: protection-exercise-exerciser-equipment
-       - Added rpc: protection-shedule-exerciser-equipment
-       - Added rpc: protection-exercise-exerciser-otm2
-       - Added rpc: protection-shedule-exerciser-otm2
-       - Added rpc: protection-exercise-exerciser-otm3
-       - Added rpc: protection-shedule-exerciser-otm3
-       - Added rpc: protection-exercise-exerciser-otm
-       - Added rpc: protection-shedule-exerciser-otm
-       - Added rpc: protection-exercise-exerciser-flex
-       - Added rpc: protection-shedule-exerciser-flex
-       - Added rpc: protection-operate-switch-equipment
-       - Added rpc: protection-release-switch-equipment
-       - Added rpc: protection-operate-switch-eth
-       - Added rpc: protection-release-switch-eth
-       - Added rpc: protection-operate-switch-rpr
-       - Added rpc: protection-release-switch-rpr
-       - Added rpc: protection-delete-ffp-otm2
-       - Added rpc: protection-operate-switch-otm2
-       - Added rpc: protection-release-switch-otm2
-       - Added rpc: protection-delete-ffp-otm3
-       - Added rpc: protection-operate-switch-otm3
-       - Added rpc: protection-release-switch-otm3
-       - Added rpc: protection-delete-ffp-otm
-       - Added rpc: protection-operate-switch-otm
-       - Added rpc: protection-release-switch-otm
-       - Added rpc: protection-delete-ffp-flex
-       - Added rpc: protection-operate-switch-flex
-       - Added rpc: protection-release-switch-flex
-       - Added rpc: protection-operate-switch-lag
-       - Added rpc: protection-release-switch-lag
-       - Added rpc: protection-release-switch-ringlet
-       - Added rpc: protection-disable-ffp-protgrp
-       - Added rpc: protection-enable-ffp-protgrp
-       - Added rpc: protection-show-ffp-protgrp
-       - Added rpc: protection-operate-switch-protgrp
-       - Added rpc: protection-release-switch-protgrp
-       - Added rpc: protection-operate-switch-odu
-       - Added rpc: protection-release-switch-odu
-       - Added container: protection";
-  }
-
-  rpc protection-exercise-exerciser-equipment {
-    description
-      "Run the Equipment Protection Exerciser Manually.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "AID";
-        }
-        leaf rslt {
-          type ciena-6500-enums:ExResult;
-          mandatory true;
-          description
-            "Exerciser Result";
-        }
-      }
-    }
-  }
-  rpc protection-shedule-exerciser-equipment {
-    description
-      "Schedule Exerciser on equipment: This command is used to schedule the exerciser to test the equipment protection mechanism.";
-    input {
-      leaf protaid {
-        mandatory true;
-        description
-          "AID in format 155MEP-shelf-slot, 155MEP-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf invl {
-        type ciena-6500-enums:ExInvl;
-        default "1-DAY";
-        description
-          "Specify the interval between exerciser, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-      }
-      leaf statm {
-        type enumeration {
-          enum "HOD-MOH" {
-            description
-              "Hour of Day-Minute of Hour";
-          }
-        }
-        description
-          "Specify the start time of the first exerciser.";
-      }
-      leaf numinvl {
-        type ciena-6500-types:INT {
-          range "0..250";
-        }
-        description
-          "Number of intervals to run the exerciser - a value of 0 stops the exerciser. If no parameter is entered, the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-      }
-      leaf reptmode {
-        type enumeration {
-          enum "ALL" {
-            description
-              "Report results of all exercises";
-          }
-          enum "FAIL" {
-            description
-              "Report results of failed exercises";
-          }
-        }
-        default "FAIL";
-        description
-          "Specify the report mode.";
-      }
-    }
-  }
-  rpc protection-exercise-exerciser-otm2 {
-    description
-      "The high-speed exerciser is a routine that tests the integrity of the protection switching bytes.";
-    input {
-      leaf otm2 {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-shedule-exerciser-otm2 {
-    description
-      "Schedule Exerciser on facility: This command is used to schedule the exerciser to test the protection mechanisms associated with 1+1 APS switching.";
-    input {
-      leaf otm2 {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf invl {
-        type ciena-6500-enums:ExInvl;
-        default "1-DAY";
-        description
-          "Specify the interval between exerciser, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-      }
-      leaf statm {
-        type enumeration {
-          enum "HOD-MOH" {
-            description
-              "Hour of Day-Minute of Hour";
-          }
-        }
-        description
-          "Specify the start time of the first exerciser. Default start time is 5 minutes from now.";
-      }
-      leaf numinvl {
-        type ciena-6500-types:INT {
-          range "0..250";
-        }
-        description
-          "Number of intervals to run the exerciser - a value of 0 stops the exerciser. If no parameter is entered, the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-      }
-      leaf reptmode {
-        type enumeration {
-          enum "ALL" {
-            description
-              "Report results of all exercises";
-          }
-          enum "FAIL" {
-            description
-              "Report results of failed exercises";
-          }
-        }
-        default "FAIL";
-        description
-          "Specify the report mode.";
-      }
-    }
-  }
-  rpc protection-exercise-exerciser-otm3 {
-    description
-      "Run an OTM3 Exerciser. The Exerciser is a routine that tests the integrity of the protection switching bytes.";
-    input {
-      leaf otm3 {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-shedule-exerciser-otm3 {
-    description
-      "Schedule an OTM3 Line Protection Exerciser.";
-    input {
-      leaf otm3 {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf invl {
-        type ciena-6500-enums:ExInvl;
-        default "1-DAY";
-        description
-          "Specify the interval between exerciser runs, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-      }
-      leaf statm {
-        type enumeration {
-          enum "HOD-MOH" {
-            description
-              "Hour of Day-Minute of Hour";
-          }
-        }
-        description
-          "Specify the start time of the first exerciser. Default start time is 5 minutes from now.";
-      }
-      leaf numinvl {
-        type ciena-6500-types:INT {
-          range "0..250";
-        }
-        description
-          "Number of intervals to run the exerciser - a value of 0 stops the exerciser. If no parameter is entered, the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-      }
-      leaf reptmode {
-        type enumeration {
-          enum "ALL" {
-            description
-              "Report results of all exercises";
-          }
-          enum "FAIL" {
-            description
-              "Report results of failed exercises";
-          }
-        }
-        default "FAIL";
-        description
-          "Specify the report mode.";
-      }
-    }
-  }
-  rpc protection-exercise-exerciser-otm {
-    description
-      "Run an OTM Exerciser. The Exerciser is a routine that tests the integrity of the protection switching bytes.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-shedule-exerciser-otm {
-    description
-      "Schedule an OTM Protection Exerciser.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf invl {
-        type ciena-6500-enums:ExInvl;
-        default "1-DAY";
-        description
-          "Specify the interval between exerciser runs, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-      }
-      leaf statm {
-        type enumeration {
-          enum "HOD-MOH" {
-            description
-              "Hour of Day-Minute of Hour";
-          }
-        }
-        description
-          "Specify the start time of the first exerciser. Default start time is 5 minutes from now.";
-      }
-      leaf numinvl {
-        type ciena-6500-types:INT {
-          range "0..250";
-        }
-        description
-          "Number of intervals to run the exerciser - a value of 0 stops the exerciser. If no parameter is entered, the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-      }
-      leaf reptmode {
-        type enumeration {
-          enum "ALL" {
-            description
-              "Report results of all exercises";
-          }
-          enum "FAIL" {
-            description
-              "Report results of failed exercises";
-          }
-        }
-        default "FAIL";
-        description
-          "Specify the report mode.";
-      }
-    }
-  }
-  rpc protection-exercise-exerciser-flex {
-    description
-      "The high-speed exerciser is a routine that tests the integrity of the protection switching bytes.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-shedule-exerciser-flex {
-    description
-      "Schedule Exerciser on facility: This command is used to schedule the exerciser to test the protection mechanisms associated with 1+1 APS switching.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf invl {
-        type ciena-6500-enums:ExInvl;
-        default "1-DAY";
-        description
-          "Specify the interval between exerciser, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-      }
-      leaf statm {
-        type enumeration {
-          enum "HOD-MOH" {
-            description
-              "Hour of Day-Minute of Hour";
-          }
-        }
-        description
-          "Specify the start time of the first exerciser. Default start time is 5 minutes from now.";
-      }
-      leaf numinvl {
-        type ciena-6500-types:INT {
-          range "0..250";
-        }
-        description
-          "Number of intervals to run the exerciser - a value of 0 stops the exerciser. If no parameter is entered, the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-      }
-      leaf reptmode {
-        type enumeration {
-          enum "ALL" {
-            description
-              "Report results of all exercises";
-          }
-          enum "FAIL" {
-            description
-              "Report results of failed exercises";
-          }
-        }
-        default "FAIL";
-        description
-          "Specify the report mode.";
-      }
-    }
-  }
-  rpc protection-operate-switch-equipment {
-    description
-      "Operate Protection Switch: perform an equipment protection switch.";
-    input {
-      leaf eqpt.ds3ec1 {
-        mandatory true;
-        description
-          "AID in format DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, XC-shelf-slot, XC-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, SP-shelf-slot, CTM-shelf-slot";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type enumeration {
-          enum "MAN" {
-            description
-              "If the AID identifies a working circuit pack, then service will be transferred from it to the protection circuit pack if and only if the latter is neither failed nor servicing a higher or equal priority request.";
-          }
-          enum "FRCD" {
-            description
-              "If the AID identifies a working circuit pack, then service will be transferred from it to the protection circuit pack if and only if the latter is not servicing a higher or equal priority request. If the AID identifies a working circuit pack that has already been switched to protection, no switch occurs; however, the priority of the existing switch will be raised to forced.";
-          }
-          enum "LOCKOUT" {
-            description
-              "If the AID identifies the protection circuit pack then the command will prevent any working circuit pack from switching to the protection circuit pack. If a working circuit pack is already on protection, it will be switched back.";
-          }
-        }
-        default "MAN";
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc protection-release-switch-equipment {
-    description
-      "Release Protection Switch: remove an equipment protection switch.";
-    input {
-      leaf eqpt.ds3ec1 {
-        mandatory true;
-        description
-          "AID in format DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, XC-shelf-slot, XC-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, SP-shelf-slot, SP-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-operate-switch-eth {
-    description
-      "This command instructs the NE to perform a protection switch.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandOC;
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc protection-release-switch-eth {
-    description
-      "This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-rr command and are active on the entity specified.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-operate-switch-rpr {
-    description
-      "Operate a RPR Span Protection Switch.";
-    input {
-      leaf rprwan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchStatusRPR;
-        mandatory true;
-        description
-          "";
-      }
-    }
-  }
-  rpc protection-release-switch-rpr {
-    description
-      "Release a RPR Span Protection Switch.";
-    input {
-      leaf rprwan {
-        mandatory true;
-        description
-          "AID in format WAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-delete-ffp-otm2 {
-    description
-      "Delete Protection Group: Used to delete a traffic protection group.";
-    input {
-      leaf wrkgaid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf protaid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf ps {
-        type enumeration {
-          enum "1PLUS1" {
-            description
-              "Linear 1+1";
-          }
-          enum "1PLUS1TPT" {
-            description
-              "Linear 1+1 TPT";
-          }
-          enum "1PLUS1PTPT" {
-            description
-              "1+1 Port TPT";
-          }
-        }
-        description
-          "Indicates the protection scheme to be deleted. The default is card specific.";
-      }
-    }
-  }
-  rpc protection-operate-switch-otm2 {
-    description
-      "Operate Protection Switch: This command instructs the NE to perform a protection switch.";
-    input {
-      leaf otm2 {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandOC;
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc protection-release-switch-otm2 {
-    description
-      "Release Protection Switch: This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-rr command and are active on the entity specified.";
-    input {
-      leaf otm2 {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-delete-ffp-otm3 {
-    description
-      "Delete OTM3 Line Facility Protection.";
-    input {
-      leaf wrkgaid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf protaid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf ps {
-        type enumeration {
-          enum "1PLUS1" {
-            description
-              "Linear 1+1";
-          }
-          enum "1PLUS1PTPT" {
-            description
-              " 1 Plus 1 Port TPT";
-          }
-        }
-        description
-          "Indicates the protection scheme to be deleted.";
-      }
-    }
-  }
-  rpc protection-operate-switch-otm3 {
-    description
-      "Operate an OTM3 Line Facility Protection Switch: This command instructs the NE to perform a protection switch.";
-    input {
-      leaf otm3 {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandOTMn;
-        default "MAN";
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc protection-release-switch-otm3 {
-    description
-      "Release an OTM3 Line Facility Protection Switch. This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-rr command and are active on the entity specified.";
-    input {
-      leaf otm3 {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-delete-ffp-otm {
-    description
-      "Delete OTM Facility Protection.";
-    input {
-      leaf wrkgaid {
-        mandatory true;
-        description
-          "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf protaid {
-        mandatory true;
-        description
-          "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf ps {
-        type enumeration {
-          enum "1PLUS1PTPT" {
-            description
-              "1+1 Port TPT";
-          }
-          enum "1PLUS1" {
-            description
-              "Linear 1+1";
-          }
-        }
-        description
-          "Indicates the protection scheme to be deleted. For the OTN FLEXMOTR, the default is 1PLUS1 for line OTM facilities and 1PLUS1PTPT for client OTM facilities.";
-      }
-    }
-  }
-  rpc protection-operate-switch-otm {
-    description
-      "Operate an OTM Facility Protection Switch: This command instructs the NE to perform a protection switch.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandOTMn;
-        default "MAN";
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc protection-release-switch-otm {
-    description
-      "Release an OTM Facility Protection Switch. This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-OTM command and are active on the entity specified.";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-delete-ffp-flex {
-    description
-      "Delete Protection Group: Used to delete a traffic protection group.";
-    input {
-      leaf wrkgaid {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf protaid {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf ps {
-        type enumeration {
-          enum "1PLUS1PTPT" {
-            description
-              "1+1 Port TPT";
-          }
-        }
-        description
-          "Indicates the protection scheme to be deleted.";
-      }
-    }
-  }
-  rpc protection-operate-switch-flex {
-    description
-      "Operate Protection Switch: This command instructs the NE to perform a protection switch.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandOC;
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc protection-release-switch-flex {
-    description
-      "Release Protection Switch: This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-rr command and are active on the entity specified.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-operate-switch-lag {
-    description
-      "Operate Protection Switch: This command instructs the NE to perform a protection switch.";
-    input {
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandOC;
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc protection-release-switch-lag {
-    description
-      "Release Protection Switch: This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-rr command and are active on the entity specified.";
-    input {
-      leaf lag {
-        mandatory true;
-        description
-          "AID in format LAG-shelf-slot-lagid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-release-switch-ringlet {
-    description
-      "Release an RLE Ring Protection Switch. This command is used to revert (clear) protection switch on the entity specified.";
-    input {
-      leaf rle {
-        mandatory true;
-        description
-          "AID in format RLE-shelf-slot-port-ringid-grpid";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-disable-ffp-protgrp {
-    description
-      "Remove a Protection Group";
-    input {
-      leaf prot-grp {
-        mandatory true;
-        description
-          "AID in format PROTGRPSNCP-shelf-id, PROTGRPAPS-shelf-id, PROTGRPOPS-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-enable-ffp-protgrp {
-    description
-      "Restore a Protection Group";
-    input {
-      leaf prot-grp {
-        mandatory true;
-        description
-          "AID in format PROTGRPSNCP-shelf-id, PROTGRPAPS-shelf-id, PROTGRPOPS-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-show-ffp-protgrp {
-    description
-      "Retrieve Protection Groups.";
-    input {
-      leaf prot-grp {
-        mandatory true;
-        description
-          "AID in format PROTGRPSNCP-shelf-id, PROTGRPSNCP-shelf-ALL, PROTGRPAPS-shelf-id, PROTGRPAPS-shelf-ALL, PROTGRPOPS-shelf-id, PROTGRPOPS-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mbrfilter {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies Protection Group retrieval filter values.";
-      }
-    }
-    output {
-      list output {
-        leaf prot-grp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf holdback-signal-degrade-threshold {
-          type ciena-6500-types:INT {
-            range "5..12";
-          }
-          description
-            "Holdback signal degrade threshold.";
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "Label for the protection group.";
-        }
-        leaf prot-member {
-          type ciena-6500-types:aid;
-          description
-            "Protecting member of the protection group";
-        }
-        leaf protsnc {
-          type ciena-6500-types:aid;
-          description
-            "SNC associated with the protection member of the protection group";
-        }
-        leaf ps {
-          type ciena-6500-enums:PG_PS_RTRV;
-          description
-            "Indicates the protection scheme to be used.";
-        }
-        leaf ps-dirn {
-          type ciena-6500-enums:PG_PSDIRN_defaultUNI;
-          description
-            "Protection Switch Direction.";
-        }
-        leaf rvrt-type {
-          type ciena-6500-enums:EnumRVRTTYPE;
-          description
-            "Indicates the reversion type of this PROTGRP.";
-        }
-        leaf revertive {
-          type ciena-6500-enums:PG_RVRTV_defaultN;
-          description
-            "Revertive switching mode enabled?";
-        }
-        leaf sig-type {
-          type ciena-6500-enums:PG_SIGTYPE;
-          description
-            "Signaling type for the automatic protection switching.";
-        }
-        leaf todr-holdback-enable {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specifies if time of day reversion holdback is enabled.";
-        }
-        leaf todr-holdback-period {
-          type ciena-6500-types:TIME;
-          description
-            "Specifies the time of day reversion holdback period.";
-        }
-        leaf todr-period {
-          type ciena-6500-types:INT {
-            range "5..300";
-          }
-          description
-            "Specifies the time period (in minutes) over which it is acceptable to do the TODR.";
-        }
-        leaf-list todr-profile-list {
-          type ciena-6500-types:aid;
-          description
-            "List of time of day reversion profiles that are associated with this PROTGRP.";
-        }
-        leaf todr-time {
-          type ciena-6500-types:TIME;
-          description
-            "Specifies the time of day to do reversion to the home path.";
-        }
-        leaf wr {
-          type ciena-6500-enums:PG_WTR_default_5MIN;
-          description
-            "Wait-to-restore period (in minutes).";
-        }
-        leaf working-member {
-          type ciena-6500-types:aid;
-          description
-            "Working member of the protection group";
-        }
-        leaf wrksnc {
-          type ciena-6500-types:aid;
-          description
-            "SNC associated with the working member of the protection group";
-        }
-        leaf detection-guard-time {
-          type ciena-6500-enums:TDG_OTM_default_0SEC;
-          description
-            "Detection Guard Time";
-        }
-        leaf detection-recovery-time {
-          type ciena-6500-enums:TRG_OTM_default_0MSEC;
-          description
-            "Detection Recovery Time";
-        }
-        leaf detection-recovery-guard-time {
-          type ciena-6500-enums:TDG_OTM_default_0SEC;
-          description
-            "Detection and recovery guard time for ASNCP";
-        }
-        leaf ttops {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Transponder Triggered Switching Mode Enabled";
-        }
-        leaf pst {
-          type ciena-6500-enums:PSTfac_RTRV;
-          description
-            "Primary state of the Protection Group.";
-        }
-        leaf-list sst {
-          type ciena-6500-enums:PG_SST;
-          description
-            "Secondary state of the Protection Group.";
-        }
-      }
-    }
-  }
-  rpc protection-operate-switch-protgrp {
-    description
-      "Operate Protection Switch: This command instructs the NE to perform a protection switch.";
-    input {
-      leaf protgrp {
-        mandatory true;
-        description
-          "AID in format PROTGRPSNCP-shelf-id, PROTGRPAPS-shelf-id, PROTGRPOPS-shelf-id";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandPG_defaultMAN;
-        default "MAN";
-        description
-          "Switch command to be initiated on AID.";
-      }
-      leaf member {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "Member of the protection group to be operated on";
-      }
-    }
-  }
-  rpc protection-release-switch-protgrp {
-    description
-      "Release Protection Switch: This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-rr command and are active on the entity specified.";
-    input {
-      leaf protgrp {
-        mandatory true;
-        description
-          "AID in format PROTGRPSNCP-shelf-id, PROTGRPAPS-shelf-id, PROTGRPOPS-shelf-id";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc protection-operate-switch-odu {
-    description
-      "Operate Protection Switch: This command instructs the NE to perform a protection switch.";
-    input {
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type ciena-6500-enums:SwitchCommandOC;
-        description
-          "Switch command to be initiated on AID.";
-      }
-    }
-  }
-  rpc protection-release-switch-odu {
-    description
-      "Release Protection Switch: This command is used to release (clear) specified protection switch requests that were initiated by the OPR-PROTNSW-rr command and are active on the entity specified.";
-    input {
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container protection {
-    container exerciser {
-      container schedule {
-        list equipment {
-          key "aid";
-          config false;
-          leaf aid {
-            type ciena-6500-types:IDENT;
-            mandatory true;
-            description
-              "Working Member AID in format 155MEP-shelf-slot, 155MEP-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL";
-          }
-          leaf protaid {
-            type ciena-6500-types:IDENT;
-            description
-              "Protecting Member AID";
-            config false;
-          }
-          leaf invl {
-            type ciena-6500-enums:ExInvl;
-            description
-              "Specify the interval between exerciser, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-            config false;
-          }
-          leaf dat {
-            type ciena-6500-types:STRING;
-            description
-              "Month of year, day of month of the next exercise.";
-            config false;
-          }
-          leaf tm {
-            type ciena-6500-types:TIME;
-            description
-              "Hour of day, minute of hour of the next exercise.";
-            config false;
-          }
-          leaf numinvl {
-            type ciena-6500-types:INT {
-              range "0..250";
-            }
-            description
-              "The remaining number of intervals over which exercises are to be performed. A value of INDEF signifies that the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-            config false;
-          }
-          leaf reptmode {
-            type enumeration {
-              enum "ALL" {
-                description
-                  "Report results of all exercises";
-              }
-              enum "FAIL" {
-                description
-                  "Report results of failed exercises";
-              }
-            }
-            description
-              "The report mode.";
-            config false;
-          }
-          leaf alw {
-            type enumeration {
-              enum "ALW" {
-                description
-                  "The exerciser is enabled.";
-              }
-              enum "INH" {
-                description
-                  "The exerciser is disabled.";
-              }
-            }
-            description
-              "Display whether the exerciser is enabled or disabled.";
-            config false;
-          }
-          leaf auto {
-            type enumeration {
-              enum "AUTO";
-              enum "NOAUTO";
-            }
-            description
-              "Auto run exerciser status.";
-            config false;
-          }
-        }
-        list otm2 {
-          key "otm2";
-          config false;
-          leaf otm2 {
-            mandatory true;
-            description
-              "AID in format OTM2-shelf-slot-port";
-            type ciena-6500-types:aid;
-          }
-          leaf aidtype {
-            type enumeration {
-              enum "OTM2";
-            }
-            description
-              "aidtype";
-            config false;
-          }
-          leaf invl {
-            type ciena-6500-enums:ExInvl;
-            description
-              "Specify the interval between exerciser, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-            config false;
-          }
-          leaf dat {
-            type ciena-6500-types:STRING;
-            description
-              "Month of year, day of month of the next exercise. Absent if no start date provisioned.";
-            config false;
-          }
-          leaf tm {
-            type ciena-6500-types:TIME;
-            description
-              "Hour of day, minute of hour of the next exercise. Absent if no start time provisioned.";
-            config false;
-          }
-          leaf numinvl {
-            type ciena-6500-types:INT {
-              range "0..250";
-            }
-            description
-              "The remaining number of intervals over which exercises are to be performed. A value of INDEF signifies that the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-            config false;
-          }
-          leaf reptmode {
-            type enumeration {
-              enum "ALL" {
-                description
-                  "Report results of all exercises";
-              }
-              enum "FAIL" {
-                description
-                  "Report results of failed exercises";
-              }
-            }
-            description
-              "Specify the report mode.";
-            config false;
-          }
-          leaf alw {
-            type enumeration {
-              enum "ALW" {
-                description
-                  "The exerciser is enabled.";
-              }
-              enum "INH" {
-                description
-                  "The exerciser is disabled.";
-              }
-            }
-            description
-              "Display whether the exerciser is enabled or disabled.";
-            config false;
-          }
-        }
-        list otm3 {
-          key "otm3";
-          config false;
-          leaf otm3 {
-            mandatory true;
-            description
-              "AID in format OTM3-shelf-slot-port";
-            type ciena-6500-types:aid;
-          }
-          leaf aidtype {
-            type enumeration {
-              enum "OTM3";
-            }
-            description
-              "aidtype";
-            config false;
-          }
-          leaf invl {
-            type ciena-6500-enums:ExInvl;
-            description
-              "Specify the interval between exerciser, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-            config false;
-          }
-          leaf dat {
-            type ciena-6500-types:STRING;
-            description
-              "Month of year, day of month of the next exercise. Absent if no start date provisioned.";
-            config false;
-          }
-          leaf tm {
-            type ciena-6500-types:TIME;
-            description
-              "Hour of day, minute of hour of the next exercise. Absent if no start time provisioned.";
-            config false;
-          }
-          leaf numinvl {
-            type ciena-6500-types:INT {
-              range "0..250";
-            }
-            description
-              "The remaining number of intervals over which exercises are to be performed. A value of INDEF signifies that the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-            config false;
-          }
-          leaf reptmode {
-            type enumeration {
-              enum "ALL" {
-                description
-                  "Report results of all exercises";
-              }
-              enum "FAIL" {
-                description
-                  "Report results of failed exercises";
-              }
-            }
-            description
-              "Specify the report mode.";
-            config false;
-          }
-          leaf alw {
-            type enumeration {
-              enum "ALW" {
-                description
-                  "The exerciser is enabled.";
-              }
-              enum "INH" {
-                description
-                  "The exerciser is disabled.";
-              }
-            }
-            description
-              "Display whether the exerciser is enabled or disabled.";
-            config false;
-          }
-        }
-        list otm {
-          key "otm";
-          config false;
-          leaf otm {
-            mandatory true;
-            description
-              "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-            type ciena-6500-types:aid;
-          }
-          leaf aidtype {
-            type enumeration {
-              enum "OTM";
-            }
-            description
-              "aidtype";
-            config false;
-          }
-          leaf invl {
-            type ciena-6500-enums:ExInvl;
-            description
-              "Specify the interval between exerciser, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-            config false;
-          }
-          leaf dat {
-            type ciena-6500-types:STRING;
-            description
-              "Month of year, day of month of the next exercise. Absent if no start date provisioned.";
-            config false;
-          }
-          leaf tm {
-            type ciena-6500-types:TIME;
-            description
-              "Hour of day, minute of hour of the next exercise. Absent if no start time provisioned.";
-            config false;
-          }
-          leaf numinvl {
-            type ciena-6500-types:INT {
-              range "0..250";
-            }
-            description
-              "The remaining number of intervals over which exercises are to be performed. A value of INDEF signifies that the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-            config false;
-          }
-          leaf reptmode {
-            type enumeration {
-              enum "ALL" {
-                description
-                  "Report results of all exercises";
-              }
-              enum "FAIL" {
-                description
-                  "Report results of failed exercises";
-              }
-            }
-            description
-              "Specify the report mode.";
-            config false;
-          }
-          leaf alw {
-            type enumeration {
-              enum "ALW" {
-                description
-                  "The exerciser is enabled.";
-              }
-              enum "INH" {
-                description
-                  "The exerciser is disabled.";
-              }
-            }
-            description
-              "Display whether the exerciser is enabled or disabled.";
-            config false;
-          }
-        }
-        list flex {
-          key "flex";
-          config false;
-          leaf flex {
-            mandatory true;
-            description
-              "AID in format FLEX-shelf-slot-port";
-            type ciena-6500-types:aid;
-          }
-          leaf aidtype {
-            type enumeration {
-              enum "FLEX";
-            }
-            description
-              "aidtype";
-            config false;
-          }
-          leaf invl {
-            type ciena-6500-enums:ExInvl;
-            description
-              "Specify the interval between exerciser, ex: 3-DAY runs the exerciser once every 3 days, ex: 4-HR runs the exerciser once every 4 hours, ex: 9-MIN runs the exerciser once every 9 minutes.";
-            config false;
-          }
-          leaf dat {
-            type ciena-6500-types:STRING;
-            description
-              "Month of year, day of month of the next exercise. Absent if no start date provisioned.";
-            config false;
-          }
-          leaf tm {
-            type ciena-6500-types:TIME;
-            description
-              "Hour of day, minute of hour of the next exercise. Absent if no start time provisioned.";
-            config false;
-          }
-          leaf numinvl {
-            type ciena-6500-types:INT {
-              range "0..250";
-            }
-            description
-              "The remaining number of intervals over which exercises are to be performed. A value of INDEF signifies that the exerciser runs indefinitely, until it is stopped or rescheduled by another command.";
-            config false;
-          }
-          leaf reptmode {
-            type enumeration {
-              enum "ALL" {
-                description
-                  "Report results of all exercises";
-              }
-              enum "FAIL" {
-                description
-                  "Report results of failed exercises";
-              }
-            }
-            description
-              "Specify the report mode.";
-            config false;
-          }
-          leaf alw {
-            type enumeration {
-              enum "ALW" {
-                description
-                  "The exerciser is enabled.";
-              }
-              enum "INH" {
-                description
-                  "The exerciser is disabled.";
-              }
-            }
-            description
-              "Display whether the exerciser is enabled or disabled.";
-            config false;
-          }
-        }
-      }
-      list equipment {
-        key "wkrgaid";
-        config false;
-        leaf wkrgaid {
-          mandatory true;
-          description
-            "AID in format 155ME-shelf-slot, 155ME-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, E1-shelf-slot, E1-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-      }
-      list otm2 {
-        key "otm2";
-        config false;
-        leaf otm2 {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-      }
-      list otm3 {
-        key "otm3";
-        config false;
-        leaf otm3 {
-          mandatory true;
-          description
-            "AID in format OTM3-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-      }
-      list otm {
-        key "aid";
-        config false;
-        leaf aid {
-          mandatory true;
-          description
-            "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-      }
-      list flex {
-        key "flex";
-        config false;
-        leaf flex {
-          mandatory true;
-          description
-            "AID in format FLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-      }
-    }
-    container ffp {
-      list eth {
-        key "wrkgaid protaid";
-        config true;
-        leaf wrkgaid {
-          mandatory true;
-          description
-            "AID in format ETH-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf protaid {
-          mandatory true;
-          description
-            "AID in format ETH-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf ps-dirn {
-          type enumeration {
-            enum "UNI" {
-              description
-                "Unidirectional";
-            }
-            enum "BI" {
-              description
-                "Bidirectional";
-            }
-          }
-          default "UNI";
-          description
-            "Protection Switch Direction.";
-          config true;
-        }
-        leaf wr {
-          type ciena-6500-enums:WTR_ETH_default_5MIN;
-          default "5-MIN";
-          description
-            "Wait-to-restore period (in minutes).";
-          config true;
-        }
-        leaf revertive {
-          type enumeration {
-            enum "Y";
-            enum "N";
-          }
-          default "N";
-          description
-            "Revertive switching mode enabled?(applicable to 1+1 protection schemes only).";
-          config true;
-        }
-        leaf stdbytx {
-          type ciena-6500-enums:STDBYTX;
-          description
-            "Standby Tx Mode";
-          config true;
-        }
-        leaf-list swcr {
-          type ciena-6500-enums:SWCR;
-          description
-            "Switch Criteria";
-          config true;
-        }
-      }
-      list otm2 {
-        key "wrkgaid protaid";
-        config true;
-        leaf wrkgaid {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf protaid {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf ps-dirn {
-          type enumeration {
-            enum "UNI" {
-              description
-                "Unidirectional";
-            }
-            enum "BI" {
-              description
-                "Bidirectional";
-            }
-          }
-          default "UNI";
-          description
-            "Protection Switch Direction.Default=UNI.";
-          config true;
-        }
-        leaf wr {
-          type ciena-6500-enums:WTR_OTMn_default_5MIN;
-          default "5-MIN";
-          description
-            "Wait-to-restore period (in minutes).";
-          config true;
-        }
-        leaf revertive {
-          type enumeration {
-            enum "Y";
-            enum "N";
-          }
-          default "N";
-          description
-            "Revertive switching mode enabled(applicable to 1+1 protection schemes only).";
-          config true;
-        }
-        leaf detection-guard-time {
-          type ciena-6500-enums:TDG_OTM_default_0SEC;
-          default "0-MSEC";
-          description
-            "Detection Guard Time";
-          config true;
-        }
-        leaf detection-recovery-time {
-          type ciena-6500-enums:TRG_OTM_default_0MSEC;
-          default "0-MSEC";
-          description
-            "Detection Recovery Time";
-          config true;
-        }
-        leaf ps {
-          type enumeration {
-            enum "1PLUS1" {
-              description
-                "Linear 1+1";
-            }
-            enum "1PLUS1TPT" {
-              description
-                "Linear 1+1 TPT";
-            }
-            enum "1PLUS1PTPT" {
-              description
-                "1+1 Port TPT";
-            }
-          }
-          description
-            "Indicates the protection scheme to be deleted. The default is card specific.";
-          config true;
-        }
-        leaf rem-standard {
-          type ciena-6500-enums:ProtStandardOTMn;
-          default "G8731";
-          description
-            "Standard used on the remote equipment";
-          config true;
-        }
-        leaf rd {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Route Diversity OFF";
-            }
-          }
-          default "OFF";
-          description
-            "Route Diversity";
-          config true;
-        }
-      }
-      list otm3 {
-        key "wrkgaid protaid";
-        config true;
-        leaf wrkgaid {
-          mandatory true;
-          description
-            "AID in format OTM3-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf protaid {
-          mandatory true;
-          description
-            "AID in format OTM3-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf ps-dirn {
-          type enumeration {
-            enum "UNI" {
-              description
-                "Unidirectional";
-            }
-            enum "BI" {
-              description
-                "Bidirectional";
-            }
-          }
-          default "BI";
-          description
-            "Protection Switch Direction.";
-          config true;
-        }
-        leaf wr {
-          type ciena-6500-enums:WTR_OTMn_default_5MIN;
-          default "5-MIN";
-          description
-            "Wait-to-restore period (in minutes).";
-          config true;
-        }
-        leaf revertive {
-          type enumeration {
-            enum "Y";
-            enum "N";
-          }
-          default "N";
-          description
-            "Revertive switching mode enabled (applicable to 1+1 protection schemes only).";
-          config true;
-        }
-        leaf detection-guard-time {
-          type ciena-6500-enums:TDG_OTM_default_0SEC;
-          default "0-MSEC";
-          description
-            "Detection Guard Time";
-          config true;
-        }
-        leaf detection-recovery-time {
-          type ciena-6500-enums:TRG_OTM_default_0MSEC;
-          default "0-MSEC";
-          description
-            "Detection Recovery Time";
-          config true;
-        }
-        leaf ps {
-          type enumeration {
-            enum "1PLUS1" {
-              description
-                "Linear 1+1";
-            }
-            enum "1PLUS1PTPT" {
-              description
-                " 1 Plus 1 Port TPT";
-            }
-          }
-          default "1PLUS1";
-          description
-            "Indicates the protection scheme to be deleted.";
-          config true;
-        }
-        leaf rem-standard {
-          type ciena-6500-enums:ProtStandardOTMn;
-          default "G8731";
-          description
-            "Standard used on the remote equipment";
-          config true;
-        }
-        leaf rd {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Route Diversity OFF";
-            }
-          }
-          default "OFF";
-          description
-            "Route Diversity";
-          config true;
-        }
-      }
-      list otm {
-        key "wrkgaid protaid";
-        config true;
-        leaf wrkgaid {
-          mandatory true;
-          description
-            "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf protaid {
-          mandatory true;
-          description
-            "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf ps-dirn {
-          type enumeration {
-            enum "UNI" {
-              description
-                "Unidirectional";
-            }
-            enum "BI" {
-              description
-                "Bidirectional";
-            }
-          }
-          default "BI";
-          description
-            "Protection Switch Direction.";
-          config true;
-        }
-        leaf wr {
-          type ciena-6500-enums:WTR_OTMn_default_5MIN;
-          default "5-MIN";
-          description
-            "Wait-to-restore period (in minutes).";
-          config true;
-        }
-        leaf revertive {
-          type enumeration {
-            enum "Y";
-            enum "N";
-          }
-          default "N";
-          description
-            "Revertive switching mode enabled (applicable to 1+1 protection schemes only).";
-          config true;
-        }
-        leaf detection-guard-time {
-          type ciena-6500-enums:TDG_OTM_default_0SEC;
-          default "0-MSEC";
-          description
-            "Detection Guard Time";
-          config true;
-        }
-        leaf detection-recovery-time {
-          type ciena-6500-enums:TRG_OTM_default_0MSEC;
-          default "0-MSEC";
-          description
-            "Detection Recovery Time";
-          config true;
-        }
-        leaf ps {
-          type enumeration {
-            enum "1PLUS1PTPT" {
-              description
-                "1+1 Port TPT";
-            }
-            enum "1PLUS1" {
-              description
-                "Linear 1+1";
-            }
-          }
-          description
-            "Indicates the protection scheme to be deleted. For the OTN FLEXMOTR, the default is 1PLUS1 for line OTM facilities and 1PLUS1PTPT for client OTM facilities.";
-          config true;
-        }
-        leaf rem-standard {
-          type ciena-6500-enums:ProtStandardOTMn;
-          default "G8731";
-          description
-            "Standard used on the remote equipment";
-          config true;
-        }
-        leaf rd {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Route Diversity OFF";
-            }
-          }
-          default "OFF";
-          description
-            "Route Diversity";
-          config true;
-        }
-      }
-      list flex {
-        key "wrkgaid protaid";
-        config true;
-        leaf wrkgaid {
-          mandatory true;
-          description
-            "AID in format FLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf protaid {
-          mandatory true;
-          description
-            "AID in format FLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf ps-dirn {
-          type enumeration {
-            enum "UNI" {
-              description
-                "Unidirectional";
-            }
-            enum "BI" {
-              description
-                "Bidirectional";
-            }
-          }
-          default "BI";
-          description
-            "Protection Switch Direction.";
-          config true;
-        }
-        leaf wr {
-          type ciena-6500-enums:WTR_OTMn_default_5MIN;
-          default "5-MIN";
-          description
-            "Wait-to-restore period (in minutes).";
-          config true;
-        }
-        leaf revertive {
-          type enumeration {
-            enum "Y";
-            enum "N";
-          }
-          default "N";
-          description
-            "Revertive switching mode enabled (applicable to 1+1 protection schemes only).";
-          config true;
-        }
-        leaf rd {
-          type enumeration {
-            enum "OFF" {
-              description
-                "Route Diversity OFF";
-            }
-          }
-          default "OFF";
-          description
-            "Route Diversity";
-          config true;
-        }
-        leaf ps {
-          type enumeration {
-            enum "1PLUS1PTPT" {
-              description
-                "1+1 Port TPT";
-            }
-          }
-          description
-            "Indicates the protection scheme to be deleted.";
-          config true;
-        }
-        leaf rem-standard {
-          type ciena-6500-enums:ProtStandardOTMn;
-          description
-            "Standard used on Remote Equipment(Mandatory for edit operations)";
-          config true;
-        }
-      }
-      list lag {
-        key "wrkgaid protaid";
-        config true;
-        leaf wrkgaid {
-          mandatory true;
-          description
-            "AID in format LAG-shelf-slot-lagid";
-          type ciena-6500-types:aid;
-        }
-        leaf protaid {
-          mandatory true;
-          description
-            "AID in format LAG-shelf-slot-lagid";
-          type ciena-6500-types:aid;
-        }
-        leaf swmode {
-          type ciena-6500-enums:SWMODE_LAG;
-          description
-            "Switch mode.";
-          config true;
-        }
-      }
-      list protgrp {
-        key "prot-grp";
-        config true;
-        leaf prot-grp {
-          mandatory true;
-          description
-            "AID in format PROTGRPAPS-shelf-id, PROTGRPOPS-shelf-id, PROTGRPSNCP-shelf-id, PROTGRPSNCP-shelf-ALL, PROTGRPAPS-shelf-ALL, PROTGRPOPS-shelf-ALL, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf holdback-signal-degrade-threshold {
-          type ciena-6500-types:INT {
-            range "5..12";
-          }
-          description
-            "Holdback signal degrade threshold.";
-          config true;
-        }
-        leaf label {
-          type string {
-            length "0..64";
-          }
-          description
-            "Label for the protection group.";
-          config true;
-        }
-        leaf ps-dirn {
-          type ciena-6500-enums:PG_PSDIRN_defaultUNI;
-          default "UNI";
-          description
-            "Protection Switch Direction.";
-          config true;
-        }
-        leaf rvrt-type {
-          type ciena-6500-enums:EnumRVRTTYPE;
-          default "WTR";
-          description
-            "Indicates the reversion type of this PROTGRP.";
-          config true;
-        }
-        leaf revertive {
-          type ciena-6500-enums:PG_RVRTV_defaultN;
-          default "N";
-          description
-            "Revertive switching mode enabled";
-          config true;
-        }
-        leaf sig-type {
-          type ciena-6500-enums:PG_SIGTYPE;
-          description
-            "Signaling type for the automatic protection switching.";
-          config true;
-        }
-        leaf todr-holdback-enable {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Specifies if time of day reversion holdback is enabled.";
-          config true;
-        }
-        leaf todr-holdback-period {
-          type ciena-6500-types:TIME;
-          description
-            "Specifies the time of day reversion holdback period.";
-          config true;
-        }
-        leaf todr-period {
-          type ciena-6500-types:INT {
-            range "5..300";
-          }
-          description
-            "Specifies the time period (in minutes) over which it is acceptable to do the TODR.";
-          config true;
-        }
-        leaf-list todr-profile-list {
-          type ciena-6500-types:aid;
-          description
-            "List of time of day reversion profiles that are associated with this PROTGRP.";
-          config true;
-        }
-        leaf todr-time {
-          type ciena-6500-types:TIME;
-          description
-            "Specifies the time of day to do reversion to the home path.";
-          config true;
-        }
-        leaf wr {
-          type ciena-6500-enums:PG_WTR_default_5MIN;
-          default "5-MIN";
-          description
-            "Wait-to-restore period (in minutes).";
-          config true;
-        }
-        leaf detection-guard-time {
-          type ciena-6500-enums:TDG_OTM_default_0SEC;
-          default "0-MSEC";
-          description
-            "Detection Guard Time";
-          config true;
-        }
-        leaf detection-recovery-time {
-          type ciena-6500-enums:TRG_OTM_default_0MSEC;
-          default "0-MSEC";
-          description
-            "Detection Recovery Time";
-          config true;
-        }
-        leaf detection-recovery-guard-time {
-          type ciena-6500-enums:TDG_OTM_default_0SEC;
-          default "0-MSEC";
-          description
-            "Detection and recovery guard time for ASNCP";
-          config true;
-        }
-        leaf working-member {
-          type ciena-6500-types:aid;
-          mandatory true;
-          description
-            "Working member of the protection group";
-          config true;
-        }
-        leaf prot-member {
-          type ciena-6500-types:aid;
-          mandatory true;
-          description
-            "Protecting member of the protection group";
-          config true;
-        }
-        leaf ps {
-          type enumeration {
-            enum "1PLUS1" {
-              description
-                "1+1(This value can be used in create operation)";
-            }
-            enum "1PLUS1PTPT" {
-              description
-                "1 Plus 1 Port TPT(This value can be used in create operation)";
-            }
-            enum "A-SNCP" {
-              description
-                "A-SNCP";
-            }
-            enum "SNCP" {
-              description
-                "SNCP";
-            }
-          }
-          default "1PLUS1";
-          description
-            "Indicates the protection scheme to be used.";
-          config true;
-        }
-        leaf pst {
-          type enumeration {
-            enum "IS" {
-              description
-                "In Service(This value can be used in create operation)";
-            }
-            enum "OOS-MA" {
-              description
-                "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-            }
-            enum "IS-ANR" {
-              description
-                "In Service - Abnormal";
-            }
-            enum "OOS-AU" {
-              description
-                "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-            }
-            enum "OOS-AUMA" {
-              description
-                "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-            }
-            enum "OOS-MAANR" {
-              description
-                "Out-of-service maintenance - abnormal.";
-            }
-          }
-          description
-            "Identify the primary state";
-          config true;
-        }
-        leaf protsnc {
-          type ciena-6500-types:aid;
-          description
-            "SNC associated with the protection member of the protection group";
-          config false;
-        }
-        leaf wrksnc {
-          type ciena-6500-types:aid;
-          description
-            "SNC associated with the working member of the protection group";
-          config false;
-        }
-        leaf ttops {
-          type ciena-6500-enums:BOOL_YES_NO;
-          description
-            "Transponder Triggered Switching Mode Enabled";
-          config false;
-        }
-        leaf-list sst {
-          type ciena-6500-enums:PG_SST;
-          description
-            "Secondary state of the Protection Group.";
-          config false;
-        }
-      }
-      list odu {
-        key "wrkg-aid prot-aid";
-        config true;
-        leaf wrkg-aid {
-          mandatory true;
-          description
-            "AID in format ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index";
-          type ciena-6500-types:aid;
-        }
-        leaf prot-aid {
-          mandatory true;
-          description
-            "AID in format ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index";
-          type ciena-6500-types:aid;
-        }
-        leaf ps-dirn {
-          type enumeration {
-            enum "UNI" {
-              description
-                "Unidirectional";
-            }
-          }
-          description
-            "Protection Switch Direction. Default=UNI.";
-          config true;
-        }
-        leaf wr {
-          type ciena-6500-enums:WTR_OTMn_default_5MIN;
-          default "5-MIN";
-          description
-            "Wait-to-restore period (in minutes).";
-          config true;
-        }
-        leaf revertive {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "Revertive switching mode enabled. .";
-          config true;
-        }
-        leaf ps {
-          type enumeration {
-            enum "A-SNCP" {
-              description
-                "A-SNCP";
-            }
-          }
-          description
-            "Protection Scheme.";
-          config false;
-        }
-        leaf sig-type {
-          type ciena-6500-enums:ODU_SIGTYPE;
-          description
-            "Signalling type";
-          config false;
-        }
-      }
-    }
-    container switch {
-      list equipment {
-        key "eqpt";
-        config false;
-        leaf eqpt {
-          mandatory true;
-          description
-            "AID in format DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, DS3E3EC1P-shelf-slot, DS3E3EC1P-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, E1P-shelf-slot, E1P-shelf-ALL, DS1TM-slot-%HLINK-facility-hshelf-hslot-hport, DS1TM-hshelf-ALL, XC-shelf-slot, XC-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, 155ME-shelf-slot, 155ME-shelf-ALL, 155MEP-shelf-slot, 155MEP-shelf-ALL, SHELF-shelf-ALL, SP-shelf-slot, SP-shelf-ALL, CTM-shelf-slot, CTM-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type enumeration {
-            enum "IDLE" {
-              description
-                "No switch";
-            }
-            enum "AUTO" {
-              description
-                "Autonomous switch by network element";
-            }
-            enum "MAN" {
-              description
-                "Manual switch by user";
-            }
-            enum "FRCD" {
-              description
-                "Forced switch by user";
-            }
-            enum "LOCKOUT" {
-              description
-                "Lockout by user";
-            }
-          }
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "LOCAL" {
-              description
-                "The switch is initiated by the local network element.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf swreason {
-          type ciena-6500-enums:SwitchReason_EQPT;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-      }
-      list eth {
-        key "eth";
-        config false;
-        leaf eth {
-          mandatory true;
-          description
-            "AID in format ETH-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusBLSR;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "REMOTE" {
-              description
-                "The switch is initiated at the far end. Applicable to protection such as SONET APS where the protocol requires negotiation of switch requests between network elements.";
-            }
-            enum "LOCAL" {
-              description
-                "The switch is initiated by the local network element. All equipment and path switches are always locally initiated. OC-3 line switches are LOCAL when a failure is detected on the local network element or if the user request is initiated locally.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf swreason {
-          type ciena-6500-enums:SwitchReason_OCn;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-      }
-      list rpr {
-        key "rpr-wan";
-        config false;
-        leaf rpr-wan {
-          mandatory true;
-          description
-            "AID in format WAN-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusRPR;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "LOCAL" {
-              description
-                "TIndicates the location of the Span Protection switch.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf sw-reason {
-          type ciena-6500-enums:SwitchReasonRPR;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-        leaf neighbor-valid {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Indicates if the neighbor MAC address is valid (active).";
-          config false;
-        }
-      }
-      list otm2 {
-        key "otm2";
-        config false;
-        leaf otm2 {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusOTMn;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "REMOTE" {
-              description
-                "The switch is initiated at the far end. Applicable to protection such as OTN APS where the protocol requires negotiation of switch requests between network elements.";
-            }
-            enum "LOCAL" {
-              description
-                "The switch is initiated by the local network element. All equipment and path switches are always locally initiated. OTM2 line switches are LOCAL when a failure is detected on the local network element or if the user request is initiated locally.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf sw-reason {
-          type ciena-6500-enums:SwitchReasonOTMn;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-      }
-      list otm3 {
-        key "otm3";
-        config false;
-        leaf otm3 {
-          mandatory true;
-          description
-            "AID in format OTM3-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusOTMn;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "REMOTE" {
-              description
-                "The switch is initiated at the far end. Applicable to protection such as OTN APS where the protocol requires negotiation of switch requests between network elements.";
-            }
-            enum "LOCAL" {
-              description
-                "The switch is initiated by the local network element. All equipment and path switches are always locally initiated. OTM3 line switches are LOCAL when a failure is detected on the local network element or if the user request is initiated locally.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf sw-reason {
-          type ciena-6500-enums:SwitchReasonOTMn;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-      }
-      list otm {
-        key "otm";
-        config false;
-        leaf otm {
-          mandatory true;
-          description
-            "AID in format OTM0-shelf-slot-port, OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMFLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusOTMn;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "REMOTE" {
-              description
-                "The switch is initiated at the far end. Applicable to protection such as OTN APS where the protocol requires negotiation of switch requests between network elements.";
-            }
-            enum "LOCAL" {
-              description
-                "The switch is initiated by the local network element. All equipment and path switches are always locally initiated. OTM3 line switches are LOCAL when a failure is detected on the local network element or if the user request is initiated locally.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf sw-reason {
-          type ciena-6500-enums:SwitchReasonOTMn;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-      }
-      list flex {
-        key "flex";
-        config false;
-        leaf flex {
-          mandatory true;
-          description
-            "AID in format FLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusOTMn;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "REMOTE" {
-              description
-                "The switch is initiated at the far end. Applicable to protection such as OTN APS where the protocol requires negotiation of switch requests between network elements.";
-            }
-            enum "LOCAL" {
-              description
-                "The switch is initiated by the local network element. All equipment and path switches are always locally initiated. FLEX line switches are LOCAL when a failure is detected on the local network element or if the user request is initiated locally.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf sw-reason {
-          type ciena-6500-enums:SwitchReasonOTMn;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-      }
-      list lag {
-        key "lag";
-        config false;
-        leaf lag {
-          mandatory true;
-          description
-            "AID in format LAG-shelf-slot-lagid";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusOTMn;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "REMOTE" {
-              description
-                "The switch is initiated at the far end. Applicable to protection such as OTN APS where the protocol requires negotiation of switch requests between network elements.";
-            }
-            enum "LOCAL" {
-              description
-                "The switch is initiated by the local network element. All equipment and path switches are always locally initiated. LAG switches are LOCAL when a failure is detected on the local network element or if the user request is initiated locally.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf sw-reason {
-          type ciena-6500-enums:SwitchReasonLAG;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-      }
-      list protgrp {
-        key "prot-grp";
-        config false;
-        leaf prot-grp {
-          mandatory true;
-          description
-            "AID in format PROTGRPSNCP-shelf-id, PROTGRPSNCP-shelf-ALL, PROTGRPAPS-shelf-id, PROTGRPAPS-shelf-ALL, PROTGRPOPS-shelf-id, PROTGRPOPS-shelf-ALL, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf member {
-          type ciena-6500-types:aid;
-          description
-            "Member of the protection group";
-          config false;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusPG;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type ciena-6500-enums:SwitchEndPG;
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf sw-reason {
-          type ciena-6500-enums:SwitchReasonPG;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-        leaf active {
-          type ciena-6500-types:IDENT;
-          description
-            "The AID of the active protection group member";
-          config false;
-        }
-        leaf revert-fail-count {
-          type ciena-6500-types:INT;
-          description
-            "Specifies the number of windows during which Time of Day Reversion has failed. Applies only to A/S-SNCP Protection Groups";
-          config false;
-        }
-        leaf todr-sd-clear-line-time {
-          type ciena-6500-types:STRING;
-          description
-            "Specifies date and time when working member became available for TODR reversion. Applies only to A/S-SNCP Protection Groups.";
-          config false;
-        }
-      }
-      list odu {
-        key "odun";
-        config false;
-        leaf odun {
-          mandatory true;
-          description
-            "AID in format ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index";
-          type ciena-6500-types:aid;
-        }
-        leaf sw-status {
-          type ciena-6500-enums:SwitchStatusOTMn;
-          description
-            "Switch Status.";
-          config false;
-        }
-        leaf sw-end {
-          type enumeration {
-            enum "REMOTE" {
-              description
-                "The switch is initiated at the far end.";
-            }
-            enum "LOCAL" {
-              description
-                "The switch is initiated by the local network element.";
-            }
-          }
-          description
-            "Switch End.";
-          config false;
-        }
-        leaf sw-reason {
-          type ciena-6500-enums:SwitchReasonOTMn;
-          description
-            "Reason for auto switch.";
-          config false;
-        }
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-provisioning.yang b/models/ciena-6500-provisioning.yang
deleted file mode 100644
index 6789109bf09221fcbcc8a9cb3d68b793d20d5052..0000000000000000000000000000000000000000
--- a/models/ciena-6500-provisioning.yang
+++ /dev/null
@@ -1,528 +0,0 @@
-module ciena-6500-provisioning {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-provisioning";
-  prefix provisioning;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's provisioning object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         rpc provisioning-restore
-           input
-             leaf shelf-id
-               type ciena-6500-types:INT
-               - Changed range from 0..254 to 0..992";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: provisioning-cancel
-       - Added rpc: provisioning-show-state
-       - Added rpc: provisioning-ignore-prov
-         rpc provisioning-check
-           input
-             leaf url
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..393 
-             leaf check-alarm
-             - Added default: Y 
-         rpc provisioning-restore
-           input
-             leaf url
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..393 
-             leaf check-tid
-             - Added default: Y 
-             leaf check-alarm
-             - Added default: Y 
-             leaf check-shelf-type
-             - Added default: Y 
-             leaf save-comms
-             - Added default: Y 
-             leaf shelf-id
-               type ciena-6500-types:INT
-               - Added range: 0..254 
-         rpc provisioning-save
-           input
-             leaf url
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..393 
-             leaf check-alarm
-             - Added default: Y 
-             leaf save-comms
-             - Added default: Y 
-         container provisioning
-           list state
-           - Removed key
-             leaf aid
-             - Added mandatory: true ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Removed rpc: provisioning-validate
-         container provisioning
-           list state
-           - Removed leaf: autosave
-             leaf aid
-             - Removed mandatory
-             - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT
-             leaf source
-               type enumeration
-               - Added enum: USB
-         rpc provisioning-check
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc provisioning-commit
-           input
-           - Changed leaf from aid to shelf
-             leaf shelf
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         rpc provisioning-restore
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-           - Added leaf: max-transfer-sessions
-         rpc provisioning-save
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-           - Added leaf: max-transfer-sessions";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: provisioning
-       - Added rpc: provisioning-check
-       - Added rpc: provisioning-commit
-       - Added rpc: provisioning-restore
-       - Added rpc: provisioning-save
-       - Added rpc: provisioning-validate";
-  }
-
-  rpc provisioning-cancel {
-    description
-      "Cancel Backup and Restore Actions";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc provisioning-check {
-    description
-      "Pre-Check Backup and Restore Actions";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "0..393";
-        }
-        mandatory true;
-        description
-          "The URL format is: [protocol:]//user:password@host[:port]/directory-path. Supported protocols are FTP, SFTP and file. The maximum URL length is 393 characters.";
-      }
-      leaf check-alarm {
-        type enumeration {
-          enum "Y" {
-            description
-              "Alarm checking is performed";
-          }
-          enum "N" {
-            description
-              "Alarm checking is not performed";
-          }
-        }
-        default "Y";
-        description
-          "Check active alarms";
-      }
-    }
-  }
-  rpc provisioning-commit {
-    description
-      "Commit Provisioning Data Restoration";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc provisioning-restore {
-    description
-      "Restore Provisioning Data";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "0..393";
-        }
-        mandatory true;
-        description
-          "The URL format is: [protocol:]//user:password@host[:port]/directory-path. Supported protocols are FTP, SFTP and file. The maximum URL length is 393 characters.";
-      }
-      leaf check-tid {
-        type enumeration {
-          enum "Y" {
-            description
-              "Restore only if TID check passed";
-          }
-          enum "N" {
-            description
-              "Restore regardless of TID check result";
-          }
-        }
-        default "Y";
-        description
-          "Check TID";
-      }
-      leaf check-alarm {
-        type enumeration {
-          enum "Y" {
-            description
-              "Alarm checking is performed";
-          }
-          enum "N" {
-            description
-              "Alarm checking is not performed";
-          }
-        }
-        default "Y";
-        description
-          "Check alarm status";
-      }
-      leaf check-shelf-type {
-        type enumeration {
-          enum "Y" {
-            description
-              "Restore only if Shelf Type check passed";
-          }
-          enum "N" {
-            description
-              "Restore regardless of Shelf Type check result";
-          }
-        }
-        default "Y";
-        description
-          "Check Shelf Type";
-      }
-      leaf file-identifier {
-        type ciena-6500-types:STRING;
-        description
-          "ASCII prefix for Save and Restore filenames at the remote destination. The allowable characters are: A through Z (uppercase and lowercase), 0 through 9, underscore and dash. Example: OME_0035_05-06-12. This parameter is supported for FTP and SFTP protocols and for the FILE protocol from USB.";
-      }
-      leaf save-comms {
-        type enumeration {
-          enum "N" {
-            description
-              "Comms and Shelf Data are not saved";
-          }
-          enum "Y" {
-            description
-              "Comms and Shelf Data are saved";
-          }
-        }
-        default "Y";
-        description
-          "Whether comms and shelf data is restored or not";
-      }
-      leaf shelf-id {
-        type ciena-6500-types:INT {
-          range "0..992";
-        }
-        description
-          "Shelf ID to restore from (Default local)";
-      }
-      leaf rst-path {
-        type enumeration {
-          enum "AUTOBKUP" {
-            description
-              "Restore to the Auto backup database";
-          }
-          enum "DAILYBKUP" {
-            description
-              "Restore to the Daily backup database";
-          }
-          enum "LASTWEEKBKUP" {
-            description
-              "Restore to the Last week backup database";
-          }
-          enum "4WEEKLYBKUP" {
-            description
-              "Restore to the 4 Weekly backup database";
-          }
-        }
-        description
-          "Restore Path (Only for file type)";
-      }
-      leaf max-transfer-sessions {
-        type ciena-6500-types:INT;
-        description
-          "Maximum allowed number of simultaneous file transfer sessions";
-      }
-    }
-  }
-  rpc provisioning-show-state {
-    description
-      "Retrieve Backup and Restore State";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf autosave {
-        type enumeration {
-          enum "Y" {
-            description
-              "Autosave state required";
-          }
-          enum "N" {
-            description
-              "Autosave state not required";
-          }
-        }
-        description
-          "Check auto save state";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf source {
-          type enumeration {
-            enum "LOCAL";
-            enum "REMOTE";
-            enum "AUTOSAVE";
-            enum "USB";
-          }
-          description
-            "Source";
-        }
-        leaf state {
-          type enumeration {
-            enum "SAVE" {
-              description
-                "last command entered was SAV-PROV";
-            }
-            enum "RESTORE" {
-              description
-                "last command entered was RST-PROV";
-            }
-            enum "COMMIT" {
-              description
-                "last command entered was CMMT-PROV";
-            }
-            enum "FAILED" {
-              description
-                "last command failed";
-            }
-            enum "INACTIVE" {
-              description
-                "no save/restore operation currently active";
-            }
-          }
-          description
-            "Backup and Restore state";
-        }
-        leaf lastbackup {
-          type ciena-6500-types:STRING;
-          description
-            "Last Backup";
-        }
-        leaf backuprequired {
-          type enumeration {
-            enum "T";
-            enum "F";
-          }
-          description
-            "Backup required";
-        }
-      }
-    }
-  }
-  rpc provisioning-save {
-    description
-      "Save Provisioning Data";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "0..393";
-        }
-        mandatory true;
-        description
-          "The URL format is: [protocol:]//user:password@host[:port]/directory-path. Supported protocols are FTP, SFTP and file. The maximum URL length is 393 characters.";
-      }
-      leaf check-alarm {
-        type enumeration {
-          enum "Y" {
-            description
-              "Alarm checking is performed";
-          }
-          enum "N" {
-            description
-              "Alarm checking is not performed";
-          }
-        }
-        default "Y";
-        description
-          "Check active alarms";
-      }
-      leaf file-identifier {
-        type ciena-6500-types:STRING;
-        description
-          "ASCII prefix for Save and Restore filenames at the remote destination. The allowable characters are: A through Z (uppercase and lowercase), 0 through 9, underscore and dash. Example: OME_0035_05-06-12. This parameter is supported for FTP and SFTP protocols and for the FILE protocol to USB.";
-      }
-      leaf save-comms {
-        type enumeration {
-          enum "N" {
-            description
-              "Comms and Shelf Data are not saved";
-          }
-          enum "Y" {
-            description
-              "Comms and Shelf Data are saved";
-          }
-        }
-        default "Y";
-        description
-          "Whether comms and shelf data are saved or not";
-      }
-      leaf max-transfer-sessions {
-        type ciena-6500-types:INT;
-        description
-          "Maximum allowed number of simultaneous file transfer sessions";
-      }
-    }
-  }
-  rpc provisioning-ignore-prov {
-    description
-      "Validate Restore Action";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf response {
-          type ciena-6500-types:STRING;
-          mandatory true;
-          description
-            "Information on Backup being Restored";
-        }
-      }
-    }
-  }
-  container provisioning {
-    list state {
-      config false;
-      leaf aid {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-      }
-      leaf source {
-        type enumeration {
-          enum "LOCAL";
-          enum "REMOTE";
-          enum "AUTOSAVE";
-          enum "USB";
-        }
-        description
-          "Source";
-        config false;
-      }
-      leaf state {
-        type enumeration {
-          enum "SAVE" {
-            description
-              "last command entered was SAV-PROV";
-          }
-          enum "RESTORE" {
-            description
-              "last command entered was RST-PROV";
-          }
-          enum "COMMIT" {
-            description
-              "last command entered was CMMT-PROV";
-          }
-          enum "FAILED" {
-            description
-              "last command failed";
-          }
-          enum "INACTIVE" {
-            description
-              "no save/restore operation currently active";
-          }
-        }
-        description
-          "Backup and Restore state";
-        config false;
-      }
-      leaf lastbackup {
-        type ciena-6500-types:STRING;
-        description
-          "Last Backup";
-        config false;
-      }
-      leaf backuprequired {
-        type enumeration {
-          enum "T";
-          enum "F";
-        }
-        description
-          "Backup required";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-publishers.yang b/models/ciena-6500-publishers.yang
deleted file mode 100644
index f490d6e92a322e214ebd8f66d4a5b55102e7df7a..0000000000000000000000000000000000000000
--- a/models/ciena-6500-publishers.yang
+++ /dev/null
@@ -1,101 +0,0 @@
-module ciena-6500-publishers {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-publishers";
-  prefix publishers;
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's publishers for the 6500";
-
-  revision 2017-07-13 {
-    description
-      "6500 Release 12.10
-         container publishers
-           list publisher
-             leaf name
-             - Changed length from 1..64 to 1..512";
-  }
-  revision 2015-01-01 {
-    description
-      "Initial revision.";
-  }
-
-  typedef data-format-type {
-    type enumeration {
-      enum "XML" {
-        value 1;
-        description
-          "XML Format";
-      }
-      enum "JSON" {
-        description
-          "JSON Format";
-      }
-      enum "OpenConfig" {
-        description
-          "OpenConfig Format";
-      }
-    }
-  }
-
-  typedef publisher-type {
-    type enumeration {
-      enum "event" {
-        description
-          "Publish AO messages";
-      }
-      enum "poller" {
-        description
-          "Publish data on fix interval";
-      }
-    }
-  }
-
-  typedef publisher-path {
-    description
-      "Publisher Path";
-    type string {
-      length "1..512";
-    }
-  }
-
-  typedef publisher-frequency {
-    description
-      "Publisher Frequency in nano seconds";
-    type uint32;
-    units "ns";
-  }
-
-  container publishers {
-    list publisher {
-      key "name";
-      config false;
-      leaf name {
-        description
-          "Publisher Name";
-        type string {
-          length "1..64";
-        }
-        mandatory true;
-      }
-      leaf path {
-        type publisher-path;
-      }
-      leaf type {
-        description
-          "Publisher Type";
-        type publisher-type;
-      }
-      leaf frequency {
-        type publisher-frequency;
-      }
-      leaf-list formats {
-        description
-          "Publisher data format type";
-        type data-format-type;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-radius.yang b/models/ciena-6500-radius.yang
deleted file mode 100644
index 59dab8cc8b41adf46d457f8127f375d0f5c8845f..0000000000000000000000000000000000000000
--- a/models/ciena-6500-radius.yang
+++ /dev/null
@@ -1,283 +0,0 @@
-module ciena-6500-radius {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-radius";
-  prefix radius;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's radius object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container radius
-           list auth
-           - Added leaf: encrypted-pid";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         rpc radius-show-auth
-           input
-             leaf server
-             - Added mandatory: true 
-           output
-           - Removed leaf: shelf
-           - Removed leaf: state
-           - Removed leaf: radius-ip
-           - Removed leaf: port
-           - Removed leaf: to
-           - Removed leaf: gen-secret
-           - Removed leaf: passwd-chg
-           - Added list: output
-         container radius
-           list auth
-             leaf port
-             - Added default: 1812 
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf to
-             - Added default: 15 
-               type ciena-6500-types:INT
-               - Added range: 1..30 
-             leaf gen-secret
-             - Added default: N 
-             leaf passwd-chg
-             - Added default: ENABLE ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container radius
-           list auth
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf pid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..128 
-             leaf pid_confirmed
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..128 
-         rpc radius-show-auth
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-           output
-           - Added leaf: shelf";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: radius
-       - Added rpc: radius-show-auth";
-  }
-
-  rpc radius-show-auth {
-    description
-      "Retrieve the current remote authorization (RADIUS) server configuration for the NE";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf server {
-        type enumeration {
-          enum "PRIMARY";
-          enum "SECONDARY";
-        }
-        mandatory true;
-        description
-          "Select server to provision";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf state {
-          type ciena-6500-enums:ENABLE_DISABLE;
-          mandatory true;
-          description
-            "Provisioned service state of the server";
-        }
-        leaf radius-ip {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "IP address (n.n.n.n) of the server running the RADIUS authentication protocol(Format: n.n.n.n)";
-        }
-        leaf port {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          mandatory true;
-          description
-            "UDP Port the server accepts incoming requests";
-        }
-        leaf to {
-          type ciena-6500-types:INT {
-            range "1..30";
-          }
-          mandatory true;
-          description
-            "Timeout (in seconds) after which non-response from the server is considered a failure";
-        }
-        leaf gen-secret {
-          type enumeration {
-            enum "Y" {
-              description
-                "Automatically generate server shared secret.";
-            }
-            enum "N" {
-              description
-                "Do not generate server shared secret.";
-            }
-          }
-          mandatory true;
-          description
-            "Automatically generate server shared secret";
-        }
-        leaf passwd-chg {
-          type enumeration {
-            enum "ENABLE" {
-              description
-                "RADIUS password change is enabled on this server.";
-            }
-            enum "DISABLE" {
-              description
-                "RADIUS password change is disabled on this server.";
-            }
-          }
-          mandatory true;
-          description
-            "Provisioned RADIUS password change state of the server";
-        }
-      }
-    }
-  }
-  container radius {
-    list auth {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf server {
-        type enumeration {
-          enum "PRIMARY";
-          enum "SECONDARY";
-        }
-        description
-          "Select server to provision(Mandatory for edit operations)";
-        config true;
-      }
-      leaf pid {
-        type string {
-          length "1..128";
-        }
-        description
-          "Server shared secret";
-        config true;
-      }
-      leaf pid_confirmed {
-        type string {
-          length "1..128";
-        }
-        description
-          "Re-entered Server shared secret for confirmation";
-        config true;
-      }
-      leaf state {
-        type ciena-6500-enums:ENABLE_DISABLE;
-        description
-          "Provisioned service state of the server";
-        config true;
-      }
-      leaf radius-ip {
-        type ciena-6500-types:IPADDR;
-        description
-          "IP address (n.n.n.n) of the server running the RADIUS authentication protocol(Format: n.n.n.n)";
-        config true;
-      }
-      leaf port {
-        default "1812";
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "UDP Port the server accepts incoming requests";
-        config true;
-      }
-      leaf to {
-        default "15";
-        type ciena-6500-types:INT {
-          range "1..30";
-        }
-        description
-          "Timeout (in seconds) after which non-response from the server is considered a failure";
-        config true;
-      }
-      leaf gen-secret {
-        type enumeration {
-          enum "Y" {
-            description
-              "Automatically generate server shared secret.";
-          }
-          enum "N" {
-            description
-              "Do not generate server shared secret.";
-          }
-        }
-        default "N";
-        description
-          "Automatically generate server shared secret";
-        config true;
-      }
-      leaf passwd-chg {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "Enable RADIUS password change on this server.";
-          }
-          enum "DISABLE" {
-            description
-              "Disable RADIUS password change on this server.";
-          }
-        }
-        default "ENABLE";
-        description
-          "Provisioned RADIUS password change state of the server";
-        config true;
-      }
-      leaf encrypted-pid {
-        type string {
-          length "6..175";
-        }
-        description
-          "Encrypted server shared secret";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-ramans.yang b/models/ciena-6500-ramans.yang
deleted file mode 100644
index d2ddc49b64fd9d1c51b2d4e8715dceef4f289161..0000000000000000000000000000000000000000
--- a/models/ciena-6500-ramans.yang
+++ /dev/null
@@ -1,712 +0,0 @@
-module ciena-6500-ramans {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-ramans";
-  prefix ramans;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's ramans object for the 6500 platform";
-
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container ramans
-           list raman
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Removed rpc: ramans-show-password-state-raman
-       - Added rpc: ramans-operate-calibration
-         container ramans
-         - Added list: password-state
-           list raman
-             leaf raman
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf targ-pow
-             - Added default: 27.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..27.00 
-             leaf turn-on-thres
-             - Added default: -38.40 
-               type ciena-6500-types:DECIMAL
-               - Added range: -40.00..0.00 
-             leaf apr-thres
-             - Added default: 21.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..28.00 
-             leaf pump-ratio1
-             - Added default: 100.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..100.00 
-             leaf pump-ratio2
-             - Added default: 100.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..100.00 
-             leaf pump-ratio3
-             - Added default: 100.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..100.00 
-             leaf pump-ratio4
-             - Added default: 100.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..100.00 
-             leaf pst
-             - Changed type from ciena-6500-enums:PSTfac_RTRV to enumeration
-               type enumeration
-               - Added enum: IS
-               - Added enum: OOS-MA
-               - Added enum: IS-ANR
-               - Added enum: OOS-AU
-               - Added enum: OOS-AUMA
-               - Added enum: OOS-MAANR
-             leaf fiber-pinch-thresh
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..6.00 
-             leaf res-pump-pwr-thresh
-             - Added default: -45.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: -60.00..-25.00 
-             leaf targ-gain
-             - Added default: 0.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..22.00 
-             leaf recommended-gain
-             - Added default: 5.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 5.00..24.00 
-             leaf targ-gain-tilt
-             - Added default: 0 
-               type ciena-6500-types:DECIMAL
-               - Added range: -3.00..3.00 
-             leaf tgt-unach-min
-             - Added default: 2.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..7.00 
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTfac to enumeration
-               type enumeration
-               - Added enum: AINS
-               - Added enum: AINS-DEA
-               - Added enum: BRIDGED
-               - Added enum: SWITCHED
-               - Added enum: ROLL
-               - Added enum: ACT
-               - Added enum: IDLE
-               - Added enum: STBYS
-               - Added enum: WRK
-               - Added enum: ERRANL
-               - Added enum: PSI
-               - Added enum: FLT
-               - Added enum: MEA
-               - Added enum: TSTF
-               - Added enum: UEQ
-               - Added enum: SGEO
-               - Added enum: DISCD
-               - Added enum: LPBK
-               - Added enum: TS
-               - Added enum: FAF
-               - Added enum: STBYH
-               - Added enum: WRKRX
-               - Added enum: WRKTX
-               - Added enum: PRTCL
-               - Added enum: UAS
-               - Added enum: NOSITE
-               - Added enum: NOAM
-               - Added enum: MON
-               - Added enum: MSC
-               - Added enum: PROTECTED
-               - Added enum: MT
-               - Added enum: DSBLD
-               - Added enum: INHIP
-               - Added enum: L2DSBLD
-               - Added enum: TSGEN
-               - Added enum: TSMON
-             leaf input-los-thres
-             - Added default: -23.90 
-               type ciena-6500-types:DECIMAL
-               - Added range: -40.00..0.00 
-             leaf shutoff-thres
-             - Added default: -25.40 
-               type ciena-6500-types:DECIMAL
-               - Added range: -31.00..0.00 
-             leaf apr-targ-pow
-             - Added default: 17.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 17.00..19.50 
-             leaf input-loss
-             - Added default: 0.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..5.00 
-             leaf auto-shutoff-disabled-time
-             - Added default: 10 
-               type ciena-6500-types:INT
-               - Added range: 1..480 
-           list override
-           - Added leaf: override-password
-             leaf raman
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added container: ramans
-       - Added rpc: ramans-disable-raman
-       - Added rpc: ramans-enable-raman
-       - Added rpc: ramans-set-password-raman
-       - Added rpc: ramans-show-password-state-raman";
-  }
-
-  rpc ramans-disable-raman {
-    description
-      "Removes the RAMAN Facility from service.";
-    input {
-      leaf raman {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Remove facility from Maintenance State";
-      }
-    }
-  }
-  rpc ramans-enable-raman {
-    description
-      "Restores the RAMANl Facility to service.";
-    input {
-      leaf raman {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc ramans-set-password-raman {
-    description
-      "Set the RAMAN autoshutoff password.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf old-pid {
-        type ciena-6500-types:STRING;
-        description
-          "The existing RAMAN autoshutoff password.";
-      }
-      leaf new-pid {
-        type ciena-6500-types:STRING;
-        description
-          "The new RAMAN autoshutoff password.";
-      }
-      leaf new-pid1 {
-        type ciena-6500-types:STRING;
-        description
-          "The new RAMAN autoshutoff password.";
-      }
-    }
-  }
-  rpc ramans-operate-calibration {
-    description
-      "Send Calibration request";
-    input {
-      leaf raman {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container ramans {
-    list raman {
-      key "raman";
-      config true;
-      leaf raman {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port, RAMAN-shelf-ALL, RAMAN-shelf-slot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf targ-pow {
-        default "27.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..27.00";
-        }
-        description
-          "Target Power.";
-        config true;
-      }
-      leaf turn-on-thres {
-        default "-38.40";
-        type ciena-6500-types:DECIMAL {
-          range "-40.00..0.00";
-        }
-        description
-          "OSC Turn On Threshold.";
-        config true;
-      }
-      leaf apr-thres {
-        default "21.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..28.00";
-        }
-        description
-          "APR Threshold.";
-        config true;
-      }
-      leaf pump-ratio1 {
-        default "100.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..100.00";
-        }
-        description
-          "Pump 1 Power Ratio";
-        config true;
-      }
-      leaf pump-ratio2 {
-        default "100.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..100.00";
-        }
-        description
-          "Pump 2 Power Ratio";
-        config true;
-      }
-      leaf pump-ratio3 {
-        default "100.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..100.00";
-        }
-        description
-          "Pump 3 Power Ratio";
-        config true;
-      }
-      leaf pump-ratio4 {
-        default "100.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..100.00";
-        }
-        description
-          "Pump 4 Power Ratio";
-        config true;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service(This value can be used in create operation)";
-          }
-          enum "OOS-MA" {
-            description
-              "Out-of-service maintenance for provisioning memory administration(This value can be used in create operation)";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service - Abnormal";
-          }
-          enum "OOS-AU" {
-            description
-              "Out-of-service autonomous from a failure detected point of view. It is not out of service from a state point of view. Alarm is raised if the entity is not able to perform its provisioned functions";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out-of-service autonomous management - the entity is not able to perform its provisioned functions and is purposefully removed from service";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out-of-service maintenance - abnormal.";
-          }
-        }
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf fiber-pinch-thresh {
-        type ciena-6500-types:DECIMAL {
-          range "0.00..6.00";
-        }
-        description
-          "Fiber Pinch Threshold.";
-        config true;
-      }
-      leaf raman-mode {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "Automatic Mode";
-          }
-          enum "MANUAL" {
-            description
-              "Manual Mode";
-          }
-          enum "MAXGAIN" {
-            description
-              "Maximum Gain Mode";
-          }
-        }
-        description
-          "Provisioned mode for RAMAN Pumps.";
-        config true;
-      }
-      leaf pump-mode {
-        type enumeration {
-          enum "CW" {
-            description
-              "CW";
-          }
-          enum "PWM" {
-            description
-              "PWM";
-          }
-        }
-        description
-          "Mode of operation for RAMAN Pumps.";
-        config true;
-      }
-      leaf gain-mode {
-        type enumeration {
-          enum "PROVISIONED" {
-            description
-              "Provisioned Mode";
-          }
-          enum "RECOMMENDED" {
-            description
-              "Recommended Mode";
-          }
-        }
-        description
-          "Provisioned gain mode for RAMAN Pumps.";
-        config true;
-      }
-      leaf res-pump-pwr-thresh {
-        default "-45.00";
-        type ciena-6500-types:DECIMAL {
-          range "-60.00..-25.00";
-        }
-        description
-          "Residual Pump Power Threshold.";
-        config true;
-      }
-      leaf targ-gain {
-        default "0.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..22.00";
-        }
-        description
-          "Provisioned Gain for Raman pumps.";
-        config true;
-      }
-      leaf recommended-gain {
-        default "5.00";
-        type ciena-6500-types:DECIMAL {
-          range "5.00..24.00";
-        }
-        description
-          "Recommended Gain for Raman pumps.";
-        config true;
-      }
-      leaf targ-gain-tilt {
-        default "0";
-        type ciena-6500-types:DECIMAL {
-          range "-3.00..3.00";
-        }
-        description
-          "Gain Tilt of Raman pumps.";
-        config true;
-      }
-      leaf calibrated {
-        type enumeration {
-          enum "NOTCALIBRATED" {
-            description
-              "Raman not calibrated";
-          }
-          enum "CALIBRATED" {
-            description
-              "Raman calibrated completed";
-          }
-          enum "RECALIBRATIONREQUIRED" {
-            description
-              "Raman recalibration required";
-          }
-          enum "CALIBRATIONNOTREQUIRED" {
-            description
-              "Raman calibration not required";
-          }
-        }
-        description
-          "State of Raman pump DOC calibration.";
-        config true;
-      }
-      leaf forced-shutoff {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "Forced Shutoff Active";
-          }
-          enum "FALSE" {
-            description
-              "Forced Shutoff Inactive";
-          }
-        }
-        description
-          "Force Shutoff of Raman pumps.";
-        config true;
-      }
-      leaf tgt-unach-min {
-        default "2.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..7.00";
-        }
-        description
-          "Target Unachievable Minor Threshold.";
-        config true;
-      }
-      leaf targ-pow-password {
-        type string {
-          length "8..10";
-        }
-        description
-          "Target Power Password";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in edit operation)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in edit operation)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf pump1-power {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Actual Pump1 Power";
-        config false;
-      }
-      leaf pump2-power {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Actual Pump2 Power";
-        config false;
-      }
-      leaf pump3-power {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Actual Pump3 Power";
-        config false;
-      }
-      leaf pump4-power {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Actual Pump4 Power";
-        config false;
-      }
-      leaf oper-mode {
-        type enumeration {
-          enum "NORMAL" {
-            description
-              "Normal";
-          }
-          enum "APR" {
-            description
-              "APR";
-          }
-          enum "SHUTOFF" {
-            description
-              "Shutoff";
-          }
-        }
-        description
-          "Provides the operating state of the RAMAN Pumps.";
-        config false;
-      }
-      leaf calc-gain {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Calculated Gain of Raman pumps.";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "AINS time left \"HH-MM\"";
-        config false;
-      }
-      leaf input-los-thres {
-        default "-23.90";
-        type ciena-6500-types:DECIMAL {
-          range "-40.00..0.00";
-        }
-        description
-          "OSC Input LOS Threshold.";
-        config true;
-      }
-      leaf shutoff-thres {
-        default "-25.40";
-        type ciena-6500-types:DECIMAL {
-          range "-31.00..0.00";
-        }
-        description
-          "OSC Shut Off Threshold.";
-        config true;
-      }
-      leaf apr-targ-pow {
-        default "17.00";
-        type ciena-6500-types:DECIMAL {
-          range "17.00..19.50";
-        }
-        description
-          "APR Target Power";
-        config true;
-      }
-      leaf input-loss {
-        default "0.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..5.00";
-        }
-        description
-          "Input Connector Loss";
-        config true;
-      }
-      leaf auto-shutoff-password {
-        type string {
-          length "8..10";
-        }
-        description
-          "Auto Shutoff Disabled Password";
-        config true;
-      }
-      leaf auto-shutoff-disabled-time {
-        default "10";
-        type ciena-6500-types:INT {
-          range "1..480";
-        }
-        description
-          "Auto Shutoff Disabled Time";
-        config true;
-      }
-    }
-    list password-state {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf targ-pow-password {
-        type ciena-6500-types:STRING;
-        description
-          "SET if Raman password set, NOT_SET otherwise";
-        config false;
-      }
-    }
-    list override {
-      key "raman";
-      config true;
-      leaf raman {
-        mandatory true;
-        description
-          "AID in format RAMAN-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf-list otdr {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "OTDR override is enabled";
-          }
-          enum "DISABLE" {
-            description
-              "OTDR override disabled";
-          }
-        }
-        description
-          "State of the Raman pumps to turn on when OTDR failed(Mandatory for edit operations)";
-        config true;
-      }
-      leaf override-password {
-        type string {
-          length "8..10";
-        }
-        description
-          "Override Password(Mandatory for edit operations)";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-repeater.yang b/models/ciena-6500-repeater.yang
deleted file mode 100644
index 9cddef886625d541222509be76498c5f82c437b9..0000000000000000000000000000000000000000
--- a/models/ciena-6500-repeater.yang
+++ /dev/null
@@ -1,451 +0,0 @@
-module ciena-6500-repeater {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-repeater";
-  prefix repeater;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's repeater object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: repeater-show-info
-       - Added container: repeater";
-  }
-
-  rpc repeater-show-info {
-    description
-      "Retrieve Repeater Information Entry";
-    input {
-      leaf otm2 {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf operation {
-        type enumeration {
-          enum "GETADDRESSLIST" {
-            description
-              "Retrieve Repeater Addresses (Max 300)";
-          }
-          enum "GETSTATUSDATA" {
-            description
-              "Retrieve Status Data from Repeater";
-          }
-          enum "SENDCOMMAND" {
-            description
-              "Send Command Data (hex) to Repeater";
-          }
-        }
-        mandatory true;
-        description
-          "Repeater Operation to Perform";
-      }
-      leaf command {
-        type string {
-          length "0..15";
-        }
-        description
-          "Command data (hex).";
-      }
-      leaf resptimeout {
-        type ciena-6500-types:INT {
-          range "2..30";
-        }
-        description
-          "Response Timeout - Provisionable for GETSTATUSDATA";
-      }
-    }
-    output {
-      list output {
-        leaf otm2 {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf seq-num {
-          type ciena-6500-types:INT;
-          mandatory true;
-          description
-            "Sequence Number";
-        }
-        leaf repeater-address {
-          type ciena-6500-types:INT;
-          description
-            "Repeater Address ";
-        }
-        leaf repeater-label {
-          type ciena-6500-types:STRING;
-          description
-            "Repeater Label";
-        }
-        leaf direction {
-          type ciena-6500-enums:Direction;
-          description
-            "Direction";
-        }
-        leaf dev-type {
-          type ciena-6500-enums:DevType;
-          default "RPTR";
-          description
-            "Device Type";
-        }
-        leaf dflt-setting {
-          type ciena-6500-enums:DfltSetting;
-          default "ALC1";
-          description
-            "Default Setting";
-        }
-        leaf latitude {
-          type ciena-6500-types:STRING;
-          description
-            "Latitude";
-        }
-        leaf longitude {
-          type ciena-6500-types:STRING;
-          description
-            "Longitude";
-        }
-        leaf xa-1 {
-          type ciena-6500-types:STRING;
-          description
-            "XA1 Calibration Constant";
-        }
-        leaf xa-2 {
-          type ciena-6500-types:STRING;
-          description
-            "XA2 Calibration Constant";
-        }
-        leaf xb-1 {
-          type ciena-6500-types:STRING;
-          description
-            "XB1 Calibration Constant";
-        }
-        leaf xb-2 {
-          type ciena-6500-types:STRING;
-          description
-            "XB2 Calibration Constant";
-        }
-        leaf xc-1 {
-          type ciena-6500-types:STRING;
-          description
-            "XC1 Calibration Constant";
-        }
-        leaf xc-2 {
-          type ciena-6500-types:STRING;
-          description
-            "XC2 Calibration Constant";
-        }
-        leaf xd-1 {
-          type ciena-6500-types:STRING;
-          description
-            "XD1 Calibration Constant";
-        }
-        leaf xd-2 {
-          type ciena-6500-types:STRING;
-          description
-            "XD2 Calibration Constant";
-        }
-        leaf xd-3 {
-          type ciena-6500-types:STRING;
-          description
-            "XD3 Calibration Constant";
-        }
-        leaf ya-1 {
-          type ciena-6500-types:STRING;
-          description
-            "YA1 Calibration Constant";
-        }
-        leaf ya-2 {
-          type ciena-6500-types:STRING;
-          description
-            "YA2 Calibration Constant";
-        }
-        leaf yb-1 {
-          type ciena-6500-types:STRING;
-          description
-            "YB1 Calibration Constant";
-        }
-        leaf yb-2 {
-          type ciena-6500-types:STRING;
-          description
-            "YB2 Calibration Constant";
-        }
-        leaf yc-1 {
-          type ciena-6500-types:STRING;
-          description
-            "YC1 Calibration Constant";
-        }
-        leaf yc-2 {
-          type ciena-6500-types:STRING;
-          description
-            "YC2 Calibration Constant";
-        }
-        leaf yd-1 {
-          type ciena-6500-types:STRING;
-          description
-            "YD1 Calibration Constant";
-        }
-        leaf yd-2 {
-          type ciena-6500-types:STRING;
-          description
-            "YD2 Calibration Constant";
-        }
-        leaf yd-3 {
-          type ciena-6500-types:STRING;
-          description
-            "YD3 Calibration Constant";
-        }
-        leaf status-resp {
-          type ciena-6500-types:STRING;
-          description
-            "Repeater Status Response";
-        }
-      }
-    }
-  }
-  container repeater {
-    list info {
-      key "otm2";
-      config true;
-      leaf otm2 {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf seq-num {
-        type ciena-6500-types:INT {
-          range "1..300";
-        }
-        mandatory true;
-        description
-          "Sequence Number";
-        config true;
-      }
-      leaf repeater-address {
-        type ciena-6500-types:INT {
-          range "0..65534";
-        }
-        mandatory true;
-        description
-          "Repeater Address";
-        config true;
-      }
-      leaf repeater-label {
-        type string {
-          length "0..32";
-        }
-        description
-          "Repeater Label";
-        config true;
-      }
-      leaf direction {
-        type ciena-6500-enums:Direction;
-        description
-          "Direction";
-        config true;
-      }
-      leaf dev-type {
-        type ciena-6500-enums:DevType;
-        default "RPTR";
-        description
-          "Device Type";
-        config true;
-      }
-      leaf dflt-setting {
-        type ciena-6500-enums:DfltSetting;
-        default "ALC1";
-        description
-          "Default Setting";
-        config true;
-      }
-      leaf latitude {
-        type string {
-          length "0..10";
-        }
-        description
-          "Latitude";
-        config true;
-      }
-      leaf longitude {
-        type string {
-          length "0..11";
-        }
-        description
-          "Longitude";
-        config true;
-      }
-      leaf xa-1 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XA1 Calibration Constant";
-        config true;
-      }
-      leaf xa-2 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XA2 Calibration Constant";
-        config true;
-      }
-      leaf xb-1 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XB1 Calibration Constant";
-        config true;
-      }
-      leaf xb-2 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XB2 Calibration Constant";
-        config true;
-      }
-      leaf xc-1 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XC1 Calibration Constant";
-        config true;
-      }
-      leaf xc-2 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XC2 Calibration Constant";
-        config true;
-      }
-      leaf xd-1 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XD1 Calibration Constant";
-        config true;
-      }
-      leaf xd-2 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XD2 Calibration Constant";
-        config true;
-      }
-      leaf xd-3 {
-        type string {
-          length "0..7";
-        }
-        description
-          "XD3 Calibration Constant";
-        config true;
-      }
-      leaf ya-1 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YA1 Calibration Constant";
-        config true;
-      }
-      leaf ya-2 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YA2 Calibration Constant";
-        config true;
-      }
-      leaf yb-1 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YB1 Calibration Constant";
-        config true;
-      }
-      leaf yb-2 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YB2 Calibration Constant";
-        config true;
-      }
-      leaf yc-1 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YC1 Calibration Constant";
-        config true;
-      }
-      leaf yc-2 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YC2 Calibration Constant";
-        config true;
-      }
-      leaf yd-1 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YD1 Calibration Constant";
-        config true;
-      }
-      leaf yd-2 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YD2 Calibration Constant";
-        config true;
-      }
-      leaf yd-3 {
-        type string {
-          length "0..7";
-        }
-        description
-          "YD3 Calibration Constant";
-        config true;
-      }
-      leaf command {
-        type string {
-          length "0..15";
-        }
-        description
-          "Command data (hex).";
-        config true;
-      }
-      leaf supervisory-password {
-        type ciena-6500-types:STRING;
-        description
-          "Supervisory Password";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-restart.yang b/models/ciena-6500-restart.yang
deleted file mode 100644
index 4d47a5790e83330711c32b3fd3a407fa7d921324..0000000000000000000000000000000000000000
--- a/models/ciena-6500-restart.yang
+++ /dev/null
@@ -1,68 +0,0 @@
-module ciena-6500-restart {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-restart";
-  prefix restart;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's restart object for the 6500 platform";
-
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         rpc restart-cold
-           input
-           - Changed leaf from aid to slot
-             leaf slot
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         rpc restart-warm
-           input
-           - Removed leaf: aid
-           - Removed leaf: processor
-           - Added leaf: slot
-           - Added leaf: cpux";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added rpc: restart-cold
-       - Added rpc: restart-warm";
-  }
-
-  rpc restart-cold {
-    description
-      "Initialize Cold: Instructs a Network Element to initialize its circuit packs. A cold initialization is equivalent to a power-up and will affect traffic.";
-    input {
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SLOT-shelf-slotSsubslot, SLOT-slot-%HLINK-facility-hshelf-hslot-hport, REMOTE-shelf-slot-port-remoteInst";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc restart-warm {
-    description
-      "Initialize Warm: instructs a Network Element to initialize its circuit packs. A warm initialization does not affect traffic.";
-    input {
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SLOT-slot-%HLINK-facility-hshelf-hslot-hport, SLOT-shelf-slotSsubslot";
-        type ciena-6500-types:aid;
-      }
-      leaf cpux {
-        type ciena-6500-types:STRING;
-        description
-          "Processor (denoted by a 4 character identifier, of the form CPUx or cpux) to warm restart if there is more than one processor on a card. Ex: CPU1 for OAM Processor, CPU2 for Auxiliary";
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-security.yang b/models/ciena-6500-security.yang
deleted file mode 100644
index 1dbccdf0f0bca6dbb540b2c303dfa994e13a7752..0000000000000000000000000000000000000000
--- a/models/ciena-6500-security.yang
+++ /dev/null
@@ -1,2608 +0,0 @@
-module ciena-6500-security {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-security";
-  prefix security;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's security object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Added rpc: security-init-zeroize
-       - Added rpc: security-operate-encrypt-string
-         container security
-           container radius
-             container accounting
-               list servers
-               - Added leaf: encrypted-pid
-           list user
-             leaf timeout
-               type ciena-6500-types:INT
-               - Changed range from 0..99 to 1..99
-           list defaults
-           - Added leaf: lockout-mode
-           list challenge-secret
-           - Added leaf: encrypted-secret
-           list advanced-settings
-           - Added leaf: zeroize-mode
-           list tacacs-server
-           - Added leaf: encrypted-secret
-           list authmode
-             leaf tl1
-               type enumeration
-               - Added enum: TACACS
-         rpc security-show-logs
-           output
-             list output
-               leaf log-name
-                 type enumeration
-                 - Added enum: SECU417
-                 - Added enum: SECU420";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: security-delete-bad-password
-       - Added rpc: security-show-radius-auth
-       - Added rpc: security-show-banner
-       - Added rpc: security-show-radius-proxy
-       - Added rpc: security-show-intruded-user
-       - Added rpc: security-show-radius-accounting-config
-       - Added rpc: security-show-radius-accounting-servers
-       - Added rpc: security-upload-cert-auth
-         rpc security-enable-user
-           input
-             leaf uid
-             - Added mandatory: true 
-             leaf user-type
-               type enumeration
-               - Added enum: GRPC
-         rpc security-show-logs
-           input
-             leaf numlogs
-               type ciena-6500-types:INT
-               - Added range: 1..3000 
-           output
-           - Removed leaf: shelf
-           - Removed leaf: date
-           - Removed leaf: time
-           - Removed leaf: log-name
-           - Removed leaf: log-event
-           - Removed leaf: uid
-           - Removed leaf: upc
-           - Removed leaf: port-type
-           - Removed leaf: port-addr
-           - Removed leaf: status
-           - Removed leaf: evt-descr
-           - Removed leaf: resource
-           - Added list: output
-         rpc security-disable-user
-           input
-             leaf uid
-             - Added mandatory: true 
-         rpc security-kill-user
-           input
-             leaf uid
-             - Added mandatory: true 
-             leaf session
-             - Added mandatory: true 
-         container security
-         - Added container: radius
-         - Added container: bad-password
-         - Added list: blocked-channel-id
-         - Added list: upc
-         - Added list: remauth-alternate
-         - Added list: intruded-user
-         - Added list: intershlf-comkey
-         - Added list: tacacs-server
-         - Added list: authdflt
-         - Added list: authmode
-         - Added list: cert-auth
-           list user
-           - Removed leaf: pwd-status
-           - Removed leaf: pwd-exp
-           - Added leaf: password-status
-           - Added leaf: password-expiry
-             leaf uid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:aid
-             leaf upc
-             - Added mandatory: true 
-             leaf auto-timeout
-             - Added mandatory: true 
-             leaf timeout
-             - Added default: 30 
-               type ciena-6500-types:INT
-               - Added range: 0..99 
-             leaf password-age-stat
-             - Added default: OFF 
-             - Changed type from ciena-6500-enums:BOOL_ON_OFF to ciena-6500-enums:BOOL_ON_OFF_defaultOFF
-             leaf password-age
-             - Added default: 45 
-               type ciena-6500-types:INT
-               - Added range: 0..999 
-             leaf accr-stat
-             - Added default: OFF 
-             - Changed type from ciena-6500-enums:BOOL_ON_OFF to ciena-6500-enums:BOOL_ON_OFF_defaultOFF
-             leaf accr
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..30 
-             leaf expiry-warning
-             - Added default: 14 
-               type ciena-6500-types:INT
-               - Added range: 0..14 
-             leaf min-waiting
-             - Added default: 20 
-               type ciena-6500-types:INT
-               - Added range: 0..999 
-             leaf user-type
-               type enumeration
-               - Added enum: 0
-               - Added enum: 1
-             leaf newpid
-             - Added mandatory: true 
-             leaf newpid_confirmed
-             - Added mandatory: true 
-           list defaults
-           - Removed leaf: pwd-rules
-           - Added leaf: password-rules
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf password-age-stat
-             - Added default: OFF 
-             - Changed type from ciena-6500-enums:BOOL_ON_OFF to ciena-6500-enums:BOOL_ON_OFF_defaultOFF
-             leaf password-age
-             - Added default: 45 
-               type ciena-6500-types:INT
-               - Added range: 0..999 
-             leaf accr-stat
-             - Added default: OFF 
-             - Changed type from ciena-6500-enums:BOOL_ON_OFF to enumeration
-               type enumeration
-               - Added enum: ON
-               - Added enum: OFF
-             leaf accr
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..30 
-             leaf expiry-warning
-             - Added default: 14 
-               type ciena-6500-types:INT
-               - Added range: 0..14 
-             leaf min-waiting
-             - Added default: 20 
-               type ciena-6500-types:INT
-               - Added range: 0..999 
-             leaf max-invalid
-             - Added default: 5 
-               type ciena-6500-types:INT
-               - Added range: 2..20 
-             leaf lockout-duration
-             - Added default: 60 
-               type ciena-6500-types:INT
-               - Added range: 0..7200 
-             leaf max-login
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..99 
-             leaf dormancy-state
-             - Added default: DISABLED 
-             leaf user-aging
-             - Added default: 45 
-               type ciena-6500-types:INT
-               - Added range: 1..999 
-           list radius-auth
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf passwd-chg
-             - Added default: DISABLE 
-           list banner
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf linenum
-               type ciena-6500-types:INT
-               - Added range: 1..31 
-             leaf linetext
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..512 
-           list advanced-settings
-           - Added leaf: validation-certificate-expiry-warning
-           - Added leaf: grpc-upc
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf debug-auth
-             - Added default: DISABLED 
-             leaf limit-host-only
-             - Added default: N 
-             leaf server-certificate-expiry-warning
-             - Added default: 90 
-               type ciena-6500-types:INT
-               - Added range: 14..365 
-           list password-rules
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf upperc-min
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..3 
-             leaf lowerc-min
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..3 
-             leaf alpha-min
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..3 
-             leaf num-min
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..3 
-             leaf special-min
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..3 
-             leaf repeat-char-max
-             - Added default: 3 
-               type ciena-6500-types:INT
-               - Added range: 0..10 
-             leaf password-len-min
-             - Added default: 8 
-               type ciena-6500-types:INT
-               - Added range: 8..15 
-             leaf password-old
-             - Added default: 5 
-               type ciena-6500-types:INT
-               - Added range: 5..15 
-             leaf password-dif
-             - Added default: 7 
-               type ciena-6500-types:INT
-               - Added range: 1..10 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container security
-         - Removed list: passwd
-         - Added list: password
-           list user
-           - Changed key from aid to uid
-           - Removed leaf: aid
-           - Removed leaf: min-warning
-           - Added leaf: min-waiting
-           - Added leaf: uid
-             leaf user-type
-               type enumeration
-               - Removed enum: 0
-               - Removed enum: 1
-               - Added enum: LOCAL
-           list defaults
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: min-warning
-           - Added leaf: min-waiting
-           - Added leaf: shelf
-           list radius-auth
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: ex-info
-           - Added leaf: shelf
-           list challenge-secret
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf newpid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 6..20 
-             leaf newpid_confirmed
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 6..20 
-           list banner
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: banner-type
-           - Added leaf: shelf
-           list advanced-settings
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: server-certificate-expiry-warning
-           - Added leaf: shelf
-           list password-rules
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc security-enable-user
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc security-show-logs
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-           output
-           - Removed leaf: year
-           - Added leaf: shelf
-             leaf log-name
-               type enumeration
-               - Added enum: SECU416
-             leaf port-type
-               type enumeration
-               - Removed enum: PTTEL
-               - Removed enum: TP4
-               - Removed enum: OSI7
-               - Removed enum: X25
-               - Added enum: TCP
-               - Added enum: SSH
-               - Added enum: SFTP
-         rpc security-kill-user
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf my-session
-             - Changed type from ciena-6500-types:BOOLEAN to ciena-6500-enums:BOOL_Y_N";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: security
-       - Added rpc: security-enable-user
-       - Added rpc: security-show-logs
-       - Added rpc: security-disable-user
-       - Added rpc: security-kill-user";
-  }
-
-  rpc security-delete-bad-password {
-    description
-      "Delete Security Bad Password: this command is used to remove previously entered words from the list of unusable passwords on the specified network element.";
-    input {
-      leaf-list badpid {
-        type ciena-6500-types:IDENT;
-        description
-          "Word to remove. Grouping is allowed.";
-      }
-    }
-  }
-  rpc security-enable-user {
-    description
-      "The Allow Security User command is used to enable a disabled or locked user account on the network element.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf uid {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "User Identifier.";
-      }
-      leaf user-type {
-        type enumeration {
-          enum "LOCAL" {
-            description
-              "local";
-          }
-          enum "NETWORK" {
-            description
-              "network";
-          }
-          enum "CHALRES" {
-            description
-              "challenge-response";
-          }
-          enum "GRPC" {
-            description
-              "gRPC";
-          }
-        }
-        description
-          "User account type. 0 = local, 1 = network, 2 = chalres";
-      }
-    }
-  }
-  rpc security-show-logs {
-    description
-      "Retrieve Audit Security Log: this command is used to retrieve security logs.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf numlogs {
-        type ciena-6500-types:INT {
-          range "1..3000";
-        }
-        description
-          "Retrieve the specified number of logs. If it is not specified then all logs will be returned. In a TIDc configuration with members, if it is not specified, then 100 logs per shelf will be returned.";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf date {
-          type ciena-6500-types:DATE;
-          mandatory true;
-          description
-            "Date of log entry in the format YY-MM-DD.";
-        }
-        leaf time {
-          type ciena-6500-types:TIME;
-          mandatory true;
-          description
-            "Time of log entry in the format HH-MM-SS.";
-        }
-        leaf log-name {
-          type enumeration {
-            enum "SECU400" {
-              description
-                "User login/logout";
-            }
-            enum "SECU401" {
-              description
-                "Unauthorized command attempted";
-            }
-            enum "SECU406" {
-              description
-                "Valid command usage log";
-            }
-            enum "SECU407" {
-              description
-                "Active session timeout";
-            }
-            enum "SECU408" {
-              description
-                "Intrusion attempt";
-            }
-            enum "SECU410" {
-              description
-                "Customer managed network - successful access";
-            }
-            enum "SECU412" {
-              description
-                "Customer managed network - denied access";
-            }
-            enum "SECU414" {
-              description
-                "SFTP Client connect/disconnect";
-            }
-            enum "SECU415" {
-              description
-                "Active session dropped";
-            }
-            enum "SECU416" {
-              description
-                "Account Dormancy";
-            }
-            enum "SECU417" {
-              description
-                "SSH Client connect/disconnect";
-            }
-            enum "SECU420" {
-              description
-                "Info";
-            }
-          }
-          mandatory true;
-          description
-            "Log name.";
-        }
-        leaf log-event {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "Specified TL1 command code (verb-mod).";
-        }
-        leaf uid {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "User Identifier.";
-        }
-        leaf upc {
-          type ciena-6500-enums:UPC;
-          mandatory true;
-          description
-            "User Privilege Code";
-        }
-        leaf port-type {
-          type enumeration {
-            enum "TELNET" {
-              description
-                "TCP/IP Telnet application server";
-            }
-            enum "FTP" {
-              description
-                "TCP/IP FTP application server";
-            }
-            enum "SHELF" {
-              description
-                "Shelf processor";
-            }
-            enum "FPLT" {
-              description
-                "SP faceplate serial port";
-            }
-            enum "RLOGIN" {
-              description
-                "Remote login application server";
-            }
-            enum "TCP" {
-              description
-                "Transmission Control Protocol";
-            }
-            enum "SSH" {
-              description
-                "Secure Shell Network Protocol";
-            }
-            enum "SFTP" {
-              description
-                "SSH File Transfer Protocol";
-            }
-            enum "SNMP" {
-              description
-                "UDP/IP SNMP Application Server";
-            }
-            enum "GRPC" {
-              description
-                "gRPC Server";
-            }
-            enum "ALL" {
-              description
-                "All access ports on the shelf";
-            }
-          }
-          mandatory true;
-          description
-            "Protocol";
-        }
-        leaf port-addr {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "Originating address for an IP or NSAP port.";
-        }
-        leaf status {
-          type enumeration {
-            enum "COMPLD" {
-              description
-                "Completed";
-            }
-            enum "PRTL" {
-              description
-                "PRTL";
-            }
-            enum "DENY" {
-              description
-                "Deny";
-            }
-            enum "IBEX" {
-              description
-                "Input, Block EXtra";
-            }
-            enum "IBMS" {
-              description
-                "Input, Block MiSsing";
-            }
-            enum "ICNV" {
-              description
-                "Input, Command Not Valid";
-            }
-            enum "IDNV" {
-              description
-                "Input, Data Not Valid";
-            }
-            enum "IDNC" {
-              description
-                "Input, Data Not Consistent";
-            }
-            enum "IDRG" {
-              description
-                "Input, Data RanGe error";
-            }
-            enum "IEAE" {
-              description
-                "Input, Entity Already Exists";
-            }
-            enum "IENE" {
-              description
-                "Input, Entity does Not Exist";
-            }
-            enum "IIAC" {
-              description
-                "Input, Invalid ACcess identifier";
-            }
-            enum "IICT" {
-              description
-                "Input, Invalid Correlation Tag";
-            }
-            enum "IITA" {
-              description
-                "Input, Invalid TArget identifier";
-            }
-            enum "IPMS" {
-              description
-                "Input, Parameter MiSsing";
-            }
-            enum "IPNV" {
-              description
-                "Input, Parameter Not Valid";
-            }
-            enum "PIUC" {
-              description
-                "Privilege, Illegal User Code";
-            }
-            enum "PIUI" {
-              description
-                "Privilege, Illegal User Identity";
-            }
-            enum "SAAS" {
-              description
-                "Status, Already ASsigned";
-            }
-            enum "SARB" {
-              description
-                "Status, All Resources Busy";
-            }
-            enum "SDNC" {
-              description
-                "Status, Data Not Consistent";
-            }
-            enum "SLEM" {
-              description
-                "Status, List, Exceed Maximum";
-            }
-            enum "SNVS" {
-              description
-                "Status, Not in Valid State";
-            }
-            enum "SRCI" {
-              description
-                "Status, Requested Command Inhibited";
-            }
-            enum "SROF" {
-              description
-                "Status, Requested Operation Failed";
-            }
-            enum "SSRE" {
-              description
-                "Status, System Resources Exceeded";
-            }
-            enum "SSTP" {
-              description
-                "Status, execution SToPped due to hardware or software problem";
-            }
-            enum "SUCCESS" {
-              description
-                "Successfully completed";
-            }
-            enum "ERROR" {
-              description
-                "Error occured";
-            }
-          }
-          mandatory true;
-          description
-            "Command status.";
-        }
-        leaf evt-descr {
-          type ciena-6500-types:STRING;
-          description
-            "Further description of event (if applicable).";
-        }
-        leaf resource {
-          type string {
-            length "0..130";
-          }
-          description
-            "Resource accessed by request. For TL1, it is AID. For SNMP, it is OID.";
-        }
-      }
-    }
-  }
-  rpc security-show-radius-auth {
-    description
-      "Retrieve the status of Centralize Security Authentication (CSA)";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ex-info {
-        type enumeration {
-          enum "Y" {
-            description
-              "Request extra information to be displayed.";
-          }
-          enum "N" {
-            description
-              "Do not display extra information.";
-          }
-        }
-        description
-          "Request extra information to be displayed.";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf auth-state {
-          type ciena-6500-enums:ENABLE_DISABLE;
-          description
-            "Provisioned state of the CSA feature";
-        }
-        leaf query-mode {
-          type ciena-6500-enums:CSA_QUERYMODE;
-          description
-            "CSA RADIUS server query mode";
-        }
-        leaf passwd-chg {
-          type enumeration {
-            enum "ENABLE" {
-              description
-                "RADIUS password change is enabled";
-            }
-            enum "DISABLE" {
-              description
-                "RADIUS password change is disabled";
-            }
-          }
-          description
-            "Provisioned RADIUS password change state";
-        }
-        leaf tx {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client transmitted packet count";
-        }
-        leaf dup {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client duplicate packet count";
-        }
-        leaf rx {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client received packet count";
-        }
-        leaf tmout {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client auth timeout packet count";
-        }
-        leaf late {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client late packet count";
-        }
-        leaf tx-err {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client transmit error count";
-        }
-        leaf bad-auth {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client bad authenticator count";
-        }
-        leaf bad-port {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client bad port count";
-        }
-        leaf bad-srv {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client bad server count";
-        }
-        leaf bad-type {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client bad packet type count";
-        }
-      }
-    }
-  }
-  rpc security-disable-user {
-    description
-      "The Inhibit Security User command is used to disable a local user account on the network element.";
-    input {
-      leaf uid {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "User Identifier.";
-      }
-    }
-  }
-  rpc security-show-banner {
-    description
-      "This command will be used to retrieve the warning login banner..";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf banner-type {
-        type enumeration {
-          enum "ACTIVE" {
-            description
-              "Retrieves the modified banner if it exists; default otherwise";
-          }
-          enum "DEFAULT" {
-            description
-              "Default banner for the system";
-          }
-          enum "MODIFIED" {
-            description
-              "Retrieves the modified banner if it exists";
-          }
-          enum "FIXED" {
-            description
-              "Unmodifiable (fixed) banner ";
-          }
-        }
-        description
-          "The type of banner that is required to be retrieved.";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf linenum {
-          type ciena-6500-types:INT {
-            range "1..31";
-          }
-          description
-            "line number";
-        }
-        leaf linetext {
-          type string {
-            length "1..512";
-          }
-          description
-            "line text";
-        }
-      }
-    }
-  }
-  rpc security-kill-user {
-    description
-      "Terminate User (Session): This command is used to terminate user session or sessions which are logged into the NE.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf uid {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "User Identifier. The maximum size is 40 currently. Must be in uppercase";
-      }
-      leaf session {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "The session identification to be terminated.";
-      }
-      leaf my-session {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Indicator of current command session is included or not";
-      }
-    }
-  }
-  rpc security-show-radius-proxy {
-    description
-      "Retrieve the state of the RADIUS gateway.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf server {
-        type enumeration {
-          enum "AUTHENTICATION";
-          enum "ACCOUNTING";
-        }
-        mandatory true;
-        description
-          "Select server to provision";
-      }
-      leaf ex-info {
-        type enumeration {
-          enum "Y" {
-            description
-              "Request extra information to be displayed.";
-          }
-          enum "N" {
-            description
-              "Do not display extra information.";
-          }
-        }
-        description
-          "Request extra information to be displayed.";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf server {
-          type enumeration {
-            enum "AUTHENTICATION";
-            enum "ACCOUNTING";
-          }
-          mandatory true;
-          description
-            "Select server to provision";
-        }
-        leaf state {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          mandatory true;
-          description
-            "Operational state of the radius gateway";
-        }
-        leaf gen-secret {
-          type enumeration {
-            enum "Y" {
-              description
-                "Automatically generate the server shared secret";
-            }
-            enum "N" {
-              description
-                "Do not generate the shared secret";
-            }
-          }
-          mandatory true;
-          description
-            "Automatically generate the server shared secret";
-        }
-        leaf received {
-          type ciena-6500-types:INT;
-          description
-            "Count of packets received";
-        }
-        leaf sent {
-          type ciena-6500-types:INT;
-          description
-            "Count of sent packets";
-        }
-        leaf duplicate {
-          type ciena-6500-types:INT;
-          description
-            "Count of duplicate packets dropped";
-        }
-        leaf bad-size {
-          type ciena-6500-types:INT;
-          description
-            "Count of packets dropped due to invalid size";
-        }
-        leaf invalid {
-          type ciena-6500-types:INT;
-          description
-            "Count of packets dropped due to reasons other than badsize or duplicate";
-        }
-      }
-    }
-  }
-  rpc security-show-intruded-user {
-    description
-      "This command retrieves and displays the list of intruded users";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf uid {
-          type ciena-6500-types:IDENT;
-          description
-            "User Identifier.";
-        }
-        leaf user-type {
-          type enumeration {
-            enum "LOCAL" {
-              description
-                "local";
-            }
-            enum "NETWORK" {
-              description
-                "network";
-            }
-            enum "CHALRES" {
-              description
-                "challenge-response";
-            }
-            enum "GRPC" {
-              description
-                "gRPC";
-            }
-          }
-          description
-            "User account type. 0 = local, 1 = network, 2 = chalres";
-        }
-      }
-    }
-  }
-  rpc security-show-radius-accounting-config {
-    description
-      "Retrieve the state of the RADIUS accounting feature.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ex-info {
-        type enumeration {
-          enum "Y" {
-            description
-              "Request extra information to be displayed.";
-          }
-          enum "N" {
-            description
-              "Do not display extra information.";
-          }
-        }
-        description
-          "Request extra information to be displayed.";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf state {
-          type ciena-6500-enums:ENABLE_DISABLE;
-          description
-            "Provisioned state of the server";
-        }
-        leaf tx {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client transmitted packet count";
-        }
-        leaf dup {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client duplicate packet count";
-        }
-        leaf rx {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client received packet count";
-        }
-        leaf timeout {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client auth timeout packet count";
-        }
-        leaf late {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client late packet count";
-        }
-        leaf tx-err {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client transmit error count";
-        }
-        leaf bad-auth {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client bad authenticator count";
-        }
-        leaf bad-port {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client bad port count";
-        }
-        leaf bad-srv {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client bad server count";
-        }
-        leaf bad-type {
-          type ciena-6500-types:INT;
-          description
-            "RADIUS client bad packet type count";
-        }
-      }
-    }
-  }
-  rpc security-show-radius-accounting-servers {
-    description
-      "Retrieve the current remote accounting (RADIUS) server provisioning on the network element.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf server {
-        type enumeration {
-          enum "PRIMARY";
-          enum "SECONDARY";
-        }
-        mandatory true;
-        description
-          "Select server to provision";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf state {
-          type ciena-6500-enums:ENABLE_DISABLE;
-          mandatory true;
-          description
-            "Provisioned service state of the server";
-        }
-        leaf radius {
-          type ciena-6500-types:IPADDR;
-          mandatory true;
-          description
-            "IP address (n.n.n.n) of the remote accounting (RADIUS) server(Format: n.n.n.n)";
-        }
-        leaf port {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          mandatory true;
-          description
-            "UDP Port the server accepts incoming requests";
-        }
-        leaf timeout {
-          type ciena-6500-types:INT {
-            range "1..30";
-          }
-          mandatory true;
-          description
-            "Timeout (in seconds) after which non-response from the server is considered a failure";
-        }
-      }
-    }
-  }
-  rpc security-upload-cert-auth {
-    description
-      "Uploads validation certificate";
-    input {
-      leaf cert-aid {
-        mandatory true;
-        description
-          "AID in format CERT-shelf-instance";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "0..393";
-        }
-        mandatory true;
-        description
-          "Address of server which stores the certificate.";
-      }
-    }
-  }
-  rpc security-init-zeroize {
-    description
-      "This command will destroy all non-volatile keys (private keys)";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc security-operate-encrypt-string {
-    description
-      "This command will encrypt a string and return it in base64 format";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf input-string {
-        type string {
-          length "1..128";
-        }
-        mandatory true;
-        description
-          "String to encrypt";
-      }
-    }
-    output {
-      list output {
-        leaf encrypted-str {
-          type string {
-            length "6..175";
-          }
-          mandatory true;
-          description
-            "Encrypted string";
-        }
-      }
-    }
-  }
-  container security {
-    container radius {
-      container accounting {
-        list config {
-          key "shelf";
-          config true;
-          leaf shelf {
-            mandatory true;
-            description
-              "AID in format SHELF-shelf";
-            type ciena-6500-types:aid;
-          }
-          leaf state {
-            type ciena-6500-enums:ENABLE_DISABLE;
-            description
-              "Provisioned state of the server(Mandatory for edit operations)";
-            config true;
-          }
-          leaf tx {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client transmitted packet count";
-            config false;
-          }
-          leaf dup {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client duplicate packet count";
-            config false;
-          }
-          leaf rx {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client received packet count";
-            config false;
-          }
-          leaf timeout {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client auth timeout packet count";
-            config false;
-          }
-          leaf late {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client late packet count";
-            config false;
-          }
-          leaf tx-err {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client transmit error count";
-            config false;
-          }
-          leaf bad-auth {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client bad authenticator count";
-            config false;
-          }
-          leaf bad-port {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client bad port count";
-            config false;
-          }
-          leaf bad-srv {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client bad server count";
-            config false;
-          }
-          leaf bad-type {
-            type ciena-6500-types:INT;
-            description
-              "RADIUS client bad packet type count";
-            config false;
-          }
-        }
-        list servers {
-          key "shelf";
-          config true;
-          leaf shelf {
-            mandatory true;
-            description
-              "AID in format SHELF-shelf";
-            type ciena-6500-types:aid;
-          }
-          leaf server {
-            type enumeration {
-              enum "PRIMARY";
-              enum "SECONDARY";
-            }
-            description
-              "Select server to provision(Mandatory for edit operations)";
-            config true;
-          }
-          leaf pid {
-            type string {
-              length "1..128";
-            }
-            description
-              "Server shared secret";
-            config true;
-          }
-          leaf pid-confirmed {
-            type string {
-              length "1..128";
-            }
-            description
-              "Re-entered Server shared secret for confirmation";
-            config true;
-          }
-          leaf state {
-            type ciena-6500-enums:ENABLE_DISABLE;
-            description
-              "Provisioned service state of the server";
-            config true;
-          }
-          leaf radius {
-            type ciena-6500-types:IPADDR;
-            description
-              "IP address (n.n.n.n) of the remote accounting (RADIUS) server(Format: n.n.n.n)";
-            config true;
-          }
-          leaf port {
-            default "1813";
-            type ciena-6500-types:INT {
-              range "1..65535";
-            }
-            description
-              "UDP Port the server accepts incoming requests";
-            config true;
-          }
-          leaf timeout {
-            default "15";
-            type ciena-6500-types:INT {
-              range "1..30";
-            }
-            description
-              "Timeout (in seconds) after which non-response from the server is considered a failure";
-            config true;
-          }
-          leaf encrypted-pid {
-            type string {
-              length "6..128";
-            }
-            description
-              "Encrypted Server shared secret";
-            config true;
-          }
-        }
-      }
-      list proxy {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf server {
-          type enumeration {
-            enum "AUTHENTICATION";
-            enum "ACCOUNTING";
-          }
-          description
-            "Select server to provision(Mandatory for edit operations)";
-          config true;
-        }
-        leaf pid {
-          type string {
-            length "1..128";
-          }
-          description
-            "Server shared secret";
-          config true;
-        }
-        leaf pid-confirmed {
-          type string {
-            length "1..128";
-          }
-          description
-            "Re-entered Server shared secret for confirmation";
-          config true;
-        }
-        leaf state {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "Operational state of the RADIUS gateway.";
-          config true;
-        }
-        leaf gen-secret {
-          type enumeration {
-            enum "Y" {
-              description
-                "Automatically generate server shared secret.";
-            }
-            enum "N" {
-              description
-                "Do not generate server shared secret.";
-            }
-          }
-          description
-            "Automatically generate server shared secret";
-          config true;
-        }
-      }
-    }
-    list password {
-      key "uid";
-      config true;
-      leaf uid {
-        mandatory true;
-        description
-          "User Identifier.";
-        type ciena-6500-types:aid;
-      }
-      leaf oldpid {
-        type ciena-6500-types:STRING;
-        description
-          "The user's old password.(Mandatory for edit operations)";
-        config true;
-      }
-      leaf newpid {
-        type ciena-6500-types:STRING;
-        description
-          "The user's new password. Password identifiers (PIDs) must meet the following: The PID must be between 6 and 128 characters. A password must have at least one alphabetic and one numeric or special character. The PID cannot contain any of the following characters: semicolon, colon, ampersand, comma, spaces (deleted as entered), control characters, or question mark. The PID cannot contain the associated user identifier (UID). You cannot use any of your previous five passwords or any words that are in the list of unusable passwords. The list of unusable passwords is set with the ENT-SECU-BADPID command and can be retrieved with the RTRV-SECU-BADPID command. A double quote entered in the PID must be preceded by a backslash. The backslash is considered as a character in the length of the password. Carriage returns are ignored.(Mandatory for edit operations)";
-        config true;
-      }
-      leaf newpid_confirmed {
-        type ciena-6500-types:STRING;
-        description
-          "The user's new password - entered again for confirmation.(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    container bad-password {
-      config true;
-      leaf bad-pid {
-        type ciena-6500-types:STRING;
-        description
-          "Unusable password.";
-        config false;
-      }
-      leaf-list pid {
-        type ciena-6500-types:IDENT;
-        description
-          "Word to add to the list of unusable passwords. A string between 1 and 10 alphanumeric characters. Grouping is allowed.";
-        config true;
-      }
-    }
-    list user {
-      key "uid";
-      config true;
-      leaf uid {
-        mandatory true;
-        description
-          "User Identifier.";
-        type ciena-6500-types:aid;
-      }
-      leaf upc {
-        type ciena-6500-enums:UPC;
-        mandatory true;
-        description
-          "User Privilege Code";
-        config true;
-      }
-      leaf auto-timeout {
-        type enumeration {
-          enum "Y" {
-            description
-              "Timeout enabled. If TMOUTA is enabled and the TMOUT interval is not specified, the default is 30 minutes.";
-          }
-          enum "N" {
-            description
-              "Timeout disabled. The user will never be automatically logged off. TMOUT is irrelevant (set to 0 minutes).";
-          }
-        }
-        mandatory true;
-        description
-          "Automatic timeout flag. The user is automatically logged off from the network element if no valid TL1 command is sent within the specified TMOUT interval.";
-        config true;
-      }
-      leaf timeout {
-        default "30";
-        type ciena-6500-types:INT {
-          range "1..99";
-        }
-        description
-          "Timeout interval in minutes.";
-        config true;
-      }
-      leaf password-age-stat {
-        type ciena-6500-enums:BOOL_ON_OFF_defaultOFF;
-        default "OFF";
-        description
-          "Password aging status";
-        config true;
-      }
-      leaf password-age {
-        default "45";
-        type ciena-6500-types:INT {
-          range "0..999";
-        }
-        description
-          "Password aging time in days.";
-        config true;
-      }
-      leaf accr-stat {
-        type ciena-6500-enums:BOOL_ON_OFF_defaultOFF;
-        default "OFF";
-        description
-          "Password accreditation status";
-        config true;
-      }
-      leaf accr {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..30";
-        }
-        description
-          "Password accreditation time in days. The amount of time a user has to change a password that was assigned to the user account. The default is 0, which means that a password must be changed the day it is assigned to the user account.";
-        config true;
-      }
-      leaf expiry-warning {
-        default "14";
-        type ciena-6500-types:INT {
-          range "0..14";
-        }
-        description
-          "Early warning time in days. The number of days before a password expires that the user is given a warning when logging into the network element.";
-        config true;
-      }
-      leaf min-waiting {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..999";
-        }
-        description
-          "Minimum waiting time in days. The minimum number of days that a user must wait before changing a password.";
-        config true;
-      }
-      leaf user-type {
-        type enumeration {
-          enum "0" {
-            description
-              "local(This value can be used in create and edit operations)";
-          }
-          enum "1" {
-            description
-              "network(This value can be used in create and edit operations)";
-          }
-          enum "LOCAL" {
-            description
-              "local";
-          }
-        }
-        description
-          "User account type. 0 = local, 1 = network";
-        config true;
-      }
-      leaf use-dflt {
-        type enumeration {
-          enum "Y" {
-            description
-              "Usedefaults enabled.If Usedefaults is enabled, the parameters in the userprofile shall use all default values set by SET-ATTR-SECUDFLT command.";
-          }
-          enum "N" {
-            description
-              "Usedefaults diabled.If Usedefaults is disabled,the default values may be overridden with other defined values for the parameters.";
-          }
-        }
-        description
-          "Use security default parameters.The parameters in the user profile are set to either defaults or modified values depending upon USEDFLT parameter.";
-        config true;
-      }
-      leaf active {
-        type enumeration {
-          enum "Y" {
-            description
-              "User is logged in.";
-          }
-          enum "N" {
-            description
-              "User is not logged in.";
-          }
-        }
-        description
-          "Display whether user is logged in or not";
-        config false;
-      }
-      leaf password-status {
-        type enumeration {
-          enum "ASSIGNED" {
-            description
-              "A new user account is created or the password is changed by the system administrator";
-          }
-          enum "VALID" {
-            description
-              "Password provided by the user himself";
-          }
-          enum "EXPIRED_AP" {
-            description
-              "Expired password that was previously in a valid state.";
-          }
-          enum "EXPIRED_EP" {
-            description
-              "Expired password that was previously in a assigned state.";
-          }
-          enum "INHIBITED" {
-            description
-              "Administrator has disabled the user.";
-          }
-          enum "LOCKED" {
-            description
-              "System has LOCKED the intruded user for the period of DURAL.";
-          }
-        }
-        description
-          "Password status";
-        config false;
-      }
-      leaf password-expiry {
-        type ciena-6500-types:STRING;
-        description
-          "Password Expiry Date is formatted in the form of yyyy-mm-dd hh:mm:ss";
-        config false;
-      }
-      leaf last-lg-time {
-        type ciena-6500-types:STRING;
-        description
-          "User last successful login is formatted in the form of yyyy-mm-dd hh:mm:ss";
-        config false;
-      }
-      leaf newpid {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "The user's new password.";
-        config true;
-      }
-      leaf newpid_confirmed {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "The user's new password - entered twice for confirmation.";
-        config true;
-      }
-      leaf newuid {
-        type ciena-6500-types:STRING;
-        description
-          "This parameter is not used. The parameter is defined in TR-NWT-00835 but not supported.";
-        config true;
-      }
-    }
-    list defaults {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf password-age-stat {
-        type ciena-6500-enums:BOOL_ON_OFF_defaultOFF;
-        default "OFF";
-        description
-          "Password aging status";
-        config true;
-      }
-      leaf password-age {
-        default "45";
-        type ciena-6500-types:INT {
-          range "0..999";
-        }
-        description
-          "Password aging time in days.";
-        config true;
-      }
-      leaf accr-stat {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Password accreditation status";
-        config true;
-      }
-      leaf accr {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..30";
-        }
-        description
-          "Password accreditation time in days. The amount of time a user has to change a password that was assigned to the user account. The default is 0, which means that a password must be changed the day it is assigned to the user account.";
-        config true;
-      }
-      leaf expiry-warning {
-        default "14";
-        type ciena-6500-types:INT {
-          range "0..14";
-        }
-        description
-          "Early warning time in days. The number of days before a password expires that the user is given a warning when logging into the network element.";
-        config true;
-      }
-      leaf min-waiting {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..999";
-        }
-        description
-          "Minimum waiting time in days. The minimum number of days that a user must wait before changing a password.";
-        config true;
-      }
-      leaf max-invalid {
-        default "5";
-        type ciena-6500-types:INT {
-          range "2..20";
-        }
-        description
-          "Maximum number of invalid login attempts";
-        config true;
-      }
-      leaf lockout-duration {
-        default "60";
-        type ciena-6500-types:INT {
-          range "0..7200";
-        }
-        description
-          "Duration of lockout in seconds.";
-        config true;
-      }
-      leaf intrusion-detection {
-        type enumeration {
-          enum "ON" {
-            description
-              "User Based Intrusion Detection is enabled";
-          }
-          enum "UBIDON" {
-            description
-              "User Based Intrusion Detection is enabled ";
-          }
-          enum "OFF" {
-            description
-              "Intrusion Detection is disabled";
-          }
-        }
-        description
-          "Intrusion detection state";
-        config true;
-      }
-      leaf password-rules {
-        type enumeration {
-          enum "STD" {
-            description
-              "Standard";
-          }
-          enum "CMPLX" {
-            description
-              "Complex";
-          }
-          enum "CUSTOM" {
-            description
-              "Custom (Password rules can be configured by the administrator.)";
-          }
-        }
-        default "STD";
-        description
-          "Password Rules state";
-        config true;
-      }
-      leaf max-login {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..99";
-        }
-        description
-          "Simultaneous login limit";
-        config true;
-      }
-      leaf dormancy-state {
-        type enumeration {
-          enum "ENABLED" {
-            description
-              "Account Dormancy is enabled";
-          }
-          enum "DISABLED" {
-            description
-              "Account Dormancy is disabled ";
-          }
-        }
-        default "DISABLED";
-        description
-          "Account Dormancy state";
-        config true;
-      }
-      leaf user-aging {
-        default "45";
-        type ciena-6500-types:INT {
-          range "1..999";
-        }
-        description
-          "User aging interval";
-        config true;
-      }
-      leaf lockout-mode {
-        type enumeration {
-          enum "ALLREMUSRS" {
-            description
-              "Behaves the same as NONADMIN for connections via the local craft port. For connections from anywhere else (i.e. remote connections) User Based Intrusion Detection will lockout all accounts regardless of UPC level";
-          }
-          enum "NONADMIN" {
-            description
-              "User Based Intrusion Detection will lockout user accounts of UPC 3 or below";
-          }
-        }
-        default "NONADMIN";
-        description
-          "User lockout mode";
-        config true;
-      }
-    }
-    list blocked-channel-id {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf port-type {
-        type enumeration {
-          enum "TELNET" {
-            description
-              "TCP/IP Telnet application server";
-          }
-          enum "FTP" {
-            description
-              "TCP/IP FTP application server";
-          }
-          enum "SHELF" {
-            description
-              "Access panel serial port";
-          }
-          enum "FPLT" {
-            description
-              "SP faceplate serial port";
-          }
-          enum "RLOGIN" {
-            description
-              "Remote login application server";
-          }
-        }
-        description
-          "Protocol";
-        config false;
-      }
-      leaf port-addr {
-        type ciena-6500-types:STRING;
-        description
-          "Protocol type and Physical address of port (if applicable).";
-        config false;
-      }
-      leaf portstat {
-        type enumeration {
-          enum "ALW" {
-            description
-              "Specified port is not in a locked out state";
-          }
-          enum "INH" {
-            description
-              "Specified port is in a locked out state";
-          }
-        }
-        description
-          "Port status.";
-        config false;
-      }
-    }
-    list upc {
-      key "uid";
-      config false;
-      leaf uid {
-        mandatory true;
-        description
-          "User Identifier.";
-        type ciena-6500-types:aid;
-      }
-      leaf upc {
-        type ciena-6500-enums:UPC;
-        description
-          "User Privilege Code";
-        config false;
-      }
-    }
-    list radius-auth {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf auth-state {
-        type ciena-6500-enums:ENABLE_DISABLE;
-        description
-          "Provisioned state of the CSA feature";
-        config true;
-      }
-      leaf query-mode {
-        type ciena-6500-enums:CSA_QUERYMODE;
-        description
-          "CSA RADIUS server query mode";
-        config true;
-      }
-      leaf passwd-chg {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "Enable RADIUS password change";
-          }
-          enum "DISABLE" {
-            description
-              "Disable RADIUS password change";
-          }
-        }
-        default "DISABLE";
-        description
-          "Provisioned RADIUS password change state";
-        config true;
-      }
-      leaf tx {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client transmitted packet count";
-        config false;
-      }
-      leaf dup {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client duplicate packet count";
-        config false;
-      }
-      leaf rx {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client received packet count";
-        config false;
-      }
-      leaf tmout {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client auth timeout packet count";
-        config false;
-      }
-      leaf late {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client late packet count";
-        config false;
-      }
-      leaf tx-err {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client transmit error count";
-        config false;
-      }
-      leaf bad-auth {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client bad authenticator count";
-        config false;
-      }
-      leaf bad-port {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client bad port count";
-        config false;
-      }
-      leaf bad-srv {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client bad server count";
-        config false;
-      }
-      leaf bad-type {
-        type ciena-6500-types:INT;
-        description
-          "RADIUS client bad packet type count";
-        config false;
-      }
-    }
-    list challenge-secret {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf newpid {
-        type string {
-          length "6..20";
-        }
-        description
-          "New shared secret";
-        config true;
-      }
-      leaf newpid_confirmed {
-        type string {
-          length "6..20";
-        }
-        description
-          "New shared secret confirmation";
-        config true;
-      }
-      leaf encrypted-secret {
-        type string {
-          length "6..175";
-        }
-        description
-          "Encrypted shared secret";
-        config true;
-      }
-    }
-    list remauth-alternate {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf alternate {
-        type ciena-6500-enums:AlternateSecurityDomains;
-        description
-          "Alternate authentication mode(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    list banner {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf linenum {
-        type ciena-6500-types:INT {
-          range "1..31";
-        }
-        description
-          "The line number to change.(Mandatory for edit operations)";
-        config true;
-      }
-      leaf linetext {
-        type string {
-          length "1..512";
-        }
-        description
-          "The text to replace the line number by.(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    list intruded-user {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "aid in format SHELF-shelf";
-      }
-      leaf uid {
-        type ciena-6500-types:IDENT;
-        description
-          "User Identifier.";
-        config false;
-      }
-      leaf user-type {
-        type enumeration {
-          enum "LOCAL" {
-            description
-              "local";
-          }
-          enum "NETWORK" {
-            description
-              "network";
-          }
-          enum "CHALRES" {
-            description
-              "challenge-response";
-          }
-          enum "GRPC" {
-            description
-              "gRPC";
-          }
-        }
-        description
-          "User account type. 0 = local, 1 = network, 2 = chalres";
-        config false;
-      }
-    }
-    list advanced-settings {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf debug-auth {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "DISABLED";
-        description
-          "Enable or disable the Debug Login Authentication (default is DISABLED).";
-        config true;
-      }
-      leaf limit-host-only {
-        type enumeration {
-          enum "Y";
-          enum "N";
-        }
-        default "N";
-        description
-          "Turns on/off the LIMITHOSTONLY mode (default is 'N==off').";
-        config true;
-      }
-      leaf server-certificate-expiry-warning {
-        default "90";
-        type ciena-6500-types:INT {
-          range "14..365";
-        }
-        description
-          "Warning period of certificate expiry in number of days (0-365)";
-        config true;
-      }
-      leaf validation-certificate-expiry-warning {
-        default "60";
-        type ciena-6500-types:INT {
-          range "0..180";
-        }
-        description
-          "Warning period of validation certificate expiry in number of days (0-180)";
-        config true;
-      }
-      leaf grpc-upc {
-        default "4";
-        type ciena-6500-types:INT {
-          range "1..5";
-        }
-        description
-          "Default gRPC UPC for certificate authentication";
-        config true;
-      }
-      leaf zeroize-mode {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "DISABLED";
-        description
-          "Enable or disable the Zeroization mode (default is DISABLED).";
-        config true;
-      }
-    }
-    list password-rules {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf upperc-min {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..3";
-        }
-        description
-          "Minimum number of uppercase characters in a password";
-        config true;
-      }
-      leaf lowerc-min {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..3";
-        }
-        description
-          "Minimum number of lowercase characters in a password";
-        config true;
-      }
-      leaf alpha-min {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..3";
-        }
-        description
-          "Minimum number of alphabetic characters in a password";
-        config true;
-      }
-      leaf num-min {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..3";
-        }
-        description
-          "Minimum number of numeric characters in a password";
-        config true;
-      }
-      leaf special-min {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..3";
-        }
-        description
-          "Minimum number of special characters in a password";
-        config true;
-      }
-      leaf repeat-char-max {
-        default "3";
-        type ciena-6500-types:INT {
-          range "0..10";
-        }
-        description
-          "Maximum number of repeating characters in a password";
-        config true;
-      }
-      leaf password-len-min {
-        default "8";
-        type ciena-6500-types:INT {
-          range "8..15";
-        }
-        description
-          "Minimum number of characters in a password";
-        config true;
-      }
-      leaf password-old {
-        default "5";
-        type ciena-6500-types:INT {
-          range "5..15";
-        }
-        description
-          "Minimum number of prior password that cannot be used in new password (Prevent reusing last N passwords).";
-        config true;
-      }
-      leaf password-dif {
-        default "7";
-        type ciena-6500-types:INT {
-          range "1..10";
-        }
-        description
-          "Minimum number of characters differ between the old and new password.";
-        config true;
-      }
-    }
-    list intershlf-comkey {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf comkey-1 {
-        type string {
-          length "6..32";
-        }
-        description
-          "comkey 1";
-        config true;
-      }
-      leaf comkey-2 {
-        type string {
-          length "6..32";
-        }
-        description
-          "comkey 2";
-        config true;
-      }
-    }
-    list tacacs-server {
-      key "tac-server";
-      config true;
-      leaf tac-server {
-        mandatory true;
-        description
-          "AID in format SERVER-shelf-serverid";
-        type ciena-6500-types:aid;
-      }
-      leaf state {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "Provisioned state of the server";
-        config true;
-      }
-      leaf tmout {
-        default "15";
-        type ciena-6500-types:INT {
-          range "1..30";
-        }
-        description
-          "Timeout (in seconds) after which non-response from the server is considered a failure";
-        config true;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "IP address of the TACACS server(Format: n.n.n.n)";
-        config true;
-      }
-      leaf port {
-        default "49";
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Port the server accepts incoming requests";
-        config true;
-      }
-      leaf secret {
-        type string {
-          length "1..64";
-        }
-        description
-          "secret 1";
-        config true;
-      }
-      leaf secret-confirmed {
-        type string {
-          length "1..64";
-        }
-        description
-          "secret 2";
-        config true;
-      }
-      leaf encrypted-secret {
-        type string {
-          length "6..175";
-        }
-        description
-          "Encrypted server shared secret";
-        config true;
-      }
-    }
-    list authdflt {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf dflt {
-        type enumeration {
-          enum "LOCAL";
-          enum "RADIUS";
-        }
-        default "LOCAL";
-        description
-          "Default authentication mode";
-        config true;
-      }
-    }
-    list authmode {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf tl1 {
-        type enumeration {
-          enum "DEFAULT";
-          enum "TACACS";
-        }
-        default "DEFAULT";
-        description
-          "Set the authentication mode for TL1";
-        config true;
-      }
-      leaf cli {
-        type enumeration {
-          enum "DEFAULT";
-          enum "TACACS";
-        }
-        default "DEFAULT";
-        description
-          "Set the authentication mode for CLI";
-        config true;
-      }
-      leaf rest {
-        type enumeration {
-          enum "DEFAULT";
-        }
-        default "DEFAULT";
-        description
-          "Set the authentication mode for REST";
-        config true;
-      }
-      leaf grpc {
-        type enumeration {
-          enum "DEFAULT";
-          enum "CERTIFICATE";
-        }
-        default "DEFAULT";
-        description
-          "Set the authentication mode for gRPC";
-        config true;
-      }
-      leaf ftp {
-        type enumeration {
-          enum "DEFAULT";
-        }
-        default "DEFAULT";
-        description
-          "Set the authentication mode for FTP";
-        config true;
-      }
-    }
-    list cert-auth {
-      key "cert-aid";
-      config false;
-      leaf cert-aid {
-        mandatory true;
-        description
-          "AID in format CERT-shelf-instance, CERT-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf distinguished-name {
-        type string {
-          length "0..125";
-        }
-        description
-          "Certificate distinguished name.";
-        config false;
-      }
-      leaf ser-number {
-        type ciena-6500-types:STRING;
-        description
-          "Certificate serial number.";
-        config false;
-      }
-      leaf start-date {
-        type ciena-6500-types:STRING;
-        description
-          "Certificate validity period start date.";
-        config false;
-      }
-      leaf end-date {
-        type ciena-6500-types:STRING;
-        description
-          "Certificate validity period end date.";
-        config false;
-      }
-      leaf issuer {
-        type string {
-          length "0..125";
-        }
-        description
-          "Certificate Issuer.";
-        config false;
-      }
-      leaf sha1 {
-        type string {
-          length "0..125";
-        }
-        description
-          "SHA1 Fingerprint.";
-        config false;
-      }
-      leaf sha256 {
-        type string {
-          length "0..125";
-        }
-        description
-          "SHA256 Fingerprint.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-servers.yang b/models/ciena-6500-servers.yang
deleted file mode 100644
index f8b50aed648204e7efa1d64b1c6443317e48798b..0000000000000000000000000000000000000000
--- a/models/ciena-6500-servers.yang
+++ /dev/null
@@ -1,459 +0,0 @@
-module ciena-6500-servers {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-servers";
-  prefix servers;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's servers object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container servers
-           list http
-           - Added leaf: grpcencoding
-           list ssh
-           - Added leaf-list: host-key-algorithm
-           - Added leaf: key-re-exchange
-           - Added leaf: host-key-validation
-           - Added leaf-list: server-authmethod
-           - Added leaf: ssh-log-level";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         container servers
-         - Added list: ftp
-         - Added list: ssl
-           list dhcp
-             leaf ip.lan
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf ipv4-server-state
-             - Added default: ON 
-             leaf ipv6-server-state
-             - Added default: OFF 
-           list http
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf http-state
-             - Added default: ON 
-             leaf https-state
-             - Added default: ON 
-             leaf rest
-             - Added default: OFF 
-             leaf idle-timeout
-             - Added default: 600 
-               type ciena-6500-types:INT
-               - Added range: 1..900 
-             leaf grpc
-             - Added default: OFF 
-           list telnet
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf max-sessions
-             - Added default: 18 
-               type ciena-6500-types:INT
-               - Added range: 1..18 
-             leaf idle-timeout
-             - Added default: 30 
-               type ciena-6500-types:INT
-               - Added range: 0..99 
-             leaf server-state
-             - Added default: ENABLED 
-           list ssh
-           - Added leaf-list: key-exc-method
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf max-sessions
-             - Added default: 3 
-               type ciena-6500-types:INT
-               - Added range: 1..28 
-             leaf idle-timeout
-             - Added default: 30 
-               type ciena-6500-types:INT
-               - Added range: 0..99 
-             leaf server-state
-             - Added default: ENABLED 
-             leaf-list cipher
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..256 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container servers
-           list dhcp
-           - Changed key from aid to ip.lan
-           - Removed leaf: aid
-           - Removed leaf: server-state
-           - Removed leaf: ip-addr
-           - Removed leaf: netmask
-           - Removed leaf: gateway
-           - Removed leaf: def-lease
-           - Removed leaf: max-lease
-           - Added leaf: ipv4-server-state
-           - Added leaf: ipv6-server-state
-           - Added leaf: ip.lan
-           list http
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: grpc
-           - Added leaf: shelf
-           list telnet
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: server
-           - Removed leaf: SHELF
-           - Added leaf: server-state
-           - Added leaf: shelf
-           list ssh
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf-list hmac
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..256 ";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: servers";
-  }
-
-  container servers {
-    list dhcp {
-      key "ip.lan";
-      config true;
-      leaf ip.lan {
-        mandatory true;
-        description
-          "AID in format LAN-shelf-port, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ipv4-server-state {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "Turn the DHCP service on the CRAFT LAN port ON or OFF (default is ON).";
-        config true;
-      }
-      leaf ipv6-server-state {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Turn the DHCPV6 service on the CRAFT LAN port ON or OFF (default is OFF)";
-        config true;
-      }
-    }
-    list ftp {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf idle-timeout {
-        default "180";
-        type ciena-6500-types:INT {
-          range "1..900";
-        }
-        description
-          "Idle timeout, in seconds, for any connection to the FTP server.";
-        config true;
-      }
-      leaf server {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "DISABLED";
-        description
-          "Enable or disable the FTP server (default is DISABLED).";
-        config true;
-      }
-      leaf max-sessions {
-        default "8";
-        type ciena-6500-types:INT {
-          range "1..8";
-        }
-        description
-          "Maximum number of simultaneous sessions that the FTP server will accept (default=8).";
-        config false;
-      }
-    }
-    list http {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf http-state {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "Disable or enable state of the regular HTTP protocol access";
-        config true;
-      }
-      leaf https-state {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "ON";
-        description
-          "Disable or enable state of the secure HTTP protocol access";
-        config true;
-      }
-      leaf rest {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Disable or enable access to the REST service";
-        config true;
-      }
-      leaf idle-timeout {
-        default "600";
-        type ciena-6500-types:INT {
-          range "1..900";
-        }
-        description
-          "Specify the REST service idle time out value (in seconds)";
-        config true;
-      }
-      leaf grpc {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Disable or enable access to the GRPC service";
-        config true;
-      }
-      leaf grpcencoding {
-        type ciena-6500-enums:grpc_encoding;
-        default "ASCII";
-        description
-          "Select the gRPC encoding type";
-        config true;
-      }
-    }
-    list telnet {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf max-sessions {
-        default "18";
-        type ciena-6500-types:INT {
-          range "1..18";
-        }
-        description
-          "Maximum number of simultaneous sessions that the TELNET server will accept.";
-        config true;
-      }
-      leaf idle-timeout {
-        default "30";
-        type ciena-6500-types:INT {
-          range "0..99";
-        }
-        description
-          "Idle timeout, in minutes, for any connection to the TELNET server.";
-        config true;
-      }
-      leaf server-state {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "ENABLED";
-        description
-          "Enable or disable the TELNET server (default is ENABLED). SSH server must be enabled in order to disable TELNET server";
-        config true;
-      }
-    }
-    list ssh {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf max-sessions {
-        default "3";
-        type ciena-6500-types:INT {
-          range "1..28";
-        }
-        description
-          "The maximum number of active SSH sessions that the server will support.";
-        config true;
-      }
-      leaf idle-timeout {
-        default "30";
-        type ciena-6500-types:INT {
-          range "0..99";
-        }
-        description
-          "The idletimeout used by the SSH server to determine whether an SSH connection is idle and requires termination.";
-        config true;
-      }
-      leaf server-state {
-        type enumeration {
-          enum "ENABLED";
-          enum "DISABLED";
-        }
-        default "ENABLED";
-        description
-          "Enable or disable the SSH server (default is DISABLED).";
-        config true;
-      }
-      leaf-list hmac {
-        type string {
-          length "0..256";
-        }
-        description
-          "Provisions supported SSH HMACs. Supported values are: SHA2_256, MD5, MD5_96, SHA1, SHA1_96";
-        config true;
-      }
-      leaf-list cipher {
-        type string {
-          length "0..256";
-        }
-        description
-          "Provisions supported SSH ciphers. Supported values are: AES128CTR, AES128CBC, AES192CTR, AES192CBC, AES256CTR, AES256CBC, RIJNDAEL128CBC, RIJNDAEL192CBC, RIJNDAEL256CBC, 3DESCBC";
-        config true;
-      }
-      leaf-list key-exc-method {
-        type string {
-          length "0..256";
-        }
-        description
-          "Provisions supported SSH Key Exchange Methods. Supported values are: DH-GROUP1 DH-GROUP14";
-        config true;
-      }
-      leaf-list host-key-algorithm {
-        type string {
-          length "0..256";
-        }
-        description
-          "Displays the provisioned SSH Host Key Algorithms. Supported values are: RSA DSA";
-        config true;
-      }
-      leaf key-re-exchange {
-        type enumeration {
-          enum "Y" {
-            description
-              "Key Re-exchange enabled";
-          }
-          enum "N" {
-            description
-              "Key Re-exchange disabled";
-          }
-        }
-        default "N";
-        description
-          "Enable or Disable SSH Key Re-exchange";
-        config true;
-      }
-      leaf host-key-validation {
-        type enumeration {
-          enum "Y" {
-            description
-              "Host Key Validation enabled";
-          }
-          enum "N" {
-            description
-              "Host Key Validation disabled";
-          }
-        }
-        default "N";
-        description
-          "Enable or Disable SSH Host Key Validation";
-        config true;
-      }
-      leaf-list server-authmethod {
-        type string {
-          length "0..256";
-        }
-        description
-          "Provisions supported SSH Authentication Methods on the server. Supported values are: PUBKEY NONE (Default is NONE)";
-        config true;
-      }
-      leaf ssh-log-level {
-        type ciena-6500-types:INT;
-        description
-          "Controls the logs that are generated for SSH and SFTP connections. Supported values are: 1-SFTP client connection logs and 2-SSH/SFTP server connection logs (Default is 1)";
-        config true;
-      }
-    }
-    list ssl {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf min-version {
-        type enumeration {
-          enum "TLS10";
-          enum "TLS11";
-          enum "TLS12";
-        }
-        description
-          "Minimum TLS version (default 1.0)";
-        config true;
-      }
-      leaf max-version {
-        type enumeration {
-          enum "TLS10";
-          enum "TLS11";
-          enum "TLS12";
-        }
-        description
-          "Maximum TLS version (default 1.2)";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-session.yang b/models/ciena-6500-session.yang
deleted file mode 100644
index 6eed1636164a8c3891066c83cca7d65b56c7b36c..0000000000000000000000000000000000000000
--- a/models/ciena-6500-session.yang
+++ /dev/null
@@ -1,45 +0,0 @@
-module ciena-6500-session {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-session";
-  prefix session;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's session object for the 6500 platform";
-
-  revision 2015-01-01 {
-    description
-      "Initial revision.";
-  }
-
-  rpc session-allow-message {
-    description
-      "Allow all messages : Enables reporting of all automatic messages from the network element. This command also lets you resume reporting of automatic messages that were previously inhibited by an INH-MSG-ALL command.";
-    input {
-      leaf all {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "AID";
-      }
-    }
-  }
-  rpc session-inhibit-message {
-    description
-      "Inhibit all messages : Disables reporting of all automatic messages from the network element. Automatic reporting can be re-enabled by using the ALW-MSG-ALL command.";
-    input {
-      leaf all {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "AID";
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-shelves.yang b/models/ciena-6500-shelves.yang
deleted file mode 100644
index dac93b51466d05ac8e004a27f1340bb97df04735..0000000000000000000000000000000000000000
--- a/models/ciena-6500-shelves.yang
+++ /dev/null
@@ -1,453 +0,0 @@
-module ciena-6500-shelves {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-shelves";
-  prefix shelves;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's shelves object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Added rpc: shelves-delete-shelf";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: shelves-disable-member
-       - Added rpc: shelves-enable-member
-         container shelves
-         - Added list: member
-         - Added list: member-session
-           list shelf
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf site-id
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf bay-num
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..99 
-             leaf phys-shelf
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..9 
-             leaf om5000-ne-id
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..64 
-             leaf primary
-             - Added default: DISABLE 
-             leaf tidc
-             - Added default: DISABLE 
-             leaf extended-shelf
-             - Added default: DISABLE 
-             leaf act-fltr-timer
-             - Added default: DISABLE 
-             leaf fltr-timer
-               type ciena-6500-types:INT
-               - Added range: 1..1826 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container shelves
-           list shelf
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: fix-cfg-type
-           - Added leaf: shelf
-           - Added leaf: shelfsync";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: shelves";
-  }
-
-  rpc shelves-delete-shelf {
-    description
-      "De-provision the shelf";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf force {
-        type enumeration {
-          enum "YES" {
-            description
-              "Allow if line or cross-connect card present";
-          }
-          enum "NO" {
-            description
-              "Deny if line or cross-connect card present";
-          }
-        }
-        description
-          "Check for line and cross-connect card presence";
-      }
-    }
-  }
-  rpc shelves-disable-member {
-    description
-      "Puts shelf in a Consolidated TID in an out of service state. It may be executed at any time from the primary to place a member shelf out of service. Can only be executed by a member shelf when the primary is unreachable from the member shelf. This does not remove a shelf from service, as optical connections may persist, and a node being converted to standalone may still intend to carry traffic.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc shelves-enable-member {
-    description
-      "Restores a shelf member to a managed in-service state through a TID consolidation primary.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container shelves {
-    list shelf {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf site-id {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Site ID.";
-        config true;
-      }
-      leaf site-name {
-        type ciena-6500-types:STRING;
-        description
-          "Site Name.";
-        config true;
-      }
-      leaf fic {
-        type ciena-6500-types:STRING;
-        description
-          "FIC";
-        config true;
-      }
-      leaf bay-num {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..99";
-        }
-        description
-          "Bay Number";
-        config true;
-      }
-      leaf phys-shelf {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..9";
-        }
-        description
-          "Physical Shelf Number";
-        config true;
-      }
-      leaf location {
-        type ciena-6500-types:STRING;
-        description
-          "Location";
-        config true;
-      }
-      leaf subnet-name {
-        type ciena-6500-types:STRING;
-        description
-          "Subnet Name";
-        config true;
-      }
-      leaf om5000-ne-id {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..64";
-        }
-        description
-          "OM5000 NE ID.";
-        config true;
-      }
-      leaf om5000-primary-ip {
-        type ciena-6500-types:IPADDR;
-        description
-          "OM5000 Primary IP Address.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf primary {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "Activate Shelf as Primary";
-          }
-          enum "DISABLE" {
-            description
-              "Do not Activate";
-          }
-        }
-        default "DISABLE";
-        description
-          "Primary Member Activation";
-        config true;
-      }
-      leaf tidc {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "TID Consolidation feature is enabled.";
-          }
-          enum "DISABLE" {
-            description
-              "TID Consolidation feature is disabled.";
-          }
-        }
-        default "DISABLE";
-        description
-          "States whether TID Consolidation feature is enabled or not";
-        config true;
-      }
-      leaf extended-shelf {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "Extended shelf feature is enabled.";
-          }
-          enum "DISABLE" {
-            description
-              "Extended shelf feature is disabled.";
-          }
-        }
-        default "DISABLE";
-        description
-          "States whether Extended shelf is enabled or not, if enabled then shelf range 0-992 otherwise 0-254";
-        config true;
-      }
-      leaf act-fltr-timer {
-        type enumeration {
-          enum "ENABLE" {
-            description
-              "Activate Timer";
-          }
-          enum "DISABLE" {
-            description
-              "Do not activate timer";
-          }
-        }
-        default "DISABLE";
-        description
-          "Activate Filter Timer";
-        config true;
-      }
-      leaf fltr-timer {
-        type ciena-6500-types:INT {
-          range "1..1826";
-        }
-        description
-          "Filter Timer Value in days (1-1826)";
-        config true;
-      }
-      leaf db-sync-state {
-        type ciena-6500-enums:DB_SYNC_STATE;
-        description
-          "Database Sync State. When the database becomes unsynchronized (OOSYNC), database changed notifications are suspended. When the database becomes synchronized (INSYNC), the database should be re-queried";
-        config false;
-      }
-      leaf shelfsync {
-        type ciena-6500-enums:BOOL_TRUE_defaultFALSE;
-        description
-          "Tells the Shelf-Sync state of Primary with member";
-        config false;
-      }
-      leaf new-shelf-id {
-        type ciena-6500-types:aid;
-        description
-          "SHELF-shelf";
-        config true;
-      }
-    }
-    list member {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        mandatory true;
-        description
-          "The IP address to be given out on the CRAFT LAN port.(Format: n.n.n.n)";
-        config true;
-      }
-      leaf member-func {
-        type enumeration {
-          enum "CHA" {
-            description
-              "Channel Access";
-          }
-          enum "AMP" {
-            description
-              "Line Amplifier";
-          }
-          enum "OCP" {
-            description
-              "Optical Convergence Platform";
-          }
-          enum "POTS" {
-            description
-              "Packet Optical Transport System";
-          }
-        }
-        mandatory true;
-        description
-          "Member Function.";
-        config true;
-      }
-      leaf shelf-model {
-        type ciena-6500-types:STRING;
-        description
-          "Shelf Model.";
-        config false;
-      }
-      leaf ne-type {
-        type enumeration {
-          enum "OCP" {
-            description
-              "Optical Convergence Platform";
-          }
-          enum "POTS" {
-            description
-              "Packet Optical Transport System";
-          }
-        }
-        description
-          "NE Type of the member.";
-        config false;
-      }
-      leaf sw-ver {
-        type ciena-6500-types:STRING;
-        description
-          "Software Release.";
-        config false;
-      }
-      leaf pst {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service";
-          }
-          enum "IS-ANR" {
-            description
-              "In Service/Abnormal";
-          }
-          enum "OOS-AUMA" {
-            description
-              "Out Of Service/Autonomous Management";
-          }
-          enum "OOS-MAANR" {
-            description
-              "Out Of Service/Maintenance Abnormal";
-          }
-        }
-        description
-          "";
-        config false;
-      }
-      leaf sst {
-        type enumeration {
-          enum "UAS" {
-            description
-              "UnASsigned";
-          }
-          enum "UEQ" {
-            description
-              "UnEQuipped";
-          }
-          enum "MEA" {
-            description
-              "Mismatched Equipment Attributes";
-          }
-          enum "SGEO" {
-            description
-              "Supporting Entity Outage";
-          }
-        }
-        description
-          "";
-        config false;
-      }
-      leaf state {
-        type enumeration {
-          enum "IS" {
-            description
-              "In Service";
-          }
-          enum "OOS-MA" {
-            description
-              "Out of Service - Management";
-          }
-        }
-        description
-          "";
-        config true;
-      }
-    }
-    list member-session {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf status {
-        type enumeration {
-          enum "AVAILABLE" {
-            description
-              "TL1 session is available";
-          }
-          enum "UNAVAILABLE" {
-            description
-              "TL1 session in unavailable";
-          }
-        }
-        description
-          "";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-snmp.yang b/models/ciena-6500-snmp.yang
deleted file mode 100644
index ad2414c2343b4ee02055e59336dd3c13a4c5031e..0000000000000000000000000000000000000000
--- a/models/ciena-6500-snmp.yang
+++ /dev/null
@@ -1,621 +0,0 @@
-module ciena-6500-snmp {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-snmp";
-  prefix snmp;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's snmp object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: snmp-show-usergroup
-         rpc snmp-delete-user
-           input
-             leaf uid
-             - Added mandatory: true 
-         container snmp
-           list config
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf snmp-agent
-             - Added default: DISABLED 
-             leaf alm-masking
-             - Added default: ON 
-             leaf proxy
-             - Added default: OFF 
-             leaf proxy-req-timeout
-             - Added default: 20 
-               type ciena-6500-types:INT
-               - Added range: 5..100 
-             leaf enhanced-proxy
-             - Added default: OFF 
-             leaf tca-reporting
-             - Added default: ON 
-             leaf trap-if
-             - Added default: AUTO 
-             leaf trapmib
-             - Added default: NORTEL 
-           list trap-dest
-           - Removed leaf: ipaddr
-             leaf dest
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf ip-addr
-             - Changed config from false to true
-             leaf udp-port
-             - Added default: 162 
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-           list user
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf uid
-             - Added mandatory: true 
-             leaf auth
-               type enumeration
-               - Added enum: NOAUTH
-             leaf priv
-               type enumeration
-               - Removed enum: NONE
-               - Added enum: NOPRIV
-             leaf user-group
-             - Added mandatory: true 
-           list usergroup
-           - Removed key
-             leaf shelf
-             - Added mandatory: true ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Added rpc: snmp-delete-user
-         container snmp
-           list config
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: trapmib
-           - Added leaf: shelf
-           list trap-dest
-           - Changed key from aid to dest
-           - Removed leaf: aid
-           - Added leaf: dest
-             leaf ip-addr
-             - Changed type from ciena-6500-types:IPADDR to string
-               type string
-               - Added length: 0..48 
-             leaf ipaddr
-             - Changed type from ciena-6500-types:IPADDR to string
-               type string
-               - Added length: 0..48 
-           list community
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-           list user
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf auth
-               type enumeration
-               - Removed enum: NONE
-             leaf priv
-               type enumeration
-               - Added enum: AES192
-               - Added enum: AES256
-           list usergroup
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: snmp";
-  }
-
-  rpc snmp-delete-user {
-    description
-      "Delete a SNMPv3 user and a corresponding user to access group mapping.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf uid {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "This will be the SNMP V3 USM user.";
-      }
-    }
-  }
-  rpc snmp-show-usergroup {
-    description
-      "Retrieve access groups from VACM-USERGROUP Table";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "Shelf";
-        }
-        leaf user-group {
-          type ciena-6500-types:STRING;
-          description
-            "User Group";
-        }
-        leaf secu-model {
-          type enumeration {
-            enum "SNMPv1" {
-              description
-                "SNMP v1 Security Model";
-            }
-            enum "SNMPv2c" {
-              description
-                "SNMP v2c Security Model";
-            }
-            enum "USM" {
-              description
-                "SNMP v3 (USM) Security Model";
-            }
-          }
-          description
-            "SNMPv3 Security Model of the provisioned user group.";
-        }
-        leaf secu-level {
-          type enumeration {
-            enum "NOAUTHNOPRIV" {
-              description
-                "No Auth No Priv";
-            }
-            enum "AUTHNOPRIV" {
-              description
-                "Auth No Priv";
-            }
-            enum "AUTHPRIV" {
-              description
-                "Auth Priv";
-            }
-          }
-          description
-            "Security Level";
-        }
-      }
-    }
-  }
-  container snmp {
-    list config {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf snmp-agent {
-        type enumeration {
-          enum "ENABLED" {
-            description
-              "Enable SNMP Agent";
-          }
-          enum "DISABLED" {
-            description
-              "Disable SNMP Agent";
-          }
-        }
-        default "DISABLED";
-        description
-          "Controls SNMP Agent availability";
-        config true;
-      }
-      leaf version {
-        type enumeration {
-          enum "V1V2C" {
-            description
-              "Enable SNMP Version 1 and 2c";
-          }
-          enum "V3" {
-            description
-              "Enable SNMP Version 1, 2c and 3";
-          }
-          enum "V1V2CV3" {
-            description
-              "Enable SNMP Version 3";
-          }
-        }
-        description
-          "Versions of SNMP currently supported";
-        config true;
-      }
-      leaf alm-masking {
-        type enumeration {
-          enum "ON" {
-            description
-              "The SNMP Agent will not receive alarms that have been disabled on the NE";
-          }
-          enum "OFF" {
-            description
-              "The SNMP Agent will receive alarm that have been disabled on the NE";
-          }
-        }
-        default "ON";
-        description
-          "Alarm Masking option controls whether disabled alarms are received by the SNMP Agent";
-        config true;
-      }
-      leaf proxy {
-        type enumeration {
-          enum "ON" {
-            description
-              "The SNMP Agent will support the proxy functionality";
-          }
-          enum "OFF" {
-            description
-              "The SNMP Agent will not support the proxy functionality";
-          }
-        }
-        default "OFF";
-        description
-          "Proxy option controls SNMP proxy feature support by the SNMP Agent";
-        config true;
-      }
-      leaf proxy-req-timeout {
-        default "20";
-        type ciena-6500-types:INT {
-          range "5..100";
-        }
-        description
-          "Proxy request timeout";
-        config true;
-      }
-      leaf enhanced-proxy {
-        type enumeration {
-          enum "ON" {
-            description
-              "Enhanced Proxy feature is ON";
-          }
-          enum "OFF" {
-            description
-              "Enhanced proxy feature is OFF";
-          }
-        }
-        default "OFF";
-        description
-          "EnhancedProxy option provides enhanced feature i.e single USMUser access to all shelves";
-        config true;
-      }
-      leaf tca-reporting {
-        type enumeration {
-          enum "ON" {
-            description
-              "TCA Reporting is ON";
-          }
-          enum "OFF" {
-            description
-              "TCA Reporting is OFF";
-          }
-        }
-        default "ON";
-        description
-          "TCA Reporitng controls whether traps corresponding to TCA are generated";
-        config true;
-      }
-      leaf trap-if {
-        type ciena-6500-enums:TRAPIF;
-        default "AUTO";
-        description
-          "SNMP Provisionable IP address functionlity for traps";
-        config true;
-      }
-      leaf trapmib {
-        type enumeration {
-          enum "NORTEL" {
-            description
-              "NORTEL MIBs shall be used for filling in trap varbinds";
-          }
-          enum "NORTELCIENA" {
-            description
-              "Existing IPv4 data shall be filled using NORTEL MIBs. Then IPv6 data is appended to IPv4 data using CIENA MIBs.";
-          }
-          enum "CIENA" {
-            description
-              "CIENA MIBs shall be used for filling in trap varbinds";
-          }
-        }
-        default "NORTEL";
-        description
-          "The selected MIB shall be referenced for filling in trap varbinds";
-        config true;
-      }
-    }
-    list trap-dest {
-      key "dest";
-      config true;
-      leaf dest {
-        mandatory true;
-        description
-          "AID in format DEST-shelf-inst, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ip-addr {
-        type string {
-          length "0..48";
-        }
-        description
-          "The IP address.";
-        config true;
-      }
-      leaf udp-port {
-        default "162";
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "Trap destination IP port.";
-        config true;
-      }
-      leaf version {
-        type enumeration {
-          enum "V1" {
-            description
-              "Trap version V1";
-          }
-          enum "V2C" {
-            description
-              "Trap version V2C";
-          }
-          enum "V3" {
-            description
-              "Trap version V3";
-          }
-        }
-        description
-          "Version of the trap being sent to this destination.";
-        config true;
-      }
-      leaf uid {
-        type ciena-6500-types:STRING;
-        description
-          "This will be the SNMP V3 user if version is specified as a V3 trap. This will be the user information used to send traps.";
-        config true;
-      }
-      leaf uap {
-        type enumeration {
-          enum "PUBLIC";
-          enum "SYSADMIN";
-          enum "OBSERVER";
-          enum "CUSTOMER1";
-          enum "CUSTOMER2";
-          enum "OPERATOR";
-        }
-        description
-          "User access privilege of the V2 user to be used to send traps.";
-        config true;
-      }
-      leaf trap-config {
-        type enumeration {
-          enum "DISABLE" {
-            description
-              "Disable Trap destination";
-          }
-          enum "TL1_TRAPS_ONLY" {
-            description
-              "Enable only TL1 traps";
-          }
-          enum "SAOS_TRAPS_ONLY" {
-            description
-              "Enable only SAOS traps";
-          }
-          enum "ENABLE_ALL" {
-            description
-              "Enable all traps";
-          }
-        }
-        description
-          "Controls SNMP Trap Functionality";
-        config true;
-      }
-    }
-    list community {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf uap {
-        type enumeration {
-          enum "PUBLIC";
-          enum "SYSADMIN";
-          enum "OBSERVER";
-          enum "CUSTOMER1";
-          enum "CUSTOMER2";
-          enum "OPERATOR";
-        }
-        description
-          "User Access Privilege to act upon(Mandatory for edit operations)";
-        config true;
-      }
-      leaf community-str {
-        type ciena-6500-types:STRING;
-        description
-          "Community STRing being set by user(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    list user {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf uid {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "This will be the SNMP V3 USM user.(Mandatory for edit operations)";
-        config true;
-      }
-      leaf auth {
-        type enumeration {
-          enum "NOAUTH" {
-            description
-              "No Authentication Protocol";
-          }
-          enum "MD5" {
-            description
-              "Message-Digest algorithm 5";
-          }
-          enum "SHA" {
-            description
-              "SHA hash functions";
-          }
-        }
-        description
-          "NOAUTH, MD5,SHA.";
-        config true;
-      }
-      leaf priv {
-        type enumeration {
-          enum "NOPRIV" {
-            description
-              "No Privacy Protocol";
-          }
-          enum "DES" {
-            description
-              "DES Privacy Protocol";
-          }
-          enum "3DES" {
-            description
-              "3DES Privacy Protocol";
-          }
-          enum "AES128" {
-            description
-              "AES128 Privacy Protocol";
-          }
-          enum "AES192" {
-            description
-              "AES192 Privacy Protocol";
-          }
-          enum "AES256" {
-            description
-              "AES256 Privacy Protocol";
-          }
-        }
-        description
-          "NOPRIV, DES, 3DES, AES128, AES192, AES256.";
-        config true;
-      }
-      leaf user-group {
-        type ciena-6500-types:STRING;
-        mandatory true;
-        description
-          "User Group";
-        config true;
-      }
-      leaf storage-type {
-        type enumeration {
-          enum "NONVOLATILE";
-          enum "PERMANENT";
-        }
-        description
-          "User Storage Type";
-        config true;
-      }
-      leaf auth-password {
-        type ciena-6500-types:STRING;
-        description
-          "Authentication Password";
-        config true;
-      }
-      leaf priv-password {
-        type ciena-6500-types:STRING;
-        description
-          "Privacy Password";
-        config true;
-      }
-    }
-    list usergroup {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "Shelf in format SHELF-shelf";
-      }
-      leaf user-group {
-        type ciena-6500-types:STRING;
-        description
-          "User Group";
-        config false;
-      }
-      leaf secu-model {
-        type enumeration {
-          enum "SNMPv1" {
-            description
-              "SNMP v1 Security Model";
-          }
-          enum "SNMPv2c" {
-            description
-              "SNMP v2c Security Model";
-          }
-          enum "USM" {
-            description
-              "SNMP v3 (USM) Security Model";
-          }
-        }
-        description
-          "SNMPv3 Security Model of the provisioned user group.";
-        config false;
-      }
-      leaf secu-level {
-        type enumeration {
-          enum "NOAUTHNOPRIV" {
-            description
-              "No Auth No Priv";
-          }
-          enum "AUTHNOPRIV" {
-            description
-              "Auth No Priv";
-          }
-          enum "AUTHPRIV" {
-            description
-              "Auth Priv";
-          }
-        }
-        description
-          "Security Level";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-ssh.yang b/models/ciena-6500-ssh.yang
deleted file mode 100644
index 46f8bda6955a14b5bdd2aac3f41137ad0eae661c..0000000000000000000000000000000000000000
--- a/models/ciena-6500-ssh.yang
+++ /dev/null
@@ -1,514 +0,0 @@
-module ciena-6500-ssh {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-ssh";
-  prefix ssh;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's ssh object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-       - Added rpc: ssh-delete-hostkey
-       - Added rpc: ssh-show-hostkey
-       - Added rpc: ssh-delete-authuser
-       - Added rpc: ssh-show-authuser
-         container ssh
-         - Added list: hostkey
-         - Added list: authuser
-           container server
-             list keys
-               leaf key-size
-                 type enumeration
-                 - Removed enum: 4096
-         rpc ssh-generate-server-keys
-           input
-             leaf key-size
-               type enumeration
-               - Removed enum: 4096";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Removed rpc: ssh-generate-keys
-       - Added rpc: ssh-check-server-keys
-       - Added rpc: ssh-generate-server-keys
-         container ssh
-         - Removed list: server-key
-         - Added container: server";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container ssh
-           list server-key
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf pubkey
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..1024 
-             leaf fingerprint
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 19..61 
-         rpc ssh-generate-keys
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: ssh
-       - Added rpc: ssh-generate-keys";
-  }
-
-  rpc ssh-check-server-keys {
-    description
-      "Validates SSH keys";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc ssh-generate-server-keys {
-    description
-      "Create public and private keys for the SSH server and SFTP client.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf key-size {
-        type enumeration {
-          enum "512" {
-            description
-              "512 bit key";
-          }
-          enum "1024" {
-            description
-              "1024 bit key";
-          }
-          enum "2048" {
-            description
-              "2048 bit key";
-          }
-          enum "3072" {
-            description
-              "3072 bit key";
-          }
-        }
-        mandatory true;
-        description
-          "SSH server key size.";
-      }
-      leaf key-type {
-        type enumeration {
-          enum "RSA" {
-            description
-              "RSA key. Key sizes of 2048 and 3072 bits supported.";
-          }
-          enum "DSA" {
-            description
-              "DSA key. Key sizes of 512 and 1024 bits supported.";
-          }
-        }
-        mandatory true;
-        description
-          "SSH server key type";
-      }
-    }
-  }
-  rpc ssh-delete-hostkey {
-    description
-      "Delete host/key from the list of known hosts";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ssh-host {
-        type string {
-          length "1..50";
-        }
-        mandatory true;
-        description
-          "IP address the host key belongs to (IPv4 or IPv6)";
-      }
-      leaf ssh-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "SSH TCP port";
-      }
-    }
-  }
-  rpc ssh-show-hostkey {
-    description
-      "Retrieves the list of known host keys";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ssh-host {
-        type string {
-          length "1..50";
-        }
-        description
-          "IP address the host key belongs to (IPv4 or IPv6)";
-      }
-      leaf ssh-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "SSH TCP port";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf ssh-host {
-          type string {
-            length "1..50";
-          }
-          description
-            "IP address the host key belongs to (IPv4 or IPv6)";
-        }
-        leaf port {
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "SSH TCP port";
-        }
-        leaf key-type {
-          type enumeration {
-            enum "RSA" {
-              description
-                "RSA key.";
-            }
-            enum "DSA" {
-              description
-                "DSA key.";
-            }
-          }
-          description
-            "SSH host's public key type";
-        }
-        leaf md5 {
-          type string {
-            length "19..80";
-          }
-          description
-            "MD5 finger print";
-        }
-        leaf sha1 {
-          type string {
-            length "19..80";
-          }
-          description
-            "SHA1 finger print";
-        }
-      }
-    }
-  }
-  rpc ssh-delete-authuser {
-    description
-      "Delete user/public key from list of authorized users";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf userID {
-        type string {
-          length "1..40";
-        }
-        mandatory true;
-        description
-          "User to delete from the list of authorized users";
-      }
-    }
-  }
-  rpc ssh-show-authuser {
-    description
-      "Retrieve the list of authorized users";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf userID {
-        type string {
-          length "1..40";
-        }
-        description
-          "User ID";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf userID {
-          type string {
-            length "1..40";
-          }
-          description
-            "User ID";
-        }
-        leaf key-type {
-          type enumeration {
-            enum "RSA" {
-              description
-                "RSA key.";
-            }
-            enum "DSA" {
-              description
-                "DSA key.";
-            }
-          }
-          description
-            "SSH host's public key type";
-        }
-        leaf md5 {
-          type string {
-            length "19..80";
-          }
-          description
-            "MD5 finger print";
-        }
-        leaf sha1 {
-          type string {
-            length "19..80";
-          }
-          description
-            "SHA1 finger print";
-        }
-      }
-    }
-  }
-  container ssh {
-    container server {
-      list keys {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf pub-key {
-          type string {
-            length "1..1024";
-          }
-          description
-            "SSH server's public key";
-          config false;
-        }
-        leaf key-type {
-          type enumeration {
-            enum "RSA" {
-              description
-                "RSA key.";
-            }
-            enum "DSA" {
-              description
-                "DSA key.";
-            }
-          }
-          description
-            "SSH server key type";
-          config false;
-        }
-        leaf key-size {
-          type enumeration {
-            enum "512";
-            enum "1024";
-            enum "2048";
-            enum "3072";
-          }
-          description
-            "SSH server key size";
-          config false;
-        }
-        leaf fingerprint {
-          type string {
-            length "19..61";
-          }
-          description
-            "SSH finger print";
-          config false;
-        }
-      }
-    }
-    list hostkey {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ssh-host {
-        type string {
-          length "1..50";
-        }
-        mandatory true;
-        description
-          "IP address the host key belongs to (IPv4 or IPv6)";
-        config true;
-      }
-      leaf port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "SSH TCP port";
-        config false;
-      }
-      leaf key-type {
-        type enumeration {
-          enum "RSA" {
-            description
-              "RSA key.";
-          }
-          enum "DSA" {
-            description
-              "DSA key.";
-          }
-        }
-        description
-          "SSH host's public key type";
-        config false;
-      }
-      leaf md5 {
-        type string {
-          length "19..80";
-        }
-        description
-          "MD5 finger print";
-        config false;
-      }
-      leaf sha1 {
-        type string {
-          length "19..80";
-        }
-        description
-          "SHA1 finger print";
-        config false;
-      }
-      leaf ssh-port {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "SSH TCP port";
-        config true;
-      }
-      leaf ssh-key {
-        type string {
-          length "128..1024";
-        }
-        mandatory true;
-        description
-          "Host's public key in base64 format";
-        config true;
-      }
-    }
-    list authuser {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf userID {
-        type string {
-          length "1..40";
-        }
-        mandatory true;
-        description
-          "Must be between one and 40 characters in length. Valid characters are (A to Z, and 0 to 9, period (.), hyphen (-), and underscore(_) characters)";
-        config true;
-      }
-      leaf key-type {
-        type enumeration {
-          enum "RSA" {
-            description
-              "RSA key.";
-          }
-          enum "DSA" {
-            description
-              "DSA key.";
-          }
-        }
-        description
-          "SSH host's public key type";
-        config false;
-      }
-      leaf md5 {
-        type string {
-          length "19..80";
-        }
-        description
-          "MD5 finger print";
-        config false;
-      }
-      leaf sha1 {
-        type string {
-          length "19..80";
-        }
-        description
-          "SHA1 finger print";
-        config false;
-      }
-      leaf ssh-key {
-        type string {
-          length "128..1024";
-        }
-        mandatory true;
-        description
-          "User's public key in base64 format";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-ssl.yang b/models/ciena-6500-ssl.yang
deleted file mode 100644
index ab97266e2f2c32b74bf609b9c2d0339776b71924..0000000000000000000000000000000000000000
--- a/models/ciena-6500-ssl.yang
+++ /dev/null
@@ -1,211 +0,0 @@
-module ciena-6500-ssl {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-ssl";
-  prefix ssl;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's ssl object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Removed rpc: ssl-generate-keys
-       - Added rpc: ssl-generate-server-certificate
-       - Added rpc: ssl-upload-server-certificate
-         container ssl
-         - Removed list: key
-         - Added container: server";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container ssl
-           list key
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-           - Added leaf: fingerprint-algorithm
-             leaf pubkey
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..1024 
-             leaf key-type
-             - Changed type from enumeration to ciena-6500-types:STRING
-             leaf key-size
-             - Changed type from enumeration to ciena-6500-types:STRING
-             leaf fingerprint
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 19..61 
-         rpc ssl-generate-keys
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf key-type
-             - Changed type from enumeration to ciena-6500-types:STRING
-             leaf key-size
-             - Changed type from enumeration to ciena-6500-types:STRING";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: ssl
-       - Added rpc: ssl-generate-keys";
-  }
-
-  rpc ssl-generate-server-certificate {
-    description
-      "Regenerates the SSL certificate for secure HTTP access";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf key-type {
-        type enumeration {
-          enum "RSA" {
-            description
-              "Only RSA keytype is supported";
-          }
-        }
-        mandatory true;
-        description
-          "SSL server key type (RSA is only supported)";
-      }
-      leaf key-size {
-        type enumeration {
-          enum "1024";
-          enum "2048";
-          enum "4096";
-        }
-        mandatory true;
-        description
-          "SSL server key size (1024)";
-      }
-    }
-  }
-  rpc ssl-upload-server-certificate {
-    description
-      "Uploads server certificate";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "0..393";
-        }
-        mandatory true;
-        description
-          "Address of server which stores the certificate.";
-      }
-      leaf pid {
-        type string {
-          length "4..128";
-        }
-        description
-          "Password that will be used to decrypt the certificate.";
-      }
-    }
-  }
-  container ssl {
-    container server {
-      list certificate {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf";
-          type ciena-6500-types:aid;
-        }
-        leaf pub-key {
-          type string {
-            length "1..1024";
-          }
-          description
-            "SSL public key";
-          config false;
-        }
-        leaf expiry {
-          type ciena-6500-types:STRING;
-          description
-            "SSL certificate date";
-          config false;
-        }
-        leaf key-type {
-          type enumeration {
-            enum "RSA" {
-              description
-                "RSA keytype";
-            }
-            enum "ECDSA" {
-              description
-                "ECDSA keytype";
-            }
-          }
-          description
-            "SSL key type (RSA and ECDSA supported)";
-          config false;
-        }
-        leaf key-size {
-          type enumeration {
-            enum "1024" {
-              description
-                "RSA 1024 bits";
-            }
-            enum "2048" {
-              description
-                "RSA 2048 bits";
-            }
-            enum "4096" {
-              description
-                "RSA 4096 bits";
-            }
-            enum "secp256k1" {
-              description
-                "Elliptic Curve secp256k1";
-            }
-            enum "secp384k1" {
-              description
-                "Elliptic Curve secp384k1";
-            }
-            enum "secp521k1" {
-              description
-                "Elliptic Curve secp521k1";
-            }
-          }
-          description
-            "SSL key size value";
-          config false;
-        }
-        leaf fingerprint-algo {
-          type ciena-6500-types:STRING;
-          description
-            "SSL public key fingerprint algorithm";
-          config false;
-        }
-        leaf fingerprint {
-          type string {
-            length "19..61";
-          }
-          description
-            "SSL public key fingerprint";
-          config false;
-        }
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-statistics.yang b/models/ciena-6500-statistics.yang
deleted file mode 100644
index 27b477fa38ff7d59c29abadfa9f729700ace6e3b..0000000000000000000000000000000000000000
--- a/models/ciena-6500-statistics.yang
+++ /dev/null
@@ -1,850 +0,0 @@
-module ciena-6500-statistics {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-statistics";
-  prefix statistics;
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's statistics object for the 6500 platform";
-
-  revision 2016-04-04 {
-    description
-      "Initial revision.";
-  }
-
-  typedef facility-type {
-    type string {
-      length "1..10";
-    }
-  }
-
-  typedef facility-status {
-    description
-      "Status of the PM data";
-    type enumeration {
-      enum "COMPLD" {
-        value 1;
-        description
-          "Completed Successfully";
-      }
-      enum "EMPTY" {
-        description
-          "No facility";
-      }
-    }
-  }
-
-  grouping error-count-group {
-    leaf coding-violation {
-      type uint32;
-      description
-        "Coding violations";
-    }
-    leaf errored-seconds {
-      type uint32;
-      description
-        "Errored seconds";
-    }
-    leaf severely-errored-seconds {
-      type uint32;
-      description
-        "Severely errored seconds";
-    }
-  }
-
-  grouping optical-power-group-rcv {
-    leaf optical-power {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Optical power";
-    }
-    leaf optical-power-low {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Lowest optical power";
-    }
-    leaf optical-power-high {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Highest optical power";
-    }
-    leaf optical-power-normalized {
-      type int32;
-      description
-        "Optical power normalized";
-    }
-    leaf optical-power-normalized-low {
-      type int32;
-      description
-        "Lowest optical Power normalized";
-    }
-    leaf optical-power-normalized-high {
-      type int32;
-      description
-        "Highest optical Power normalized";
-    }
-    leaf optical-power-min {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Optical power minimum";
-    }
-    leaf optical-power-max {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Optical power maximum";
-    }
-    leaf optical-power-average {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Optical power average";
-    }
-  }
-
-  grouping optical-power-group-trmt {
-    leaf optical-power {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Optical power";
-    }
-    leaf optical-power-low {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Lowest optical power";
-    }
-    leaf optical-power-high {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Highest optical power";
-    }
-    leaf optical-power-normalized {
-      type uint32;
-      description
-        "Optical power normalized";
-    }
-    leaf optical-power-normalized-low {
-      type uint32;
-      description
-        "Lowest optical Power normalized";
-    }
-    leaf optical-power-normalized-high {
-      type uint32;
-      description
-        "Highest optical Power normalized";
-    }
-    leaf optical-power-min {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Optical power minimum";
-    }
-    leaf optical-power-max {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Optical power maximum";
-    }
-    leaf optical-power-average {
-      type decimal64 {
-        fraction-digits 2;
-      }
-      description
-        "Optical power average";
-    }
-  }
-
-  grouping protection-switch-group {
-    leaf protection-switch-counts-working {
-      type uint32;
-      description
-        "Protection switch count, working line";
-    }
-    leaf protection-switch-counts-protection {
-      type uint32;
-      description
-        "Protection switch count, protection line";
-    }
-    leaf protection-switch-duration {
-      type uint32;
-      description
-        "Protection switch count, duration line";
-    }
-  }
-
-  container statistics {
-    config false;
-    list otm {
-      key "aid";
-      config false;
-      leaf aid {
-        type string {
-          length "1..32";
-        }
-        description
-          "AID in format OTM1-shelf-slot-port, OTM3-shelf-slot-port, OTM2-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-      }
-      leaf facility {
-        type facility-type;
-      }
-      leaf status {
-        type facility-status;
-      }
-      container pm {
-        container otu {
-          container near-end {
-            container rx {
-              uses error-count-group;
-              leaf forward-error-corrections {
-                type uint32;
-                description
-                  "Forward Error Corrections";
-              }
-              leaf uncorrected-forward-error-corrections-block {
-                type uint32;
-                description
-                  "Forward Error Corrections block";
-              }
-              leaf high-correction-count-seconds {
-                type uint32;
-                description
-                  "High Correction Count Seconds";
-              }
-              leaf post-forward-error-corrections-ber-est {
-                type string {
-                  length "1..21";
-                }
-                description
-                  "Post forward error correction";
-              }
-              leaf pre-forward-error-corrections-ber {
-                type string {
-                  length "1..21";
-                }
-                description
-                  "Pre forward error correction";
-              }
-              leaf pre-forward-error-corrections-ber-max {
-                type string {
-                  length "1..21";
-                }
-                description
-                  "Pre forward error correction";
-              }
-              leaf severely-errored-frame-seconds {
-                type uint32;
-                description
-                  "Severely Errored Frame Seconds";
-              }
-              leaf q-min {
-                type decimal64 {
-                  fraction-digits 2;
-                }
-                description
-                  "Minimum Q";
-              }
-              leaf q-max {
-                type decimal64 {
-                  fraction-digits 2;
-                }
-                description
-                  "Maximum Q";
-              }
-              leaf q-average {
-                type decimal64 {
-                  fraction-digits 2;
-                }
-                description
-                  "Average Q";
-              }
-              leaf q-std-dev {
-                type decimal64 {
-                  fraction-digits 3;
-                }
-                description
-                  "Q Standard Deviation";
-              }
-              leaf incoming-alignment-errors {
-                type uint32;
-                description
-                  "Incoming Alignment Error";
-              }
-            }
-            container tx {
-              uses error-count-group;
-              leaf severely-errored-frame-seconds {
-                type uint32;
-                description
-                  "Severely Errored Frame Seconds";
-              }
-              leaf forward-error-corrections {
-                type uint32;
-                description
-                  "Forward Error Corrections";
-              }
-            }
-          }
-          container far-end {
-            container rx {
-              uses error-count-group;
-              leaf incoming-alignment-errors {
-                type uint32;
-                description
-                  "Incoming Alignment Error";
-              }
-            }
-          }
-        }
-        container och {
-          container near-end {
-            container rx {
-              leaf diff-group-delay-average {
-                type uint32;
-                description
-                  "Differential Group Delay Average";
-              }
-              leaf diff-group-delay-max {
-                type uint32;
-                description
-                  "Differential Group Delay Maximum";
-              }
-              uses optical-power-group-rcv;
-            }
-            container tx {
-              uses optical-power-group-trmt;
-            }
-          }
-        }
-        container ots {
-          container near-end {
-            container rx {
-              leaf optical-power {
-                type decimal64 {
-                  fraction-digits 2;
-                }
-                description
-                  "Optical power";
-              }
-              leaf optical-power-normalized {
-                type int32;
-                description
-                  "Optical power normalized";
-              }
-              leaf optical-power-min {
-                type decimal64 {
-                  fraction-digits 2;
-                }
-                description
-                  "Optical power minimum";
-              }
-              leaf optical-power-max {
-                type decimal64 {
-                  fraction-digits 2;
-                }
-                description
-                  "Optical power maximum";
-              }
-              leaf optical-power-average {
-                type decimal64 {
-                  fraction-digits 2;
-                }
-                description
-                  "Optical power average";
-              }
-            }
-          }
-        }
-        container odu {
-          container near-end {
-            container rx {
-              uses error-count-group;
-              uses protection-switch-group;
-              leaf unavailable-seconds {
-                type uint32;
-                description
-                  "Unavailable seconds";
-              }
-              leaf failure-count {
-                type uint32;
-                description
-                  "Failure Count";
-              }
-              leaf delay-measurement-average {
-                type uint32;
-                description
-                  "Delay Measurement Average";
-              }
-              leaf delay-measurement-max {
-                type uint32;
-                description
-                  "Delay Measurement Maximum";
-              }
-              leaf delay-measurement-min {
-                type uint32;
-                description
-                  "Delay Measurement Minimum";
-              }
-            }
-            container tx {
-              uses error-count-group;
-              leaf unavailable-seconds {
-                type uint32;
-                description
-                  "Unavailable seconds";
-              }
-              leaf failure-count {
-                type uint32;
-                description
-                  "Failure Count";
-              }
-            }
-          }
-          container far-end {
-            container rx {
-              uses error-count-group;
-              leaf unavailable-seconds {
-                type uint32;
-                description
-                  "Unavailable seconds";
-              }
-              leaf failure-count {
-                type uint32;
-                description
-                  "Failure Count";
-              }
-            }
-            container tx {
-              uses error-count-group;
-              leaf unavailable-seconds {
-                type uint32;
-                description
-                  "Unavailable seconds";
-              }
-              leaf failure-count {
-                type uint32;
-                description
-                  "Failure Count";
-              }
-            }
-          }
-        }
-      }
-    }
-    list ethernet {
-      key "aid";
-      config false;
-      leaf aid {
-        type string {
-          length "1..32";
-        }
-        description
-          "AID in format ETH10G-shelf-slot-port, ETH100-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, ETH-shelf-slot-port";
-      }
-      leaf facility {
-        type facility-type;
-      }
-      leaf status {
-        type facility-status;
-      }
-      container pm {
-        container pcs {
-          container near-end {
-            container rx {
-              uses error-count-group;
-              leaf unavailable-seconds {
-                type uint32;
-                description
-                  "Unavailable seconds";
-              }
-            }
-            container tx {
-              uses error-count-group;
-              leaf unavailable-seconds {
-                type uint32;
-                description
-                  "Unavailable seconds";
-              }
-            }
-          }
-        }
-        container eth {
-          container near-end {
-            container rx {
-              leaf unavailable-seconds {
-                type uint32;
-                description
-                  "Unavailable seconds";
-              }
-              uses protection-switch-group;
-            }
-            container tx {
-              leaf unavailable-seconds {
-                type uint32;
-                description
-                  "Unavailable seconds";
-              }
-            }
-          }
-        }
-        container e {
-          container near-end {
-            container local {
-              container rx {
-                leaf errored-seconds {
-                  type uint32;
-                  description
-                    "Errored seconds";
-                }
-                leaf severely-errored-seconds {
-                  type uint32;
-                  description
-                    "Severely errored seconds";
-                }
-                leaf in-frames {
-                  type uint32;
-                  description
-                    "Number of frames received";
-                }
-                leaf in-frames-err {
-                  type uint32;
-                  description
-                    "Number of errored frames received";
-                }
-                leaf in-frames-discarded {
-                  type uint32;
-                  description
-                    "Number of received frames discarded";
-                }
-                leaf in-discarded-frames {
-                  type uint32;
-                  description
-                    "Number of received discarded frames";
-                }
-                leaf frame-check-seq-err {
-                  type uint32;
-                  description
-                    "Frame Check Sequence Errors";
-                }
-              }
-              container tx {
-                leaf errored-seconds {
-                  type uint32;
-                  description
-                    "Errored seconds";
-                }
-                leaf severely-errored-seconds {
-                  type uint32;
-                  description
-                    "Severely errored seconds";
-                }
-                leaf out-frames {
-                  type uint32;
-                  description
-                    "Number of frames transmitted";
-                }
-                leaf out-frames-err {
-                  type uint32;
-                  description
-                    "Number of errored frames transmitted";
-                }
-                leaf out-frames-discarded {
-                  type uint32;
-                  description
-                    "Number of egress discarded frames due to congestion or overflow";
-                }
-                leaf out-discarded-frames {
-                  type uint32;
-                  description
-                    "Number of egress discarded frames due to congestion or overflow";
-                }
-                leaf frame-check-seq-err {
-                  type uint32;
-                  description
-                    "Frame Check Sequence Errors";
-                }
-              }
-            }
-            container remote {
-              container rx {
-                leaf in-frames {
-                  type uint32;
-                  description
-                    "Number of frames received";
-                }
-                leaf in-frames-err {
-                  type uint32;
-                  description
-                    "Number of errored frames received";
-                }
-                leaf frame-check-seq-err {
-                  type uint32;
-                  description
-                    "Frame Check Sequence Errors";
-                }
-              }
-              container tx {
-                leaf out-frames {
-                  type uint32;
-                  description
-                    "Number of frames transmitted";
-                }
-                leaf out-frames-discarded {
-                  type uint32;
-                  description
-                    "Number of egress discarded frames due to congestion or overflow";
-                }
-              }
-            }
-          }
-        }
-        container pma {
-          container near-end {
-            container rx {
-              leaf forward-error-corrections {
-                type uint32;
-                description
-                  "Forward Error Corrections";
-              }
-              leaf fec-corrected-code-words {
-                type uint32;
-                description
-                  "Forward Error Corrections corrected code words";
-              }
-              leaf fec-uncorrected-code-words {
-                type uint32;
-                description
-                  "Forward Error Corrections uncorrected code words";
-              }
-              leaf high-correction-count-seconds {
-                type uint32;
-                description
-                  "High correction counts";
-              }
-              leaf pre-fec-ber-average {
-                type string {
-                  length "1..21";
-                }
-                description
-                  "Pre-FEC Bit Average Error Rate";
-              }
-              leaf pre-fec-ber-max {
-                type string {
-                  length "1..21";
-                }
-                description
-                  "Pre-FEC Bit Maximum Error Rate";
-              }
-            }
-          }
-        }
-        container och {
-          container near-end {
-            container rx {
-              uses optical-power-group-rcv;
-            }
-            container tx {
-              uses optical-power-group-trmt;
-            }
-          }
-        }
-      }
-      container om {
-        leaf in-frames {
-          description
-            "Total frames received.";
-          type uint32;
-        }
-        leaf out-frames {
-          description
-            "OUTFRAMES";
-          type uint32;
-        }
-        leaf fcs-error {
-          description
-            "Frames of valid length with LAN FCS errors.";
-          type uint32;
-        }
-        leaf frames-too-long {
-          description
-            "Frames that exceed the MTU with valid FCS.";
-          type uint32;
-        }
-        leaf frames-too-short {
-          description
-            "Frames less than 64 bytes in length with valid FCS.";
-          type uint32;
-        }
-        leaf all-if {
-          description
-            "All Generic IF OM Parameters: INFRAMES and OUTFRAMES";
-          type uint32;
-        }
-        leaf all-eth {
-          description
-            "All Ethernet OM parameters: FCSERR, FRTOOLONGS and FRTOOSHORTS";
-          type uint32;
-        }
-        leaf align-error {
-          description
-            "Frames received that are not an integral number of octets in length and do not pass the FCS check.";
-          type uint32;
-        }
-        leaf single-collision-frame {
-          description
-            "Successfully transmitted frames for which transmission is inhibited by exactly one collision.";
-          type uint32;
-        }
-        leaf multi-collision-frame {
-          description
-            "Count of successfully transmitted frames for which transmission is inhibited by more than one collision.";
-          type uint32;
-        }
-        leaf sqe-test-error {
-          description
-            "Count of times that the SQE test error message is generated by the PLS sub-layer.";
-          type uint32;
-        }
-        leaf defer-transmission {
-          description
-            "Count of frames for which the first transmission attempt is delayed because the medium is busy.";
-          type uint32;
-        }
-        leaf late-collision {
-          description
-            "Number of times that a collision is detected later than 512 bit-times into the transmission of a packet.";
-          type uint32;
-        }
-        leaf excess-collision {
-          description
-            "Count of frames for which the transmission fails because of excessive collisions.";
-          type uint32;
-        }
-        leaf career-sense-error {
-          description
-            "Number of times that the carrier sense condition was lost or never asserted when attempting to transmit a frame.";
-          type uint32;
-        }
-        leaf in-frames-error {
-          description
-            "Total ETH frames received with FCS errors.";
-          type uint32;
-        }
-        leaf in-frame-octets {
-          description
-            "Count of Bytes contained in INFRAMES.";
-          type uint32;
-        }
-        leaf in-frames-discard {
-          description
-            "Count of ingress Frames discarded due to FIFO overflow.";
-          type uint32;
-        }
-        leaf in-discard-frame {
-          description
-            "Total ETH RX frames discarded for reasons other than FCS errors.";
-          type uint32;
-        }
-        leaf in-pause-frames {
-          description
-            "Pause frames received.";
-          type uint32;
-        }
-        leaf in-control-frames {
-          description
-            "Control frames received.";
-          type uint32;
-        }
-        leaf under-frag {
-          description
-            "Undersized frames with FCS errors.";
-          type uint32;
-        }
-        leaf jab-oversized-frames {
-          description
-            "Oversized frames with FCS errors.";
-          type uint32;
-        }
-        leaf symbol-error {
-          description
-            "Count of GMII data reception errors.";
-          type uint32;
-        }
-        leaf out-frames-error {
-          description
-            "Total ETH frames transmitted with errors.";
-          type uint32;
-        }
-        leaf out-frames-octets {
-          description
-            "Octets in frames counted by OUTFRAMES.";
-          type uint32;
-        }
-        leaf out-frame-discard {
-          description
-            "Total Egress direction frames discarded due to congestion &amp;FIFO overflow.";
-          type uint32;
-        }
-        leaf out-pause-frames {
-          description
-            "Total ETH pause frames transmitted.";
-          type uint32;
-        }
-        leaf out-discard-frames {
-          description
-            "Total ETH TX frames discarded.";
-          type uint32;
-        }
-        leaf auto-negotiation-cycles {
-          description
-            "counts the number of Auto Negotiation cycles.";
-          type uint32;
-        }
-        leaf internal-mac-receive-error {
-          description
-            "Count of frames for which the reception fails because of an internal MAC sub-layer receive error.";
-          type uint32;
-        }
-        leaf out-internal-mac-error {
-          description
-            "Count of frames for which the transmission fails because of an internal MAC sub-layer receive error.";
-          type uint32;
-        }
-        leaf in-octet-error {
-          description
-            "Count of Bytes contained in INFRAMES";
-          type uint32;
-        }
-        leaf out-octet-error {
-          description
-            "Octets in frames counted by OUTFRAMESERR";
-          type uint32;
-        }
-        leaf hec-discard-frame {
-          description
-            "Received frames discarded due to HEC error";
-          type uint32;
-        }
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-synchronization.yang b/models/ciena-6500-synchronization.yang
deleted file mode 100644
index ab267c9d371881d81f4ccffb5e5f838753425176..0000000000000000000000000000000000000000
--- a/models/ciena-6500-synchronization.yang
+++ /dev/null
@@ -1,1595 +0,0 @@
-module ciena-6500-synchronization {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-synchronization";
-  prefix synchronization;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's synchronization object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: synchronization-operate-switch-bits-out
-       - Added rpc: synchronization-operate-switch-sync
-       - Added rpc: synchronization-release-switch-bits-out
-       - Added rpc: synchronization-release-switch-sync
-       - Added rpc: synchronization-show-switch-bits-out
-       - Added rpc: synchronization-show-sync-status-in
-       - Added rpc: synchronization-show-sync-status-out
-       - Added container: synchronization";
-  }
-
-  rpc synchronization-operate-switch-bits-out {
-    description
-      "Operate BITS Out Switch: this command instructs the network element to switch synchronization timing reference signals at the specified BITS output. The aid is the switched-to reference source. Since BITSOUT-A and BITSOUT-B are sourced from the same reference, this command doesn't differentiate BITSOUT-A and BITSOUT-B. It will do for both. The switch completes only if the quality of the two references is not the same. The network element always chooses the best quality timing reference for its synchronization reference. Use the RTRV-BITS-OUT command to retrieve the current timing reference settings. Use the SET-BITS-OUT command to assign the timing references. Use the SET-SYNCSTIN command to set the synchronization status of the incoming synchronization signal. User synchronization switches initiated using this command remain active until another BITS Out switch is activated or they are overridden by a synchronization reference failure.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OTUTTP-shelf-slot-port, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1, BITSIN-shelf-port, ILAN-shelf-port, OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type enumeration {
-          enum "MAN";
-          enum "FRCD";
-          enum "LOCKOUT";
-        }
-        mandatory true;
-        description
-          "The switch command to be initiated.";
-      }
-    }
-  }
-  rpc synchronization-operate-switch-sync {
-    description
-      "Operate Synchronization Switch: this command instructs the network element to switch synchronization timing reference signals in the sync selection hierarchy. The aid is the switched-to reference. The switch completes only if the quality of the two references is not the same. The network element always chooses the best quality timing reference for its synchronization reference. Use the RTRV-TMREFIN command to retrieve timing references. Use the SET-SYNCSTIN command to set the synchronization status of the incoming synchronization signal. User synchronization switches initiated using this command remain active until another synchronization switch is activated or they are overridden by a synchronization reference failure. Timing references are assigned using the SET-TMREFIN command.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OTUTTP-shelf-slot-port, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1, BITSIN-shelf-port, ILAN-shelf-port, OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type enumeration {
-          enum "MAN";
-          enum "FRCD";
-          enum "LOCKOUT";
-        }
-        mandatory true;
-        description
-          "The switch command to be initiated.";
-      }
-    }
-  }
-  rpc synchronization-release-switch-bits-out {
-    description
-      "Release BITS Out Switch: this command is used to release an active forced or lockout synchronization switch from the specified BITS output selection hierarchy. The aid is the to-be-released reference source. Since BITSOUT-A and BITSOUT-B are sourced from the same reference, this command doesn't differentiate BITSOUT-A and BITSOUT-B. It will do for both.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OTUTTP-shelf-slot-port, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1, BITSIN-shelf-port, ILAN-shelf-port, OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type enumeration {
-          enum "FRCD";
-          enum "LOCKOUT";
-          enum "WTR";
-        }
-        mandatory true;
-        description
-          "The switch command to be released.";
-      }
-    }
-  }
-  rpc synchronization-release-switch-sync {
-    description
-      "Release Synchronization Switch: this command instructs the network element to release an active forced or lockout synchronization switch from the sync selection hierarchy. The aid is the to-be-released reference source.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OTUTTP-shelf-slot-port, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1, BITSIN-shelf-port, ILAN-shelf-port, OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sc {
-        type enumeration {
-          enum "FRCD";
-          enum "LOCKOUT";
-          enum "WTR";
-        }
-        mandatory true;
-        description
-          "The switch command to be released.";
-      }
-    }
-  }
-  rpc synchronization-show-switch-bits-out {
-    description
-      "Retrieve BITS Output Switch: this command displays the status of any switch requests for the specified BITS output.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf lock-status {
-          type ciena-6500-types:STRING;
-          description
-            "Locked status.";
-        }
-        leaf frcd-status {
-          type ciena-6500-types:STRING;
-          description
-            "Forced status.";
-        }
-        leaf autostatus {
-          type ciena-6500-types:STRING;
-          description
-            "Auto status.";
-        }
-        leaf man-status {
-          type ciena-6500-types:STRING;
-          description
-            "Manual status.";
-        }
-      }
-    }
-  }
-  rpc synchronization-show-sync-status-in {
-    description
-      "Retrieve Synchronization Status Input: this command is used to find out the synchronization status provisioned by the user using the SET-SYNCSTIN command.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OTUTTP-shelf-slot-port, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1, BITSIN-shelf-port, ILAN-shelf-port, OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf tmgid {
-        type ciena-6500-types:IDENT;
-        description
-          "Retrieve ALL supported facility synchronization status input for the given TMGID";
-      }
-    }
-    output {
-      list output {
-        leaf ocn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf sync-status {
-          type enumeration {
-            enum "PRS" {
-              description
-                "Primary Reference Source ( or Stratum 1 Traceable)";
-            }
-            enum "STU" {
-              description
-                "Normal-Traceability unknown";
-            }
-            enum "ST2" {
-              description
-                "Traceable Stratum 2";
-            }
-            enum "ST3E" {
-              description
-                "Stratum 3E Traceable";
-            }
-            enum "SSU-A" {
-              description
-                "Synchronisation Supply Unit A";
-            }
-            enum "ST3" {
-              description
-                "Traceable Stratum 3";
-            }
-            enum "SSU-B" {
-              description
-                "Synchronisation Supply Unit B";
-            }
-            enum "SEC" {
-              description
-                "Synchronous Equipment Clock";
-            }
-            enum "SMC" {
-              description
-                "Traceable SONET minimum clock";
-            }
-            enum "ST4" {
-              description
-                "Traceable Stratum 4";
-            }
-            enum "PNO" {
-              description
-                "Provisionable by Network Operator";
-            }
-            enum "DUS" {
-              description
-                "Do not use for synchronization";
-            }
-            enum "NONE" {
-              description
-                "None";
-            }
-            enum "INV" {
-              description
-                "Invalid quality level code received";
-            }
-          }
-          description
-            "Sync status (global SDH/SONET set of values)";
-        }
-        leaf dus-override {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS.";
-        }
-      }
-    }
-  }
-  rpc synchronization-show-sync-status-out {
-    description
-      "Retrieve Synchronization Status Output: this command is used to find out the synchronization status provisioned by the user using the SET-SYNCSTOUT command.";
-    input {
-      leaf ocn {
-        mandatory true;
-        description
-          "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OTUTTP-shelf-slot-port, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1, BITSIN-shelf-port, ILAN-shelf-port, OSC-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf tmgid {
-        type ciena-6500-types:IDENT;
-        description
-          "Retrieve ALL supported facility synchronization status output for the given TMGID";
-      }
-    }
-    output {
-      list output {
-        leaf ocn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf sync-status {
-          type enumeration {
-            enum "PRS" {
-              description
-                "Primary Reference Source ( or Stratum 1 Traceable)";
-            }
-            enum "STU" {
-              description
-                "Normal-Traceability unknown";
-            }
-            enum "ST2" {
-              description
-                "Traceable Stratum 2";
-            }
-            enum "ST3E" {
-              description
-                "Stratum 3E Traceable";
-            }
-            enum "SSU-A" {
-              description
-                "Synchronisation Supply Unit A";
-            }
-            enum "ST3" {
-              description
-                "Traceable Stratum 3";
-            }
-            enum "SSU-B" {
-              description
-                "Synchronisation Supply Unit B";
-            }
-            enum "SEC" {
-              description
-                "Synchronous Equipment Clock";
-            }
-            enum "SMC" {
-              description
-                "Traceable SONET minimum clock";
-            }
-            enum "ST4" {
-              description
-                "Traceable Stratum 4";
-            }
-            enum "PNO" {
-              description
-                "Provisionable by Network Operator";
-            }
-            enum "DUS" {
-              description
-                "Do not use for synchronization";
-            }
-            enum "NONE" {
-              description
-                "None";
-            }
-          }
-          description
-            "Sync status (global SDH/SONET set of values)";
-        }
-        leaf ssm-transmit {
-          type ciena-6500-enums:SSMTRANSMIT;
-          description
-            "Synchronized Status Messaging Transmit.";
-        }
-      }
-    }
-  }
-  container synchronization {
-    container switch {
-      list bits-out {
-        config false;
-        leaf lock-status {
-          type ciena-6500-types:STRING;
-          description
-            "Locked status.";
-          config false;
-        }
-        leaf frcd-status {
-          type ciena-6500-types:STRING;
-          description
-            "Forced status.";
-          config false;
-        }
-        leaf autostatus {
-          type ciena-6500-types:STRING;
-          description
-            "Auto status.";
-          config false;
-        }
-        leaf man-status {
-          type ciena-6500-types:STRING;
-          description
-            "Manual status.";
-          config false;
-        }
-      }
-      list sync {
-        key "shelf";
-        config false;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf, SHELF-shelf-ALL, SMUX-shelf-slot, SMUX-shelf-ALL, L2MOTR-shelf-slot, L2MOTR-shelf-ALL, FLEXMOTR-shelf-slot, FLEXMOTR-shelf-ALL, EQPTGRP-shelf-eqptGrpId";
-          type ciena-6500-types:aid;
-        }
-        leaf facilityaid {
-          type ciena-6500-types:IDENT;
-          description
-            "Facility Aid";
-          config false;
-        }
-        leaf lock-status {
-          type ciena-6500-types:STRING;
-          description
-            "Locked status.";
-          config false;
-        }
-        leaf frcd-status {
-          type ciena-6500-types:STRING;
-          description
-            "Forced status.";
-          config false;
-        }
-        leaf autostatus {
-          type ciena-6500-types:STRING;
-          description
-            "Auto status.";
-          config false;
-        }
-        leaf man-status {
-          type ciena-6500-types:STRING;
-          description
-            "Manual status.";
-          config false;
-        }
-      }
-    }
-    container sync {
-      list status-in {
-        key "ocn";
-        config true;
-        leaf ocn {
-          mandatory true;
-          description
-            "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OTUTTP-shelf-slot-port, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1, BITSIN-shelf-port, ILAN-shelf-port, OSC-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf sync-status {
-          type enumeration {
-            enum "PRS" {
-              description
-                "Primary Reference Source ( or Stratum 1 Traceable)(This value can be used in edit operation)";
-            }
-            enum "STU" {
-              description
-                "Normal-Traceability unknown(This value can be used in edit operation)";
-            }
-            enum "ST2" {
-              description
-                "Traceable Stratum 2(This value can be used in edit operation)";
-            }
-            enum "ST3E" {
-              description
-                "Stratum 3E Traceable(This value can be used in edit operation)";
-            }
-            enum "SSU-A" {
-              description
-                "Synchronisation Supply Unit A(This value can be used in edit operation)";
-            }
-            enum "ST3" {
-              description
-                "Traceable Stratum 3(This value can be used in edit operation)";
-            }
-            enum "SSU-B" {
-              description
-                "Synchronisation Supply Unit B(This value can be used in edit operation)";
-            }
-            enum "SEC" {
-              description
-                "Synchronous Equipment Clock(This value can be used in edit operation)";
-            }
-            enum "SMC" {
-              description
-                "Traceable SONET minimum clock(This value can be used in edit operation)";
-            }
-            enum "ST4" {
-              description
-                "Traceable Stratum 4(This value can be used in edit operation)";
-            }
-            enum "PNO" {
-              description
-                "Provisionable by Network Operator(This value can be used in edit operation)";
-            }
-            enum "DUS" {
-              description
-                "Do not use for synchronization(This value can be used in edit operation)";
-            }
-            enum "NONE" {
-              description
-                "None(This value can be used in edit operation)";
-            }
-            enum "INV" {
-              description
-                "Invalid quality level code received";
-            }
-          }
-          description
-            "Sync status (global SDH/SONET set of values)(Mandatory for edit operations)";
-          config true;
-        }
-        leaf dus-override {
-          type enumeration {
-            enum "ENABLE";
-            enum "DISABLE";
-          }
-          description
-            "A parameter which allows the synchronization quality level of a line reference to be overriden even when the receiving quality level is DUS.";
-          config true;
-        }
-      }
-      list status-out {
-        key "ocn";
-        config true;
-        leaf ocn {
-          mandatory true;
-          description
-            "AID in format OC1-shelf-slot-port, OC1-shelf-ALL, OC1-shelf-slot-ALL, OC3-shelf-slot-port, OC12-shelf-slot-port, OC48-shelf-slot-port, OC192-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OTUTTP-shelf-slot-port, ODUTTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ETTP-shelf-slot-port, ETTP-shelf-slot-portSsubport, ETTP-shelf-slot-port-rt1Ptp1, ETTP-shelf-slot-portSsubport-rt1Ptp1, BITSIN-shelf-port, ILAN-shelf-port, OSC-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf sync-status {
-          type enumeration {
-            enum "PRS" {
-              description
-                "Primary Reference Source ( or Stratum 1 Traceable)";
-            }
-            enum "STU" {
-              description
-                "Normal-Traceability unknown";
-            }
-            enum "ST2" {
-              description
-                "Traceable Stratum 2";
-            }
-            enum "ST3E" {
-              description
-                "Stratum 3E Traceable";
-            }
-            enum "SSU-A" {
-              description
-                "Synchronisation Supply Unit A";
-            }
-            enum "ST3" {
-              description
-                "Traceable Stratum 3";
-            }
-            enum "SSU-B" {
-              description
-                "Synchronisation Supply Unit B";
-            }
-            enum "SEC" {
-              description
-                "Synchronous Equipment Clock";
-            }
-            enum "SMC" {
-              description
-                "Traceable SONET minimum clock";
-            }
-            enum "ST4" {
-              description
-                "Traceable Stratum 4";
-            }
-            enum "PNO" {
-              description
-                "Provisionable by Network Operator";
-            }
-            enum "DUS" {
-              description
-                "Do not use for synchronization";
-            }
-            enum "NONE" {
-              description
-                "None";
-            }
-          }
-          description
-            "Sync status (global SDH/SONET set of values)(Mandatory for edit operations)";
-          config true;
-        }
-        leaf ssm-transmit {
-          type ciena-6500-enums:SSMTRANSMIT;
-          description
-            "Synchronized Status Messaging Transmit.";
-          config true;
-        }
-      }
-    }
-    container timing {
-      list mode {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf, SHELF-shelf-ALL, SMUX-shelf-slot, SMUX-shelf-ALL, L2MOTR-shelf-slot, L2MOTR-shelf-ALL, FLEXMOTR-shelf-slot, FLEXMOTR-shelf-ALL, EQPTGRP-shelf-eqptGrpId";
-          type ciena-6500-types:aid;
-        }
-        leaf mode {
-          type enumeration {
-            enum "EXT" {
-              description
-                "Externally-Timed (locked to BITS)";
-            }
-            enum "INT" {
-              description
-                "Self-Timed (freerun)";
-            }
-            enum "LINE" {
-              description
-                "Line-Timed (locked to traffic facility)";
-            }
-            enum "MIXED" {
-              description
-                "Mixed (Lock to BITS and Traffic Facility)";
-            }
-            enum "NOTINUSE" {
-              description
-                "Timing mode not in use (retrieve only)";
-            }
-          }
-          description
-            "Specifies the Timing Mode to be used by the Network Element.";
-          config true;
-        }
-        leaf syncoption {
-          type enumeration {
-            enum "OPT1";
-            enum "OPT2";
-          }
-          description
-            "Synchronization Options";
-          config true;
-        }
-        leaf tgenwtr {
-          default "5-MIN";
-          type ciena-6500-enums:WTR_Sync;
-          description
-            "Timing Generation Wait To Restore (in minutes).";
-          config true;
-        }
-        leaf tdistwtr {
-          default "5-MIN";
-          type ciena-6500-enums:WTR_Sync;
-          description
-            "Timing Distribution Wait To Restore (in minutes).";
-          config true;
-        }
-      }
-      list reference-in {
-        key "shelf";
-        config true;
-        leaf shelf {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf, SHELF-shelf-ALL, SMUX-shelf-slot, SMUX-shelf-ALL, L2MOTR-shelf-slot, L2MOTR-shelf-ALL, FLEXMOTR-shelf-slot, FLEXMOTR-shelf-ALL, EQPTGRP-shelf-eqptGrpId";
-          type ciena-6500-types:aid;
-        }
-        leaf first {
-          type ciena-6500-types:aid;
-          description
-            "Specifies the provisioned reference source for the external timing input.";
-          config true;
-        }
-        leaf second {
-          type ciena-6500-types:aid;
-          description
-            "Specifies the provisioned reference source for the external timing input.";
-          config true;
-        }
-        leaf third {
-          type ciena-6500-types:aid;
-          description
-            "Specifies the provisioned reference source for the external timing input.";
-          config true;
-        }
-        leaf fourth {
-          type ciena-6500-types:aid;
-          description
-            "Specifies the provisioned reference source for the external timing input.";
-          config true;
-        }
-        leaf-list sst {
-          type enumeration {
-            enum "ACT" {
-              description
-                "Active";
-            }
-            enum "WRK" {
-              description
-                "Working";
-            }
-            enum "ERRANL" {
-              description
-                "Errored";
-            }
-            enum "IDLE" {
-              description
-                "Idle";
-            }
-            enum "FLT" {
-              description
-                "Faulty";
-            }
-            enum "WTR" {
-              description
-                "Wait to Restore";
-            }
-          }
-          description
-            "Secondary State";
-          config false;
-        }
-        leaf sync-status {
-          type enumeration {
-            enum "PRS" {
-              description
-                "Primary Reference Source ( or Stratum 1 Traceable)";
-            }
-            enum "STU" {
-              description
-                "Normal-Traceability unknown";
-            }
-            enum "ST2" {
-              description
-                "Traceable Stratum 2";
-            }
-            enum "ST3E" {
-              description
-                "Stratum 3E Traceable";
-            }
-            enum "SSU-A" {
-              description
-                "Synchronisation Supply Unit A";
-            }
-            enum "ST3" {
-              description
-                "Traceable Stratum 3";
-            }
-            enum "SSU-B" {
-              description
-                "Synchronisation Supply Unit B";
-            }
-            enum "SEC" {
-              description
-                "Synchronous Equipment Clock";
-            }
-            enum "SMC" {
-              description
-                "Traceable SONET minimum clock";
-            }
-            enum "ST4" {
-              description
-                "Traceable Stratum 4";
-            }
-            enum "PNO" {
-              description
-                "Provisionable by Network Operator";
-            }
-            enum "DUS" {
-              description
-                "Do not use for synchronization";
-            }
-            enum "NONE" {
-              description
-                "None";
-            }
-            enum "INV" {
-              description
-                "Invalid quality level code received";
-            }
-          }
-          description
-            "Incoming Sync status (global SDH/SONET set of values)";
-          config false;
-        }
-        leaf sync-status-prov {
-          type enumeration {
-            enum "PRS" {
-              description
-                "Primary Reference Source ( or Stratum 1 Traceable)";
-            }
-            enum "STU" {
-              description
-                "Normal-Traceability unknown";
-            }
-            enum "ST2" {
-              description
-                "Traceable Stratum 2";
-            }
-            enum "ST3E" {
-              description
-                "Stratum 3E Traceable";
-            }
-            enum "SSU-A" {
-              description
-                "Synchronisation Supply Unit A";
-            }
-            enum "ST3" {
-              description
-                "Traceable Stratum 3";
-            }
-            enum "SSU-B" {
-              description
-                "Synchronisation Supply Unit B";
-            }
-            enum "SEC" {
-              description
-                "Synchronous Equipment Clock";
-            }
-            enum "SMC" {
-              description
-                "Traceable SONET minimum clock";
-            }
-            enum "ST4" {
-              description
-                "Traceable Stratum 4";
-            }
-            enum "PNO" {
-              description
-                "Provisionable by Network Operator";
-            }
-            enum "DUS" {
-              description
-                "Do not use for synchronization";
-            }
-            enum "NONE" {
-              description
-                "None";
-            }
-          }
-          description
-            "Provisioned Sync status (global SDH/SONET set of values)";
-          config false;
-        }
-        leaf sync-status-override {
-          type enumeration {
-            enum "PRS" {
-              description
-                "Primary Reference Source ( or Stratum 1 Traceable)";
-            }
-            enum "STU" {
-              description
-                "Normal-Traceability unknown";
-            }
-            enum "ST2" {
-              description
-                "Traceable Stratum 2";
-            }
-            enum "ST3E" {
-              description
-                "Stratum 3E Traceable";
-            }
-            enum "SSU-A" {
-              description
-                "Synchronisation Supply Unit A";
-            }
-            enum "ST3" {
-              description
-                "Traceable Stratum 3";
-            }
-            enum "SSU-B" {
-              description
-                "Synchronisation Supply Unit B";
-            }
-            enum "SEC" {
-              description
-                "Synchronous Equipment Clock";
-            }
-            enum "SMC" {
-              description
-                "Traceable SONET minimum clock";
-            }
-            enum "ST4" {
-              description
-                "Traceable Stratum 4";
-            }
-            enum "PNO" {
-              description
-                "Provisionable by Network Operator";
-            }
-            enum "DUS" {
-              description
-                "Do not use for synchronization";
-            }
-            enum "NONE" {
-              description
-                "None";
-            }
-            enum "FAILED" {
-              description
-                "Terminated SD trail is in the signal fail state";
-            }
-            enum "NSUPP" {
-              description
-                " un-supported signal/Disabled";
-            }
-          }
-          description
-            "Sync status after overriding (global SDH/SONET set of values)";
-          config false;
-        }
-        leaf first-priority {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "Priority of the First Timing Reference";
-          config false;
-        }
-        leaf first-status-priority {
-          type enumeration {
-            enum "ON" {
-              description
-                "Priority Status ON";
-            }
-            enum "OFF" {
-              description
-                "Priority Status OFF";
-            }
-          }
-          description
-            "Priority Status of the First Timing Reference";
-          config false;
-        }
-        leaf second-priority {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "Priority of the Second Timing Reference";
-          config false;
-        }
-        leaf second-status-priority {
-          type enumeration {
-            enum "ON" {
-              description
-                "Priority Status ON";
-            }
-            enum "OFF" {
-              description
-                "Priority Status OFF";
-            }
-          }
-          description
-            "Priority Status of the Second Timing Reference";
-          config false;
-        }
-        leaf third-priority {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "Priority of the Third Timing Reference";
-          config false;
-        }
-        leaf third-status-priority {
-          type enumeration {
-            enum "ON" {
-              description
-                "Priority Status ON";
-            }
-            enum "OFF" {
-              description
-                "Priority Status OFF";
-            }
-          }
-          description
-            "Priority Status of the Third Timing Reference";
-          config false;
-        }
-        leaf fourth-priority {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "Priority of the Fourth Timing Reference";
-          config false;
-        }
-        leaf fourth-status-priority {
-          type enumeration {
-            enum "ON" {
-              description
-                "Priority Status ON";
-            }
-            enum "OFF" {
-              description
-                "Priority Status OFF";
-            }
-          }
-          description
-            "Priority Status of the Fourth Timing Reference";
-          config false;
-        }
-        leaf first-pri {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "Priority for First Timing Reference";
-          config true;
-        }
-        leaf first-status {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "The Priority Status of the First Timing Reference.";
-          config true;
-        }
-        leaf second-pri {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "Priority for Second Timing Reference";
-          config true;
-        }
-        leaf second-status {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Priority Status for Second Timing Reference.";
-          config true;
-        }
-        leaf third-pri {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "Priority for Third Timing Reference";
-          config true;
-        }
-        leaf third-status {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Priority Status for Third Timing Reference.";
-          config true;
-        }
-        leaf fourth-pri {
-          default "4";
-          type ciena-6500-types:INT {
-            range "1..4";
-          }
-          description
-            "Priority for Fourth Timing Reference";
-          config true;
-        }
-        leaf fourth-timing-ref-status {
-          type enumeration {
-            enum "ON";
-            enum "OFF";
-          }
-          description
-            "Priority Status for Fourth Timing Reference.";
-          config true;
-        }
-      }
-    }
-    list bits-in {
-      key "bits-in";
-      config true;
-      leaf bits-in {
-        mandatory true;
-        description
-          "AID in format BITSIN-shelf-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sig-fmt {
-        type enumeration {
-          enum "DS1" {
-            description
-              "DS-1 signal";
-          }
-          enum "E1" {
-            description
-              "E-1 signal";
-          }
-          enum "2MHZ" {
-            description
-              "2MHz Clock signal";
-          }
-        }
-        description
-          "Specifies the signal format to use for the external timing input.";
-        config true;
-      }
-      leaf fmt {
-        type enumeration {
-          enum "SF" {
-            description
-              "Superframe";
-          }
-          enum "ESF" {
-            description
-              "Extended Superframe";
-          }
-          enum "NORMAL" {
-            description
-              "Normal";
-          }
-          enum "CRC4" {
-            description
-              "CRC4";
-          }
-        }
-        default "SF";
-        description
-          "Specifies the framing format to use for the external timing input.";
-        config true;
-      }
-      leaf line-code {
-        type enumeration {
-          enum "B8ZS" {
-            description
-              "Bipolar with 8 Zeros Substitution";
-          }
-          enum "HDB3";
-          enum "AMI" {
-            description
-              "Alternate Mark Inversion";
-          }
-        }
-        description
-          "Specifies the line coding to use for the external timing input.";
-        config true;
-      }
-      leaf san {
-        type enumeration {
-          enum "SA4";
-          enum "SA5";
-          enum "SA6";
-          enum "SA7";
-          enum "SA8";
-        }
-        default "SA4";
-        description
-          "Specifies which San bits to use (see G.704).";
-        config true;
-      }
-      leaf imp {
-        type enumeration {
-          enum "75R";
-          enum "100R";
-          enum "120R";
-        }
-        description
-          "Impedence Level.";
-        config true;
-      }
-      leaf dus-override {
-        type enumeration {
-          enum "DISABLE" {
-            description
-              "DUSOVERRIDE disabled";
-          }
-          enum "ENABLE" {
-            description
-              "DUSOVERRIDE enabled";
-          }
-        }
-        default "DISABLE";
-        description
-          "Specifies the DUSOVERRIDE ability on ESI BITSIN port if SIGFMT=DS1 and FMT=ESF.";
-        config true;
-      }
-    }
-    list bits-out {
-      key "bits-out";
-      config true;
-      leaf bits-out {
-        mandatory true;
-        description
-          "AID in format BITSOUT-shelf-port, BITSOUT-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf first {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies the 1st reference source for the external timing output.";
-        config true;
-      }
-      leaf second {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies the 2nd reference source for the external timing output.";
-        config true;
-      }
-      leaf third {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies the 3rd reference source for the external timing output.";
-        config true;
-      }
-      leaf fourth {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies the 4th reference source for the external timing output.";
-        config true;
-      }
-      leaf sig-fmt {
-        type enumeration {
-          enum "DS1" {
-            description
-              "DS-1 signal";
-          }
-          enum "E1" {
-            description
-              "E-1 signal";
-          }
-          enum "2MHZ" {
-            description
-              "2MHz Clock signal";
-          }
-        }
-        description
-          "Specifies the signal format to use for the external timing input.";
-        config true;
-      }
-      leaf fmt {
-        type enumeration {
-          enum "SF" {
-            description
-              "Superframe";
-          }
-          enum "ESF" {
-            description
-              "Extended Superframe";
-          }
-          enum "NORMAL" {
-            description
-              "Normal";
-          }
-          enum "CRC4" {
-            description
-              "CRC4";
-          }
-        }
-        default "SF";
-        description
-          "Specifies the framing format to use for the external timing output.";
-        config true;
-      }
-      leaf eqlz {
-        type enumeration {
-          enum "1" {
-            description
-              "Short (0 to 266 ft.)";
-          }
-          enum "2" {
-            description
-              "Medium (266 to 533 ft.)";
-          }
-          enum "3" {
-            description
-              "Long (533 to 655 ft.)";
-          }
-        }
-        description
-          "Equalization";
-        config true;
-      }
-      leaf threshold {
-        type enumeration {
-          enum "STU" {
-            description
-              "Normal-Traceability unknown";
-          }
-          enum "ST2" {
-            description
-              "Stratum 2 Traceable";
-          }
-          enum "ST3" {
-            description
-              "Stratum 3 Traceable";
-          }
-          enum "ST4" {
-            description
-              "Stratum 4 Traceable";
-          }
-          enum "SMC" {
-            description
-              "SONET minimum clock traceable";
-          }
-          enum "SSU-A" {
-            description
-              "Synchronisation Supply Unit A";
-          }
-          enum "SSU-B" {
-            description
-              "Synchronisation Supply Unit B";
-          }
-          enum "SEC" {
-            description
-              "Synchronous Equipment Clock";
-          }
-          enum "ST3E" {
-            description
-              "Stratum 3E Traceable";
-          }
-          enum "NONE" {
-            description
-              "None";
-          }
-          enum "PRS" {
-            description
-              "Primary Reference Source ( or Stratum 1 Traceable)";
-          }
-        }
-        description
-          "Threshold";
-        config true;
-      }
-      leaf san {
-        type enumeration {
-          enum "SA4";
-          enum "SA5";
-          enum "SA6";
-          enum "SA7";
-          enum "SA8";
-        }
-        default "SA4";
-        description
-          "Specifies which San bits to use (see G.704).";
-        config true;
-      }
-      leaf imp {
-        type enumeration {
-          enum "75R";
-          enum "100R";
-          enum "120R";
-        }
-        description
-          "Impedence Level.";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "ACT" {
-            description
-              "Active";
-          }
-          enum "WRK" {
-            description
-              "Working";
-          }
-          enum "ERRANL" {
-            description
-              "Errored";
-          }
-          enum "IDLE" {
-            description
-              "Idle";
-          }
-          enum "FLT" {
-            description
-              "Faulty";
-          }
-          enum "WTR" {
-            description
-              "Wait to Restore";
-          }
-        }
-        description
-          "Secondary State";
-        config false;
-      }
-      leaf sync-status {
-        type enumeration {
-          enum "PRS";
-          enum "STU" {
-            description
-              "Normal-Traceability unknown";
-          }
-          enum "ST2" {
-            description
-              "Traceable Stratum 2";
-          }
-          enum "ST3E";
-          enum "SSU-A";
-          enum "ST3" {
-            description
-              "Traceable Stratum 3";
-          }
-          enum "SSU-B";
-          enum "SEC";
-          enum "SMC" {
-            description
-              "Traceable SONET minimum clock";
-          }
-          enum "ST4" {
-            description
-              "Traceable Stratum 4";
-          }
-          enum "PNO";
-          enum "DUS" {
-            description
-              "Do not use for synchronization";
-          }
-          enum "NONE" {
-            description
-              "None";
-          }
-          enum "INV" {
-            description
-              "Invalid quality level code received";
-          }
-        }
-        description
-          "Incoming Sync status (global SDH/SONET set of values)";
-        config false;
-      }
-      leaf sync-status-prov {
-        type enumeration {
-          enum "PRS";
-          enum "STU" {
-            description
-              "Normal-Traceability unknown";
-          }
-          enum "ST2" {
-            description
-              "Traceable Stratum 2";
-          }
-          enum "ST3E";
-          enum "SSU-A";
-          enum "ST3" {
-            description
-              "Traceable Stratum 3";
-          }
-          enum "SSU-B";
-          enum "SEC";
-          enum "SMC" {
-            description
-              "Traceable SONET minimum clock";
-          }
-          enum "ST4" {
-            description
-              "Traceable Stratum 4";
-          }
-          enum "PNO";
-          enum "DUS" {
-            description
-              "Do not use for synchronization";
-          }
-          enum "NONE" {
-            description
-              "None";
-          }
-        }
-        description
-          "Provisioned Sync status (global SDH/SONET set of values)";
-        config false;
-      }
-      leaf sync-status-override {
-        type enumeration {
-          enum "PRS";
-          enum "STU" {
-            description
-              "Normal-Traceability unknown";
-          }
-          enum "ST2" {
-            description
-              "Traceable Stratum 2";
-          }
-          enum "ST3E";
-          enum "SSU-A";
-          enum "ST3" {
-            description
-              "Traceable Stratum 3";
-          }
-          enum "SSU-B";
-          enum "SEC";
-          enum "SMC" {
-            description
-              "Traceable SONET minimum clock";
-          }
-          enum "ST4" {
-            description
-              "Traceable Stratum 4";
-          }
-          enum "PNO";
-          enum "DUS" {
-            description
-              "Do not use for synchronization";
-          }
-          enum "NONE" {
-            description
-              "None";
-          }
-          enum "FAILED" {
-            description
-              "Terminated SD trail is in the signal fail state";
-          }
-          enum "NSUPP" {
-            description
-              " un-supported signal/Disabled";
-          }
-        }
-        description
-          "Sync status after overriding (global SDH/SONET set of values)";
-        config false;
-      }
-      leaf priority {
-        default "4";
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "Priority of this Timing Reference";
-        config false;
-      }
-      leaf status-priority {
-        type enumeration {
-          enum "ON" {
-            description
-              "Priority Status ON";
-          }
-          enum "OFF" {
-            description
-              "Priority Status OFF";
-          }
-        }
-        description
-          "Priority Status of this Timing Reference";
-        config false;
-      }
-      leaf first-pri {
-        default "4";
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "The Priority of First Timing Reference";
-        config true;
-      }
-      leaf first-status {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        description
-          "The Priority Status of the First Timing Reference.";
-        config true;
-      }
-      leaf second-pri {
-        default "4";
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "The Priority of Second Timing Reference";
-        config true;
-      }
-      leaf second-status {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        description
-          "The Priority Status of Second Timing Reference.";
-        config true;
-      }
-      leaf third-pri {
-        default "4";
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "The Priority of Third Timing Reference";
-        config true;
-      }
-      leaf third-status {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        description
-          "The Priority Status of Third Timing Reference.";
-        config true;
-      }
-      leaf fourth-pri {
-        default "4";
-        type ciena-6500-types:INT {
-          range "1..4";
-        }
-        description
-          "The Priority of Fourth Timing Reference";
-        config true;
-      }
-      leaf fourth-timing-ref-status {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        description
-          "The Priority Status of Fourth Timing Reference.";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-syslog.yang b/models/ciena-6500-syslog.yang
deleted file mode 100644
index edf31dba8472bb40123e1f390cd0b38f1455c582..0000000000000000000000000000000000000000
--- a/models/ciena-6500-syslog.yang
+++ /dev/null
@@ -1,296 +0,0 @@
-module ciena-6500-syslog {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-syslog";
-  prefix syslog;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's syslog object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: syslog-show-data
-         rpc syslog-show-config
-           input
-             leaf server
-             - Added mandatory: true 
-               type enumeration
-               - Added enum: SERVER3
-           output
-           - Removed leaf: shelf
-           - Removed leaf: state
-           - Removed leaf: ip
-           - Removed leaf: port
-           - Removed leaf: prtcl
-           - Added list: output
-         container syslog
-         - Removed list: data
-         - Added list: settings
-           list config
-           - Removed leaf: prtcl
-             leaf server
-               type enumeration
-               - Added enum: SERVER3
-             leaf port
-             - Added default: 514 
-               type ciena-6500-types:INT
-               - Added range: 1..65535 ";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container syslog
-           list data
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: numlogs
-           - Removed leaf: trex-url
-           - Removed leaf: trex-frmt
-           - Removed leaf: LOGMSG
-           - Added leaf: shelf
-           - Added leaf: logmsg
-           list config
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc syslog-show-config
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-           output
-           - Added leaf: shelf";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: syslog
-       - Added rpc: syslog-show-config";
-  }
-
-  rpc syslog-show-data {
-    description
-      "Retrieve Syslog: this command is used to retrieve syslogs. TREX can be used to upload the TL1 response to a file in a specified FTP/SFTP server.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf numlogs {
-        type ciena-6500-types:INT {
-          range "1..3000";
-        }
-        description
-          "Retrieve the specified number of logs. If it is not specified then all logs will be returned. In a TIDc configuration with members provisioned, if it is not specified, then 100 logs per shelf will be returned.";
-      }
-      leaf trex-url {
-        type ciena-6500-types:STRING;
-        description
-          "Full URL to remote file (inside quotes)";
-      }
-      leaf trex-frmt {
-        type ciena-6500-enums:TREXFRMT;
-        description
-          "Format to store remote file in";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf logmsg {
-          type string {
-            length "0..825";
-          }
-          mandatory true;
-          description
-            "Syslog Message";
-        }
-      }
-    }
-  }
-  rpc syslog-show-config {
-    description
-      "Retrieve the current syslog server configuration for the NE";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf server {
-        type enumeration {
-          enum "SERVER1";
-          enum "SERVER2";
-          enum "SERVER3";
-        }
-        mandatory true;
-        description
-          "Select server";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          mandatory true;
-          description
-            "aid";
-        }
-        leaf state {
-          type ciena-6500-enums:ENABLED_DISABLED;
-          description
-            "Provisioned service state of the server";
-        }
-        leaf ip {
-          type ciena-6500-types:IPADDR;
-          description
-            "IP address of the syslog server(Format: n.n.n.n)";
-        }
-        leaf port {
-          default "514";
-          type ciena-6500-types:INT {
-            range "1..65535";
-          }
-          description
-            "UDP Port of the syslog server";
-        }
-      }
-    }
-  }
-  container syslog {
-    list config {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf server {
-        type enumeration {
-          enum "SERVER1";
-          enum "SERVER2";
-          enum "SERVER3";
-        }
-        description
-          "Select server to provision(Mandatory for edit operations)";
-        config true;
-      }
-      leaf state {
-        type ciena-6500-enums:ENABLED_DISABLED;
-        description
-          "Provisioned service state of the server";
-        config true;
-      }
-      leaf ip {
-        type ciena-6500-types:IPADDR;
-        description
-          "IP address of the syslog server(Format: n.n.n.n)";
-        config true;
-      }
-      leaf port {
-        default "514";
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "UDP Port of the syslog server";
-        config true;
-      }
-    }
-    list settings {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf syslog-types {
-        type enumeration {
-          enum "SECU" {
-            description
-              "Only security syslog";
-          }
-          enum "ALL" {
-            description
-              "All syslog (security, alarms, ao, transient conditions)";
-          }
-        }
-        default "SECU";
-        description
-          "Syslog Type are SECU(Security syslogs) and ALL (All syslogs including security, alarms ...)";
-        config true;
-      }
-      leaf syslog-sev {
-        default "6";
-        type ciena-6500-types:INT {
-          range "0..7";
-        }
-        description
-          "Standard syslog severity 0 to 7 (0-Emergancy, 1-Alert, 2-Critical, 3-Error, 4-Warning, 5-Notice, 6-Informational, 7-Debug)";
-        config true;
-      }
-      leaf syslog-fac {
-        default "16";
-        type ciena-6500-types:INT {
-          range "16..23";
-        }
-        description
-          "Standard syslog facility 16 to 23 (16-local0 to 23-local7)";
-        config true;
-      }
-      leaf syslog-prtcl {
-        type enumeration {
-          enum "3164" {
-            description
-              "Syslog protocol RFC-3164";
-          }
-          enum "5424" {
-            description
-              "Syslog protocol RFC-5424";
-          }
-        }
-        default "3164";
-        description
-          "Syslog protocol RFC-XXXX";
-        config true;
-      }
-      leaf hostipfmt {
-        type enumeration {
-          enum "IPV4" {
-            description
-              "IPv4 NE IP";
-          }
-          enum "IPV6" {
-            description
-              "IPv6 NE IP";
-          }
-        }
-        default "IPV4";
-        description
-          "Syslog Host IP format";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-system.yang b/models/ciena-6500-system.yang
deleted file mode 100644
index 0c047275c4b2bf8fd06b58222274ae580568a6b8..0000000000000000000000000000000000000000
--- a/models/ciena-6500-system.yang
+++ /dev/null
@@ -1,2868 +0,0 @@
-module ciena-6500-system {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-system";
-  prefix system;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's system object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container system
-         - Added list: config-services
-         - Added list: config-system
-         - Added list: config-alm
-         - Added list: config-l0
-           list config
-           - Added leaf: pm-timeoffset";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         container system
-         - Added container: node-type
-         - Added container: clli
-         - Added container: bulk
-         - Added container: extsid
-         - Added container: timezone
-         - Added list: power
-           list swversion
-             leaf slot
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list config
-           - Added leaf: fiber-loss-major-threshold-default
-           - Added leaf: fiber-loss-minor-threshold-default
-           - Added leaf: auto-prov-crs
-           - Added leaf: licensing-policy
-           - Added leaf: emotr-mode-dflt
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf ne-mode
-             - Added default: UNKNOWN 
-             leaf path-sd-th
-             - Added default: 6 
-               type ciena-6500-types:INT
-               - Added range: 5..9 
-             leaf path-eber-th
-             - Added default: 3 
-               type ciena-6500-types:INT
-               - Added range: 3 | 4 | 5 
-             leaf min-cooling
-             - Added default: LOWFLOW 
-             leaf voa-reset-reqd
-             - Added default: TRUE 
-             leaf eth-gfp-rfi
-             - Added default: ENABLED 
-             leaf eth-gfp-rfi-upi
-               type ciena-6500-types:INT
-               - Added range: 3..255 
-             leaf gcc0-mode
-             - Added default: DISABLED 
-             leaf gcc1-mode
-             - Added default: DISABLED 
-             leaf ndp-mode
-             - Added default: OFF 
-             leaf laser-off-far-end-fail
-             - Added default: DISABLED 
-             leaf alm-ho
-             - Added default: 2.5 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0 | 2.5 
-             leaf bits-mode
-             - Added default: UNKNOWN 
-             leaf bay-fic-in-ao
-             - Added default: FALSE 
-             leaf auto-save-skip-day
-             - Added default: FALSE 
-             leaf auto-rtrv-log-col
-             - Added default: TRUE 
-             leaf ains-pm
-             - Added default: OFF 
-             leaf ains-eqpt-alm-mode
-             - Added default: TRAFFICIMP 
-             leaf ains-eqpt-dflt
-             - Added default: OFF 
-             leaf ains-eqpt-suppr-slot-alm
-             - Added default: OFF 
-             leaf filler-mgmt
-             - Added default: ENABLED 
-             leaf fiber-loss-detection
-             - Added default: DISABLED 
-             leaf state
-             - Added default: NORMAL 
-             leaf sncp-sig-type
-             - Added default: PM 
-             leaf asncp-sig-type
-             - Added default: TCM3 
-             leaf otn-path-wtr
-             - Added default: 5 
-               type ciena-6500-types:INT
-               - Added range: 0..12 | 15 | 30 | 45 | 60 
-             leaf pathtgdflt
-             - Added default: 0-MSEC 
-             - Changed type from ciena-6500-enums:TDG_OTM to ciena-6500-enums:TDG_OTM_default_0SEC
-             leaf path-wtr
-             - Added default: 5 
-               type ciena-6500-types:INT
-               - Added range: 0..12 | 15 | 30 | 45 | 60 
-             leaf cs-ctrl
-             - Added default: OFF 
-             leaf adv-eqpt-mgmt
-             - Added default: DISABLED 
-             leaf cond-override
-             - Added default: PROFILE 
-             leaf g8032-wtr-in-fp-sc-alm
-             - Added default: STANDING 
-             leaf auto-prov-fac
-             - Added default: ON 
-             leaf eth10g-mapping
-             - Added default: GFPSTD 
-             leaf lfa-raise-time
-             - Added default: 300 
-               type ciena-6500-types:INT
-               - Added range: 30..86399 
-             leaf lfa-clear-time
-             - Added default: 600 
-               type ciena-6500-types:INT
-               - Added range: 30..86399 
-             leaf lfa-threshold
-             - Added default: 3 
-               type ciena-6500-types:INT
-               - Added range: 2..10 
-             leaf auto-chc-profile-reset-thresh
-             - Added default: 6 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0..30 
-             leaf auto-connval
-             - Added default: ON 
-             leaf tod-rprd-dflt
-               type ciena-6500-types:INT
-               - Added range: 5..300 
-             leaf rvrt-type-dflt
-             - Added default: WTR 
-             leaf ctrlmodedflt
-             - Added default: 50 
-             leaf dbdflt
-             - Added default: 6.250 
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.000..4800.000 
-             leaf eth-sd-th
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..100 
-             leaf eth-eer-th
-             - Added default: 20 
-               type ciena-6500-types:INT
-               - Added range: 0..100 
-             leaf fc-sd-th
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf fc-eer-th
-             - Added default: 20 
-               type ciena-6500-types:INT
-               - Added range: 0..100 
-             leaf wan-fr-sd-th
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..100 
-             leaf wan-fr-eer-th
-             - Added default: 20 
-               type ciena-6500-types:INT
-               - Added range: 0..100 
-             leaf wan-tr-sd-th
-             - Added default: 1 
-               type ciena-6500-types:INT
-               - Added range: 0..100 
-             leaf wan-tr-eer-th
-             - Added default: 20 
-               type ciena-6500-types:INT
-               - Added range: 0..100 
-             leaf eqpt-current
-               type enumeration
-               - Added enum: 480
-               - Added enum: 600
-               - Added enum: 660
-               - Added enum: 720
-               - Added enum: 780
-               - Added enum: 840
-               - Added enum: 960
-               - Added enum: 120
-             leaf estimated-power
-               type ciena-6500-types:INT
-               - Added range: 0..17280 
-             leaf zone-1-power
-               type ciena-6500-types:INT
-               - Added range: 0..2250 
-             leaf zone-2-power
-               type ciena-6500-types:INT
-               - Added range: 0..2250 
-             leaf zone-3-power
-               type ciena-6500-types:INT
-               - Added range: 0..2250 
-             leaf zone-4-power
-               type ciena-6500-types:INT
-               - Added range: 0..2250 
-           list backplane
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           container netype
-             leaf netype
-               type enumeration
-               - Removed enum: CHA
-               - Removed enum: CCA
-               - Removed enum: AMP";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-         container system
-           list config
-           - Removed leaf: grid-mode
-           - Added leaf: ctrlmodedflt
-           - Added leaf: dbdflt";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container system
-           list swversion
-           - Changed key from aid to slot
-           - Removed leaf: aid
-           - Removed leaf: swIssue
-           - Removed leaf: swLocation
-           - Removed leaf: swType
-           - Added leaf: slot
-           - Added leaf: swissue
-           - Added leaf: swlocation
-           - Added leaf: swtype
-           list sid
-           - Changed key from aid to all
-           - Removed leaf: aid
-           - Added leaf: all
-           container date
-           - Removed leaf: currenttime
-           - Removed leaf: currentdate
-           - Added leaf: current-date
-           - Added leaf: current-time
-           list config
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: monitor-fan
-           - Added leaf: pathtgdflt
-           - Added leaf: shelf
-             leaf ne-mode
-               type enumeration
-               - Added enum: NONE
-             leaf-list path-sw-crit
-             - Changed type from bits to enumeration
-               type enumeration
-               - Added enum: TIM
-               - Added enum: PLM
-               - Added enum: UNEQ
-               - Added enum: SD
-               - Added enum: EBER
-               - Added enum: AIS
-               - Added enum: LOP
-               - Added enum: ODUSD
-             leaf-list pth-ais-insert
-             - Changed type from ciena-6500-enums:PathRDIAISInsert_bits to ciena-6500-enums:PathRDIAISInsert
-             leaf-list path-pev-stat
-             - Changed type from bits to enumeration
-               type enumeration
-               - Added enum: MAN
-               - Added enum: AUTO
-               - Added enum: DISABLED
-             leaf-list line-pev-stat
-             - Changed type from bits to enumeration
-               type enumeration
-               - Added enum: MAN
-               - Added enum: AUTO
-               - Added enum: DISABLED
-             leaf state
-               type enumeration
-               - Added enum: FLEX_RECONFIG
-             leaf-list alarm-info
-             - Changed type from ciena-6500-enums:ALARMINFO_bits to ciena-6500-enums:ALARMINFO
-             leaf eqpt-current
-               type enumeration
-               - Added enum: 360
-               - Added enum: 300
-           list backplane
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-           container netype
-           - Removed leaf: neType
-           - Removed leaf: swIssue
-           - Added leaf: manuf
-           - Added leaf: netype
-           - Added leaf: swissue";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: system";
-  }
-
-  container system {
-    container node-type {
-      config true;
-      leaf nodetype {
-        type enumeration {
-          enum "ILA" {
-            description
-              "Integrated Line Amplifier";
-          }
-          enum "OADM" {
-            description
-              "Optical Add/Drop Multiplexer";
-          }
-          enum "DGE" {
-            description
-              "Dynamic Gain Element";
-          }
-        }
-        description
-          "Node type.(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    container clli {
-      config true;
-      leaf clli {
-        type string {
-          length "0..11";
-        }
-        description
-          "Common Language Location Identifier.(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    list swversion {
-      key "slot";
-      config false;
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SHELF-shelf, SLOT-slot-%HLINK-facility-hshelf-hslot-hport";
-        type ciena-6500-types:aid;
-      }
-      leaf swissue {
-        type ciena-6500-types:STRING;
-        description
-          "Build number software on card";
-        config false;
-      }
-      leaf swlocation {
-        type enumeration {
-          enum "RAM";
-          enum "BANK0";
-          enum "BANK1";
-        }
-        description
-          "";
-        config false;
-      }
-      leaf swtype {
-        type ciena-6500-types:STRING;
-        description
-          "";
-        config false;
-      }
-      leaf alignment {
-        type enumeration {
-          enum "ALIGNED";
-          enum "MISALIGNED";
-        }
-        description
-          "";
-        config false;
-      }
-    }
-    list sid {
-      key "all";
-      config true;
-      leaf all {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf name {
-        type ciena-6500-types:STRING;
-        description
-          "To change the node name, enter 1 to 20 alphanumeric characters into the new value field. The name can include any combination of upper and lower case letters, numbers, or special characters. The name is either an identifier(which must begin with a letter) or a quoted string. Numeric valus may be contained in the identifier or in quoted string but cannot be the first character in an identifier. The name cannot include the following characters: backslash(\\), space, double-quote (\"), colon (:), semicolon (;), ampersand (&), greater than (>), less than (<), or comma (,).(Mandatory for edit operations)";
-        config true;
-      }
-    }
-    container bulk {
-      config false;
-    }
-    container extsid {
-      config true;
-      leaf extended-sid {
-        type string {
-          length "1..64";
-        }
-        description
-          "Set network entity name(Mandatory for edit operations)";
-        config true;
-      }
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        description
-          "aid";
-        config false;
-      }
-    }
-    container date {
-      config true;
-      leaf current-date {
-        type ciena-6500-types:DATE;
-        description
-          "DATE is the current date in a format of: YY-MM-DD, where YY is the last two digits of the year ranging from 96 to 99 and 00 to 30. MM is the month of the year ranging from 01 to 12, and DD is the day of the month ranging from 01 to 31.";
-        config true;
-      }
-      leaf current-time {
-        type ciena-6500-types:TIME;
-        description
-          "TIME is the current time in a format of: HH-MM-SS, where HH is the hour in a 24 hour format ranging from 00 to 23, MM is the minute ranging from 00 to 59, and SS is the second ranging from 00 to 59.";
-        config true;
-      }
-    }
-    container timezone {
-      config false;
-      leaf time-zone {
-        type enumeration {
-          enum "HST10" {
-            description
-              "Hawaiian Standard Time";
-          }
-          enum "AST10ADT" {
-            description
-              "Aleutian Standard Time, Aleutian Daylight Time";
-          }
-          enum "YST9" {
-            description
-              "Yukon Standard Time";
-          }
-          enum "YST9YDT" {
-            description
-              "Yukon Standard Time, Yukon Daylight Time";
-          }
-          enum "PST8" {
-            description
-              "Pacific Standard Time";
-          }
-          enum "PST8PDT" {
-            description
-              "Pacific Standard Time, Pacific Daylight Time";
-          }
-          enum "MST7" {
-            description
-              "Mountain Standard Time";
-          }
-          enum "MST7MDT" {
-            description
-              "Mountain Standard Time, Mountain Daylight Time";
-          }
-          enum "CST6CDT" {
-            description
-              "Central Standard Time, Central Daylight Time";
-          }
-          enum "CST6" {
-            description
-              "Central Standard Time";
-          }
-          enum "EST5" {
-            description
-              "Eastern Standard Time";
-          }
-          enum "EST5CDT" {
-            description
-              "Eastern Standard Time, Central Daylight Time";
-          }
-          enum "EST5EDT" {
-            description
-              "Eastern Standard Time, Eastern Daylight Time";
-          }
-          enum "AST4" {
-            description
-              "Atlantic Standard Time";
-          }
-          enum "AST4ADT" {
-            description
-              "Atlantic Standard Time, Atlantic Daylight Time";
-          }
-          enum "NST330NDT" {
-            description
-              "Newfoundland Standard Time, Newfoundland Daylight Time";
-          }
-          enum "GMT0" {
-            description
-              "Greenwich Mean Time";
-          }
-          enum "GMT0BST" {
-            description
-              "Greenwich Mean Time, British Summer Time";
-          }
-          enum "WET0WETDST" {
-            description
-              "Western European Time, West. European Daylight Time";
-          }
-          enum "PWT0PST" {
-            description
-              "Portuguese Winter Time, Portuguese Summer Time";
-          }
-          enum "MET1" {
-            description
-              "Middle European Time";
-          }
-          enum "MET1METDST" {
-            description
-              "Middle European Time, Middle European Daylight Time";
-          }
-          enum "MET2" {
-            description
-              "Middle European Time";
-          }
-          enum "SAST2SADT" {
-            description
-              "South Africa Standard Time, South Africa Daylight Time";
-          }
-          enum "EET3" {
-            description
-              "Eastern European Time";
-          }
-          enum "WAT4" {
-            description
-              "Western Asian Time";
-          }
-          enum "WAT5" {
-            description
-              "Western Asian Time";
-          }
-          enum "MAT6" {
-            description
-              "Middle Asian Time";
-          }
-          enum "MAT7" {
-            description
-              "Middle Asian Time";
-          }
-          enum "WST800" {
-            description
-              "Australian Western Standard Time";
-          }
-          enum "KST9" {
-            description
-              "Korean Standard Time";
-          }
-          enum "JST9" {
-            description
-              "Japan Standard Time";
-          }
-          enum "CST930" {
-            description
-              "Australian Central Standard Time";
-          }
-          enum "CST930CDT" {
-            description
-              "Australian Central Standard Time, Australian Central Daylight Time";
-          }
-          enum "EST10" {
-            description
-              "Australian Eastern Standard Time";
-          }
-          enum "EST10EDT" {
-            description
-              "Australian Eastern Standard Time, Australian Eastern Daylight Time";
-          }
-          enum "NZST12NZDT" {
-            description
-              "New Zealand Standard Time, New Zealand Daylight Time";
-          }
-          enum "SAT3" {
-            description
-              "Argentina Standard Time";
-          }
-        }
-        description
-          "Timezone.";
-        config false;
-      }
-    }
-    list power {
-      key "eqpt";
-      config false;
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf, PWRZONE-shelf-zone, PWRFEED-shelf-slot-subslot";
-        type ciena-6500-types:aid;
-      }
-      leaf current {
-        type ciena-6500-types:INT;
-        description
-          "Reported current drawn from each power feed in milliAmps(Param is applicable only on T-Series shelf.)";
-        config false;
-      }
-      leaf voltage {
-        type ciena-6500-types:INT;
-        description
-          "Reported voltage from each power feed in milliVolts(Param is applicable only on T-Series shelf.)";
-        config false;
-      }
-      leaf reportedpower {
-        type ciena-6500-types:INT;
-        description
-          "Reported power drawn from each power zone or shelf in Watts(Param is applicable only on T-Series shelf.)";
-        config false;
-      }
-      leaf powerbudget {
-        type ciena-6500-types:INT;
-        description
-          "Estimated budgeted power for each power zone or shelf in Watts";
-        config false;
-      }
-    }
-    list config {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ne-mode {
-        type enumeration {
-          enum "SONET" {
-            description
-              "Global personality of NE is SONET.";
-          }
-          enum "SDH" {
-            description
-              "Global personality of NE is SDH.";
-          }
-          enum "SDHJ" {
-            description
-              "Global personality of NE is SDHJ.";
-          }
-          enum "UNKNOWN" {
-            description
-              "Global personality of NE is unknown.";
-          }
-          enum "NONE" {
-            description
-              "Global personality of NE is none. Has no relevance on system operation.";
-          }
-        }
-        default "UNKNOWN";
-        description
-          "NE Mode";
-        config true;
-      }
-      leaf-list path-sw-crit {
-        type enumeration {
-          enum "TIM" {
-            description
-              "Trace Identifier Mismatch";
-          }
-          enum "PLM" {
-            description
-              "Payload Label Mismatch";
-          }
-          enum "UNEQ" {
-            description
-              "Path Unequipped";
-          }
-          enum "SD" {
-            description
-              "Path Signal Degrade";
-          }
-          enum "EBER" {
-            description
-              "Path Excessive Bit Error";
-          }
-          enum "AIS" {
-            description
-              "Alarm Indication Signal";
-          }
-          enum "LOP" {
-            description
-              "Loss Of Pointer";
-          }
-          enum "ODUSD" {
-            description
-              "ODU Signal Degrade";
-          }
-        }
-        description
-          "Path protection switch criteria. Parameter is listable - a set of criteria can be defined e.g. TIM&PLM&SD. This parameter does not work in a cumulative manner: to add/remove criteria from an existing set, the desired new set must be fully specified as a list.";
-        config true;
-      }
-      leaf-list pth-ais-insert {
-        type ciena-6500-enums:PathRDIAISInsert;
-        description
-          "Path AIS insertion criteria. Values must be grouped. Allowable combinations are TIM&UNEQ; TIM&UNEQ&PLM. This parameter does not work in a cumulative manner: to add/remove criteria from an existing set, the desired new set must be fully specified as a list.";
-        config true;
-      }
-      leaf path-sd-th {
-        default "6";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Path signal degrade threshold value. Range of PATHSDTH is 5, 6, 7, 8, 9. Default value is 6.";
-        config true;
-      }
-      leaf path-eber-th {
-        default "3";
-        type ciena-6500-types:INT {
-          range "3 | 4 | 5";
-        }
-        description
-          "Path excessive bit error threshold value. Range of PATHEBERTH is 3, 4, 5. Default value is 3.";
-        config true;
-      }
-      leaf min-cooling {
-        type enumeration {
-          enum "LOWFLOW" {
-            description
-              "Low flow fan cooling";
-          }
-          enum "HIGHFLOW" {
-            description
-              "High flow fan cooling";
-          }
-        }
-        default "LOWFLOW";
-        description
-          "Minimum provisioned cooling requirements of the shelf.";
-        config true;
-      }
-      leaf voa-reset-reqd {
-        type enumeration {
-          enum "FALSE" {
-            description
-              "VOARESETREQD is set to FALSE.";
-          }
-          enum "TRUE" {
-            description
-              "VOARESETREQD is set to TRUE.";
-          }
-        }
-        default "TRUE";
-        description
-          "By setting the VOARESETREQD flag to false prevents DOC from altering the VOA TARGLOSS";
-        config true;
-      }
-      leaf targ-pad {
-        type ciena-6500-types:STRING;
-        description
-          "Defines the total loss targeted on the span or mid-stage";
-        config true;
-      }
-      leaf prov-current {
-        type ciena-6500-enums:provcurrentinfo;
-        description
-          "Provisioned shelf power limit (Amps)";
-        config true;
-      }
-      leaf eth-gfp-rfi {
-        type enumeration {
-          enum "ENABLED" {
-            description
-              "Transmit GFP RFI CMF on WAN link down.";
-          }
-          enum "DISABLED" {
-            description
-              "Do not transmit CMF UPI on WAN link down.";
-          }
-          enum "CMFCSF" {
-            description
-              "Transmit GFP CSF CMF on WAN link down.";
-          }
-          enum "USERDEF" {
-            description
-              "Transmit userdefined UPI value one WAN link down.";
-          }
-        }
-        default "ENABLED";
-        description
-          "Control the ETH GFP RFI CMF transmission. Default=DISABLE (and only possible value for FC), Default=ENABLE(Ethernet).";
-        config true;
-      }
-      leaf eth-gfp-rfi-upi {
-        type ciena-6500-types:INT {
-          range "3..255";
-        }
-        description
-          "Transmits userdefined UPI value on WAN link down. Min value is 3, max value is 255. The values 128,129 and 130 are not supported. These are reserved for system use.";
-        config true;
-      }
-      leaf-list path-pev-stat {
-        type enumeration {
-          enum "MAN" {
-            description
-              "Report manually transient path protection events.";
-          }
-          enum "AUTO" {
-            description
-              "Report automatically transient path protection events.";
-          }
-          enum "DISABLED" {
-            description
-              "Do not report transient path protection events.";
-          }
-        }
-        description
-          "Path Protection Transient Event Reporting Status";
-        config true;
-      }
-      leaf-list line-pev-stat {
-        type enumeration {
-          enum "MAN" {
-            description
-              "Report manually transient line protection events.";
-          }
-          enum "AUTO" {
-            description
-              "Report automatically transient line protection events.";
-          }
-          enum "DISABLED" {
-            description
-              "Do not report transient line protection events.";
-          }
-        }
-        description
-          "Line Protection Transient Event Reporting Status";
-        config true;
-      }
-      leaf gcc0-mode {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "GCC0 channel auto-provisioning is disabled.";
-          }
-          enum "OSPF" {
-            description
-              "GCC0 channel auto-provisioning is enabled and will run OSPF as the routing protocol.";
-          }
-          enum "IISIS" {
-            description
-              "GCC0 channel auto-provisioning is enabled and will run i-ISIS as the routing protocol.";
-          }
-        }
-        default "DISABLED";
-        description
-          "Control the auto-provisioning behaviour of the GCC0 comms channel. Default=Disabled.";
-        config true;
-      }
-      leaf gcc1-mode {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "GCC1 channel auto-provisioning is disabled.";
-          }
-          enum "OSPF" {
-            description
-              "GCC1 channel auto-provisioning is enabled and will run OSPF as the routing protocol.";
-          }
-          enum "IISIS" {
-            description
-              "GCC1 channel auto-provisioning is enabled and will run i-ISIS as the routing protocol.";
-          }
-        }
-        default "DISABLED";
-        description
-          "Control the auto-provisioning behaviour of the GCC1 comms channel. Default=Disabled.";
-        config true;
-      }
-      leaf ndp-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NDP auto-provisioning is disabled.";
-          }
-          enum "ON" {
-            description
-              "NDP auto-provisioning is enabled and will run the NDP protocol.";
-          }
-        }
-        default "OFF";
-        description
-          "Control the auto-provisioning behaviour of the NDP Link. Default=OFF.";
-        config true;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Loss of Light feature. Under certain failure scenarios insert Loss of Light (i.e. turn off the TX laser).";
-        config true;
-      }
-      leaf alm-ho {
-        default "2.5";
-        type ciena-6500-types:DECIMAL {
-          range "0 | 2.5";
-        }
-        description
-          "Alarm Hold-off Time on Raise. Supported values are 0 or 2.5 (default=2.5).";
-        config true;
-      }
-      leaf bits-mode {
-        type enumeration {
-          enum "SONET" {
-            description
-              "BITS Mode of NE is SONET.";
-          }
-          enum "SDH" {
-            description
-              "BITS Mode of NE is SDH.";
-          }
-          enum "SDHJ" {
-            description
-              "BITS Mode of NE is SDHJ.";
-          }
-          enum "UNKNOWN" {
-            description
-              "BITS Mode of NE is unknown.";
-          }
-        }
-        default "UNKNOWN";
-        description
-          "Synchronization BITS Mode";
-        config true;
-      }
-      leaf osc-mode {
-        type ciena-6500-enums:OSCMODE;
-        description
-          "OSC Mode feature. State value used to control auto provisioning of comms circuit when an OSC facility is provisioned.";
-        config true;
-      }
-      leaf alm-corr {
-        type ciena-6500-enums:ALMCORR;
-        description
-          "Alarm correlation flag, to turn the feature on or off.";
-        config true;
-      }
-      leaf bay-fic-in-ao {
-        type enumeration {
-          enum "TRUE";
-          enum "FALSE";
-        }
-        default "FALSE";
-        description
-          "All the fields controlled by BAYFICINAO has been moved to ALARMINFO parameter.";
-        config true;
-      }
-      leaf auto-save-skip-day {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "AutoSave skip 1 day is set.";
-          }
-          enum "FALSE" {
-            description
-              "AutoSave skip 1 day is not set.";
-          }
-        }
-        default "FALSE";
-        description
-          "Flag value to indicate if AutoSave skip 1 day is set.";
-        config true;
-      }
-      leaf auto-rtrv-log-col {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "Auto RTRV-LOG collection is enabled.";
-          }
-          enum "FALSE" {
-            description
-              "Auto RTRV-LOG collection is disabled.";
-          }
-        }
-        default "TRUE";
-        description
-          "Flag value to indicate if RTRV-LOG auto collection is enabled.";
-        config true;
-      }
-      leaf csf-mcast-mac {
-        type ciena-6500-types:STRING;
-        description
-          "48-bit multicast Ethernet MAC addr - 12 alphanumeric characters. Range is 000000000000 to FFFFFFFFFFFF. Default is 0180C2880001.";
-        config true;
-      }
-      leaf ains-pm {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "AINS PM Collection Toggle.";
-        config true;
-      }
-      leaf ains-eqpt-alm-mode {
-        type enumeration {
-          enum "TRAFFICIMP";
-          enum "ALL";
-        }
-        default "TRAFFICIMP";
-        description
-          "AINS Equipment Timer Impacting Alarm Mode.";
-        config true;
-      }
-      leaf ains-eqpt-dflt {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "AINS Equipment Default Toggle.";
-        config true;
-      }
-      leaf ains-eqpt-suppr-slot-alm {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Suppress Slot Specific EQPT Alarms (unprovisioned).";
-        config true;
-      }
-      leaf filler-mgmt {
-        type enumeration {
-          enum "ENABLED" {
-            description
-              "Filler card management is enabled.";
-          }
-          enum "DISABLED" {
-            description
-              "Filler card management is disabled.";
-          }
-        }
-        default "ENABLED";
-        description
-          "Flag to determine if Filler Card Missing alarms should be raised against empty slots.";
-        config true;
-      }
-      leaf ains-timeout {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the AINS timeout. Range is 00-05 to 96-00.";
-        config true;
-      }
-      leaf ains-eqpt-timeout {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the Equipment AINS timeout. Range is 00-05 to 96-00.";
-        config true;
-      }
-      leaf auto-save-sched {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the Autosave Schedule. Range is 00-00 to 23-59.";
-        config true;
-      }
-      leaf fiber-loss-detection {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "High Fiber Loss alarm is disabled.";
-          }
-          enum "ENABLED" {
-            description
-              "High Fiber Loss alarm is enabled.";
-          }
-        }
-        default "DISABLED";
-        description
-          "Flag to enable High Fiber Loss alarm when the unexpected loss on a fiber exceeds 1 dBm.";
-        config true;
-      }
-      leaf fiber-loss-major-threshold-default {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Default value for Adjacency Fiber Loss Major Threshold.";
-        config true;
-      }
-      leaf fiber-loss-minor-threshold-default {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Default value for Adjacency Fiber Loss Minor Threshold.";
-        config true;
-      }
-      leaf shelf-synch {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Flag to enable Shelf Sync across the node. When enabled, this will sync data provisioning for selected data from the primary shelf to all members.";
-        config true;
-      }
-      leaf major-degrade-thresh {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Support to edit major degrade threshold. Major degrade threshold is default to 6dB. Range of threshold is 0 to 30.";
-        config true;
-      }
-      leaf minor-degrade-thresh {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Support to edit minor degrade threshold. Minor degrade threshold is default to 3dB. Range of threshold is 0 to 30.";
-        config true;
-      }
-      leaf state {
-        type enumeration {
-          enum "NORMAL" {
-            description
-              "No reconfigurations in progress";
-          }
-          enum "MRO_RECONFIG" {
-            description
-              "MRO reconfig in progress on shelf";
-          }
-          enum "MANUAL_RECONFIG" {
-            description
-              "Manual reconfig in progress on shelf";
-          }
-          enum "TIDCPRI_RECONFIG" {
-            description
-              "TIDC Primary reconfig in progress on shelf";
-          }
-          enum "DOSC2_RECONFIG" {
-            description
-              "Uni to DOSC2 reconfig in progress on shelf";
-          }
-          enum "SHELFID_RECONFIG" {
-            description
-              "Shelf Id reconfig in progress on shelf";
-          }
-          enum "OTS_RECONFIG" {
-            description
-              "OTS reconfig in progress on shelf";
-          }
-          enum "FLEX_RECONFIG" {
-            description
-              "Flexible grid reconfig in progress on shelf";
-          }
-        }
-        default "NORMAL";
-        description
-          "System Reconfig State";
-        config true;
-      }
-      leaf sncp-sig-type {
-        type enumeration {
-          enum "PM" {
-            description
-              "ODU PM bytes";
-          }
-          enum "TCM1" {
-            description
-              "TCM layer 1";
-          }
-          enum "TCM2" {
-            description
-              "TCM layer 2";
-          }
-          enum "TCM3" {
-            description
-              "TCM layer 3";
-          }
-          enum "TCM4" {
-            description
-              "TCM layer 4";
-          }
-          enum "TCM5" {
-            description
-              "TCM layer 5";
-          }
-          enum "TCM6" {
-            description
-              "TCM layer 6";
-          }
-        }
-        default "PM";
-        description
-          "Default Signaling type to be used for SNCP.";
-        config true;
-      }
-      leaf asncp-sig-type {
-        type enumeration {
-          enum "PM" {
-            description
-              "ODU PM bytes";
-          }
-          enum "TCM1" {
-            description
-              "TCM layer 1";
-          }
-          enum "TCM2" {
-            description
-              "TCM layer 2";
-          }
-          enum "TCM3" {
-            description
-              "TCM layer 3";
-          }
-          enum "TCM4" {
-            description
-              "TCM layer 4";
-          }
-          enum "TCM5" {
-            description
-              "TCM layer 5";
-          }
-          enum "TCM6" {
-            description
-              "TCM layer 6";
-          }
-        }
-        default "TCM3";
-        description
-          "Default Signaling type to be used for ASNCP.";
-        config true;
-      }
-      leaf otn-path-wtr {
-        default "5";
-        type ciena-6500-types:INT {
-          range "0..12 | 15 | 30 | 45 | 60";
-        }
-        description
-          "The ASNCP/SNCP PG wait to restore time.";
-        config true;
-      }
-      leaf pathtgdflt {
-        type ciena-6500-enums:TDG_OTM_default_0SEC;
-        default "0-MSEC";
-        description
-          "Default detection and recovery guard time for ASNCP.";
-        config true;
-      }
-      leaf path-wtr {
-        default "5";
-        type ciena-6500-types:INT {
-          range "0..12 | 15 | 30 | 45 | 60";
-        }
-        description
-          "Path protection wait to restore time. Range is 0,1,2..12,15,30,45,60 minutes. Default is 5 minutes.";
-        config true;
-      }
-      leaf autoroute-def {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Sets the AutoRoute value in new channel access OTSs created in this node, unless the user provides an explicit value in the create command. When AutoRoute is disabled, cross-connects must be provisioned at all channel access sites. When AutoRoute is enabled, cross-connects are automatically derived as follows: passthrough cross-connects are ceated at intra-domain channel access sites and local add/drop cross-connects are created for in-service CMD Tx/Rx adjacencies.";
-        config true;
-      }
-      leaf cs-ctrl {
-        type enumeration {
-          enum "OFF" {
-            description
-              "CS Control is OFF. OTS CS Indicator defaults to N.";
-          }
-          enum "ON" {
-            description
-              "CS Control is ON. OTS CS Indicator defaults to Y.";
-          }
-        }
-        default "OFF";
-        description
-          "Flag to enable Booster, Pre-AMP, and Tx Power Control on Coherent Select (CS) networks. Also drives the default value of the CS Indicator for OTS creation. Default is OFF.";
-        config true;
-      }
-      leaf adv-eqpt-mgmt {
-        type ciena-6500-enums:ENABLED_defaultDISABLED;
-        default "DISABLED";
-        description
-          "Advanced Equipment Mode Toggle.";
-        config true;
-      }
-      leaf-list alarm-info {
-        type ciena-6500-enums:ALARMINFO;
-        description
-          "Alarm Info.Parameter is listable - a set of parameters can be defined e.g. CRDTYP&WVLNGTH. This parameter does not work in a cumulative manner: to add/remove flag from an existing set, the desired new set must be fully specified as a list.";
-        config true;
-      }
-      leaf amp-gain-discrepancy-thresh {
-        type ciena-6500-types:STRING;
-        description
-          "Threshold for convicting a LIM based on discrepancy between achieved and target gain. Default is 1db.";
-        config true;
-      }
-      leaf cond-override {
-        type ciena-6500-enums:ConditioningOverride;
-        default "PROFILE";
-        description
-          "Alarm Conditioning Override. This parameter is used to override the alarm profile provisioning for conditioning alarms.";
-        config true;
-      }
-      leaf doc-auto-del-los {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Enables/Disables the auto-squelch feature (delete of channels with Ingress LOS alarm).";
-        config true;
-      }
-      leaf tca-suppression {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Enables/Disables the TCA Suppression functionality";
-        config true;
-      }
-      leaf g8032-wtr-in-fp-sc-alm {
-        type enumeration {
-          enum "STANDING" {
-            description
-              "The Protection Switch Complete Alarm is active until the ring has been switched over, meaning that the RPL owner has a block active and the ring is in the idle state.";
-          }
-          enum "CLR" {
-            description
-              "The Protection Switch Complete Alarm is only active when the ring is open, meaning that there is more than 1 block on the ring resulting in traffic possibly being lost.";
-          }
-        }
-        default "STANDING";
-        description
-          "G8032 Protection Switch Complete Alarm Behaviour";
-        config true;
-      }
-      leaf auto-prov-fac {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Facilities on OCLD cards will not be auto created";
-          }
-          enum "ON" {
-            description
-              "Facilities on OCLD cards will be auto created";
-          }
-        }
-        default "ON";
-        description
-          "Indicate whether or not the facilities are auto created on the OCLD cards.Default = ON";
-        config true;
-      }
-      leaf auto-prov-crs {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Cross connections will not be auto created";
-          }
-          enum "ON" {
-            description
-              "Cross connections will be auto created";
-          }
-        }
-        default "ON";
-        description
-          "Indicate whether or not the cross connections are auto created between facilities within the same circuit pack, once both facilities have been provisioned.";
-        config true;
-      }
-      leaf eth10g-mapping {
-        type enumeration {
-          enum "GFPSTD" {
-            description
-              "When a 10GE port is created the mapping will be set to this system wide default";
-          }
-          enum "GFPMACOSTR";
-          enum "PROP237";
-        }
-        default "GFPSTD";
-        description
-          "The default mapping used for ETTPs with a rate of ETH10G. This is the mapping value when ETTP is created. It does not change the mapping value of already created ETTPs.";
-        config true;
-      }
-      leaf lfa-enable {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Control the Line Flapping Alarm Enable feature.If enabled, the LFA alarm can be raised. If disabled, the LFA alarm can not be raised.";
-        config true;
-      }
-      leaf lfa-raise-time {
-        default "300";
-        type ciena-6500-types:INT {
-          range "30..86399";
-        }
-        description
-          "Indicates the time window that failures must occur in order to raise the Line Flapping alarm.";
-        config true;
-      }
-      leaf lfa-clear-time {
-        default "600";
-        type ciena-6500-types:INT {
-          range "30..86399";
-        }
-        description
-          "Indicates how long the line must be error free to clear the Line Flapping alarm.";
-        config true;
-      }
-      leaf lfa-threshold {
-        default "3";
-        type ciena-6500-types:INT {
-          range "2..10";
-        }
-        description
-          "Indicates the number of failure events which must occur within time window in order to raise the Line Flapping alarm.";
-        config true;
-      }
-      leaf auto-chc-profile-reset-thresh {
-        default "6";
-        type ciena-6500-types:DECIMAL {
-          range "0..30";
-        }
-        description
-          "Automatic CHC Profile Reset Threshold. Its range is from 0 to 30dB. The default is 6dB.";
-        config true;
-      }
-      leaf auto-connval {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Automatic Connection Validation is OFF";
-          }
-          enum "ON" {
-            description
-              "Automatic Connection Validation is ON";
-          }
-        }
-        default "ON";
-        description
-          "Indicates if Automatic Connection Validation is ON/OFF. The default = ON.";
-        config true;
-      }
-      leaf tod-rhb-en-dflt {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates the default value of Time of Day Reversion Holdback Enabled for A/S-SNCP Protection Groups. Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. The default value is NO.";
-        config true;
-      }
-      leaf tod-rhb-prd-dflt {
-        type ciena-6500-types:TIME;
-        description
-          "Indicates the default value of Time of Day Reversion Holdback Period for A/S-SNCP Protection Groups. The format is HH-MM. Range is 00-05 to 72-00. The default value is 24-00.";
-        config true;
-      }
-      leaf tod-rtime-dflt {
-        type ciena-6500-types:TIME;
-        description
-          "Indicates the default Time for Time of Day Reversion on A/S-SNCP Protection Groups. Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. The format is HH-MM. Range is 00-00 to 23-59. The default value is 02-00.";
-        config true;
-      }
-      leaf tod-rprd-dflt {
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "The default value of Time of Day Reversion Period for A/S-SNCP Protection Groups. It specifies the time period (in minutes) over which it is acceptable to do the reversion (The working member must be available during this window otherwise wait 24 hours to try again). Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. Range is 5 to 300 minutes. The default value is 20.";
-        config true;
-      }
-      leaf rvrtv-dflt {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates the default for Revertive switching mode enabling on A/S-SNCP Protection Groups. Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. The default value is NO.";
-        config true;
-      }
-      leaf rvrt-type-dflt {
-        type ciena-6500-enums:EnumRVRTTYPE;
-        default "WTR";
-        description
-          "Indicates the default Reversion Type for A/S-SNCP Protection Groups. Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. The possible values are WTR and TODR. The default value is WTR.";
-        config true;
-      }
-      leaf ctrlmodedflt {
-        type enumeration {
-          enum "50" {
-            description
-              "50GHz resolution bandwidth; ITU fixed grid.";
-          }
-          enum "12.5" {
-            description
-              "12.5GHz resolution bandwidth.";
-          }
-        }
-        default "50";
-        description
-          "Provides a create-time default desired control mode for the OTS facility.";
-        config true;
-      }
-      leaf dbdflt {
-        default "6.250";
-        type decimal64 {
-          range "0.000..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Provide a create-time default value for the dead band value for all Media Channels to be created by the control plane.";
-        config true;
-      }
-      leaf licensing-policy {
-        type enumeration {
-          enum "DEFAULT" {
-            description
-              "Set the shelf feature licensing policy to follow the individual feature's predefined policy (Strict or Preauth)";
-          }
-          enum "PREAUTH" {
-            description
-              "Enabled shelf wide pre-authorized licensing policy for all features that can be overridden";
-          }
-          enum "STRICT" {
-            description
-              "Enabled shelf wide strict licensing policy for all features that can be overridden";
-          }
-        }
-        default "DEFAULT";
-        description
-          "Shelf feature licensing policy setting";
-        config true;
-      }
-      leaf emotr-mode-dflt {
-        type enumeration {
-          enum "L2STANDARD" {
-            description
-              "Supports standard services";
-          }
-          enum "L2EXTENDED" {
-            description
-              "Supports extended services";
-          }
-        }
-        default "L2EXTENDED";
-        description
-          "eMOTR equipment group mode default";
-        config true;
-      }
-      leaf pm-timeoffset {
-        default "0";
-        type ciena-6500-types:DECIMAL {
-          range "-12..12";
-        }
-        description
-          "Set PMTIMEOFFSET";
-        config true;
-      }
-      leaf eth-sd-th {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "Ethernet client signal degrade threshold value, expressed as a % of errored frames.";
-        config false;
-      }
-      leaf eth-eer-th {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "Ethernet client excessive error ratio threshold value, expressed as a % of errored frames.";
-        config false;
-      }
-      leaf fc-sd-th {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Fiber Channel client signal degrade threshold value, expressed as a number of 8B10B codes.";
-        config false;
-      }
-      leaf fc-eer-th {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "Fiber Channel client excessive error ratio threshold value, expressed as a % of errored 8B10B codes.";
-        config false;
-      }
-      leaf wan-fr-sd-th {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "WAN frame (GFP-F and POS) signal degrade threshold value, expressed as a % of errored frames.";
-        config false;
-      }
-      leaf wan-fr-eer-th {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "WAN frame (GFP-F and POS) excessive error ratio threshold value, expressed as a % of errored frames.";
-        config false;
-      }
-      leaf wan-tr-sd-th {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "WAN transparent (GFP-T) signal degrade threshold value, expressed as a % of errored superblocks.";
-        config false;
-      }
-      leaf wan-tr-eer-th {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "WAN transparent (GFP-T) excessive error ratio threshold value, expressed as a % of errored superblocks.";
-        config false;
-      }
-      leaf actual-cooling {
-        type enumeration {
-          enum "LOWFLOW";
-          enum "HIGHFLOW";
-        }
-        description
-          "Actual cooling capacity of the shelf";
-        config false;
-      }
-      leaf eqpt-current {
-        type enumeration {
-          enum "40";
-          enum "60";
-          enum "180";
-          enum "10";
-          enum "4";
-          enum "5";
-          enum "18";
-          enum "100";
-          enum "240";
-          enum "20";
-          enum "50";
-          enum "15";
-          enum "360";
-          enum "300";
-          enum "480";
-          enum "600";
-          enum "660";
-          enum "720";
-          enum "780";
-          enum "840";
-          enum "960";
-          enum "120";
-        }
-        description
-          "Shelf power capacity (Amps)";
-        config false;
-      }
-      leaf estimated-power {
-        type ciena-6500-types:INT {
-          range "0..17280";
-        }
-        description
-          "Calculated shelf power usage (Watts)";
-        config false;
-      }
-      leaf zone-1-power {
-        type ciena-6500-types:INT {
-          range "0..2250";
-        }
-        description
-          "Shelf power usage (Watts) for Zone 1 of the shelf. (Applies to 6500 32-slot Shelf only)";
-        config false;
-      }
-      leaf zone-2-power {
-        type ciena-6500-types:INT {
-          range "0..2250";
-        }
-        description
-          "Shelf power usage (Watts) for Zone 2 of the shelf. (Applies to 6500 32-slot Shelf only)";
-        config false;
-      }
-      leaf zone-3-power {
-        type ciena-6500-types:INT {
-          range "0..2250";
-        }
-        description
-          "Shelf power usage (Watts) for Zone 3 of the shelf. (Applies to 6500 32-slot Shelf only)";
-        config false;
-      }
-      leaf zone-4-power {
-        type ciena-6500-types:INT {
-          range "0..2250";
-        }
-        description
-          "Shelf power usage (Watts) for Zone 4 of the shelf. (Applies to 6500 4x60 32-slot Shelf only)";
-        config false;
-      }
-      leaf uni-supported {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Uni-directional functionality support on the shelf. If YES, Uni-directional is supported. If NO, Uni-directional is Not supported. Default is NO.";
-        config false;
-      }
-    }
-    list config-services {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf asncp-sig-type {
-        type enumeration {
-          enum "PM" {
-            description
-              "ODU PM bytes";
-          }
-          enum "TCM1" {
-            description
-              "TCM layer 1";
-          }
-          enum "TCM2" {
-            description
-              "TCM layer 2";
-          }
-          enum "TCM3" {
-            description
-              "TCM layer 3";
-          }
-          enum "TCM4" {
-            description
-              "TCM layer 4";
-          }
-          enum "TCM5" {
-            description
-              "TCM layer 5";
-          }
-          enum "TCM6" {
-            description
-              "TCM layer 6";
-          }
-        }
-        default "TCM3";
-        description
-          "Default Signaling type to be used for ASNCP.";
-        config true;
-      }
-      leaf auto-prov-crs {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Cross connections will not be auto created";
-          }
-          enum "ON" {
-            description
-              "Cross connections will be auto created";
-          }
-        }
-        default "ON";
-        description
-          "Indicate whether or not the cross connections are auto created between facilities within the same circuit pack, once both facilities have been provisioned.";
-        config true;
-      }
-      leaf auto-prov-fac {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Facilities on OCLD cards will not be auto created";
-          }
-          enum "ON" {
-            description
-              "Facilities on OCLD cards will be auto created";
-          }
-        }
-        default "ON";
-        description
-          "Indicate whether or not the facilities are auto created on the OCLD cards.Default = ON";
-        config true;
-      }
-      leaf emotr-mode-dflt {
-        type enumeration {
-          enum "L2STANDARD" {
-            description
-              "Supports standard services";
-          }
-          enum "L2EXTENDED" {
-            description
-              "Supports extended services";
-          }
-        }
-        default "L2EXTENDED";
-        description
-          "eMOTR equipment group mode default";
-        config true;
-      }
-      leaf eth10g-mapping {
-        type enumeration {
-          enum "GFPSTD" {
-            description
-              "When a 10GE port is created the mapping will be set to this system wide default";
-          }
-          enum "GFPMACOSTR";
-          enum "PROP237";
-        }
-        default "GFPSTD";
-        description
-          "The default mapping used for ETTPs with a rate of ETH10G. This is the mapping value when ETTP is created. It does not change the mapping value of already created ETTPs.";
-        config true;
-      }
-      leaf eth-gfp-rfi {
-        type enumeration {
-          enum "ENABLED" {
-            description
-              "Transmit GFP RFI CMF on WAN link down.";
-          }
-          enum "DISABLED" {
-            description
-              "Do not transmit CMF UPI on WAN link down.";
-          }
-          enum "CMFCSF" {
-            description
-              "Transmit GFP CSF CMF on WAN link down.";
-          }
-          enum "USERDEF" {
-            description
-              "Transmit userdefined UPI value one WAN link down.";
-          }
-        }
-        default "ENABLED";
-        description
-          "Control the ETH GFP RFI CMF transmission. Default=DISABLE (and only possible value for FC), Default=ENABLE(Ethernet).";
-        config true;
-      }
-      leaf eth-gfp-rfi-upi {
-        type ciena-6500-types:INT {
-          range "3..255";
-        }
-        description
-          "Transmits userdefined UPI value on WAN link down. Min value is 3, max value is 255. The values 128,129 and 130 are not supported. These are reserved for system use.";
-        config true;
-      }
-      leaf g8032-wtr-in-fp-sc-alm {
-        type enumeration {
-          enum "STANDING" {
-            description
-              "The Protection Switch Complete Alarm is active until the ring has been switched over, meaning that the RPL owner has a block active and the ring is in the idle state.";
-          }
-          enum "CLR" {
-            description
-              "The Protection Switch Complete Alarm is only active when the ring is open, meaning that there is more than 1 block on the ring resulting in traffic possibly being lost.";
-          }
-        }
-        default "STANDING";
-        description
-          "G8032 Protection Switch Complete Alarm Behaviour";
-        config true;
-      }
-      leaf laser-off-far-end-fail {
-        type ciena-6500-enums:Laserofffarendfail;
-        default "DISABLED";
-        description
-          "Loss of Light feature. Under certain failure scenarios insert Loss of Light (i.e. turn off the TX laser).";
-        config true;
-      }
-      leaf lfa-clear-time {
-        default "600";
-        type ciena-6500-types:INT {
-          range "30..86399";
-        }
-        description
-          "Indicates how long the line must be error free to clear the Line Flapping alarm.";
-        config true;
-      }
-      leaf lfa-enable {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Control the Line Flapping Alarm Enable feature.If enabled, the LFA alarm can be raised. If disabled, the LFA alarm can not be raised.";
-        config true;
-      }
-      leaf lfa-raise-time {
-        default "300";
-        type ciena-6500-types:INT {
-          range "30..86399";
-        }
-        description
-          "Indicates the time window that failures must occur in order to raise the Line Flapping alarm.";
-        config true;
-      }
-      leaf lfa-threshold {
-        default "3";
-        type ciena-6500-types:INT {
-          range "2..10";
-        }
-        description
-          "Indicates the number of failure events which must occur within time window in order to raise the Line Flapping alarm.";
-        config true;
-      }
-      leaf-list line-pev-stat {
-        type enumeration {
-          enum "MAN" {
-            description
-              "Report manually transient line protection events.";
-          }
-          enum "AUTO" {
-            description
-              "Report automatically transient line protection events.";
-          }
-          enum "DISABLED" {
-            description
-              "Do not report transient line protection events.";
-          }
-        }
-        description
-          "Line Protection Transient Event Reporting Status";
-        config true;
-      }
-      leaf otn-path-wtr {
-        default "5";
-        type ciena-6500-types:INT {
-          range "0..12 | 15 | 30 | 45 | 60";
-        }
-        description
-          "The ASNCP/SNCP PG wait to restore time.";
-        config true;
-      }
-      leaf path-eber-th {
-        default "3";
-        type ciena-6500-types:INT {
-          range "3 | 4 | 5";
-        }
-        description
-          "Path excessive bit error threshold value. Range of PATHEBERTH is 3, 4, 5. Default value is 3.";
-        config true;
-      }
-      leaf-list path-pev-stat {
-        type enumeration {
-          enum "MAN" {
-            description
-              "Report manually transient path protection events.";
-          }
-          enum "AUTO" {
-            description
-              "Report automatically transient path protection events.";
-          }
-          enum "DISABLED" {
-            description
-              "Do not report transient path protection events.";
-          }
-        }
-        description
-          "Path Protection Transient Event Reporting Status";
-        config true;
-      }
-      leaf path-sd-th {
-        default "6";
-        type ciena-6500-types:INT {
-          range "5..9";
-        }
-        description
-          "Path signal degrade threshold value. Range of PATHSDTH is 5, 6, 7, 8, 9. Default value is 6.";
-        config true;
-      }
-      leaf-list path-sw-crit {
-        type enumeration {
-          enum "TIM" {
-            description
-              "Trace Identifier Mismatch";
-          }
-          enum "PLM" {
-            description
-              "Payload Label Mismatch";
-          }
-          enum "UNEQ" {
-            description
-              "Path Unequipped";
-          }
-          enum "SD" {
-            description
-              "Path Signal Degrade";
-          }
-          enum "EBER" {
-            description
-              "Path Excessive Bit Error";
-          }
-          enum "AIS" {
-            description
-              "Alarm Indication Signal";
-          }
-          enum "LOP" {
-            description
-              "Loss Of Pointer";
-          }
-          enum "ODUSD" {
-            description
-              "ODU Signal Degrade";
-          }
-        }
-        description
-          "Path protection switch criteria. Parameter is listable - a set of criteria can be defined e.g. TIM&PLM&SD. This parameter does not work in a cumulative manner: to add/remove criteria from an existing set, the desired new set must be fully specified as a list.";
-        config true;
-      }
-      leaf pathtgdflt {
-        type ciena-6500-enums:TDG_OTM_default_0SEC;
-        default "0-MSEC";
-        description
-          "Default detection and recovery guard time for ASNCP.";
-        config true;
-      }
-      leaf path-wtr {
-        default "5";
-        type ciena-6500-types:INT {
-          range "0..12 | 15 | 30 | 45 | 60";
-        }
-        description
-          "Path protection wait to restore time. Range is 0,1,2..12,15,30,45,60 minutes. Default is 5 minutes.";
-        config true;
-      }
-      leaf-list pth-ais-insert {
-        type ciena-6500-enums:PathRDIAISInsert;
-        description
-          "Path AIS insertion criteria. Values must be grouped. Allowable combinations are TIM&UNEQ; TIM&UNEQ&PLM. This parameter does not work in a cumulative manner: to add/remove criteria from an existing set, the desired new set must be fully specified as a list.";
-        config true;
-      }
-      leaf rvrt-type-dflt {
-        type ciena-6500-enums:EnumRVRTTYPE;
-        default "WTR";
-        description
-          "Indicates the default Reversion Type for A/S-SNCP Protection Groups. Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. The possible values are WTR and TODR. The default value is WTR.";
-        config true;
-      }
-      leaf rvrtv-dflt {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates the default for Revertive switching mode enabling on A/S-SNCP Protection Groups. Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. The default value is NO.";
-        config true;
-      }
-      leaf sncp-sig-type {
-        type enumeration {
-          enum "PM" {
-            description
-              "ODU PM bytes";
-          }
-          enum "TCM1" {
-            description
-              "TCM layer 1";
-          }
-          enum "TCM2" {
-            description
-              "TCM layer 2";
-          }
-          enum "TCM3" {
-            description
-              "TCM layer 3";
-          }
-          enum "TCM4" {
-            description
-              "TCM layer 4";
-          }
-          enum "TCM5" {
-            description
-              "TCM layer 5";
-          }
-          enum "TCM6" {
-            description
-              "TCM layer 6";
-          }
-        }
-        default "PM";
-        description
-          "Default Signaling type to be used for SNCP.";
-        config true;
-      }
-      leaf tod-rhb-en-dflt {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Indicates the default value of Time of Day Reversion Holdback Enabled for A/S-SNCP Protection Groups. Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. The default value is NO.";
-        config true;
-      }
-      leaf tod-rhb-prd-dflt {
-        type ciena-6500-types:TIME;
-        description
-          "Indicates the default value of Time of Day Reversion Holdback Period for A/S-SNCP Protection Groups. The format is HH-MM. Range is 00-05 to 72-00. The default value is 24-00.";
-        config true;
-      }
-      leaf tod-rprd-dflt {
-        type ciena-6500-types:INT {
-          range "5..300";
-        }
-        description
-          "The default value of Time of Day Reversion Period for A/S-SNCP Protection Groups. It specifies the time period (in minutes) over which it is acceptable to do the reversion (The working member must be available during this window otherwise wait 24 hours to try again). Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. Range is 5 to 300 minutes. The default value is 20.";
-        config true;
-      }
-      leaf tod-rtime-dflt {
-        type ciena-6500-types:TIME;
-        description
-          "Indicates the default Time for Time of Day Reversion on A/S-SNCP Protection Groups. Note that Protection Group reversion refers to a selector switch from the Protecting member to the Working member of the A/S-SNCP Protection Group. The format is HH-MM. Range is 00-00 to 23-59. The default value is 02-00.";
-        config true;
-      }
-      leaf eth-eer-th {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "Ethernet client excessive error ratio threshold value, expressed as a % of errored frames.";
-        config false;
-      }
-      leaf eth-sd-th {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "Ethernet client signal degrade threshold value, expressed as a % of errored frames.";
-        config false;
-      }
-      leaf fc-eer-th {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "Fiber Channel client excessive error ratio threshold value, expressed as a % of errored 8B10B codes.";
-        config false;
-      }
-      leaf fc-sd-th {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Fiber Channel client signal degrade threshold value, expressed as a number of 8B10B codes.";
-        config false;
-      }
-      leaf wan-fr-sd-th {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "WAN frame (GFP-F and POS) signal degrade threshold value, expressed as a % of errored frames.";
-        config false;
-      }
-      leaf wan-fr-eer-th {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "WAN frame (GFP-F and POS) excessive error ratio threshold value, expressed as a % of errored frames.";
-        config false;
-      }
-      leaf wan-tr-sd-th {
-        default "1";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "WAN transparent (GFP-T) signal degrade threshold value, expressed as a % of errored superblocks.";
-        config false;
-      }
-      leaf wan-tr-eer-th {
-        default "20";
-        type ciena-6500-types:INT {
-          range "0..100";
-        }
-        description
-          "WAN transparent (GFP-T) excessive error ratio threshold value, expressed as a % of errored superblocks.";
-        config false;
-      }
-    }
-    list config-system {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf auto-rtrv-log-col {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "Auto RTRV-LOG collection is enabled.";
-          }
-          enum "FALSE" {
-            description
-              "Auto RTRV-LOG collection is disabled.";
-          }
-        }
-        default "TRUE";
-        description
-          "Flag value to indicate if RTRV-LOG auto collection is enabled.";
-        config true;
-      }
-      leaf auto-save-sched {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the Autosave Schedule. Range is 00-00 to 23-59.";
-        config true;
-      }
-      leaf auto-save-skip-day {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "AutoSave skip 1 day is set.";
-          }
-          enum "FALSE" {
-            description
-              "AutoSave skip 1 day is not set.";
-          }
-        }
-        default "FALSE";
-        description
-          "Flag value to indicate if AutoSave skip 1 day is set.";
-        config true;
-      }
-      leaf bits-mode {
-        type enumeration {
-          enum "SONET" {
-            description
-              "BITS Mode of NE is SONET.";
-          }
-          enum "SDH" {
-            description
-              "BITS Mode of NE is SDH.";
-          }
-          enum "SDHJ" {
-            description
-              "BITS Mode of NE is SDHJ.";
-          }
-          enum "UNKNOWN" {
-            description
-              "BITS Mode of NE is unknown.";
-          }
-        }
-        default "UNKNOWN";
-        description
-          "Synchronization BITS Mode";
-        config true;
-      }
-      leaf csf-mcast-mac {
-        type ciena-6500-types:STRING;
-        description
-          "48-bit multicast Ethernet MAC addr - 12 alphanumeric characters. Range is 000000000000 to FFFFFFFFFFFF. Default is 0180C2880001.";
-        config true;
-      }
-      leaf adv-eqpt-mgmt {
-        type ciena-6500-enums:ENABLED_defaultDISABLED;
-        default "DISABLED";
-        description
-          "Advanced Equipment Mode Toggle.";
-        config true;
-      }
-      leaf filler-mgmt {
-        type enumeration {
-          enum "ENABLED" {
-            description
-              "Filler card management is enabled.";
-          }
-          enum "DISABLED" {
-            description
-              "Filler card management is disabled.";
-          }
-        }
-        default "ENABLED";
-        description
-          "Flag to determine if Filler Card Missing alarms should be raised against empty slots.";
-        config true;
-      }
-      leaf gcc0-mode {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "GCC0 channel auto-provisioning is disabled.";
-          }
-          enum "OSPF" {
-            description
-              "GCC0 channel auto-provisioning is enabled and will run OSPF as the routing protocol.";
-          }
-          enum "IISIS" {
-            description
-              "GCC0 channel auto-provisioning is enabled and will run i-ISIS as the routing protocol.";
-          }
-        }
-        default "DISABLED";
-        description
-          "Control the auto-provisioning behaviour of the GCC0 comms channel. Default=Disabled.";
-        config true;
-      }
-      leaf gcc1-mode {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "GCC1 channel auto-provisioning is disabled.";
-          }
-          enum "OSPF" {
-            description
-              "GCC1 channel auto-provisioning is enabled and will run OSPF as the routing protocol.";
-          }
-          enum "IISIS" {
-            description
-              "GCC1 channel auto-provisioning is enabled and will run i-ISIS as the routing protocol.";
-          }
-        }
-        default "DISABLED";
-        description
-          "Control the auto-provisioning behaviour of the GCC1 comms channel. Default=Disabled.";
-        config true;
-      }
-      leaf licensing-policy {
-        type enumeration {
-          enum "DEFAULT" {
-            description
-              "Set the system feature licensing policy to follow the individual feature's predefined policy (Strict or Preauth)";
-          }
-          enum "PREAUTH" {
-            description
-              "Enabled system wide pre-authorized licensing policy for all features that can be overridden";
-          }
-          enum "STRICT" {
-            description
-              "Enabled system wide strict licensing policy for all features that can be overridden";
-          }
-        }
-        default "DEFAULT";
-        description
-          "System feature licensing policy setting";
-        config true;
-      }
-      leaf min-cooling {
-        type enumeration {
-          enum "LOWFLOW" {
-            description
-              "Low flow fan cooling";
-          }
-          enum "HIGHFLOW" {
-            description
-              "High flow fan cooling";
-          }
-        }
-        default "LOWFLOW";
-        description
-          "Minimum provisioned cooling requirements of the shelf.";
-        config true;
-      }
-      leaf ndp-mode {
-        type enumeration {
-          enum "OFF" {
-            description
-              "NDP auto-provisioning is disabled.";
-          }
-          enum "ON" {
-            description
-              "NDP auto-provisioning is enabled and will run the NDP protocol.";
-          }
-        }
-        default "OFF";
-        description
-          "Control the auto-provisioning behaviour of the NDP Link. Default=OFF.";
-        config true;
-      }
-      leaf ne-mode {
-        type enumeration {
-          enum "SONET" {
-            description
-              "Global personality of NE is SONET.";
-          }
-          enum "SDH" {
-            description
-              "Global personality of NE is SDH.";
-          }
-          enum "SDHJ" {
-            description
-              "Global personality of NE is SDHJ.";
-          }
-          enum "UNKNOWN" {
-            description
-              "Global personality of NE is unknown.";
-          }
-          enum "NONE" {
-            description
-              "Global personality of NE is none. Has no relevance on system operation.";
-          }
-        }
-        default "UNKNOWN";
-        description
-          "NE Mode";
-        config true;
-      }
-      leaf prov-current {
-        type ciena-6500-enums:provcurrentinfo;
-        description
-          "Provisioned shelf power limit (Amps)";
-        config true;
-      }
-      leaf shelf-synch {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Flag to enable Shelf Sync across the node. When enabled, this will sync data provisioning for selected data from the primary shelf to all members.";
-        config true;
-      }
-      leaf state {
-        type enumeration {
-          enum "NORMAL" {
-            description
-              "No reconfigurations in progress";
-          }
-          enum "MRO_RECONFIG" {
-            description
-              "MRO reconfig in progress on shelf";
-          }
-          enum "MANUAL_RECONFIG" {
-            description
-              "Manual reconfig in progress on shelf";
-          }
-          enum "TIDCPRI_RECONFIG" {
-            description
-              "TIDC Primary reconfig in progress on shelf";
-          }
-          enum "DOSC2_RECONFIG" {
-            description
-              "Uni to DOSC2 reconfig in progress on shelf";
-          }
-          enum "SHELFID_RECONFIG" {
-            description
-              "Shelf Id reconfig in progress on shelf";
-          }
-          enum "OTS_RECONFIG" {
-            description
-              "OTS reconfig in progress on shelf";
-          }
-          enum "FLEX_RECONFIG" {
-            description
-              "Flexible grid reconfig in progress on shelf";
-          }
-        }
-        default "NORMAL";
-        description
-          "System Reconfig State";
-        config true;
-      }
-      leaf pm-timeoffset {
-        default "0";
-        type ciena-6500-types:DECIMAL {
-          range "-12..12";
-        }
-        description
-          "Set PMTIMEOFFSET";
-        config true;
-      }
-      leaf actual-cooling {
-        type enumeration {
-          enum "LOWFLOW";
-          enum "HIGHFLOW";
-        }
-        description
-          "Actual cooling capacity of the shelf";
-        config false;
-      }
-      leaf eqpt-current {
-        type enumeration {
-          enum "40";
-          enum "60";
-          enum "180";
-          enum "10";
-          enum "4";
-          enum "5";
-          enum "18";
-          enum "100";
-          enum "240";
-          enum "20";
-          enum "50";
-          enum "15";
-          enum "360";
-          enum "300";
-          enum "480";
-          enum "600";
-          enum "660";
-          enum "720";
-          enum "780";
-          enum "840";
-          enum "960";
-          enum "120";
-        }
-        description
-          "Shelf power capacity (Amps)";
-        config false;
-      }
-    }
-    list config-alm {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ains-eqpt-alm-mode {
-        type enumeration {
-          enum "TRAFFICIMP";
-          enum "ALL";
-        }
-        default "TRAFFICIMP";
-        description
-          "AINS Equipment Timer Impacting Alarm Mode.";
-        config true;
-      }
-      leaf ains-pm {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "AINS PM Collection Toggle.";
-        config true;
-      }
-      leaf ains-eqpt-dflt {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "AINS Equipment Default Toggle.";
-        config true;
-      }
-      leaf ains-eqpt-suppr-slot-alm {
-        type enumeration {
-          enum "ON";
-          enum "OFF";
-        }
-        default "OFF";
-        description
-          "Suppress Slot Specific EQPT Alarms (unprovisioned).";
-        config true;
-      }
-      leaf ains-timeout {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the AINS timeout. Range is 00-05 to 96-00.";
-        config true;
-      }
-      leaf ains-eqpt-timeout {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the Equipment AINS timeout. Range is 00-05 to 96-00.";
-        config true;
-      }
-      leaf-list alarm-info {
-        type ciena-6500-enums:ALARMINFO;
-        description
-          "Alarm Info.Parameter is listable - a set of parameters can be defined e.g. CRDTYP&WVLNGTH. This parameter does not work in a cumulative manner: to add/remove flag from an existing set, the desired new set must be fully specified as a list.";
-        config true;
-      }
-      leaf alm-corr {
-        type ciena-6500-enums:ALMCORR;
-        description
-          "Alarm correlation flag, to turn the feature on or off.";
-        config true;
-      }
-      leaf alm-ho {
-        default "2.5";
-        type ciena-6500-types:DECIMAL {
-          range "0 | 2.5";
-        }
-        description
-          "Alarm Hold-off Time on Raise. Supported values are 0 or 2.5 (default=2.5).";
-        config true;
-      }
-      leaf bay-fic-in-ao {
-        type enumeration {
-          enum "TRUE";
-          enum "FALSE";
-        }
-        default "FALSE";
-        description
-          "All the fields controlled by BAYFICINAO has been moved to ALARMINFO parameter.";
-        config true;
-      }
-      leaf cond-override {
-        type ciena-6500-enums:ConditioningOverride;
-        default "PROFILE";
-        description
-          "Alarm Conditioning Override. This parameter is used to override the alarm profile provisioning for conditioning alarms.";
-        config true;
-      }
-      leaf tca-suppression {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Enables/Disables the TCA Suppression functionality";
-        config true;
-      }
-    }
-    list config-l0 {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf amp-gain-discrepancy-thresh {
-        type ciena-6500-types:STRING;
-        description
-          "Threshold for convicting a LIM based on discrepancy between achieved and target gain. Default is 1db.";
-        config true;
-      }
-      leaf auto-chc-profile-reset-thresh {
-        default "6";
-        type ciena-6500-types:DECIMAL {
-          range "0..30";
-        }
-        description
-          "Automatic CHC Profile Reset Threshold. Its range is from 0 to 30dB. The default is 6dB.";
-        config true;
-      }
-      leaf auto-connval {
-        type enumeration {
-          enum "OFF" {
-            description
-              "Automatic Connection Validation is OFF";
-          }
-          enum "ON" {
-            description
-              "Automatic Connection Validation is ON";
-          }
-        }
-        default "ON";
-        description
-          "Indicates if Automatic Connection Validation is ON/OFF. The default = ON.";
-        config true;
-      }
-      leaf autoroute-def {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Sets the AutoRoute value in new channel access OTSs created in this node, unless the user provides an explicit value in the create command. When AutoRoute is disabled, cross-connects must be provisioned at all channel access sites. When AutoRoute is enabled, cross-connects are automatically derived as follows: passthrough cross-connects are ceated at intra-domain channel access sites and local add/drop cross-connects are created for in-service CMD Tx/Rx adjacencies.";
-        config true;
-      }
-      leaf cs-ctrl {
-        type enumeration {
-          enum "OFF" {
-            description
-              "CS Control is OFF. OTS CS Indicator defaults to N.";
-          }
-          enum "ON" {
-            description
-              "CS Control is ON. OTS CS Indicator defaults to Y.";
-          }
-        }
-        default "OFF";
-        description
-          "Flag to enable Booster, Pre-AMP, and Tx Power Control on Coherent Select (CS) networks. Also drives the default value of the CS Indicator for OTS creation. Default is OFF.";
-        config true;
-      }
-      leaf ctrlmodedflt {
-        type enumeration {
-          enum "50" {
-            description
-              "50GHz resolution bandwidth; ITU fixed grid.";
-          }
-          enum "12.5" {
-            description
-              "12.5GHz resolution bandwidth.";
-          }
-        }
-        default "50";
-        description
-          "Provides a create-time default desired control mode for the OTS facility.";
-        config true;
-      }
-      leaf dbdflt {
-        default "6.250";
-        type decimal64 {
-          range "0.000..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Provide a create-time default value for the dead band value for all Media Channels to be created by the control plane.";
-        config true;
-      }
-      leaf doc-auto-del-los {
-        type ciena-6500-enums:BOOL_YES_NO;
-        description
-          "Enables/Disables the auto-squelch feature (delete of channels with Ingress LOS alarm).";
-        config true;
-      }
-      leaf fiber-loss-major-threshold-default {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Default value for Adjacency Fiber Loss Major Threshold.";
-        config true;
-      }
-      leaf fiber-loss-minor-threshold-default {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Default value for Adjacency Fiber Loss Minor Threshold.";
-        config true;
-      }
-      leaf fiber-loss-detection {
-        type enumeration {
-          enum "DISABLED" {
-            description
-              "High Fiber Loss alarm is disabled.";
-          }
-          enum "ENABLED" {
-            description
-              "High Fiber Loss alarm is enabled.";
-          }
-        }
-        default "DISABLED";
-        description
-          "Flag to enable High Fiber Loss alarm when the unexpected loss on a fiber exceeds 1 dBm.";
-        config true;
-      }
-      leaf major-degrade-thresh {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Support to edit major degrade threshold. Major degrade threshold is default to 6dB. Range of threshold is 0 to 30.";
-        config true;
-      }
-      leaf minor-degrade-thresh {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Support to edit minor degrade threshold. Minor degrade threshold is default to 3dB. Range of threshold is 0 to 30.";
-        config true;
-      }
-      leaf osc-mode {
-        type ciena-6500-enums:OSCMODE;
-        description
-          "OSC Mode feature. State value used to control auto provisioning of comms circuit when an OSC facility is provisioned.";
-        config true;
-      }
-      leaf targ-pad {
-        type ciena-6500-types:STRING;
-        description
-          "Defines the total loss targeted on the span or mid-stage";
-        config true;
-      }
-      leaf voa-reset-reqd {
-        type enumeration {
-          enum "FALSE" {
-            description
-              "VOARESETREQD is set to FALSE.";
-          }
-          enum "TRUE" {
-            description
-              "VOARESETREQD is set to TRUE.";
-          }
-        }
-        default "TRUE";
-        description
-          "By setting the VOARESETREQD flag to false prevents DOC from altering the VOA TARGLOSS";
-        config true;
-      }
-    }
-    list backplane {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf ctype {
-        type ciena-6500-types:STRING;
-        description
-          "Card Type";
-        config false;
-      }
-      leaf pec {
-        type ciena-6500-types:STRING;
-        description
-          "Backplane PEC Code";
-        config false;
-      }
-      leaf rel {
-        type ciena-6500-types:STRING;
-        description
-          "Backplane Release Level";
-        config false;
-      }
-      leaf clei {
-        type ciena-6500-types:IDENT;
-        description
-          "Backplane CLEI";
-        config false;
-      }
-      leaf ser {
-        type ciena-6500-types:IDENT;
-        description
-          "Backplane Serial Number";
-        config false;
-      }
-      leaf mdat {
-        type ciena-6500-types:IDENT;
-        description
-          "Date of Manufacture, in the format: year-week of year (YYYY-WW).";
-        config false;
-      }
-    }
-    container netype {
-      config false;
-      leaf manuf {
-        type ciena-6500-types:STRING;
-        description
-          "Manufacturing Name";
-        config false;
-      }
-      leaf model {
-        type ciena-6500-types:STRING;
-        description
-          "Shelf Model";
-        config false;
-      }
-      leaf netype {
-        type enumeration {
-          enum "OCP" {
-            description
-              "Optical Convergence Platform";
-          }
-          enum "CNE" {
-            description
-              "Consolidated Network Element";
-          }
-          enum "POTS" {
-            description
-              "Packet Optical Transport System";
-          }
-          enum "CNEP" {
-            description
-              "Consolidated Network Element POTS";
-          }
-        }
-        description
-          "Type of Network Element";
-        config false;
-      }
-      leaf swissue {
-        type ciena-6500-types:STRING;
-        description
-          "Current software issue running";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-tacacs.yang b/models/ciena-6500-tacacs.yang
deleted file mode 100644
index ba7a509dfdbc6db68aab04014fa6de899ed1bbd7..0000000000000000000000000000000000000000
--- a/models/ciena-6500-tacacs.yang
+++ /dev/null
@@ -1,141 +0,0 @@
-module ciena-6500-tacacs {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-tacacs";
-  prefix tacacs;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's tacacs object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container tacacs
-           list config
-             leaf author
-               type enumeration
-               - Added enum: ENABLE_UPC2_PLUS
-             leaf acct
-               type enumeration
-               - Added enum: ENABLE_UPC2_PLUS";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added container: tacacs";
-  }
-
-  container tacacs {
-    list config {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf author {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-          enum "ENABLE_UPC2_PLUS";
-        }
-        default "DISABLE";
-        description
-          "Provisioned state of authorization";
-        config true;
-      }
-      leaf acct {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-          enum "ENABLE_UPC2_PLUS";
-        }
-        default "ENABLE";
-        description
-          "Provisioned state of accounting";
-        config true;
-      }
-      leaf upc-1-mpg {
-        default "3";
-        type ciena-6500-types:INT {
-          range "1..15";
-        }
-        description
-          "UPC 1 mapping";
-        config true;
-      }
-      leaf upc-2-mpg {
-        default "6";
-        type ciena-6500-types:INT {
-          range "1..15";
-        }
-        description
-          "UPC 2 mapping";
-        config true;
-      }
-      leaf upc-3-mpg {
-        default "9";
-        type ciena-6500-types:INT {
-          range "1..15";
-        }
-        description
-          "UPC 3 mapping";
-        config true;
-      }
-      leaf upc-4-mpg {
-        default "12";
-        type ciena-6500-types:INT {
-          range "1..15";
-        }
-        description
-          "UPC 4 mapping";
-        config true;
-      }
-      leaf upc-5-mpg {
-        default "15";
-        type ciena-6500-types:INT {
-          range "1..15";
-        }
-        description
-          "UPC 5 mapping";
-        config true;
-      }
-      leaf tacacs-state {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Provisioned state of the TACACS+";
-        config false;
-      }
-      leaf authn {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        description
-          "Provisioned state of authentication";
-        config false;
-      }
-      leaf state {
-        type enumeration {
-          enum "ENABLE";
-          enum "DISABLE";
-        }
-        default "DISABLE";
-        description
-          "Provisioned state of TACACS+";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-testaccess.yang b/models/ciena-6500-testaccess.yang
deleted file mode 100644
index 393391dbb6a0789d671c2ffe37949f2cd8869d98..0000000000000000000000000000000000000000
--- a/models/ciena-6500-testaccess.yang
+++ /dev/null
@@ -1,2198 +0,0 @@
-module ciena-6500-testaccess {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-testaccess";
-  prefix testaccess;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's testaccess object for the 6500 platform";
-
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         rpc testaccess-show-testset-log
-           output
-             list output
-             - Removed leaf: otmn
-             - Added leaf: tid
-             - Added leaf: aid
-         container testaccess
-           list testset-log
-           - Added leaf: tid
-           - Added leaf: aid";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: testaccess-operate-loopback-eth
-       - Added rpc: testaccess-operate-loopback-eth10g
-       - Added rpc: testaccess-operate-loopback-ethn
-       - Added rpc: testaccess-operate-loopback-flex
-       - Added rpc: testaccess-release-loopback-eth
-       - Added rpc: testaccess-release-loopback-eth10g
-       - Added rpc: testaccess-release-loopback-ethn
-       - Added rpc: testaccess-release-loopback-flex
-       - Added rpc: testaccess-operate-loopback-otm2
-       - Added rpc: testaccess-release-loopback-otm2
-       - Added rpc: testaccess-operate-loopback-otm3
-       - Added rpc: testaccess-release-loopback-otm3
-       - Added rpc: testaccess-operate-loopback-otm
-       - Added rpc: testaccess-release-loopback-otm
-       - Added rpc: testaccess-operate-loopback-fc
-       - Added rpc: testaccess-release-loopback-fc
-       - Added rpc: testaccess-operate-loopback-odu
-       - Added rpc: testaccess-release-loopback-odu
-       - Added rpc: testaccess-connect-eth
-       - Added rpc: testaccess-change-access-mode-eth
-       - Added rpc: testaccess-disconnect-eth
-       - Added rpc: testaccess-disconnect-testaccess
-       - Added rpc: testaccess-show-testaccess
-       - Added rpc: testaccess-report-initialize
-       - Added rpc: testaccess-report-stat
-       - Added rpc: testaccess-operate-loopback-eth100
-       - Added rpc: testaccess-release-loopback-eth101
-       - Added rpc: testaccess-show-testset
-       - Added rpc: testaccess-connect-testset
-       - Added rpc: testaccess-operate-testset
-       - Added rpc: testaccess-init-testset
-       - Added rpc: testaccess-show-testset-log
-       - Added rpc: testaccess-save-testset-data
-       - Added container: testaccess";
-  }
-
-  rpc testaccess-operate-loopback-eth {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type ciena-6500-enums:ETHLoopBack;
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-eth10g {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-          enum "EFMREMOTE" {
-            description
-              "Request the equivalent of a TERMINAL loopback at the far end equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-ethn {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-          enum "EFMREMOTE" {
-            description
-              "Request the equivalent of a TERMINAL loopback at the far end equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-flex {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type ciena-6500-enums:FLEXLoopBack;
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-release-loopback-eth {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-release-loopback-eth10g {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf eth10g {
-        mandatory true;
-        description
-          "AID in format ETH10G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-release-loopback-ethn {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf ethn {
-        mandatory true;
-        description
-          "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-release-loopback-flex {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf flex {
-        mandatory true;
-        description
-          "AID in format FLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-otm2 {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf otm2 {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type ciena-6500-enums:LoopBack_NGM;
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-release-loopback-otm2 {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf otm2 {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-otm3 {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf otm3 {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-release-loopback-otm3 {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf otm3 {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-otm {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf otm {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-release-loopback-otm {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf otm {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-fc {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf fc1200 {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type ciena-6500-enums:LoopBack_NGM;
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-release-loopback-fc {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf fc1200 {
-        mandatory true;
-        description
-          "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-odu {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type enumeration {
-          enum "FACILITY" {
-            description
-              "Signal looped toward the equipment";
-          }
-          enum "TERMINAL" {
-            description
-              "Signal looped away from the equipment";
-          }
-        }
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-release-loopback-odu {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf odun {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-connect-eth {
-    description
-      "Create an ETH port mirroring session. This command is implemented for ethernet test session creation.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf tapaid {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "ETH-Shelf-Slot-Port";
-      }
-      leaf mode {
-        type ciena-6500-enums:TACC_Mode_1;
-        mandatory true;
-        description
-          "Access mode of the test session";
-      }
-    }
-  }
-  rpc testaccess-change-access-mode-eth {
-    description
-      "Change the mode of a L2 Port Mirroring session.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf mode {
-        type ciena-6500-enums:TACC_Mode_1;
-        mandatory true;
-        description
-          "Access mode of the test session";
-      }
-    }
-  }
-  rpc testaccess-disconnect-eth {
-    description
-      "Release a L2 port mirroring session.";
-    input {
-      leaf eth {
-        mandatory true;
-        description
-          "AID in format ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-disconnect-testaccess {
-    description
-      "Release a Test access session.";
-    input {
-      leaf sts1 {
-        mandatory true;
-        description
-          "AID in format STS1-shelf-slot-port-sts, STS1-shelf-slot-port, STS1AU4-shelf-slot-port-sts3c-sts, VT1-shelf-slot-port-sts-vtg-vt, VT1AU4-shelf-slot-port-sts3c-sts-vtg-vt, VT2-shelf-slot-port-sts-vtg-vt, VT2AU4-shelf-slot-port-sts3c-sts-vtg-vt, VT2-shelf-slot-port, VT2-shelf-slot-DFLT-grp, VT1-1-port-%HLINK-facility-hshelf-hslot-hport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-show-testaccess {
-    description
-      "Retrieve the designated test access channels on the Tap.";
-    input {
-      leaf tacc {
-        mandatory true;
-        description
-          "AID in format STS1-shelf-slot-port-sts, STS1-shelf-slot-port, STS1AU4-shelf-slot-port-sts3c-sts, VT1-shelf-slot-port-sts-vtg-vt, VT1AU4-shelf-slot-port-sts3c-sts-vtg-vt, VT2-shelf-slot-port-sts-vtg-vt, VT2AU4-shelf-slot-port-sts3c-sts-vtg-vt, VT2-shelf-slot-port, VT2-shelf-slot-DFLT-grp, VT1-1-port-%HLINK-facility-hshelf-hslot-hport, ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf alltap {
-        type enumeration {
-          enum "ALL" {
-            description
-              "Test Sessions and Test Access ports.";
-          }
-          enum "ACTIVE" {
-            description
-              "Only Test Sessions.";
-          }
-        }
-        description
-          "Display status of all allocated Test Access channels";
-      }
-    }
-    output {
-      list output {
-        leaf tacc {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf mode {
-          type ciena-6500-enums:TACC_Mode;
-          description
-            "Access mode of the test session";
-        }
-        leaf fromaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf link-association {
-          type enumeration {
-            enum "NO" {
-              description
-                "Maintain access when Link is dropped";
-            }
-            enum "YES" {
-              description
-                "Access is dropped when Link is dropped.";
-            }
-          }
-          description
-            "Link association";
-        }
-      }
-    }
-  }
-  rpc testaccess-report-initialize {
-    description
-      "Initialize (remove) all active test access sessions";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-report-stat {
-    description
-      "Check if control link is functioning. Upon receiving the TL1 command, the NE will respond with OK (in place of the IP response)";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-operate-loopback-eth100 {
-    description
-      "Operate loopback on specified facility.";
-    input {
-      leaf eth100 {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf loopback-type {
-        type ciena-6500-enums:ETHLoopBack;
-        description
-          "Loopback Type";
-      }
-    }
-  }
-  rpc testaccess-release-loopback-eth101 {
-    description
-      "Release loopback on specified facility.";
-    input {
-      leaf eth100 {
-        mandatory true;
-        description
-          "AID in format ETH100-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-show-testset {
-    description
-      "Retrieve the Integrated Test Set data";
-    input {
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport, STTP-shelf-slot-ALL, ETTP-shelf-slot-ALL, OTUTTP-shelf-slot-ALL, ODUCTP-shelf-slot-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not request status from the card.";
-          }
-          enum "YES" {
-            description
-              "Request status data from the card";
-          }
-        }
-        description
-          "Indicating whether to request status info from the card or not";
-      }
-    }
-    output {
-      list output {
-        leaf otmn {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf oper {
-          type enumeration {
-            enum "START" {
-              description
-                "Start the test";
-            }
-            enum "STOP" {
-              description
-                "Stop the test (default)";
-            }
-            enum "STOP-TIMER-COMPLD" {
-              description
-                "Test has stopped, duration timer has completed";
-            }
-          }
-          description
-            "Operation to start or stop the test";
-        }
-        leaf dur {
-          type ciena-6500-types:STRING;
-          description
-            "Duration for the test to run";
-        }
-        leaf mode {
-          type enumeration {
-            enum "SPLTB" {
-              description
-                "Split from Backplane / Racetrack (Default)";
-            }
-            enum "SPLTF" {
-              description
-                "Split at facility / Test Set";
-            }
-            enum "MANUAL" {
-              description
-                "Manual mode";
-            }
-            enum "SPLTE" {
-              description
-                "Split at Equipment / Network";
-            }
-            enum "SPLTFTX" {
-              description
-                "Unidirectional Split at Transmit / Uni-Racetrack Tx";
-            }
-            enum "SPLTFRX" {
-              description
-                "Unidirectional Split at Receive / Uni-Racetrack Rx";
-            }
-          }
-          description
-            "Configuration mode for the test";
-        }
-        leaf elapsed-time {
-          type ciena-6500-types:STRING;
-          description
-            "Elapsed time test has been running";
-        }
-        leaf gen-a-test-sig-pattern {
-          type ciena-6500-enums:TSTSIG_Pattern;
-          description
-            "GEN A test signal pattern";
-        }
-        leaf gen-b-test-sig-pattern {
-          type ciena-6500-enums:TSTSIG_Pattern;
-          description
-            "GEN B test signal pattern";
-        }
-        leaf mon-a-test-signal-pattern {
-          type ciena-6500-enums:TSTSIG_Pattern;
-          description
-            "MON A test signal pattern";
-        }
-        leaf mon-a-payload-errors {
-          type ciena-6500-types:INT;
-          description
-            "MON A payload errors received";
-        }
-        leaf mon-a-ber-threshold {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "MON A bit error threshold value.";
-        }
-        leaf mon-a-test-signal-status {
-          type enumeration {
-            enum "PASS" {
-              description
-                "Test has passed";
-            }
-            enum "FAIL" {
-              description
-                "Test had failed";
-            }
-            enum "INPROGRESS" {
-              description
-                "Test is in progress";
-            }
-            enum "DISABLED" {
-              description
-                "Test point is disabled or not used";
-            }
-            enum "UNKNOWN" {
-              description
-                "Test status is unknown, probably due to card missing";
-            }
-          }
-          description
-            "MON A test signal status";
-        }
-        leaf mon-a-test-signal-sync {
-          type enumeration {
-            enum "GREEN" {
-              description
-                "BER threshold not exceeded. LOF/EBER/LOC not present since start of test.";
-            }
-            enum "YELLOW" {
-              description
-                "BER threshold exceeded OR LOF/EBER/LOC occurred since last Start, but not currently active";
-            }
-            enum "RED" {
-              description
-                "BER threshold exceeded OR LOF/EBER/LOC currently active";
-            }
-            enum "DISABLED" {
-              description
-                "Test point is disabled or not used";
-            }
-            enum "UNKNOWN" {
-              description
-                "Test sync is unknown, probably due to card missing";
-            }
-          }
-          description
-            "MON A test signal sync";
-        }
-        leaf mon-b-test-signal-pattern {
-          type ciena-6500-enums:TSTSIG_Pattern;
-          description
-            "MON B test signal pattern";
-        }
-        leaf mon-b-payload-errors {
-          type ciena-6500-types:INT;
-          description
-            "MON B payload errors received";
-        }
-        leaf mon-b-ber-threshold {
-          type ciena-6500-types:INT {
-            range "0..15";
-          }
-          description
-            "MON B bit error threshold value";
-        }
-        leaf mon-b-test-signal-status {
-          type enumeration {
-            enum "PASS" {
-              description
-                "Test has passed";
-            }
-            enum "FAIL" {
-              description
-                "Test had failed";
-            }
-            enum "INPROGRESS" {
-              description
-                "Test is in progress";
-            }
-            enum "DISABLED" {
-              description
-                "Test point is disabled or not used";
-            }
-            enum "UNKNOWN" {
-              description
-                "Test status is unknown, probably due to card missing";
-            }
-          }
-          description
-            "MON B test signal status";
-        }
-        leaf mon-b-test-signal-sync {
-          type enumeration {
-            enum "GREEN" {
-              description
-                "BER threshold not exceeded. LOF/EBER/LOC not present since start of test.";
-            }
-            enum "YELLOW" {
-              description
-                "BER threshold exceeded OR LOF/EBER/LOC occurred since last Start, but not currently active";
-            }
-            enum "RED" {
-              description
-                "BER threshold exceeded OR LOF/EBER/LOC currently active";
-            }
-            enum "DISABLED" {
-              description
-                "Test point is disabled or not used";
-            }
-            enum "UNKNOWN" {
-              description
-                "Test sync is unknown, probably due to card missing";
-            }
-          }
-          description
-            "MON B test signal sync";
-        }
-        leaf gen-a-err-state {
-          type enumeration {
-            enum "INJECTING" {
-              description
-                "Errors are being injected";
-            }
-            enum "INJECTED" {
-              description
-                "Errors have been injected";
-            }
-            enum "DISABLED" {
-              description
-                "Errors injection is disabled (Default)";
-            }
-            enum "UNKNOWN" {
-              description
-                "Error injection is UNKNOWN, probably due to card missing";
-            }
-          }
-          description
-            "GEN A error injection state";
-        }
-        leaf gen-a-err-type {
-          type enumeration {
-            enum "ERROR1" {
-              description
-                "Error type 1";
-            }
-            enum "ERROR2" {
-              description
-                "Error type 2";
-            }
-            enum "ERROR3" {
-              description
-                "Error type 3";
-            }
-            enum "FAULT1" {
-              description
-                "Fault type 1";
-            }
-            enum "FAULT2" {
-              description
-                "Fault type 2";
-            }
-            enum "FAULT3" {
-              description
-                "Fault type 3";
-            }
-            enum "UNKNOWN" {
-              description
-                "Error type is undefined";
-            }
-          }
-          description
-            "GEN A error type";
-        }
-        leaf gen-a-err-rate {
-          type enumeration {
-            enum "SINGLE" {
-              description
-                "Single errors are being injected";
-            }
-            enum "CONTINUOUS" {
-              description
-                "Continuous faults are being injected";
-            }
-            enum "UNKNOWN" {
-              description
-                "Error injection is UNKNOWN, probably due to card missing";
-            }
-          }
-          description
-            "GEN A error injection rate";
-        }
-        leaf gen-a-err-injected {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "GEN A number of errors injected";
-        }
-        leaf gen-b-err-state {
-          type enumeration {
-            enum "INJECTING" {
-              description
-                "Errors are being injected";
-            }
-            enum "INJECTED" {
-              description
-                "Errors have been injected";
-            }
-            enum "DISABLED" {
-              description
-                "Errors injection is disabled (Default)";
-            }
-            enum "UNKNOWN" {
-              description
-                "Error injection is UNKNOWN, probably due to card missing";
-            }
-          }
-          description
-            "GEN B error injection state";
-        }
-        leaf gen-b-err-type {
-          type enumeration {
-            enum "ERROR1" {
-              description
-                "Error type 1";
-            }
-            enum "ERROR2" {
-              description
-                "Error type 2";
-            }
-            enum "ERROR3" {
-              description
-                "Error type 3";
-            }
-            enum "FAULT1" {
-              description
-                "Fault type 1";
-            }
-            enum "FAULT2" {
-              description
-                "Fault type 2";
-            }
-            enum "FAULT3" {
-              description
-                "Fault type 3";
-            }
-            enum "UNKNOWN" {
-              description
-                "Error type is undefined";
-            }
-          }
-          description
-            "GEN B error type";
-        }
-        leaf gen-b-err-rate {
-          type enumeration {
-            enum "SINGLE" {
-              description
-                "Single errors are being injected";
-            }
-            enum "CONTINUOUS" {
-              description
-                "Continuous faults are being injected";
-            }
-            enum "UNKNOWN" {
-              description
-                "Error injection is UNKNOWN, probably due to card missing";
-            }
-          }
-          description
-            "GEN B error injection rate";
-        }
-        leaf gen-b-err-injected {
-          default "0";
-          type ciena-6500-types:INT;
-          description
-            "GEN B number of errors injected";
-        }
-        leaf mon-a-error-type {
-          type enumeration {
-            enum "ERROR1" {
-              description
-                "Error type 1";
-            }
-            enum "ERROR2" {
-              description
-                "Error type 2";
-            }
-            enum "ERROR3" {
-              description
-                "Error type 3";
-            }
-            enum "FAULT1" {
-              description
-                "Fault type 1";
-            }
-            enum "FAULT2" {
-              description
-                "Fault type 2";
-            }
-            enum "FAULT3" {
-              description
-                "Fault type 3";
-            }
-            enum "UNKNOWN" {
-              description
-                "Error type is undefined";
-            }
-          }
-          description
-            "MON A error type";
-        }
-        leaf mon-b-error-type {
-          type enumeration {
-            enum "ERROR1" {
-              description
-                "Error type 1";
-            }
-            enum "ERROR2" {
-              description
-                "Error type 2";
-            }
-            enum "ERROR3" {
-              description
-                "Error type 3";
-            }
-            enum "FAULT1" {
-              description
-                "Fault type 1";
-            }
-            enum "FAULT2" {
-              description
-                "Fault type 2";
-            }
-            enum "FAULT3" {
-              description
-                "Fault type 3";
-            }
-            enum "UNKNOWN" {
-              description
-                "Error type is undefined";
-            }
-          }
-          description
-            "MON B error type";
-        }
-      }
-    }
-  }
-  rpc testaccess-connect-testset {
-    description
-      "Provisions the parameters for the Integrated Test Set";
-    input {
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf oper {
-        type enumeration {
-          enum "START" {
-            description
-              "Start the test";
-          }
-          enum "STOP" {
-            description
-              "Stop the test (default)";
-          }
-          enum "STOP-TIMER-COMPLD" {
-            description
-              "Test has stopped, duration timer has completed";
-          }
-        }
-        description
-          "Operation to start or stop the test";
-      }
-      leaf dur {
-        type ciena-6500-types:STRING;
-        description
-          "Duration for the test to run.";
-      }
-      leaf mode {
-        type enumeration {
-          enum "SPLTB" {
-            description
-              "Split from Backplane / Racetrack (Default)";
-          }
-          enum "SPLTF" {
-            description
-              "Split at facility / Test Set";
-          }
-          enum "MANUAL" {
-            description
-              "Manual mode";
-          }
-          enum "SPLTE" {
-            description
-              "Split at Equipment / Network";
-          }
-          enum "SPLTFTX" {
-            description
-              "Unidirectional Split at Transmit / Uni-Racetrack Tx";
-          }
-          enum "SPLTFRX" {
-            description
-              "Unidirectional Split at Receive / Uni-Racetrack Rx";
-          }
-        }
-        description
-          "Configuration mode for the test";
-      }
-      leaf elapsed-time {
-        type ciena-6500-types:STRING;
-        description
-          "Elapsed time test has been running";
-      }
-      leaf gen-a-test-sig-pattern {
-        type ciena-6500-enums:TSTSIG_Pattern;
-        description
-          "GEN A test signal pattern";
-      }
-      leaf gen-b-test-sig-pattern {
-        type ciena-6500-enums:TSTSIG_Pattern;
-        description
-          "GEN B test signal pattern";
-      }
-      leaf mon-a-test-signal-pattern {
-        type ciena-6500-enums:TSTSIG_Pattern;
-        description
-          "MON A test signal pattern";
-      }
-      leaf mon-a-ber-threshold {
-        default "12";
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "MON A bit error threshold value";
-      }
-      leaf mon-b-test-signal-pattern {
-        type ciena-6500-enums:TSTSIG_Pattern;
-        description
-          "MON B test signal pattern";
-      }
-      leaf mon-b-ber-threshold {
-        default "12";
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "MON B bit error threshold value";
-      }
-    }
-  }
-  rpc testaccess-operate-testset {
-    description
-      "Operates the error injection for the Integrated Test Set";
-    input {
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf err {
-        type enumeration {
-          enum "START" {
-            description
-              "Start error injection";
-          }
-          enum "STOP" {
-            description
-              "Stop error injection";
-          }
-        }
-        mandatory true;
-        description
-          "Operation to start or stop error injection for the test";
-      }
-      leaf errpoint {
-        type enumeration {
-          enum "GENA" {
-            description
-              "GEN A error point";
-          }
-          enum "GENB" {
-            description
-              "GEN B error point";
-          }
-          enum "MONA" {
-            description
-              "MON A error point";
-          }
-          enum "MONB" {
-            description
-              "MON B error point";
-          }
-          enum "NONE" {
-            description
-              "No error point";
-          }
-        }
-        mandatory true;
-        description
-          "Error point to inject on";
-      }
-      leaf errtype {
-        type enumeration {
-          enum "ERROR1" {
-            description
-              "Error type 1";
-          }
-          enum "ERROR2" {
-            description
-              "Error type 2";
-          }
-          enum "ERROR3" {
-            description
-              "Error type 3";
-          }
-          enum "FAULT1" {
-            description
-              "Fault type 1";
-          }
-          enum "FAULT2" {
-            description
-              "Fault type 2";
-          }
-          enum "FAULT3" {
-            description
-              "Fault type 3";
-          }
-        }
-        mandatory true;
-        description
-          "Type of error to inject";
-      }
-      leaf errrate {
-        type enumeration {
-          enum "SINGLE" {
-            description
-              "Single errors are being injected";
-          }
-          enum "CONTINUOUS" {
-            description
-              "Continuous faults are being injected";
-          }
-        }
-        mandatory true;
-        description
-          "Rate for error injection";
-      }
-    }
-  }
-  rpc testaccess-init-testset {
-    description
-      "Initializes the status data for the Integrated Test Set";
-    input {
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testaccess-show-testset-log {
-    description
-      "Retrieve the Integrated Test Set log data";
-    input {
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf numlines {
-        default "50";
-        type ciena-6500-types:INT {
-          range "10..50";
-        }
-        description
-          "Number of lines from the log to display";
-      }
-    }
-    output {
-      list output {
-        leaf unit {
-          type enumeration {
-            enum "GENA" {
-              description
-                "GEN A error point";
-            }
-            enum "GENB" {
-              description
-                "GEN B error point";
-            }
-            enum "MONA" {
-              description
-                "MON A error point";
-            }
-            enum "MONB" {
-              description
-                "MON B error point";
-            }
-            enum "CONFIG" {
-              description
-                "Configuration operation";
-            }
-          }
-          description
-            "Unit event happened on";
-        }
-        leaf tid {
-          type ciena-6500-types:STRING;
-          description
-            "Identifies the Shelf's TID";
-        }
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf description {
-          type ciena-6500-types:STRING;
-          description
-            "Description of the event";
-        }
-        leaf value {
-          type ciena-6500-types:STRING;
-          description
-            "Value for the event";
-        }
-        leaf start-time {
-          type ciena-6500-types:STRING;
-          description
-            "Specifies the start time an event happened. DD-HH-MM-SS, DD = 00-99, HH = 00..23, MM = 00..59, SS = 00..59 ";
-        }
-        leaf stop-time {
-          type ciena-6500-types:STRING;
-          description
-            "Stop time of event";
-        }
-        leaf duration {
-          type ciena-6500-types:STRING;
-          description
-            "Duration of the event";
-        }
-      }
-    }
-  }
-  rpc testaccess-save-testset-data {
-    description
-      "Save the Integrated Test Set report or log data to a server";
-    input {
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "1..403";
-        }
-        mandatory true;
-        description
-          "Full URL to remote Directory or File (inside quotes)";
-      }
-      leaf fileidentifier {
-        type ciena-6500-types:STRING;
-        description
-          "Optional user specified file identifier";
-      }
-      leaf report {
-        default "1";
-        type ciena-6500-types:INT;
-        description
-          "Report number requested";
-      }
-      leaf log {
-        default "1";
-        type ciena-6500-types:INT;
-        description
-          "Log number requested";
-      }
-    }
-  }
-  container testaccess {
-    container loopback {
-      list eth {
-        key "eth";
-        config false;
-        leaf eth {
-          mandatory true;
-          description
-            "AID in format ETH-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type ciena-6500-enums:ETHLoopBack;
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list eth10g {
-        key "eth10g";
-        config false;
-        leaf eth10g {
-          mandatory true;
-          description
-            "AID in format ETH10G-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type enumeration {
-            enum "FACILITY" {
-              description
-                "Signal looped toward the equipment";
-            }
-            enum "TERMINAL" {
-              description
-                "Signal looped away from the equipment";
-            }
-            enum "EFMREMOTE" {
-              description
-                "Request the equivalent of a TERMINAL loopback at the far end equipment";
-            }
-          }
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list ethn {
-        key "ethn";
-        config false;
-        leaf ethn {
-          mandatory true;
-          description
-            "AID in format ETH100G-shelf-slot-port, ETH40G-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type enumeration {
-            enum "FACILITY" {
-              description
-                "Signal looped toward the equipment";
-            }
-            enum "TERMINAL" {
-              description
-                "Signal looped away from the equipment";
-            }
-            enum "EFMREMOTE" {
-              description
-                "Request the equivalent of a TERMINAL loopback at the far end equipment";
-            }
-          }
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list flex {
-        key "flex";
-        config false;
-        leaf flex {
-          mandatory true;
-          description
-            "AID in format FLEX-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type ciena-6500-enums:FLEXLoopBack;
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list otm2 {
-        key "otm2";
-        config false;
-        leaf otm2 {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type ciena-6500-enums:LoopBack_NGM;
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list otm3 {
-        key "otm3";
-        config false;
-        leaf otm3 {
-          mandatory true;
-          description
-            "AID in format OTM3-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type ciena-6500-enums:LoopBack;
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list otm {
-        key "otm";
-        config false;
-        leaf otm {
-          mandatory true;
-          description
-            "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type ciena-6500-enums:LoopBack;
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list fc {
-        key "fc";
-        config false;
-        leaf fc {
-          mandatory true;
-          description
-            "AID in format FC1200-shelf-slot-port, FC100-shelf-slot-port, FC200-shelf-slot-port, FC400-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type ciena-6500-enums:LoopBack_NGM;
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list odu {
-        key "odun";
-        config false;
-        leaf odun {
-          mandatory true;
-          description
-            "AID in format ODU4-shelf-slot-port-index";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type ciena-6500-enums:LoopBack;
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-      list eth102 {
-        key "ethn";
-        config false;
-        leaf ethn {
-          mandatory true;
-          description
-            "AID in format ETH100-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf loopback-type {
-          type ciena-6500-enums:ETHLoopBack;
-          description
-            "Loopback Type";
-          config false;
-        }
-      }
-    }
-    list testaccess {
-      key "tacc";
-      config false;
-      leaf tacc {
-        mandatory true;
-        description
-          "AID in format STS1-shelf-slot-port-sts, STS1-shelf-slot-port, STS1AU4-shelf-slot-port-sts3c-sts, VT1-shelf-slot-port-sts-vtg-vt, VT1AU4-shelf-slot-port-sts3c-sts-vtg-vt, VT2-shelf-slot-port-sts-vtg-vt, VT2AU4-shelf-slot-port-sts3c-sts-vtg-vt, VT2-shelf-slot-port, VT2-shelf-slot-DFLT-grp, VT1-1-port-%HLINK-facility-hshelf-hslot-hport, ETH-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf mode {
-        type ciena-6500-enums:TACC_Mode;
-        description
-          "Access mode of the test session";
-        config false;
-      }
-      leaf fromaid {
-        type ciena-6500-types:IDENT;
-        description
-          "aid";
-        config false;
-      }
-      leaf link-association {
-        type enumeration {
-          enum "NO" {
-            description
-              "Maintain access when Link is dropped";
-          }
-          enum "YES" {
-            description
-              "Access is dropped when Link is dropped.";
-          }
-        }
-        description
-          "Link association";
-        config false;
-      }
-    }
-    list testset {
-      key "otmn";
-      config false;
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport, STTP-shelf-slot-ALL, ETTP-shelf-slot-ALL, OTUTTP-shelf-slot-ALL, ODUCTP-shelf-slot-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf oper {
-        type enumeration {
-          enum "START" {
-            description
-              "Start the test";
-          }
-          enum "STOP" {
-            description
-              "Stop the test (default)";
-          }
-          enum "STOP-TIMER-COMPLD" {
-            description
-              "Test has stopped, duration timer has completed";
-          }
-        }
-        description
-          "Operation to start or stop the test";
-        config false;
-      }
-      leaf dur {
-        type ciena-6500-types:STRING;
-        description
-          "Duration for the test to run";
-        config false;
-      }
-      leaf mode {
-        type enumeration {
-          enum "SPLTB" {
-            description
-              "Split from Backplane / Racetrack (Default)";
-          }
-          enum "SPLTF" {
-            description
-              "Split at facility / Test Set";
-          }
-          enum "MANUAL" {
-            description
-              "Manual mode";
-          }
-          enum "SPLTE" {
-            description
-              "Split at Equipment / Network";
-          }
-          enum "SPLTFTX" {
-            description
-              "Unidirectional Split at Transmit / Uni-Racetrack Tx";
-          }
-          enum "SPLTFRX" {
-            description
-              "Unidirectional Split at Receive / Uni-Racetrack Rx";
-          }
-        }
-        description
-          "Configuration mode for the test";
-        config false;
-      }
-      leaf elapsed-time {
-        type ciena-6500-types:STRING;
-        description
-          "Elapsed time test has been running";
-        config false;
-      }
-      leaf gen-a-test-sig-pattern {
-        type ciena-6500-enums:TSTSIG_Pattern;
-        description
-          "GEN A test signal pattern";
-        config false;
-      }
-      leaf gen-b-test-sig-pattern {
-        type ciena-6500-enums:TSTSIG_Pattern;
-        description
-          "GEN B test signal pattern";
-        config false;
-      }
-      leaf mon-a-test-signal-pattern {
-        type ciena-6500-enums:TSTSIG_Pattern;
-        description
-          "MON A test signal pattern";
-        config false;
-      }
-      leaf mon-a-payload-errors {
-        type ciena-6500-types:INT;
-        description
-          "MON A payload errors received";
-        config false;
-      }
-      leaf mon-a-ber-threshold {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "MON A bit error threshold value.";
-        config false;
-      }
-      leaf mon-a-test-signal-status {
-        type enumeration {
-          enum "PASS" {
-            description
-              "Test has passed";
-          }
-          enum "FAIL" {
-            description
-              "Test had failed";
-          }
-          enum "INPROGRESS" {
-            description
-              "Test is in progress";
-          }
-          enum "DISABLED" {
-            description
-              "Test point is disabled or not used";
-          }
-          enum "UNKNOWN" {
-            description
-              "Test status is unknown, probably due to card missing";
-          }
-        }
-        description
-          "MON A test signal status";
-        config false;
-      }
-      leaf mon-a-test-signal-sync {
-        type enumeration {
-          enum "GREEN" {
-            description
-              "BER threshold not exceeded. LOF/EBER/LOC not present since start of test.";
-          }
-          enum "YELLOW" {
-            description
-              "BER threshold exceeded OR LOF/EBER/LOC occurred since last Start, but not currently active";
-          }
-          enum "RED" {
-            description
-              "BER threshold exceeded OR LOF/EBER/LOC currently active";
-          }
-          enum "DISABLED" {
-            description
-              "Test point is disabled or not used";
-          }
-          enum "UNKNOWN" {
-            description
-              "Test sync is unknown, probably due to card missing";
-          }
-        }
-        description
-          "MON A test signal sync";
-        config false;
-      }
-      leaf mon-b-test-signal-pattern {
-        type ciena-6500-enums:TSTSIG_Pattern;
-        description
-          "MON B test signal pattern";
-        config false;
-      }
-      leaf mon-b-payload-errors {
-        type ciena-6500-types:INT;
-        description
-          "MON B payload errors received";
-        config false;
-      }
-      leaf mon-b-ber-threshold {
-        type ciena-6500-types:INT {
-          range "0..15";
-        }
-        description
-          "MON B bit error threshold value";
-        config false;
-      }
-      leaf mon-b-test-signal-status {
-        type enumeration {
-          enum "PASS" {
-            description
-              "Test has passed";
-          }
-          enum "FAIL" {
-            description
-              "Test had failed";
-          }
-          enum "INPROGRESS" {
-            description
-              "Test is in progress";
-          }
-          enum "DISABLED" {
-            description
-              "Test point is disabled or not used";
-          }
-          enum "UNKNOWN" {
-            description
-              "Test status is unknown, probably due to card missing";
-          }
-        }
-        description
-          "MON B test signal status";
-        config false;
-      }
-      leaf mon-b-test-signal-sync {
-        type enumeration {
-          enum "GREEN" {
-            description
-              "BER threshold not exceeded. LOF/EBER/LOC not present since start of test.";
-          }
-          enum "YELLOW" {
-            description
-              "BER threshold exceeded OR LOF/EBER/LOC occurred since last Start, but not currently active";
-          }
-          enum "RED" {
-            description
-              "BER threshold exceeded OR LOF/EBER/LOC currently active";
-          }
-          enum "DISABLED" {
-            description
-              "Test point is disabled or not used";
-          }
-          enum "UNKNOWN" {
-            description
-              "Test sync is unknown, probably due to card missing";
-          }
-        }
-        description
-          "MON B test signal sync";
-        config false;
-      }
-      leaf gen-a-err-state {
-        type enumeration {
-          enum "INJECTING" {
-            description
-              "Errors are being injected";
-          }
-          enum "INJECTED" {
-            description
-              "Errors have been injected";
-          }
-          enum "DISABLED" {
-            description
-              "Errors injection is disabled (Default)";
-          }
-          enum "UNKNOWN" {
-            description
-              "Error injection is UNKNOWN, probably due to card missing";
-          }
-        }
-        description
-          "GEN A error injection state";
-        config false;
-      }
-      leaf gen-a-err-type {
-        type enumeration {
-          enum "ERROR1" {
-            description
-              "Error type 1";
-          }
-          enum "ERROR2" {
-            description
-              "Error type 2";
-          }
-          enum "ERROR3" {
-            description
-              "Error type 3";
-          }
-          enum "FAULT1" {
-            description
-              "Fault type 1";
-          }
-          enum "FAULT2" {
-            description
-              "Fault type 2";
-          }
-          enum "FAULT3" {
-            description
-              "Fault type 3";
-          }
-          enum "UNKNOWN" {
-            description
-              "Error type is undefined";
-          }
-        }
-        description
-          "GEN A error type";
-        config false;
-      }
-      leaf gen-a-err-rate {
-        type enumeration {
-          enum "SINGLE" {
-            description
-              "Single errors are being injected";
-          }
-          enum "CONTINUOUS" {
-            description
-              "Continuous faults are being injected";
-          }
-          enum "UNKNOWN" {
-            description
-              "Error injection is UNKNOWN, probably due to card missing";
-          }
-        }
-        description
-          "GEN A error injection rate";
-        config false;
-      }
-      leaf gen-a-err-injected {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "GEN A number of errors injected";
-        config false;
-      }
-      leaf gen-b-err-state {
-        type enumeration {
-          enum "INJECTING" {
-            description
-              "Errors are being injected";
-          }
-          enum "INJECTED" {
-            description
-              "Errors have been injected";
-          }
-          enum "DISABLED" {
-            description
-              "Errors injection is disabled (Default)";
-          }
-          enum "UNKNOWN" {
-            description
-              "Error injection is UNKNOWN, probably due to card missing";
-          }
-        }
-        description
-          "GEN B error injection state";
-        config false;
-      }
-      leaf gen-b-err-type {
-        type enumeration {
-          enum "ERROR1" {
-            description
-              "Error type 1";
-          }
-          enum "ERROR2" {
-            description
-              "Error type 2";
-          }
-          enum "ERROR3" {
-            description
-              "Error type 3";
-          }
-          enum "FAULT1" {
-            description
-              "Fault type 1";
-          }
-          enum "FAULT2" {
-            description
-              "Fault type 2";
-          }
-          enum "FAULT3" {
-            description
-              "Fault type 3";
-          }
-          enum "UNKNOWN" {
-            description
-              "Error type is undefined";
-          }
-        }
-        description
-          "GEN B error type";
-        config false;
-      }
-      leaf gen-b-err-rate {
-        type enumeration {
-          enum "SINGLE" {
-            description
-              "Single errors are being injected";
-          }
-          enum "CONTINUOUS" {
-            description
-              "Continuous faults are being injected";
-          }
-          enum "UNKNOWN" {
-            description
-              "Error injection is UNKNOWN, probably due to card missing";
-          }
-        }
-        description
-          "GEN B error injection rate";
-        config false;
-      }
-      leaf gen-b-err-injected {
-        default "0";
-        type ciena-6500-types:INT;
-        description
-          "GEN B number of errors injected";
-        config false;
-      }
-      leaf mon-a-error-type {
-        type enumeration {
-          enum "ERROR1" {
-            description
-              "Error type 1";
-          }
-          enum "ERROR2" {
-            description
-              "Error type 2";
-          }
-          enum "ERROR3" {
-            description
-              "Error type 3";
-          }
-          enum "FAULT1" {
-            description
-              "Fault type 1";
-          }
-          enum "FAULT2" {
-            description
-              "Fault type 2";
-          }
-          enum "FAULT3" {
-            description
-              "Fault type 3";
-          }
-          enum "UNKNOWN" {
-            description
-              "Error type is undefined";
-          }
-        }
-        description
-          "MON A error type";
-        config false;
-      }
-      leaf mon-b-error-type {
-        type enumeration {
-          enum "ERROR1" {
-            description
-              "Error type 1";
-          }
-          enum "ERROR2" {
-            description
-              "Error type 2";
-          }
-          enum "ERROR3" {
-            description
-              "Error type 3";
-          }
-          enum "FAULT1" {
-            description
-              "Fault type 1";
-          }
-          enum "FAULT2" {
-            description
-              "Fault type 2";
-          }
-          enum "FAULT3" {
-            description
-              "Fault type 3";
-          }
-          enum "UNKNOWN" {
-            description
-              "Error type is undefined";
-          }
-        }
-        description
-          "MON B error type";
-        config false;
-      }
-    }
-    list testset-log {
-      key "otmn";
-      config false;
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf unit {
-        type enumeration {
-          enum "GENA" {
-            description
-              "GEN A error point";
-          }
-          enum "GENB" {
-            description
-              "GEN B error point";
-          }
-          enum "MONA" {
-            description
-              "MON A error point";
-          }
-          enum "MONB" {
-            description
-              "MON B error point";
-          }
-          enum "CONFIG" {
-            description
-              "Configuration operation";
-          }
-        }
-        description
-          "Unit event happened on";
-        config false;
-      }
-      leaf tid {
-        type ciena-6500-types:STRING;
-        description
-          "Identifies the Shelf's TID";
-        config false;
-      }
-      leaf aid {
-        type ciena-6500-types:IDENT;
-        description
-          "aid";
-        config false;
-      }
-      leaf description {
-        type ciena-6500-types:STRING;
-        description
-          "Description of the event";
-        config false;
-      }
-      leaf value {
-        type ciena-6500-types:STRING;
-        description
-          "Value for the event";
-        config false;
-      }
-      leaf start-time {
-        type ciena-6500-types:STRING;
-        description
-          "Specifies the start time an event happened. DD-HH-MM-SS, DD = 00-99, HH = 00..23, MM = 00..59, SS = 00..59 ";
-        config false;
-      }
-      leaf stop-time {
-        type ciena-6500-types:STRING;
-        description
-          "Stop time of event";
-        config false;
-      }
-      leaf duration {
-        type ciena-6500-types:STRING;
-        description
-          "Duration of the event";
-        config false;
-      }
-    }
-    list testset-report {
-      key "otmn";
-      config false;
-      leaf otmn {
-        mandatory true;
-        description
-          "AID in format OTM4-shelf-slot-port, ETH100G-shelf-slot-port, ETH40G-shelf-slot-port, OTM3-shelf-slot-port, OC768-shelf-slot-port, ETH10G-shelf-slot-port, OTM2-shelf-slot-port, OC192-shelf-slot-port, ETTP-shelf-slot-port, STTP-shelf-slot-port, OTUTTP-shelf-slot-port, ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ETTP-shelf-slot-portSsubport, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, OTUTTP-shelf-slot-portSsubport, STTP-shelf-slot-portSsubport";
-        type ciena-6500-types:aid;
-      }
-      leaf unit {
-        type enumeration {
-          enum "GENA" {
-            description
-              "GEN A error point";
-          }
-          enum "GENB" {
-            description
-              "GEN B error point";
-          }
-          enum "MONA" {
-            description
-              "MON A error point";
-          }
-          enum "MONB" {
-            description
-              "MON B error point";
-          }
-          enum "CONFIG" {
-            description
-              "Configuration operation";
-          }
-        }
-        description
-          "Unit report information is about";
-        config false;
-      }
-      leaf report-parameter {
-        type ciena-6500-types:STRING;
-        description
-          "Parameter in the report";
-        config false;
-      }
-      leaf report-results {
-        type ciena-6500-types:STRING;
-        description
-          "Results for the parameter in the report";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-testrecirculation.yang b/models/ciena-6500-testrecirculation.yang
deleted file mode 100644
index 3ed4eb1ce59b35cb1a7abe4333162f3c93c55ddd..0000000000000000000000000000000000000000
--- a/models/ciena-6500-testrecirculation.yang
+++ /dev/null
@@ -1,408 +0,0 @@
-module ciena-6500-testrecirculation {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-testrecirculation";
-  prefix testrecirculation;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's testrecirculation object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container testrecirculation
-           list recirculation
-             leaf cum-time
-               type union
-               - Removed type: ciena-6500-types:INT
-               - Added type: ciena-6500-types:DECIMAL
-         rpc testrecirculation-show-recirculation
-           output
-             list output
-               leaf cum-time
-                 type union
-                 - Removed type: ciena-6500-types:INT
-                 - Added type: ciena-6500-types:DECIMAL";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-       - Added rpc: testrecirculation-operate-recirculation
-       - Added rpc: testrecirculation-disconnect-recirculation
-       - Added rpc: testrecirculation-show-recirculation
-       - Added container: testrecirculation";
-  }
-
-  rpc testrecirculation-operate-recirculation {
-    description
-      "This command is implemented for recirculation-loop-test session creation.";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf treload {
-        type ciena-6500-types:INT {
-          range "0..999999";
-        }
-        description
-          "Reload time";
-      }
-      leaf ttrip {
-        type ciena-6500-types:INT {
-          range "1000..999999";
-        }
-        description
-          "Trip time";
-      }
-      leaf rxdisp {
-        type ciena-6500-types:DECIMAL {
-          range "-17500..17500";
-        }
-        description
-          "Rx Dispersion";
-      }
-      leaf resetcumtime {
-        type enumeration {
-          enum "NO" {
-            description
-              "Don't Reset Cumulation Time";
-          }
-          enum "YES" {
-            description
-              "Reset Cumulation Time";
-          }
-        }
-        default "NO";
-        description
-          "Reset cumulation time YES/NO";
-      }
-    }
-  }
-  rpc testrecirculation-disconnect-recirculation {
-    description
-      "Release recirculation loop test on specified facility.";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc testrecirculation-show-recirculation {
-    description
-      "Retrieve the state of recirculation loop execution.";
-    input {
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf stats-info {
-        type enumeration {
-          enum "NO" {
-            description
-              "Do not include Recirculation loop Test information in the response";
-          }
-          enum "YES" {
-            description
-              "Include Recirculation Loop Test information in the response";
-          }
-        }
-        description
-          "Detail information YES/NO";
-      }
-    }
-    output {
-      list output {
-        leaf ptp {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf recirc-oper {
-          type ciena-6500-enums:RecircOper;
-          description
-            "Operation Mode of recirculation loop testbed";
-        }
-        leaf reload-time {
-          type ciena-6500-types:INT {
-            range "0..999999";
-          }
-          description
-            "Reload time";
-        }
-        leaf trip-time {
-          type ciena-6500-types:INT {
-            range "1000..999999";
-          }
-          description
-            "Trip Time";
-        }
-        leaf rx-dispersion {
-          type ciena-6500-types:DECIMAL {
-            range "-17500..17500";
-          }
-          description
-            "Rx Dispersion";
-        }
-        leaf reset-cumtime {
-          type enumeration {
-            enum "NO" {
-              description
-                "Don't Reset Cumulation Time";
-            }
-            enum "YES" {
-              description
-                "Reset Cumulation Time";
-            }
-          }
-          description
-            "Reset cumulation time";
-        }
-        leaf residual-dispersion {
-          type ciena-6500-types:DECIMAL {
-            range "-17500..17500";
-          }
-          description
-            "Residual Dispersion";
-        }
-        leaf err-ratio-x {
-          type decimal64 {
-            range "-999999.99..999999.99";
-            fraction-digits 2;
-          }
-          description
-            "Modulation Error Ratio X";
-        }
-        leaf err-ratio-y {
-          type decimal64 {
-            range "-999999.99..999999.99";
-            fraction-digits 2;
-          }
-          description
-            "Modulation Error Ratio Y";
-        }
-        leaf cum-time {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:DECIMAL;
-          }
-          description
-            "Cumulation time";
-        }
-        leaf cum-prefec-ber {
-          type decimal64 {
-            range "-1.000000..1.000000";
-            fraction-digits 6;
-          }
-          description
-            "Cumulated Pre-FEC BER";
-        }
-        leaf cumcyc-slips-x {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT {
-              range "0..999999";
-            }
-          }
-          description
-            "Cumulated Cycle Slips X";
-        }
-        leaf cumcyc-slips-y {
-          type union {
-            type enumeration {
-              enum "UNKNOWN";
-            }
-            type ciena-6500-types:INT {
-              range "0..999999";
-            }
-          }
-          description
-            "Cumulated Cycle Slips Y";
-        }
-        leaf recirc-dgd {
-          type decimal64 {
-            range "-999999.0000..999999.0000";
-            fraction-digits 4;
-          }
-          description
-            "Dgd";
-        }
-        leaf recirc-pdl {
-          type decimal64 {
-            range "-999999.0000..999999.0000";
-            fraction-digits 4;
-          }
-          description
-            "Pdl";
-        }
-      }
-    }
-  }
-  container testrecirculation {
-    list recirculation {
-      key "ptp";
-      config false;
-      leaf ptp {
-        mandatory true;
-        description
-          "AID in format PTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf recirc-oper {
-        type ciena-6500-enums:RecircOper;
-        description
-          "Operation Mode of recirculation loop testbed";
-        config false;
-      }
-      leaf reload-time {
-        type ciena-6500-types:INT {
-          range "0..999999";
-        }
-        description
-          "Reload time";
-        config false;
-      }
-      leaf trip-time {
-        type ciena-6500-types:INT {
-          range "1000..999999";
-        }
-        description
-          "Trip Time";
-        config false;
-      }
-      leaf rx-dispersion {
-        type ciena-6500-types:DECIMAL {
-          range "-17500..17500";
-        }
-        description
-          "Rx Dispersion";
-        config false;
-      }
-      leaf reset-cumtime {
-        type enumeration {
-          enum "NO" {
-            description
-              "Don't Reset Cumulation Time";
-          }
-          enum "YES" {
-            description
-              "Reset Cumulation Time";
-          }
-        }
-        description
-          "Reset cumulation time";
-        config false;
-      }
-      leaf residual-dispersion {
-        type ciena-6500-types:DECIMAL {
-          range "-17500..17500";
-        }
-        description
-          "Residual Dispersion";
-        config false;
-      }
-      leaf err-ratio-x {
-        type decimal64 {
-          range "-999999.99..999999.99";
-          fraction-digits 2;
-        }
-        description
-          "Modulation Error Ratio X";
-        config false;
-      }
-      leaf err-ratio-y {
-        type decimal64 {
-          range "-999999.99..999999.99";
-          fraction-digits 2;
-        }
-        description
-          "Modulation Error Ratio Y";
-        config false;
-      }
-      leaf cum-time {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:DECIMAL;
-        }
-        description
-          "Cumulation time";
-        config false;
-      }
-      leaf cum-prefec-ber {
-        type decimal64 {
-          range "-1.000000..1.000000";
-          fraction-digits 6;
-        }
-        description
-          "Cumulated Pre-FEC BER";
-        config false;
-      }
-      leaf cumcyc-slips-x {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT {
-            range "0..999999";
-          }
-        }
-        description
-          "Cumulated Cycle Slips X";
-        config false;
-      }
-      leaf cumcyc-slips-y {
-        type union {
-          type enumeration {
-            enum "UNKNOWN";
-          }
-          type ciena-6500-types:INT {
-            range "0..999999";
-          }
-        }
-        description
-          "Cumulated Cycle Slips Y";
-        config false;
-      }
-      leaf recirc-dgd {
-        type decimal64 {
-          range "-999999.0000..999999.0000";
-          fraction-digits 4;
-        }
-        description
-          "Dgd";
-        config false;
-      }
-      leaf recirc-pdl {
-        type decimal64 {
-          range "-999999.0000..999999.0000";
-          fraction-digits 4;
-        }
-        description
-          "Pdl";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-topology.yang b/models/ciena-6500-topology.yang
deleted file mode 100644
index 418095b3ac9741d8079bb4d26759266943281366..0000000000000000000000000000000000000000
--- a/models/ciena-6500-topology.yang
+++ /dev/null
@@ -1,1413 +0,0 @@
-module ciena-6500-topology {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-topology";
-  prefix topology;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's topology object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container topology
-           list ots
-           - Removed leaf: tcc
-           - Removed leaf: voa-at-lim-linea-in
-           - Removed leaf: voa-at-lim-linea-out
-           - Removed leaf: voa-at-lim-lineb-out
-             leaf refbw
-             - Changed type from ciena-6500-enums:refBW to enumeration
-               type enumeration
-               - Added enum: N/A
-               - Added enum: 12.5GHZ
-               - Added enum: 50GHZITU
-               - Added enum: PORTBW";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         rpc topology-show-shelf-wavelength
-           input
-             leaf routing
-               type enumeration
-               - Added enum: ALL
-               - Added enum: KNOWN
-           output
-           - Removed leaf: swtaid
-           - Removed leaf: sw-status
-           - Removed leaf: doc-care
-           - Removed leaf: ch-status
-           - Removed leaf: complete
-           - Removed leaf: path-id
-           - Removed leaf: instance
-           - Removed leaf: port-trail
-           - Removed leaf: routing
-           - Removed leaf: obm-configurable
-           - Removed leaf: edge-port
-           - Removed leaf: cktid
-           - Removed leaf: derived
-           - Removed leaf: active
-           - Removed leaf: mod-class
-           - Removed leaf: express-delete
-           - Removed leaf: routing-rule
-           - Added list: output
-         container topology
-         - Added list: shelf-wavelength
-           list ots
-           - Added leaf: olf-osc-only
-             leaf otsaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf tx-path
-             - Added mandatory: true 
-               type ciena-6500-types:INT
-               - Added range: 1..254 
-             leaf cs-ind
-             - Added default: N 
-             leaf min-mux-pout
-             - Added default: 15.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: -30.00..15.00 
-             leaf auto-mux-pout-ratio
-             - Added default: 0.33 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..1.00 
-             leaf ch-bias-ramp
-             - Added default: 0.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..2.00 
-             leaf unexpt-loss-thres
-             - Added default: 6.50 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..10.00 
-             leaf bun-factor
-             - Added default: 0.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: 0.00..200.00 
-             leaf gb-width
-             - Added default: 0 
-               type ciena-6500-types:INT
-               - Added range: 0..500 
-             leaf prov-ctrlmode
-             - Added default: 50 
-             leaf cfgtype
-             - Added mandatory: true 
-             leaf subtype
-             - Changed type from ciena-6500-enums:OTSsubtype_RTRV to enumeration
-               type enumeration
-               - Added enum: AMP
-               - Added enum: ROADM
-               - Added enum: TOADM
-               - Added enum: DIOADM
-               - Added enum: COADM
-               - Added enum: PASSIVE
-             leaf rx-path
-               type ciena-6500-types:INT
-               - Added range: 1..254 
-             leaf auto-mux-pout
-             - Added default: 15.00 
-               type ciena-6500-types:DECIMAL
-               - Added range: -30.00..15.00 
-             leaf lim
-             - Changed config from true to false
-             leaf cas-lim
-             - Changed config from true to false
-             leaf drop-lim
-             - Changed config from true to false
-             leaf wss
-             - Changed config from true to false
-             leaf smd
-             - Changed config from true to false
-             leaf tcc
-             - Changed config from true to false
-             leaf voa-at-lim-linea-in
-             - Changed config from true to false
-             leaf voa-at-lim-linea-out
-             - Changed config from true to false
-             leaf voa-at-lim-lineb-out
-             - Changed config from true to false
-             leaf cmd1
-             - Changed config from true to false
-             leaf cmd2
-             - Changed config from true to false
-             leaf cmd3
-             - Changed config from true to false
-             leaf cmd4
-             - Changed config from true to false
-             leaf cmd5
-             - Changed config from true to false
-             leaf cmd6
-             - Changed config from true to false
-             leaf cmd7
-             - Changed config from true to false
-             leaf cmd8
-             - Changed config from true to false
-             leaf cmd9
-             - Changed config from true to false
-             leaf cmd10
-             - Changed config from true to false
-             leaf bmd
-             - Changed config from true to false
-             leaf bmd2
-             - Changed config from true to false
-             leaf bmd3
-             - Changed config from true to false
-             leaf bmd4
-             - Changed config from true to false
-             leaf bmd5
-             - Changed config from true to false
-             leaf dscm1
-             - Changed config from true to false
-             leaf dscm2
-             - Changed config from true to false
-             leaf dscm3
-             - Changed config from true to false
-             leaf dscm4
-             - Changed config from true to false
-             leaf dscm5
-             - Changed config from true to false
-             leaf dscm6
-             - Changed config from true to false
-             leaf dscm7
-             - Changed config from true to false
-             leaf dscm8
-             - Changed config from true to false
-             leaf amp1
-             - Changed config from true to false
-             leaf amp2
-             - Changed config from true to false
-             leaf amp3
-             - Changed config from true to false
-             leaf amp4
-             - Changed config from true to false
-             leaf amp5
-             - Changed config from true to false
-             leaf amp6
-             - Changed config from true to false
-             leaf amp7
-             - Changed config from true to false
-             leaf amp8
-             - Changed config from true to false
-             leaf ase1
-             - Changed config from true to false
-             leaf ase2
-             - Changed config from true to false
-             leaf slic1
-             - Changed config from true to false
-             leaf slic2
-             - Changed config from true to false
-             leaf slic3
-             - Changed config from true to false
-             leaf slic4
-             - Changed config from true to false
-             leaf bs1
-             - Changed config from true to false
-             leaf bs2
-             - Changed config from true to false
-             leaf bs3
-             - Changed config from true to false
-             leaf bs4
-             - Changed config from true to false
-             leaf bs5
-             - Changed config from true to false
-             leaf oscf
-             - Changed config from true to false
-             leaf iss
-             - Changed config from true to false
-           list slot-seq
-             leaf slotseq
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list tid-slot-seq
-             leaf tidslotseq
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added rpc: topology-show-shelf-wavelength
-         container topology
-           list ots
-           - Added leaf: rxlabel
-           - Added leaf: txlabel
-           - Added leaf: prov-ctrlmode
-           - Added leaf: refbw
-           - Added leaf: act-ctrlmode
-           - Added leaf: ctrlcpbl";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container topology
-           list ots
-           - Changed key from aid to otsaid
-           - Removed leaf: aid
-           - Removed leaf: dra
-           - Removed leaf: gmd
-           - Added leaf: otsaid
-             leaf osid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..8 
-             leaf subtype
-             - Changed type from ciena-6500-enums:OTSsubtype to ciena-6500-enums:OTSsubtype_RTRV
-           list slot-seq
-           - Changed key from aid to slotseq
-           - Removed leaf: aid
-           - Added leaf: slotseq
-             leaf-list add-seq
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:IDENT
-             leaf-list drop-seq
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:IDENT
-             leaf anchor
-             - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT
-           list tid-slot-seq
-           - Changed key from aid to tidslotseq
-           - Removed leaf: aid
-           - Removed leaf: fiber-type
-           - Added leaf: tidslotseq
-           - Added leaf: rooteqpt
-             leaf-list add-seq
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:IDENT
-             leaf-list drop-seq
-             - Changed type from ciena-6500-types:STRING to ciena-6500-types:IDENT
-             leaf anchor
-             - Changed type from ciena-6500-types:aid to ciena-6500-types:IDENT";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: topology";
-  }
-
-  rpc topology-show-shelf-wavelength {
-    description
-      "Retrieve the Shelf Wavelength Topology Application attributes.";
-    input {
-      leaf swtaid {
-        mandatory true;
-        description
-          "AID in format SWT-shelf-wavelength, SWT-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf routing {
-        type enumeration {
-          enum "ALL" {
-            description
-              "All routing values";
-          }
-          enum "ADD" {
-            description
-              "ADD";
-          }
-          enum "DROP" {
-            description
-              "DROP";
-          }
-          enum "PASSTHROUGH" {
-            description
-              "PASSTHROUGH";
-          }
-          enum "BLOCKED" {
-            description
-              "BLOCKED";
-          }
-          enum "UNKNOWN" {
-            description
-              "UNKNOWN";
-          }
-          enum "KNOWN" {
-            description
-              "All routing values except UNKNOWN";
-          }
-        }
-        description
-          "Optional parameter used as a filter to query the SWT for a specific routing type. If ROUTING is not specified, SWT for all routing except UNKNOWN is returned.";
-      }
-    }
-    output {
-      list output {
-        leaf swtaid {
-          type ciena-6500-types:IDENT;
-          description
-            "AID";
-        }
-        leaf sw-status {
-          type enumeration {
-            enum "OK" {
-              description
-                "Wavelength fault status is good or wavelength fault status is not applicable because the channel is non-occupant.";
-            }
-            enum "UPSTREAMFAULT" {
-              description
-                "The wavelength has traversed one or more faulted facilities or circuit packs on an upstream OTS.";
-            }
-            enum "LOCALFAULT" {
-              description
-                "The wavelength traverses one or more faulted facilities or circuit packs on the current OTS.";
-            }
-          }
-          description
-            "Wavelength fault status to indicate alarm conditions present on the equipment the channel traverses locally or upstream.";
-        }
-        leaf doc-care {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Status indicating whether DOC is actively controlling the wavelength.";
-        }
-        leaf ch-status {
-          type ciena-6500-enums:CHSTATUSVALUES;
-          description
-            "The DOC status of the wavelength.";
-        }
-        leaf complete {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Indicates whether the wavelength is part of a complete NCT channel. Within a DIA or COADM OTS, the flag is asserted immediately when the cross-connect is provisioned.";
-        }
-        leaf path-id {
-          type ciena-6500-types:INT {
-            range "1..254";
-          }
-          description
-            "A numeric representation of the direction the wavelength is traveling. Similar to EAST and WEST in linear systems, but a numeric identifier allows for any number of directions in mesh topologies.";
-        }
-        leaf instance {
-          type ciena-6500-types:INT {
-            range "1..9";
-          }
-          description
-            "A unique identifier for each SWT instance sharing the same path ID and wavelength.";
-        }
-        leaf port-trail {
-          type ciena-6500-types:STRING;
-          description
-            "An ordered list of \"slot-port\" pairs representing the sequence of ports the wavelength traverses within a particular OTS.";
-        }
-        leaf routing {
-          type enumeration {
-            enum "ALL" {
-              description
-                "All routing values";
-            }
-            enum "ADD" {
-              description
-                "ADD";
-            }
-            enum "DROP" {
-              description
-                "DROP";
-            }
-            enum "PASSTHROUGH" {
-              description
-                "PASSTHROUGH";
-            }
-            enum "BLOCKED" {
-              description
-                "BLOCKED";
-            }
-            enum "UNKNOWN" {
-              description
-                "UNKNOWN";
-            }
-            enum "KNOWN" {
-              description
-                "All routing values except UNKNOWN";
-            }
-          }
-          description
-            "Optional parameter used as a filter to query the SWT for a specific routing type. If ROUTING is not specified, SWT for all routing except UNKNOWN is returned.";
-        }
-        leaf obm-configurable {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Indicates if the channel can be manually reconfigured using the OBM application. If DOCCARE is TRUE then the value of OBMCONFIGURABLE is not relevant.";
-        }
-        leaf edge-port {
-          type ciena-6500-types:STRING;
-          description
-            "The slot and port where the wavelength enters or exits the current OTS in the non line-facing direction.";
-        }
-        leaf cktid {
-          type ciena-6500-types:STRING;
-          description
-            "Circuit Identifier - can be used to hold the CLCI (see GR-199) or user-provisionable label. 64 characters max.";
-        }
-        leaf derived {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Indicates if the channel is manually provisioned using the OBM application or implicitly derived from adjacency provisioning.";
-        }
-        leaf active {
-          type enumeration {
-            enum "TRUE" {
-              description
-                "The channel has been added or will be automatically added if DOC Auto-Add is enabled.";
-            }
-            enum "FALSE" {
-              description
-                "The channel has been deleted or will be automatically deleted if DOC Auto-Delete is enabled.";
-            }
-            enum "UNKNOWN" {
-              description
-                "Temporary value following a restart to indicate that channel activity has not yet been determined.";
-            }
-          }
-          description
-            "A flag to request that DOC start or stop actively controlling the wavelength. This flag is not applicable when AUTOROUTE is disabled in the OTS.";
-        }
-        leaf mod-class {
-          type ciena-6500-enums:adjTxModClass;
-          description
-            "Modulation class of the upstream transmitter where the channel originates.";
-        }
-        leaf express-delete {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Indicates if express deletion is enabled for this channel. This flag is not applicable when AUTOROUTE is disabled in the OTS.";
-        }
-        leaf routing-rule {
-          type enumeration {
-            enum "SHORTESTPATH" {
-              description
-                "Channel built by calculating the shortest path between the Tx and Rx Adjacency. Does not support Drop and Continue applications.";
-            }
-            enum "LONGESTPATH" {
-              description
-                "Channel built by calculating the longest path between the Tx and Rx Adjacency. Supports Drop and Continue applications.";
-            }
-            enum "MANUAL" {
-              description
-                "Channel built using manually provisioned data. For future use only.";
-            }
-          }
-          description
-            "Indicates how the channel is stitched between the Tx and Rx Adjacency.";
-        }
-      }
-    }
-  }
-  container topology {
-    list ots {
-      key "otsaid";
-      config true;
-      leaf otsaid {
-        mandatory true;
-        description
-          "AID in format OTS-shelf-instance, SHELF-shelf-ALL, OTS-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf osid {
-        type string {
-          length "0..8";
-        }
-        description
-          "The Optical System ID";
-        config true;
-      }
-      leaf tx-path {
-        type ciena-6500-types:INT {
-          range "1..254";
-        }
-        mandatory true;
-        description
-          "TX Path ID value";
-        config true;
-      }
-      leaf doc-ind {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Is this a DOC end";
-        config true;
-      }
-      leaf cs-ind {
-        type ciena-6500-enums:MX_CONTROL_MODE;
-        default "N";
-        description
-          "Coherent Select Indicator";
-        config true;
-      }
-      leaf enhanced-topology {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Enhanced Topology";
-        config true;
-      }
-      leaf auto-route {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Autoroute";
-        config true;
-      }
-      leaf bw-cal {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Backward Calibration";
-        config true;
-      }
-      leaf min-mux-pout {
-        default "15.00";
-        type ciena-6500-types:DECIMAL {
-          range "-30.00..15.00";
-        }
-        description
-          "Minimum MUX Power Output";
-        config true;
-      }
-      leaf auto-mux-pout-ratio {
-        default "0.33";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..1.00";
-        }
-        description
-          "Automatic MUX Power Output Ratio";
-        config true;
-      }
-      leaf ch-bias-ramp {
-        default "0.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..2.00";
-        }
-        description
-          "Channel Bias Ramp Gradient";
-        config true;
-      }
-      leaf unexpt-loss-thres {
-        default "6.50";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..10.00";
-        }
-        description
-          "WSS UnExpected Loss Threshold";
-        config true;
-      }
-      leaf osc-required {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "OSC Required";
-        config true;
-      }
-      leaf osc {
-        type ciena-6500-types:aid;
-        description
-          "OSC-shelf-slot-port";
-        config true;
-      }
-      leaf combined-opm-power {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Sets the CombinedOpmPower value for channels created in this OTS. When CombinedOpmPower is enabled, the CMD44 optmon power reading are combined and treated as a single reading. DOC and WSS controller take this combined and scaled OPM power reading into account for input source power profile instead of the default scaled power estimates.";
-        config true;
-      }
-      leaf prov-associated-ots {
-        type ciena-6500-types:IDENT;
-        description
-          "Associated OTS";
-        config true;
-      }
-      leaf slot-cfg-mode {
-        type ciena-6500-enums:slotcfgmode;
-        description
-          "Slot Configuration Mode indicates how the Slot Data is generated in the OTS. When it is set to PROIVISIONED, it means the Slot Data is provisioned in the OTS via TL1 command. If it is set to DERIVED, then it indicates that the Slot Data is auto-populated by other application.";
-        config true;
-      }
-      leaf pepc-clamp {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "PEPC CLAMP indicates whether this algorithm is enabled or disabled.";
-        config true;
-      }
-      leaf cps {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "CPS Parameter";
-        config true;
-      }
-      leaf bun-factor {
-        default "0.00";
-        type ciena-6500-types:DECIMAL {
-          range "0.00..200.00";
-        }
-        description
-          "Bun Factor";
-        config true;
-      }
-      leaf gb-width {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..500";
-        }
-        description
-          "Guard Band Width";
-        config true;
-      }
-      leaf seq-chc-updates {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Sequence CHC Updates";
-        config true;
-      }
-      leaf auto-gb {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Auto-Guardbanding flag to allow the opacity settings on available, unmanaged channels.";
-        config true;
-      }
-      leaf rxlabel {
-        type string {
-          length "0..64";
-        }
-        description
-          "Provisioned OMS RX link identifier";
-        config true;
-      }
-      leaf txlabel {
-        type string {
-          length "0..64";
-        }
-        description
-          "Provisioned OMS TX link identifier";
-        config true;
-      }
-      leaf prov-ctrlmode {
-        type ciena-6500-enums:controlMode;
-        default "50";
-        description
-          "User provisioned CONTROL MODE for OTS.";
-        config true;
-      }
-      leaf refbw {
-        type enumeration {
-          enum "N/A" {
-            description
-              "N/A";
-          }
-          enum "12.5GHZ" {
-            description
-              "12.5GHz(This value can be used in create and edit operations)";
-          }
-          enum "50GHZITU" {
-            description
-              "50GHz ITU(This value can be used in create and edit operations)";
-          }
-          enum "PORTBW" {
-            description
-              "Bandwidth of the port";
-          }
-        }
-        description
-          "OTS MINMUXPOUT parameter's resolution bandwidth";
-        config true;
-      }
-      leaf olf-osc-only {
-        type ciena-6500-enums:DISABLE_ENABLE;
-        description
-          "Flag used to clear ALSO solely based on the OSC LOF condition .";
-        config true;
-      }
-      leaf cfgtype {
-        type enumeration {
-          enum "AMP" {
-            description
-              "Amplifier Configuration(This value can be used in create operation)";
-          }
-          enum "CHA" {
-            description
-              "Channel Access Configuration(This value can be used in create operation)";
-          }
-          enum "DGE" {
-            description
-              "Dynamic Gain Equaliser";
-          }
-        }
-        mandatory true;
-        description
-          "Configuration Type";
-        config true;
-      }
-      leaf subtype {
-        type enumeration {
-          enum "AMP" {
-            description
-              "Line Amplifier";
-          }
-          enum "ROADM" {
-            description
-              "Reconfigurable OADM";
-          }
-          enum "TOADM" {
-            description
-              "Thin OADM";
-          }
-          enum "DIOADM" {
-            description
-              "Direction Independent OADM";
-          }
-          enum "COADM" {
-            description
-              "Colourless OADM";
-          }
-          enum "PASSIVE" {
-            description
-              "Passive OADM or Line Amplifer";
-          }
-        }
-        description
-          "Configuration Subtype";
-        config true;
-      }
-      leaf amp-mate {
-        type ciena-6500-types:IDENT;
-        description
-          "OTS-shelf-instance";
-        config true;
-      }
-      leaf rx-path {
-        type ciena-6500-types:INT {
-          range "1..254";
-        }
-        description
-          "RX Path ID value";
-        config false;
-      }
-      leaf auto-mux-pout {
-        default "15.00";
-        type ciena-6500-types:DECIMAL {
-          range "-30.00..15.00";
-        }
-        description
-          "Automatic MUX Power Output";
-        config false;
-      }
-      leaf line-in {
-        type ciena-6500-types:STRING;
-        description
-          "EQPT-shelf-slot-port";
-        config false;
-      }
-      leaf line-out {
-        type ciena-6500-types:STRING;
-        description
-          "EQPT-shelf-slot-port";
-        config false;
-      }
-      leaf lim {
-        type ciena-6500-types:aid;
-        description
-          "LIM-shelf-slot";
-        config false;
-      }
-      leaf cas-lim {
-        type ciena-6500-types:aid;
-        description
-          "LIM-shelf-slot";
-        config false;
-      }
-      leaf drop-lim {
-        type ciena-6500-types:aid;
-        description
-          "LIM-shelf-slot";
-        config false;
-      }
-      leaf wss {
-        type ciena-6500-types:aid;
-        description
-          "WSSOPM-shelf-slot";
-        config false;
-      }
-      leaf smd {
-        type ciena-6500-types:aid;
-        description
-          "SMD-shelf-slot";
-        config false;
-      }
-      leaf cmd1 {
-        type ciena-6500-types:aid;
-        description
-          "First CMD Slot";
-        config false;
-      }
-      leaf cmd2 {
-        type ciena-6500-types:aid;
-        description
-          "Second CMD Slot";
-        config false;
-      }
-      leaf cmd3 {
-        type ciena-6500-types:aid;
-        description
-          "Third CMD Slot";
-        config false;
-      }
-      leaf cmd4 {
-        type ciena-6500-types:aid;
-        description
-          "Fourth CMD Slot";
-        config false;
-      }
-      leaf cmd5 {
-        type ciena-6500-types:aid;
-        description
-          "Fifth CMD Slot";
-        config false;
-      }
-      leaf cmd6 {
-        type ciena-6500-types:aid;
-        description
-          "Sixth CMD Slot";
-        config false;
-      }
-      leaf cmd7 {
-        type ciena-6500-types:aid;
-        description
-          "Seventh CMD Slot";
-        config false;
-      }
-      leaf cmd8 {
-        type ciena-6500-types:aid;
-        description
-          "Eighth CMD Slot";
-        config false;
-      }
-      leaf cmd9 {
-        type ciena-6500-types:aid;
-        description
-          "Ninth CMD Slot";
-        config false;
-      }
-      leaf cmd10 {
-        type ciena-6500-types:aid;
-        description
-          "Tenth CMD Slot";
-        config false;
-      }
-      leaf bmd {
-        type ciena-6500-types:aid;
-        description
-          "BMD-shelf-slot";
-        config false;
-      }
-      leaf bmd2 {
-        type ciena-6500-types:aid;
-        description
-          "BMD-shelf-slot";
-        config false;
-      }
-      leaf bmd3 {
-        type ciena-6500-types:aid;
-        description
-          "BMD-shelf-slot";
-        config false;
-      }
-      leaf bmd4 {
-        type ciena-6500-types:aid;
-        description
-          "BMD-shelf-slot";
-        config false;
-      }
-      leaf bmd5 {
-        type ciena-6500-types:aid;
-        description
-          "BMD-shelf-slot";
-        config false;
-      }
-      leaf dscm1 {
-        type ciena-6500-types:aid;
-        description
-          "DSCM-shelf-slot";
-        config false;
-      }
-      leaf dscm2 {
-        type ciena-6500-types:aid;
-        description
-          "DSCM-shelf-slot";
-        config false;
-      }
-      leaf dscm3 {
-        type ciena-6500-types:aid;
-        description
-          "DSCM-shelf-slot";
-        config false;
-      }
-      leaf dscm4 {
-        type ciena-6500-types:aid;
-        description
-          "DSCM-shelf-slot";
-        config false;
-      }
-      leaf dscm5 {
-        type ciena-6500-types:aid;
-        description
-          "DSCM-shelf-slot";
-        config false;
-      }
-      leaf dscm6 {
-        type ciena-6500-types:aid;
-        description
-          "DSCM-shelf-slot";
-        config false;
-      }
-      leaf dscm7 {
-        type ciena-6500-types:aid;
-        description
-          "DSCM-shelf-slot";
-        config false;
-      }
-      leaf dscm8 {
-        type ciena-6500-types:aid;
-        description
-          "DSCM-shelf-slot";
-        config false;
-      }
-      leaf amp1 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf amp2 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf amp3 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf amp4 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf amp5 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf amp6 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf amp7 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf amp8 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf ase1 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf ase2 {
-        type ciena-6500-types:aid;
-        description
-          "AMP-shelf-slot";
-        config false;
-      }
-      leaf slic1 {
-        type ciena-6500-types:aid;
-        description
-          "SLIC-shelf-slot";
-        config false;
-      }
-      leaf slic2 {
-        type ciena-6500-types:aid;
-        description
-          "SLIC-shelf-slot";
-        config false;
-      }
-      leaf slic3 {
-        type ciena-6500-types:aid;
-        description
-          "SLIC-shelf-slot";
-        config false;
-      }
-      leaf slic4 {
-        type ciena-6500-types:aid;
-        description
-          "SLIC-shelf-slot";
-        config false;
-      }
-      leaf bs1 {
-        type ciena-6500-types:aid;
-        description
-          "BS-shelf-slotSsubslot";
-        config false;
-      }
-      leaf bs2 {
-        type ciena-6500-types:aid;
-        description
-          "BS-shelf-slotSsubslot";
-        config false;
-      }
-      leaf bs3 {
-        type ciena-6500-types:aid;
-        description
-          "BS-shelf-slotSsubslot";
-        config false;
-      }
-      leaf bs4 {
-        type ciena-6500-types:aid;
-        description
-          "BS-shelf-slotSsubslot";
-        config false;
-      }
-      leaf bs5 {
-        type ciena-6500-types:aid;
-        description
-          "BS-shelf-slotSsubslot";
-        config false;
-      }
-      leaf oscf {
-        type ciena-6500-types:aid;
-        description
-          "OSCF-shelf-slotSsubslot";
-        config false;
-      }
-      leaf associated-ots {
-        type ciena-6500-types:IDENT;
-        description
-          "Associated OTS";
-        config false;
-      }
-      leaf iss {
-        type ciena-6500-types:aid;
-        description
-          "ISS-shelf-slot";
-        config false;
-      }
-      leaf act-ctrlmode {
-        type ciena-6500-enums:controlMode;
-        description
-          "Actual CONTROL MODE for OTS.";
-        config false;
-      }
-      leaf ctrlcpbl {
-        type ciena-6500-enums:controlCpbl;
-        description
-          "Capable CONTROL MODE for OTS.";
-        config false;
-      }
-    }
-    list shelf-wavelength {
-      key "swtaid";
-      config false;
-      leaf swtaid {
-        mandatory true;
-        description
-          "AID in format SWT-shelf-wavelength, SWT-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf sw-status {
-        type enumeration {
-          enum "OK" {
-            description
-              "Wavelength fault status is good or wavelength fault status is not applicable because the channel is non-occupant.";
-          }
-          enum "UPSTREAMFAULT" {
-            description
-              "The wavelength has traversed one or more faulted facilities or circuit packs on an upstream OTS.";
-          }
-          enum "LOCALFAULT" {
-            description
-              "The wavelength traverses one or more faulted facilities or circuit packs on the current OTS.";
-          }
-        }
-        description
-          "Wavelength fault status to indicate alarm conditions present on the equipment the channel traverses locally or upstream.";
-        config false;
-      }
-      leaf doc-care {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Status indicating whether DOC is actively controlling the wavelength.";
-        config false;
-      }
-      leaf ch-status {
-        type ciena-6500-enums:CHSTATUSVALUES;
-        description
-          "The DOC status of the wavelength.";
-        config false;
-      }
-      leaf complete {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Indicates whether the wavelength is part of a complete NCT channel. Within a DIA or COADM OTS, the flag is asserted immediately when the cross-connect is provisioned.";
-        config false;
-      }
-      leaf path-id {
-        type ciena-6500-types:INT {
-          range "1..254";
-        }
-        description
-          "A numeric representation of the direction the wavelength is traveling. Similar to EAST and WEST in linear systems, but a numeric identifier allows for any number of directions in mesh topologies.";
-        config false;
-      }
-      leaf instance {
-        type ciena-6500-types:INT {
-          range "1..9";
-        }
-        description
-          "A unique identifier for each SWT instance sharing the same path ID and wavelength.";
-        config false;
-      }
-      leaf port-trail {
-        type ciena-6500-types:STRING;
-        description
-          "An ordered list of \"slot-port\" pairs representing the sequence of ports the wavelength traverses within a particular OTS.";
-        config false;
-      }
-      leaf routing {
-        type enumeration {
-          enum "ALL" {
-            description
-              "All routing values";
-          }
-          enum "ADD" {
-            description
-              "ADD";
-          }
-          enum "DROP" {
-            description
-              "DROP";
-          }
-          enum "PASSTHROUGH" {
-            description
-              "PASSTHROUGH";
-          }
-          enum "BLOCKED" {
-            description
-              "BLOCKED";
-          }
-          enum "UNKNOWN" {
-            description
-              "UNKNOWN";
-          }
-          enum "KNOWN" {
-            description
-              "All routing values except UNKNOWN";
-          }
-        }
-        description
-          "Optional parameter used as a filter to query the SWT for a specific routing type. If ROUTING is not specified, SWT for all routing except UNKNOWN is returned.";
-        config false;
-      }
-      leaf obm-configurable {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Indicates if the channel can be manually reconfigured using the OBM application. If DOCCARE is TRUE then the value of OBMCONFIGURABLE is not relevant.";
-        config false;
-      }
-      leaf edge-port {
-        type ciena-6500-types:STRING;
-        description
-          "The slot and port where the wavelength enters or exits the current OTS in the non line-facing direction.";
-        config false;
-      }
-      leaf cktid {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199) or user-provisionable label. 64 characters max.";
-        config false;
-      }
-      leaf derived {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Indicates if the channel is manually provisioned using the OBM application or implicitly derived from adjacency provisioning.";
-        config false;
-      }
-      leaf active {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "The channel has been added or will be automatically added if DOC Auto-Add is enabled.";
-          }
-          enum "FALSE" {
-            description
-              "The channel has been deleted or will be automatically deleted if DOC Auto-Delete is enabled.";
-          }
-          enum "UNKNOWN" {
-            description
-              "Temporary value following a restart to indicate that channel activity has not yet been determined.";
-          }
-        }
-        description
-          "A flag to request that DOC start or stop actively controlling the wavelength. This flag is not applicable when AUTOROUTE is disabled in the OTS.";
-        config false;
-      }
-      leaf mod-class {
-        type ciena-6500-enums:adjTxModClass;
-        description
-          "Modulation class of the upstream transmitter where the channel originates.";
-        config false;
-      }
-      leaf express-delete {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Indicates if express deletion is enabled for this channel. This flag is not applicable when AUTOROUTE is disabled in the OTS.";
-        config false;
-      }
-      leaf routing-rule {
-        type enumeration {
-          enum "SHORTESTPATH" {
-            description
-              "Channel built by calculating the shortest path between the Tx and Rx Adjacency. Does not support Drop and Continue applications.";
-          }
-          enum "LONGESTPATH" {
-            description
-              "Channel built by calculating the longest path between the Tx and Rx Adjacency. Supports Drop and Continue applications.";
-          }
-          enum "MANUAL" {
-            description
-              "Channel built using manually provisioned data. For future use only.";
-          }
-        }
-        description
-          "Indicates how the channel is stitched between the Tx and Rx Adjacency.";
-        config false;
-      }
-    }
-    list slot-seq {
-      key "slotseq";
-      config true;
-      leaf slotseq {
-        mandatory true;
-        description
-          "AID in format SLOTSEQ-shelf-ots-instance, SLOTSEQ-shelf-ots-ALL, SLOTSEQ-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list add-seq {
-        type ciena-6500-types:IDENT;
-        description
-          "An ordered list of \"shelf-slot\" or \"shelf-slotSsubslot\" pairs delimited by \"&\".";
-        config true;
-      }
-      leaf-list drop-seq {
-        type ciena-6500-types:IDENT;
-        description
-          "An ordered list of \"shelf-slot\" or \"shelf-slotSsubslot\" pairs delimited by \"&\".";
-        config true;
-      }
-      leaf fiber-type {
-        type ciena-6500-enums:adj_fiber;
-        description
-          "Fibre type.";
-        config true;
-      }
-      leaf validation {
-        type ciena-6500-enums:VALIDATION_OFF_ON;
-        description
-          "Validation";
-        config true;
-      }
-      leaf label {
-        type ciena-6500-types:STRING;
-        description
-          "Label";
-        config false;
-      }
-      leaf anchor {
-        type ciena-6500-types:IDENT;
-        description
-          "Anchor";
-        config false;
-      }
-      leaf intersecting-status {
-        type ciena-6500-enums:intersectingSlotseqStatus;
-        description
-          "Intersecting Slotseq Status";
-        config false;
-      }
-      leaf-list intersecting-slot-seq {
-        type ciena-6500-types:IDENT;
-        description
-          "Intersecting Slotseq List";
-        config false;
-      }
-    }
-    list tid-slot-seq {
-      key "tidslotseq";
-      config true;
-      leaf tidslotseq {
-        mandatory true;
-        description
-          "AID in format TIDSLOTSEQ-shelf-slot-port, TIDSLOTSEQ-shelf-slotSsubslot-port, TIDSLOTSEQ-shelf-ALL, TIDSLOTSEQ-shelf-slot-ALL, TIDSLOTSEQ-shelf-slotSsubslot-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf-list add-seq {
-        type ciena-6500-types:IDENT;
-        description
-          "An ordered list of \"shelf-slot\" or \"shelf-slotSsubslot\" pairs delimited by \"&\".";
-        config true;
-      }
-      leaf-list drop-seq {
-        type ciena-6500-types:IDENT;
-        description
-          "An ordered list of \"shelf-slot\" or \"shelf-slotSsubslot\" pairs delimited by \"&\".";
-        config true;
-      }
-      leaf validation {
-        type ciena-6500-enums:VALIDATION_OFF_ON;
-        description
-          "Validation";
-        config true;
-      }
-      leaf label {
-        type ciena-6500-types:STRING;
-        description
-          "Label";
-        config false;
-      }
-      leaf anchor {
-        type ciena-6500-types:IDENT;
-        description
-          "Anchor";
-        config false;
-      }
-      leaf rooteqpt {
-        type ciena-6500-types:STRING;
-        description
-          "Root Equipment";
-        config false;
-      }
-      leaf intersecting-status {
-        type ciena-6500-enums:intersectingSlotseqStatus;
-        description
-          "Intersecting Slotseq Status";
-        config false;
-      }
-      leaf-list intersecting-slot-seq {
-        type ciena-6500-types:IDENT;
-        description
-          "Intersecting Slotseq List";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-tti.yang b/models/ciena-6500-tti.yang
deleted file mode 100644
index d63c3d8bc5bc36b1c15fd1563f735a41579a4365..0000000000000000000000000000000000000000
--- a/models/ciena-6500-tti.yang
+++ /dev/null
@@ -1,404 +0,0 @@
-module ciena-6500-tti {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-tti";
-  prefix tti;
-
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's tti object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: tti-show-otm2
-       - Added rpc: tti-show-otm3
-       - Added rpc: tti-show-otm
-         container tti
-           list otm2
-           - Changed key from otm2aid to aid
-           - Removed leaf: otm2aid
-           - Added leaf: aid
-           list otm3
-           - Changed key from otm3aid to aid
-           - Removed leaf: otm3aid
-           - Added leaf: aid
-           list otm
-           - Changed key from otmaid to aid
-           - Removed leaf: otmaid
-           - Added leaf: aid";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-       - Added container: tti";
-  }
-
-  rpc tti-show-otm2 {
-    description
-      "Retrieve Trail Trace Identifier";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf msg-type {
-        type enumeration {
-          enum "EXPTTI" {
-            description
-              "Expected incoming OTU TTI message";
-          }
-          enum "RXINCTTI" {
-            description
-              "Incoming OTU TTI message";
-          }
-          enum "TXTTI" {
-            description
-              "Outgoing OTU TTI message";
-          }
-          enum "ODURXEXPTTI" {
-            description
-              "Expected incoming ODU TTI message";
-          }
-          enum "ODURXINCTTI" {
-            description
-              "Incoming ODU TTI message";
-          }
-          enum "ODUTXTTI" {
-            description
-              "Outgoing ODU TTI message";
-          }
-          enum "OTUEXSAPI" {
-            description
-              "Expected incoming OTU SAPI TTI message";
-          }
-          enum "OTURXSAPI" {
-            description
-              "Incoming OTU SAPI TTI message";
-          }
-          enum "OTUTXSAPI" {
-            description
-              "Outgoing OTU SAPI TTI message";
-          }
-          enum "OTUEXDAPI" {
-            description
-              "Expected incoming OTU DAPI TTI message";
-          }
-          enum "OTURXDAPI" {
-            description
-              "Incoming OTU DAPI TTI message";
-          }
-          enum "OTUTXDAPI" {
-            description
-              "Outgoing OTU DAPI TTI message";
-          }
-          enum "ODUEXSAPI" {
-            description
-              "Expected incoming ODU SAPI TTI message";
-          }
-          enum "ODURXSAPI" {
-            description
-              "Incoming ODU SAPI TTI message";
-          }
-          enum "ODUTXSAPI" {
-            description
-              "Outgoing ODU SAPI TTI message";
-          }
-          enum "ODUEXDAPI" {
-            description
-              "Expected incoming ODU DAPI TTI message";
-          }
-          enum "ODURXDAPI" {
-            description
-              "Incoming ODU DAPI TTI message";
-          }
-          enum "ODUTXDAPI" {
-            description
-              "Outgoing ODU DAPI TTI message";
-          }
-        }
-        description
-          "Message type to display";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf tti-message {
-          type ciena-6500-types:STRING;
-          description
-            "Trail Trace Identifier message";
-        }
-      }
-    }
-  }
-  rpc tti-show-otm3 {
-    description
-      "Retrieve Trail Trace Identifier";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf msg-type {
-        type enumeration {
-          enum "EXPTTI" {
-            description
-              "Expected incoming OTU TTI message";
-          }
-          enum "RXINCTTI" {
-            description
-              "Incoming OTU TTI message";
-          }
-          enum "TXTTI" {
-            description
-              "Outgoing OTU TTI message";
-          }
-          enum "ODURXEXPTTI" {
-            description
-              "Expected incoming ODU TTI message";
-          }
-          enum "ODURXINCTTI" {
-            description
-              "Incoming ODU TTI message";
-          }
-          enum "ODUTXTTI" {
-            description
-              "Outgoing ODU TTI message";
-          }
-          enum "OTUEXSAPI" {
-            description
-              "Expected incoming OTU SAPI TTI message";
-          }
-          enum "OTURXSAPI" {
-            description
-              "Incoming OTU SAPI TTI message";
-          }
-          enum "OTUTXSAPI" {
-            description
-              "Outgoing OTU SAPI TTI message";
-          }
-          enum "OTUEXDAPI" {
-            description
-              "Expected incoming OTU DAPI TTI message";
-          }
-          enum "OTURXDAPI" {
-            description
-              "Incoming OTU DAPI TTI message";
-          }
-          enum "OTUTXDAPI" {
-            description
-              "Outgoing OTU DAPI TTI message";
-          }
-          enum "ODUEXSAPI" {
-            description
-              "Expected incoming ODU SAPI TTI message";
-          }
-          enum "ODURXSAPI" {
-            description
-              "Incoming ODU SAPI TTI message";
-          }
-          enum "ODUTXSAPI" {
-            description
-              "Outgoing ODU SAPI TTI message";
-          }
-          enum "ODUEXDAPI" {
-            description
-              "Expected incoming ODU DAPI TTI message";
-          }
-          enum "ODURXDAPI" {
-            description
-              "Incoming ODU DAPI TTI message";
-          }
-          enum "ODUTXDAPI" {
-            description
-              "Outgoing ODU DAPI TTI message";
-          }
-        }
-        description
-          "Message type to display";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf tti-message {
-          type ciena-6500-types:STRING;
-          description
-            "Trail Trace Identifier message";
-        }
-      }
-    }
-  }
-  rpc tti-show-otm {
-    description
-      "Retrieve Trail Trace Identifier";
-    input {
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, OTM0-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf msg-type {
-        type enumeration {
-          enum "EXPTTI" {
-            description
-              "Expected incoming OTU TTI message";
-          }
-          enum "RXINCTTI" {
-            description
-              "Incoming OTU TTI message";
-          }
-          enum "TXTTI" {
-            description
-              "Outgoing OTU TTI message";
-          }
-          enum "ODURXEXPTTI" {
-            description
-              "Expected incoming ODU TTI message";
-          }
-          enum "ODURXINCTTI" {
-            description
-              "Incoming ODU TTI message";
-          }
-          enum "ODUTXTTI" {
-            description
-              "Outgoing ODU TTI message";
-          }
-          enum "OTUEXSAPI" {
-            description
-              "Expected incoming OTU SAPI TTI message";
-          }
-          enum "OTURXSAPI" {
-            description
-              "Incoming OTU SAPI TTI message";
-          }
-          enum "OTUTXSAPI" {
-            description
-              "Outgoing OTU SAPI TTI message";
-          }
-          enum "OTUEXDAPI" {
-            description
-              "Expected incoming OTU DAPI TTI message";
-          }
-          enum "OTURXDAPI" {
-            description
-              "Incoming OTU DAPI TTI message";
-          }
-          enum "OTUTXDAPI" {
-            description
-              "Outgoing OTU DAPI TTI message";
-          }
-          enum "ODUEXSAPI" {
-            description
-              "Expected incoming ODU SAPI TTI message";
-          }
-          enum "ODURXSAPI" {
-            description
-              "Incoming ODU SAPI TTI message";
-          }
-          enum "ODUTXSAPI" {
-            description
-              "Outgoing ODU SAPI TTI message";
-          }
-          enum "ODUEXDAPI" {
-            description
-              "Expected incoming ODU DAPI TTI message";
-          }
-          enum "ODURXDAPI" {
-            description
-              "Incoming ODU DAPI TTI message";
-          }
-          enum "ODUTXDAPI" {
-            description
-              "Outgoing ODU DAPI TTI message";
-          }
-        }
-        description
-          "Message type to display";
-      }
-    }
-    output {
-      list output {
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf tti-message {
-          type ciena-6500-types:STRING;
-          description
-            "Trail Trace Identifier message";
-        }
-      }
-    }
-  }
-  container tti {
-    list otm2 {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf tti-message {
-        type ciena-6500-types:STRING;
-        description
-          "Trail Trace Identifier message";
-        config false;
-      }
-    }
-    list otm3 {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf tti-message {
-        type ciena-6500-types:STRING;
-        description
-          "Trail Trace Identifier message";
-        config false;
-      }
-    }
-    list otm {
-      key "aid";
-      config false;
-      leaf aid {
-        mandatory true;
-        description
-          "AID in format OTM1-shelf-slot-port, OTM4-shelf-slot-port, OTMC2-shelf-slot-port, OTM-shelf-slot-port, OTM0-shelf-slot-port, OTMFLEX-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf tti-message {
-        type ciena-6500-types:STRING;
-        description
-          "Trail Trace Identifier message";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-types.yang b/models/ciena-6500-types.yang
deleted file mode 100644
index b776c1868177171077006d5daf80bf25bcc3e6ff..0000000000000000000000000000000000000000
--- a/models/ciena-6500-types.yang
+++ /dev/null
@@ -1,115 +0,0 @@
-module ciena-6500-types {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-types";
-  prefix ciena-6500-types;
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's release object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         typedef aid
-           type string
-           - Changed length from 1..32 to 1..80";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         typedef IPADDR
-           type string
-           - Changed length from 1..16 to 1..47";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         typedef aid
-           type string
-           - Added length: 1..32 
-         typedef STRING
-           type string
-           - Added length: 0..79 
-         typedef IDENT
-           type string
-           - Added length: 1..32 
-         typedef IPADDR
-           type string
-           - Added length: 1..16 
-         typedef DATE
-           type string
-           - Added length: 1..9 
-         typedef TIME
-           type string
-           - Added length: 1..9 
-         typedef INT
-         - Changed type from uint32 to int64
-         typedef DECIMAL
-         - Changed type from string to decimal64";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added typedef: BOOLEAN
-       - Added typedef: aid
-       - Added typedef: STRING
-       - Added typedef: IDENT
-       - Added typedef: IPADDR
-       - Added typedef: DATE
-       - Added typedef: TIME
-       - Added typedef: INT
-       - Added typedef: DECIMAL";
-  }
-
-  typedef BOOLEAN {
-    type boolean;
-  }
-
-  typedef aid {
-    type string {
-      length "1..80";
-    }
-  }
-
-  typedef STRING {
-    type string {
-      length "0..79";
-    }
-  }
-
-  typedef IDENT {
-    type string {
-      length "1..32";
-    }
-  }
-
-  typedef IPADDR {
-    type string {
-      length "1..47";
-    }
-  }
-
-  typedef DATE {
-    type string {
-      length "1..9";
-    }
-  }
-
-  typedef TIME {
-    type string {
-      length "1..9";
-    }
-  }
-
-  typedef INT {
-    type int64;
-  }
-
-  typedef DECIMAL {
-    type decimal64 {
-      fraction-digits 2;
-    }
-  }
-}
diff --git a/models/ciena-6500-upgrade.yang b/models/ciena-6500-upgrade.yang
deleted file mode 100644
index 707ee43d1c60847b1e63f7f3a8db55b2ab8f41dc..0000000000000000000000000000000000000000
--- a/models/ciena-6500-upgrade.yang
+++ /dev/null
@@ -1,1703 +0,0 @@
-module ciena-6500-upgrade {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-upgrade";
-  prefix upgrade;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's upgrade object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         rpc upgrade-check-release
-           input
-           - Added leaf: optimized
-         rpc upgrade-delete-release
-           input
-           - Removed leaf: sp1only
-         rpc upgrade-deliver-release
-           input
-           - Added leaf: optimized";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: upgrade-delete-release-server
-       - Added rpc: upgrade-show-release
-       - Added rpc: upgrade-show-adopt-eqpt
-       - Added rpc: upgrade-show-srvpack
-       - Added rpc: upgrade-apply-srvpack
-       - Added rpc: upgrade-disable-srvpack
-         rpc upgrade-check-release
-           input
-             leaf url
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..247 
-             leaf port
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf combo
-             - Added default: N 
-             - Changed type from ciena-6500-enums:BOOL_Y_N to enumeration
-               type enumeration
-               - Added enum: Y
-               - Added enum: N
-             leaf service-bundle
-               type enumeration
-               - Added enum: BB400G
-         rpc upgrade-check
-           input
-             leaf relno
-             - Added mandatory: true 
-         rpc upgrade-save-release
-           input
-             leaf relno
-             - Added mandatory: true 
-             leaf port
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-         rpc upgrade-delete-release
-           input
-           - Removed leaf: servicebundle
-           - Added leaf: service-bundle
-             leaf relno
-             - Added mandatory: true 
-             leaf minimal
-             - Added default: N 
-             - Changed type from ciena-6500-enums:BOOL_Y_N to enumeration
-               type enumeration
-               - Added enum: Y
-               - Added enum: N
-             leaf memberonly
-             - Added default: N 
-             - Changed type from ciena-6500-enums:BOOL_Y_N to enumeration
-               type enumeration
-               - Added enum: Y
-               - Added enum: N
-             leaf sp1only
-             - Added default: N 
-             - Changed type from ciena-6500-enums:BOOL_Y_N to enumeration
-               type enumeration
-               - Added enum: Y
-               - Added enum: N
-         rpc upgrade-deliver-release
-           input
-             leaf minimal
-             - Added default: N 
-             - Changed type from ciena-6500-enums:BOOL_Y_N to enumeration
-               type enumeration
-               - Added enum: Y
-               - Added enum: N
-             leaf port
-               type ciena-6500-types:INT
-               - Added range: 0..65535 
-             leaf combo
-             - Added default: N 
-             - Changed type from ciena-6500-enums:BOOL_Y_N to enumeration
-               type enumeration
-               - Added enum: Y
-               - Added enum: N
-             leaf-list service-bundle
-               type enumeration
-               - Added enum: BB400G
-         rpc upgrade-invoke
-           input
-             leaf automatic
-             - Added default: N 
-         rpc upgrade-load
-           input
-             leaf relno
-             - Added mandatory: true 
-             leaf alrms
-             - Added default: Y 
-             - Changed type from ciena-6500-enums:BOOL_Y_N to enumeration
-               type enumeration
-               - Added enum: Y
-               - Added enum: N
-         container upgrade
-         - Added list: release-server
-         - Added container: node-release
-         - Added list: adopt-eqpt
-         - Added list: srvpack
-           list release
-           - Removed key
-           - Removed leaf: bundlestatus
-           - Added leaf: bb10g
-           - Added leaf: bb100g
-           - Added leaf: bb400g
-           - Added leaf: mspp
-           - Added leaf: bb40g
-           - Added leaf: photonics
-           - Added leaf: pots
-           - Added leaf: ome-6500
-           - Added leaf: cpl
-             leaf shelf
-             - Added mandatory: true 
-           list space
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list state
-           - Changed key from all to shelf
-           - Removed leaf: all
-           - Added leaf: shelf
-           list dependency
-             leaf shelf
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container upgrade
-           list release
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: inc-service-bundle
-           - Added leaf: shelf
-           list space
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-           list state
-           - Changed key from aid to all
-           - Removed leaf: aid
-           - Removed leaf: UPGRDSTAGE
-           - Removed leaf: UPGRDRSLT
-           - Added leaf: all
-           - Added leaf: upgrdstage
-           - Added leaf: upgrdrslt
-           list dependency
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf feature
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 1..63 
-         rpc upgrade-cancel-release
-           input
-           - Changed leaf from aid to shelf
-             leaf shelf
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         rpc upgrade-cancel
-           input
-           - Changed leaf from aid to shelf
-             leaf shelf
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         rpc upgrade-check-release
-           input
-           - Removed leaf: aid
-           - Removed leaf: RELNO
-           - Added leaf: shelf
-           - Added leaf: relno
-             leaf uid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..16 
-             leaf pid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..16 
-         rpc upgrade-check
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-         rpc upgrade-commit
-           input
-           - Changed leaf from aid to shelf
-             leaf shelf
-             - Added mandatory: true 
-             - Added type: ciena-6500-types:aid
-         rpc upgrade-save-release
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf url
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..247 
-             leaf uid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..16 
-             leaf pid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..16 
-             leaf ip-addr
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..15 
-             leaf path
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..127 
-         rpc upgrade-delete-release
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf
-             leaf url
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..247 
-         rpc upgrade-deliver-release
-           input
-           - Removed leaf: aid
-           - Removed leaf: RELNO
-           - Added leaf: shelf
-           - Added leaf: relno
-             leaf url
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..247 
-             leaf uid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..16 
-             leaf pid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..16 
-             leaf ip-addr
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..15 
-             leaf path
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..127 
-             leaf-list service-bundle
-             - Changed type from bits to enumeration
-               type enumeration
-               - Added enum: MSPP
-               - Added enum: BB10G
-               - Added enum: BB40G
-               - Added enum: BB100G
-               - Added enum: PHOTONICS
-               - Added enum: POTS
-               - Added enum: 6500
-               - Added enum: CPL
-         rpc upgrade-invoke
-           input
-           - Removed leaf: aid
-           - Added leaf: slot
-         rpc upgrade-load
-           input
-           - Removed leaf: aid
-           - Added leaf: shelf";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: upgrade
-       - Added rpc: upgrade-cancel-release
-       - Added rpc: upgrade-cancel
-       - Added rpc: upgrade-check-release
-       - Added rpc: upgrade-check
-       - Added rpc: upgrade-commit
-       - Added rpc: upgrade-save-release
-       - Added rpc: upgrade-delete-release
-       - Added rpc: upgrade-deliver-release
-       - Added rpc: upgrade-invoke
-       - Added rpc: upgrade-load";
-  }
-
-  rpc upgrade-cancel-release {
-    description
-      "This command is used to cancel a DLVR-RELEASE in progress";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc upgrade-cancel {
-    description
-      "Cancel Upgrade: this command is used to back out of an upgrade before it is completed.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc upgrade-check-release {
-    description
-      "Check Release: performs pre-delivery checks for the release.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf relno {
-        type ciena-6500-types:STRING;
-        description
-          "Release Number";
-      }
-      leaf minimal {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Set of release files to be delivered. If Y, minimal will be delivered. If N, full set will be delivered. Default is N for CPL otherwise Y.";
-      }
-      leaf optimized {
-        default "N";
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Optimized set of release files to be delivered. If Y, optimized set of release files will be delivered. Default is N.";
-      }
-      leaf url {
-        type string {
-          length "0..247";
-        }
-        mandatory true;
-        description
-          "Address of server which stores loads. Full URL to remote directory inside quotes. Example: ftp://user:password@host[:port]/path/directory_name, where host must be enclosed within square brackets, i.e., [], if it is expressed as an IPv6 address. The password cannot contain the character '@'.";
-      }
-      leaf mode {
-        type enumeration {
-          enum "FTP";
-          enum "SFTP";
-        }
-        description
-          "Protocol that will be used to connect (file transfer mode).";
-      }
-      leaf ip-addr {
-        type ciena-6500-types:IPADDR;
-        description
-          "IP address of the file server.(Format: n.n.n.n)";
-      }
-      leaf uid {
-        type string {
-          length "0..16";
-        }
-        description
-          "Username that will be used when connecting to server.";
-      }
-      leaf pid {
-        type string {
-          length "0..16";
-        }
-        description
-          "Password that will be used during login.";
-      }
-      leaf port {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Port to use.";
-      }
-      leaf path {
-        type ciena-6500-types:STRING;
-        description
-          "Path";
-      }
-      leaf combo {
-        type enumeration {
-          enum "Y" {
-            description
-              "Check all product releases that are part of the combined release";
-          }
-          enum "N" {
-            description
-              "Check only the release for the shelf specific product";
-          }
-        }
-        default "N";
-        description
-          "Set of release files to be checked in the combined release. If Y, check all product releases that are part of the combined release. If N, check only the release for the shelf specific product. Default is N";
-      }
-      leaf service-bundle {
-        type enumeration {
-          enum "MSPP";
-          enum "BB10G";
-          enum "BB40G";
-          enum "BB100G";
-          enum "BB400G";
-          enum "PHOTONICS";
-          enum "POTS";
-          enum "6500";
-          enum "CPL";
-        }
-        description
-          "If any Service Bundle(s) is mentioned, then check whether the bundle loads are present in the release server.";
-      }
-    }
-  }
-  rpc upgrade-check {
-    description
-      "Check Upgrade Command: this command is used to perform a health check on the NE before running an upgrade.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf relno {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "ASCII string identifying the release number. Must be unique and fully specified - wildcarding is not allowed. Example: REL0110Z.EM";
-      }
-    }
-  }
-  rpc upgrade-commit {
-    description
-      "Commit Upgrade: this command causes the new load on the node to become the permanent load.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  rpc upgrade-save-release {
-    description
-      "Save the network element release to an external server located at the specified URL. After executing a SAV-RELEASE, it is recommended that a CHK-UPGRD command be executed.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf relno {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "ASCII string identifying the release number. Must be unique and fully specified - wildcarding is not allowed. Example: REL0110Z.EM. The same release name will be used to create the directory under the URL that was issued with command.";
-      }
-      leaf url {
-        type string {
-          length "0..247";
-        }
-        description
-          "URL specifies the external server location where the release is saved. Full URL to remote directory inside quotes. Example: ftp://user:password@host[:port]/path/directory_name, where host must be enclosed within square brackets, i.e., [], if it is expressed as an IPv6 address. The password cannot contain the character '@'.";
-      }
-      leaf mode {
-        type enumeration {
-          enum "FTP";
-          enum "SFTP";
-        }
-        description
-          "Protocol that will be used to connect (file transfer mode).";
-      }
-      leaf uid {
-        type string {
-          length "0..16";
-        }
-        description
-          "Username that will be used when connecting to server.";
-      }
-      leaf pid {
-        type string {
-          length "0..16";
-        }
-        description
-          "Password that will be used during login.";
-      }
-      leaf ip-addr {
-        type string {
-          length "0..15";
-        }
-        description
-          "IP address of the file server.";
-      }
-      leaf port {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Port to use.";
-      }
-      leaf path {
-        type string {
-          length "0..127";
-        }
-        description
-          "Path on external server where the release is saved.";
-      }
-    }
-  }
-  rpc upgrade-delete-release {
-    description
-      "Delete Release: this command is used to delete a release of a software load stored on the SP. ";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf relno {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "ASCII string identifying the release number to delete. Must be unique and fully specified - wildcarding is not allowed. Example: REL0110Z.EM";
-      }
-      leaf minimal {
-        type enumeration {
-          enum "Y" {
-            description
-              "Minimal set to be deleted";
-          }
-          enum "N" {
-            description
-              "Full set to be deleted";
-          }
-        }
-        default "N";
-        description
-          "Set of release files to be deleted. If Y, minimal set to be deleted. If N, full set to be deleted. Default is N";
-      }
-      leaf url {
-        type string {
-          length "0..247";
-        }
-        description
-          "This field is needed only to delete a committed release of an NE. URL specifies the external server location where the complete committed release is backed up. Full URL to remote directory inside quotes. Example: ftp://user:password@host[:port]/path/directory_name, where host must be enclosed within square brackets, i.e., [], if it is expressed as an IPv6 address. The password cannot contain the character '@'.";
-      }
-      leaf memberonly {
-        type enumeration {
-          enum "Y" {
-            description
-              "Delete release on member shelves only";
-          }
-          enum "N" {
-            description
-              "Delete release on all shelves including the primary shelf";
-          }
-        }
-        default "N";
-        description
-          "Option for deleting release from the member shelves only. If Y, delete release on member shelves only. If N, delete release on all shelves including the primary shelf. Default is N.";
-      }
-      leaf service-bundle {
-        type enumeration {
-          enum "MSPP";
-          enum "BB10G";
-          enum "BB40G";
-          enum "BB100G";
-          enum "BB400G";
-          enum "PHOTONICS";
-          enum "POTS";
-          enum "6500";
-          enum "CPL";
-        }
-        description
-          "If any Service Bundle(s) is mentioned, then the set of release files those are part of the mentioned bundle(s) should be deleted.If the files are part of multiple bundles, and the other bundle (which is not specified in the command) is having DLVRD status, then those files should be skipped.";
-      }
-    }
-  }
-  rpc upgrade-delete-release-server {
-    description
-      "Delete the FTP Server Information.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf server-id {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1 | 2";
-        }
-        description
-          "Server ID of the release server.";
-      }
-    }
-  }
-  rpc upgrade-deliver-release {
-    description
-      "Deliver Release: this command fetches a software load from the remote server specified in the URL into the NE's local file system, without upgrading to it.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf relno {
-        type ciena-6500-types:STRING;
-        description
-          "Release Number";
-      }
-      leaf minimal {
-        type enumeration {
-          enum "Y" {
-            description
-              "Minimal set will be delivered";
-          }
-          enum "N" {
-            description
-              "Full set will be delivered";
-          }
-        }
-        default "N";
-        description
-          "Set of release files to be delivered. If Y, minimal set will be delivered. If N, full set will be delivered. Default is N.";
-      }
-      leaf optimized {
-        type enumeration {
-          enum "Y" {
-            description
-              "Optimized set of files will be delivered";
-          }
-          enum "N" {
-            description
-              "Not requesting optimized set of files";
-          }
-        }
-        default "N";
-        description
-          "Optimized set of release files to be delivered. If Y, optimized set of release files will be delivered. Default is N.";
-      }
-      leaf url {
-        type string {
-          length "0..247";
-        }
-        description
-          "Address of server which stores loads. Full URL to remote directory inside quotes. Example: ftp://user:password@host[:port]/path/directory_name, where host must be enclosed within square brackets, i.e., [], if it is expressed as an IPv6 address. The password cannot contain the character '@'.";
-      }
-      leaf mode {
-        type enumeration {
-          enum "FTP";
-          enum "SFTP";
-        }
-        description
-          "Protocol that will be used to connect (file transfer mode).";
-      }
-      leaf uid {
-        type string {
-          length "0..16";
-        }
-        description
-          "Username that will be used when connecting to server.";
-      }
-      leaf pid {
-        type string {
-          length "0..16";
-        }
-        description
-          "Password that will be used during login.";
-      }
-      leaf ip-addr {
-        type string {
-          length "0..15";
-        }
-        description
-          "IP address of the file server.";
-      }
-      leaf port {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Port to use.";
-      }
-      leaf path {
-        type string {
-          length "0..127";
-        }
-        description
-          "Path on file server that leads to release directory.";
-      }
-      leaf craft {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Craft software delivery";
-      }
-      leaf combo {
-        type enumeration {
-          enum "Y" {
-            description
-              "Deliver all product releases that are part of the combined release";
-          }
-          enum "N" {
-            description
-              "Deliver only the release for the shelf specific product";
-          }
-        }
-        default "N";
-        description
-          "Set of release files to be delivered in the combined release. If Y, deliver all product releases that are part of the combined release. If N, deliver only the release for the shelf specific product. Default is N";
-      }
-      leaf-list service-bundle {
-        type enumeration {
-          enum "MSPP";
-          enum "BB10G";
-          enum "BB40G";
-          enum "BB100G";
-          enum "BB400G";
-          enum "PHOTONICS";
-          enum "POTS";
-          enum "6500";
-          enum "CPL";
-        }
-        description
-          "If any Service Bundle(s) is mentioned, then the set of release files those are part of the mentioned bundle(s) should be delivered";
-      }
-    }
-  }
-  rpc upgrade-invoke {
-    description
-      "Invoke Upgrade: cause the cards to begin execution of the new load.";
-    input {
-      leaf slot {
-        mandatory true;
-        description
-          "AID in format SLOT-shelf-slot, SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf automatic {
-        type enumeration {
-          enum "Y";
-          enum "N";
-        }
-        default "N";
-        description
-          "Indicates if all subtending cards will automatically begin execution of the new load. This parameter is applicable in case of cold restart only.";
-      }
-    }
-  }
-  rpc upgrade-load {
-    description
-      "Load Upgrade: causes the new shelf controller load to be downloaded into the file system.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf relno {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "ASCII string identifying the release number to activate. Must be unique and fully specified - wildcarding is not allowed. Example: REL0110Z.EM";
-      }
-      leaf alrms {
-        type enumeration {
-          enum "Y" {
-            description
-              "Upgrade should proceed only if no unexpected active alarms present";
-          }
-          enum "N" {
-            description
-              "Upgrade should proceed regardless of alarm status";
-          }
-        }
-        default "Y";
-        description
-          "Check for the presence of unexpected active alarms before proceeding with the upgrade.Default=Y (upgrade should only proceed if no unexpected active alarms present)";
-      }
-    }
-  }
-  rpc upgrade-show-release {
-    description
-      "Query Release Name(s) stored on NE";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf inc-service-bundle {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "The bundle status values are DELIVERED or RECOMMENDED depending whether they are fully delivered or recommended in the shelf.";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "Equipment reporting in format of a Shelf AID (e.g. SHELF-1)";
-        }
-        leaf version {
-          type ciena-6500-types:IDENT;
-          description
-            "Release that is present (e.g. 'REL0200P.DV')";
-        }
-        leaf status {
-          type ciena-6500-types:STRING;
-          description
-            "If the release was determined to be ('INCOMPLETE' or 'COMPLETE' or 'PARTIAL')";
-        }
-        leaf bb10g {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "BB10G service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "BB10G service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-        leaf bb100g {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "BB100G service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "BB100G service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-        leaf bb400g {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "BB400G service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "BB400G service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-        leaf mspp {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "MSPP service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "MSPP service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-        leaf bb40g {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "BB40G service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "BB40G service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-        leaf photonics {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "PHOTONICS service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "PHOTONICS service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-        leaf pots {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "POTS service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "POTS service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-        leaf ome-6500 {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "6500 service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "6500 service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-        leaf cpl {
-          type enumeration {
-            enum "DLVRD" {
-              description
-                "CPL service bundle is delivered";
-            }
-            enum "RCMD" {
-              description
-                "CPL service bundle is recommended";
-            }
-          }
-          description
-            "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        }
-      }
-    }
-  }
-  rpc upgrade-show-adopt-eqpt {
-    description
-      "Retrieve Adoptable Equipment: Retrieves the equipment adopted by a network element.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "SHELF";
-        }
-        leaf pec {
-          type ciena-6500-types:IDENT;
-          description
-            "PEC";
-        }
-        leaf version {
-          type ciena-6500-types:STRING;
-          description
-            "VERSION";
-        }
-        leaf location {
-          type ciena-6500-types:STRING;
-          description
-            "HTTP Download Location";
-        }
-        leaf eqpt-aid {
-          type ciena-6500-types:STRING;
-          description
-            "AID";
-        }
-        leaf ctype {
-          type ciena-6500-types:STRING;
-          description
-            "Card Type";
-        }
-        leaf sm {
-          type ciena-6500-types:STRING;
-          description
-            "Site Manager Supported Baseline";
-        }
-      }
-    }
-  }
-  rpc upgrade-show-srvpack {
-    description
-      "Retrieve Service Pack: Queries a network element's service packs";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "Equipment reporting in format of a Shelf AID (e.g. SHELF-1)";
-        }
-        leaf name {
-          type ciena-6500-types:IDENT;
-          description
-            "Service Pack Name";
-        }
-        leaf complete {
-          type ciena-6500-types:STRING;
-          description
-            "Completeness";
-        }
-        leaf description {
-          type ciena-6500-types:STRING;
-          description
-            "Description";
-        }
-        leaf compatible {
-          type ciena-6500-types:STRING;
-          description
-            "Compatibility with the current release";
-        }
-        leaf active {
-          type ciena-6500-types:STRING;
-          description
-            "Activated";
-        }
-        leaf optional {
-          type ciena-6500-types:STRING;
-          description
-            "Optionalilty";
-        }
-      }
-    }
-  }
-  rpc upgrade-apply-srvpack {
-    description
-      "Apply Service Pack: Activates a specified service pack.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf relno {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "ASCII string identifying the service pack to activate. Must be unique and fully specified - wildcarding is not allowed. Example: REL0110Z.EM";
-      }
-    }
-  }
-  rpc upgrade-disable-srvpack {
-    description
-      "Remove Service Pack: Deactivates a specified service pack.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf relno {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "ASCII string identifying the service pack to deactivate. Must be unique and fully specified - wildcarding is not allowed. Example: REL0110Z.EM";
-      }
-    }
-  }
-  container upgrade {
-    list release-server {
-      key "shelf";
-      config true;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf url {
-        type string {
-          length "0..247";
-        }
-        description
-          "Address of server which stores loads. Full URL to remote directory inside quotes. Example: ftp://user:password@host[:port]/path/directory_name, where host must be enclosed within square brackets, i.e., [], if it is expressed as an IPv6 address. The password cannot contain the character '@'.";
-        config true;
-      }
-      leaf server-id {
-        default "1";
-        type ciena-6500-types:INT {
-          range "1 | 2";
-        }
-        description
-          "Server ID of the release server.";
-        config true;
-      }
-      leaf status {
-        type enumeration {
-          enum "ACCESSIBLE";
-          enum "FTP_ERROR";
-        }
-        description
-          "Status of the server the last time it had been queried.";
-        config false;
-      }
-      leaf relno {
-        type ciena-6500-types:STRING;
-        description
-          "Release Number";
-        config true;
-      }
-      leaf mode {
-        type enumeration {
-          enum "FTP";
-          enum "SFTP";
-        }
-        description
-          "Protocol that will be used to connect (file transfer mode).";
-        config true;
-      }
-      leaf uid {
-        type string {
-          length "0..16";
-        }
-        description
-          "Username that will be used when connecting to server.";
-        config true;
-      }
-      leaf pid {
-        type string {
-          length "0..16";
-        }
-        description
-          "Password that will be used during login.";
-        config true;
-      }
-      leaf ip-addr {
-        type string {
-          length "0..15";
-        }
-        description
-          "IP address of the file server.";
-        config true;
-      }
-      leaf port {
-        type ciena-6500-types:INT {
-          range "0..65535";
-        }
-        description
-          "Port to use.";
-        config true;
-      }
-      leaf path {
-        type string {
-          length "0..127";
-        }
-        description
-          "Path on file server that leads to release directory.";
-        config true;
-      }
-    }
-    list release {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "Equipment reporting in format of a Shelf AID (e.g. SHELF-1) in format SHELF-shelf";
-      }
-      leaf version {
-        type ciena-6500-types:IDENT;
-        description
-          "Release that is present (e.g. 'REL0200P.DV')";
-        config false;
-      }
-      leaf status {
-        type ciena-6500-types:STRING;
-        description
-          "If the release was determined to be ('INCOMPLETE' or 'COMPLETE' or 'PARTIAL')";
-        config false;
-      }
-      leaf bb10g {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "BB10G service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "BB10G service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-      leaf bb100g {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "BB100G service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "BB100G service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-      leaf bb400g {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "BB400G service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "BB400G service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-      leaf mspp {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "MSPP service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "MSPP service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-      leaf bb40g {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "BB40G service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "BB40G service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-      leaf photonics {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "PHOTONICS service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "PHOTONICS service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-      leaf pots {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "POTS service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "POTS service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-      leaf ome-6500 {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "6500 service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "6500 service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-      leaf cpl {
-        type enumeration {
-          enum "DLVRD" {
-            description
-              "CPL service bundle is delivered";
-          }
-          enum "RCMD" {
-            description
-              "CPL service bundle is recommended";
-          }
-        }
-        description
-          "If the service bundles were determined to be delivered (DLVRD) or recommended (RCMD)";
-        config false;
-      }
-    }
-    container node-release {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        description
-          "Equipment responding";
-        config false;
-      }
-      leaf superset {
-        type ciena-6500-types:STRING;
-        description
-          "Consolidated release's name";
-        config false;
-      }
-      leaf prod {
-        type ciena-6500-types:STRING;
-        description
-          "Platform or product's name";
-        config false;
-      }
-      leaf rel {
-        type ciena-6500-types:STRING;
-        description
-          "Release name of the preceeding platform/product";
-        config false;
-      }
-    }
-    list space {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf bytes-available {
-        type ciena-6500-types:STRING;
-        description
-          "Bytes Available";
-        config false;
-      }
-    }
-    list state {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf upgrdstage {
-        type enumeration {
-          enum "DELIVER" {
-            description
-              "last command entered was DLVR-RELEASE";
-          }
-          enum "CHECK" {
-            description
-              "last command entered was CHK-UPGRD";
-          }
-          enum "LOAD" {
-            description
-              "last command entered was LOAD-UPGRD";
-          }
-          enum "INVOKE" {
-            description
-              "last command entered was INVK-UPGRD";
-          }
-          enum "1ST_INVOKE" {
-            description
-              "last command entered was INVK-UPGRD";
-          }
-          enum "2ND_INVOKE" {
-            description
-              "last command entered was INVK-UPGRD";
-          }
-          enum "COMMIT" {
-            description
-              "last command entered was CMMT-UPGRD";
-          }
-          enum "CANCEL" {
-            description
-              "last command entered was CANC-UPGRD";
-          }
-          enum "AUTOUPGRD" {
-            description
-              "Automatic upgrade in progress";
-          }
-          enum "WARMINVOKE" {
-            description
-              "Warm restart will apply loads";
-          }
-          enum "COLDINVOKE" {
-            description
-              "Cold restart will apply loads";
-          }
-          enum "DELETE";
-          enum "INACTIVE" {
-            description
-              "no upgrade operation currently active";
-          }
-          enum "CHECK_RELEASE" {
-            description
-              "ast command entered was CHK-RELEASE";
-          }
-          enum "APPLY" {
-            description
-              "last command entered was APPLY-SRVPACK";
-          }
-          enum "REMOVE" {
-            description
-              "last command entered was RMV-SRVPACK";
-          }
-          enum "SLOT_CHECK" {
-            description
-              "All slots check is in progress";
-          }
-        }
-        description
-          "Upgrade Stage";
-        config false;
-      }
-      leaf upgrdrslt {
-        type enumeration {
-          enum "PASS" {
-            description
-              "upgrade stage passed";
-          }
-          enum "FAIL" {
-            description
-              "upgrade stage failed";
-          }
-          enum "INPROGRESS" {
-            description
-              "upgrade stage in progress";
-          }
-          enum "IDLE" {
-            description
-              "Waiting for user input";
-          }
-          enum "STANDBY" {
-            description
-              "Waiting for other checkpoints to complete";
-          }
-          enum "READY" {
-            description
-              "Invoke command may now be used to invoke this individual slot.";
-          }
-          enum "AVAILABLE" {
-            description
-              "Slot has an opportunistic load which may be applied by user restarting the card.";
-          }
-        }
-        description
-          "Result";
-        config false;
-      }
-      leaf release {
-        type ciena-6500-types:STRING;
-        description
-          "Release currently running on NE";
-        config false;
-      }
-      leaf upgrading-from {
-        type ciena-6500-types:STRING;
-        description
-          "Release being upgraded from";
-        config false;
-      }
-      leaf upgrading-to {
-        type ciena-6500-types:STRING;
-        description
-          "Release being upgraded to";
-        config false;
-      }
-      leaf delivering-to {
-        type ciena-6500-types:STRING;
-        description
-          "Release being delivered";
-        config false;
-      }
-      leaf saving-release {
-        type ciena-6500-types:STRING;
-        description
-          "Release being saved";
-        config false;
-      }
-      leaf deleting-release {
-        type ciena-6500-types:STRING;
-        description
-          "Release being deleted";
-        config false;
-      }
-      leaf applying {
-        type ciena-6500-types:STRING;
-        description
-          "Service pack being applied";
-        config false;
-      }
-      leaf removing {
-        type ciena-6500-types:STRING;
-        description
-          "Service pack being deactivated";
-        config false;
-      }
-    }
-    list dependency {
-      key "shelf";
-      config false;
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf feature {
-        type string {
-          length "1..63";
-        }
-        description
-          "Feature description";
-        config false;
-      }
-      leaf status {
-        type enumeration {
-          enum "SATISFIED" {
-            description
-              "Opportunistic load has been applied";
-          }
-          enum "UNSATISFIED" {
-            description
-              "Opportunistic load has not been applied";
-          }
-        }
-        description
-          "Status";
-        config false;
-      }
-    }
-    list adopt-eqpt {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "SHELF in format SHELF-shelf";
-      }
-      leaf pec {
-        type ciena-6500-types:IDENT;
-        description
-          "PEC";
-        config false;
-      }
-      leaf version {
-        type ciena-6500-types:STRING;
-        description
-          "VERSION";
-        config false;
-      }
-      leaf location {
-        type ciena-6500-types:STRING;
-        description
-          "HTTP Download Location";
-        config false;
-      }
-      leaf eqpt-aid {
-        type ciena-6500-types:STRING;
-        description
-          "AID";
-        config false;
-      }
-      leaf ctype {
-        type ciena-6500-types:STRING;
-        description
-          "Card Type";
-        config false;
-      }
-      leaf sm {
-        type ciena-6500-types:STRING;
-        description
-          "Site Manager Supported Baseline";
-        config false;
-      }
-    }
-    list srvpack {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "Equipment reporting in format of a Shelf AID (e.g. SHELF-1) in format SHELF-shelf";
-      }
-      leaf name {
-        type ciena-6500-types:IDENT;
-        description
-          "Service Pack Name";
-        config false;
-      }
-      leaf complete {
-        type ciena-6500-types:STRING;
-        description
-          "Completeness";
-        config false;
-      }
-      leaf description {
-        type ciena-6500-types:STRING;
-        description
-          "Description";
-        config false;
-      }
-      leaf compatible {
-        type ciena-6500-types:STRING;
-        description
-          "Compatibility with the current release";
-        config false;
-      }
-      leaf active {
-        type ciena-6500-types:STRING;
-        description
-          "Activated";
-        config false;
-      }
-      leaf optional {
-        type ciena-6500-types:STRING;
-        description
-          "Optionalilty";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-user.yang b/models/ciena-6500-user.yang
deleted file mode 100644
index ec53e92e936ed917a68e5fc980bb1cc433495c3e..0000000000000000000000000000000000000000
--- a/models/ciena-6500-user.yang
+++ /dev/null
@@ -1,314 +0,0 @@
-module ciena-6500-user {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-user";
-  prefix user;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's user object for the 6500 platform";
-
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: user-show-session
-         container user
-           list session
-           - Removed key
-             leaf shelf
-             - Added mandatory: true 
-             leaf timeout
-               type ciena-6500-types:INT
-               - Added range: 0..99 
-             leaf user-type
-               type enumeration
-               - Added enum: TACACS
-               - Added enum: GRPC
-             leaf session
-               type ciena-6500-types:INT
-               - Added range: 1..999999 
-             leaf interface
-               type enumeration
-               - Added enum: HTTP
-               - Added enum: GRPC";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container user
-           list session
-           - Changed key from aid to shelf
-           - Removed leaf: aid
-           - Removed leaf: extra-info
-           - Removed leaf: act-ses-only
-           - Added leaf: shelf
-             leaf active
-             - Changed type from ciena-6500-types:BOOLEAN to ciena-6500-enums:BOOL_Y_N";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: user";
-  }
-
-  rpc user-show-session {
-    description
-      "Retrieve Active User: Used to list all users logged in to a Network Element.";
-    input {
-      leaf shelf {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf";
-        type ciena-6500-types:aid;
-      }
-      leaf extra-info {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Request extra info to be displayed";
-      }
-      leaf act-ses-only {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "Request to retrieve active (logged in) session only";
-      }
-    }
-    output {
-      list output {
-        leaf shelf {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf uid {
-          type ciena-6500-types:IDENT;
-          description
-            "User Identifier.";
-        }
-        leaf upc {
-          type ciena-6500-enums:UPC;
-          description
-            "User Privilege Code";
-        }
-        leaf timeout {
-          type ciena-6500-types:INT {
-            range "0..99";
-          }
-          description
-            "Timeout interval in minutes";
-        }
-        leaf user-type {
-          type enumeration {
-            enum "LOCAL" {
-              description
-                "local";
-            }
-            enum "NETWORK" {
-              description
-                "network";
-            }
-            enum "CHALRES" {
-              description
-                "challenge-response";
-            }
-            enum "TACACS" {
-              description
-                "TACACS";
-            }
-            enum "GRPC" {
-              description
-                "gRPC";
-            }
-          }
-          description
-            "User account type. 0 = local, 1 = network";
-        }
-        leaf active {
-          type ciena-6500-enums:BOOL_Y_N;
-          description
-            "\"Y\" indicates the current user and session";
-        }
-        leaf port-type {
-          type ciena-6500-types:STRING;
-          description
-            "Protocol";
-        }
-        leaf port-addr {
-          type ciena-6500-types:STRING;
-          description
-            "Originating address for an IP or NSAP port ";
-        }
-        leaf session {
-          type ciena-6500-types:INT {
-            range "1..999999";
-          }
-          description
-            "The session ID in NE";
-        }
-        leaf interface {
-          type enumeration {
-            enum "TL1" {
-              description
-                "TL1";
-            }
-            enum "FTP" {
-              description
-                "FTP";
-            }
-            enum "SHELL" {
-              description
-                "General Utilities";
-            }
-            enum "CLI" {
-              description
-                "Command line interface";
-            }
-            enum "HTTP" {
-              description
-                "REST interface";
-            }
-            enum "GRPC" {
-              description
-                "gRPC interface";
-            }
-          }
-          description
-            "Indicates which application the user is logged into.";
-        }
-        leaf sid {
-          type ciena-6500-types:STRING;
-          description
-            "System Identifier of Accessing Node";
-        }
-      }
-    }
-  }
-  container user {
-    list session {
-      config false;
-      leaf shelf {
-        type ciena-6500-types:IDENT;
-        mandatory true;
-        description
-          "aid in format SHELF-shelf";
-      }
-      leaf uid {
-        type ciena-6500-types:IDENT;
-        description
-          "User Identifier.";
-        config false;
-      }
-      leaf upc {
-        type ciena-6500-enums:UPC;
-        description
-          "User Privilege Code";
-        config false;
-      }
-      leaf timeout {
-        type ciena-6500-types:INT {
-          range "0..99";
-        }
-        description
-          "Timeout interval in minutes";
-        config false;
-      }
-      leaf user-type {
-        type enumeration {
-          enum "LOCAL" {
-            description
-              "local";
-          }
-          enum "NETWORK" {
-            description
-              "network";
-          }
-          enum "CHALRES" {
-            description
-              "challenge-response";
-          }
-          enum "TACACS" {
-            description
-              "TACACS";
-          }
-          enum "GRPC" {
-            description
-              "gRPC";
-          }
-        }
-        description
-          "User account type. 0 = local, 1 = network";
-        config false;
-      }
-      leaf active {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "\"Y\" indicates the current user and session";
-        config false;
-      }
-      leaf port-type {
-        type ciena-6500-types:STRING;
-        description
-          "Protocol";
-        config false;
-      }
-      leaf port-addr {
-        type ciena-6500-types:STRING;
-        description
-          "Originating address for an IP or NSAP port ";
-        config false;
-      }
-      leaf session {
-        type ciena-6500-types:INT {
-          range "1..999999";
-        }
-        description
-          "The session ID in NE";
-        config false;
-      }
-      leaf interface {
-        type enumeration {
-          enum "TL1" {
-            description
-              "TL1";
-          }
-          enum "FTP" {
-            description
-              "FTP";
-          }
-          enum "SHELL" {
-            description
-              "General Utilities";
-          }
-          enum "CLI" {
-            description
-              "Command line interface";
-          }
-          enum "HTTP" {
-            description
-              "REST interface";
-          }
-          enum "GRPC" {
-            description
-              "gRPC interface";
-          }
-        }
-        description
-          "Indicates which application the user is logged into.";
-        config false;
-      }
-      leaf sid {
-        type ciena-6500-types:STRING;
-        description
-          "System Identifier of Accessing Node";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-voas.yang b/models/ciena-6500-voas.yang
deleted file mode 100644
index 350a8a61eb084e7b8e21661f251bc2ff5b9013d3..0000000000000000000000000000000000000000
--- a/models/ciena-6500-voas.yang
+++ /dev/null
@@ -1,262 +0,0 @@
-module ciena-6500-voas {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-voas";
-  prefix voas;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's voas object for the 6500 platform";
-
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container voas
-           list voa
-             leaf-list sst
-               type enumeration
-               - Added enum: TSRECIRC";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-         container voas
-           list voa
-             leaf voa
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf mode
-             - Added default: TOP 
-             leaf-list sst
-             - Changed type from ciena-6500-enums:SSTfac to enumeration
-               type enumeration
-               - Added enum: AINS
-               - Added enum: AINS-DEA
-               - Added enum: BRIDGED
-               - Added enum: SWITCHED
-               - Added enum: ROLL
-               - Added enum: ACT
-               - Added enum: IDLE
-               - Added enum: STBYS
-               - Added enum: WRK
-               - Added enum: ERRANL
-               - Added enum: PSI
-               - Added enum: FLT
-               - Added enum: MEA
-               - Added enum: TSTF
-               - Added enum: UEQ
-               - Added enum: SGEO
-               - Added enum: DISCD
-               - Added enum: LPBK
-               - Added enum: TS
-               - Added enum: FAF
-               - Added enum: STBYH
-               - Added enum: WRKRX
-               - Added enum: WRKTX
-               - Added enum: PRTCL
-               - Added enum: UAS
-               - Added enum: NOSITE
-               - Added enum: NOAM
-               - Added enum: MON
-               - Added enum: MSC
-               - Added enum: PROTECTED
-               - Added enum: MT
-               - Added enum: DSBLD
-               - Added enum: INHIP
-               - Added enum: L2DSBLD
-               - Added enum: TSGEN
-               - Added enum: TSMON";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-       - Added container: voas
-       - Added rpc: voas-disable-voa
-       - Added rpc: voas-enable-voa";
-  }
-
-  rpc voas-disable-voa {
-    description
-      "Removes the VOA Optical Facility from service.";
-    input {
-      leaf voa {
-        mandatory true;
-        description
-          "AID in format VOA-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf sst {
-        type ciena-6500-enums:RMVSSTMT;
-        description
-          "Remove facility from Maintenance State";
-      }
-    }
-  }
-  rpc voas-enable-voa {
-    description
-      "Restores the VOA Optical Facility to service.";
-    input {
-      leaf voa {
-        mandatory true;
-        description
-          "AID in format VOA-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-    }
-  }
-  container voas {
-    list voa {
-      key "voa";
-      config true;
-      leaf voa {
-        mandatory true;
-        description
-          "AID in format VOA-shelf-slot-port, VOA-shelf-ALL, VOA-shelf-slot-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf mode {
-        type enumeration {
-          enum "LOSS" {
-            description
-              "Control to Loss Mode.";
-          }
-          enum "TOP" {
-            description
-              "Control to Power Mode.";
-          }
-        }
-        default "TOP";
-        description
-          "Control Mode of the VOA.";
-        config true;
-      }
-      leaf targ-loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Target Loss in dB.";
-        config true;
-      }
-      leaf targ-power {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Target Power in dBm.";
-        config true;
-      }
-      leaf avg-targ-power {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Average Wavlength Target Power in dBm.";
-        config true;
-      }
-      leaf targ-peak-power {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Target peak Power in dBm.";
-        config true;
-      }
-      leaf los-thresh {
-        type ciena-6500-types:INT;
-        description
-          "Loss of Signal Threshold";
-        config true;
-      }
-      leaf voa-reset-required {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Indicates whether VOA is to be reset by DOC";
-        config true;
-      }
-      leaf targ-pad {
-        type ciena-6500-types:STRING;
-        description
-          "Defines the total loss targeted on the span or mid-stage";
-        config true;
-      }
-      leaf pst {
-        type ciena-6500-enums:PSTfac_RTRV;
-        description
-          "Identify the primary state";
-        config true;
-      }
-      leaf-list sst {
-        type enumeration {
-          enum "AINS" {
-            description
-              "Auto-In-Service(This value can be used in create and edit operations)";
-          }
-          enum "AINS-DEA" {
-            description
-              "Auto-In-Service Deactivate(This value can be used in create and edit operations)";
-          }
-          enum "BRIDGED" {
-            description
-              "Transition from switched to bridged";
-          }
-          enum "SWITCHED" {
-            description
-              "Transition from bridged to switched";
-          }
-          enum "ROLL";
-          enum "ACT";
-          enum "IDLE";
-          enum "STBYS";
-          enum "WRK";
-          enum "ERRANL";
-          enum "PSI";
-          enum "FLT";
-          enum "MEA";
-          enum "TSTF";
-          enum "UEQ";
-          enum "SGEO";
-          enum "DISCD";
-          enum "LPBK";
-          enum "TS";
-          enum "FAF";
-          enum "STBYH";
-          enum "WRKRX";
-          enum "WRKTX";
-          enum "PRTCL";
-          enum "UAS";
-          enum "NOSITE";
-          enum "NOAM";
-          enum "MON";
-          enum "MSC";
-          enum "PROTECTED";
-          enum "MT" {
-            description
-              "Maintenance(This value can be used in create operation)";
-          }
-          enum "DSBLD";
-          enum "INHIP";
-          enum "L2DSBLD";
-          enum "TSGEN";
-          enum "TSMON";
-          enum "TSRECIRC";
-        }
-        description
-          "Identify the secondary state";
-        config true;
-      }
-      leaf loss {
-        type ciena-6500-types:DECIMAL;
-        description
-          "Actual measured attenuation introduced by the VOA in dB.";
-        config false;
-      }
-      leaf ains-time-left {
-        type ciena-6500-types:TIME;
-        description
-          "The format will be \"HH-MM\" for the time left in AINS timeout.";
-        config false;
-      }
-    }
-  }
-}
diff --git a/models/ciena-6500-xconn.yang b/models/ciena-6500-xconn.yang
deleted file mode 100644
index a80d11610c047e4bdf5d9cf6d212c8091310cf32..0000000000000000000000000000000000000000
--- a/models/ciena-6500-xconn.yang
+++ /dev/null
@@ -1,2701 +0,0 @@
-module ciena-6500-xconn {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-6500-xconn";
-  prefix xconn;
-
-  import ciena-6500-enums {
-    prefix ciena-6500-enums;
-  }
-  import ciena-6500-types {
-    prefix ciena-6500-types;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com";
-  description
-    "This modules describes Ciena's xconn object for the 6500 platform";
-
-  revision 2018-07-23 {
-    description
-      "6500 Release 12.30 XM
-         container xconn
-           list mc-ttp
-           - Added leaf: cc-mode";
-  }
-  revision 2017-12-18 {
-    description
-      "6500 Release 12.20 PX
-         container xconn
-           list mc-ttp
-             leaf min-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-             leaf max-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-             leaf target-min-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-             leaf target-max-freq
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000
-           list nmc
-             leaf frequency
-               type decimal64
-               - Changed range from 191.325000..196.125000 to 186.325000..190.975000 | 191.325000..196.125000";
-  }
-  revision 2017-09-18 {
-    description
-      "6500 Release 12.10 FX
-       - Added rpc: xconn-show-crs-all
-       - Added rpc: xconn-show-crs-count
-       - Added rpc: xconn-delete-crs-otm2
-       - Added rpc: xconn-show-crs-otm2
-       - Added rpc: xconn-delete-odu
-       - Added rpc: xconn-delete-crs-ctp
-       - Added rpc: xconn-show-roll-all
-       - Added rpc: xconn-show-timeslot-highorder
-       - Added rpc: xconn-show-timeslot-loworder
-       - Added rpc: xconn-delete-fcc-row
-       - Added rpc: xconn-delete-oductp
-       - Added rpc: xconn-show-oductp
-       - Added rpc: xconn-delete-och
-         container xconn
-         - Added container: crs
-         - Added container: roll
-         - Added container: timeslot
-         - Added list: fcc
-         - Added list: fcc-row
-         - Added list: oductp
-           list odu
-             leaf fromaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf toaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf cct
-             - Added default: 2WAY 
-             leaf swmatetsprov
-             - Added default: AUTO 
-             - Changed config from false to true
-             leaf fromtsprov
-             - Added default: AUTO 
-             - Changed config from false to true
-             leaf totsprov
-             - Added default: AUTO 
-             - Changed config from false to true
-           list phys
-             leaf fromaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf toaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf cct
-             - Changed type from ciena-6500-enums:CCT to ciena-6500-enums:CCT_default2WAY
-           list och
-           - Removed leaf: broadcast
-             leaf fromaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf toaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf cct
-             - Added default: 2WAY 
-             leaf active
-             - Added default: TRUE 
-             leaf express-delete
-             - Added default: FALSE 
-             leaf auto-delete
-             - Added default: FALSE 
-             leaf snc-incarn
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf frequency
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf port-trail
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..521 
-           list loopback-ready
-             leaf cmdeqptaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf lineeqptaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-           list mc-ttp
-           - Changed key from mcttp to mc-ttp
-           - Removed leaf: mcttp
-           - Added leaf: mc-ttp
-             leaf connection-type
-             - Added default: 2WAY 
-               type enumeration
-               - Added enum: 1WAYBLOCKED
-               - Added enum: 2WAYBLOCKED
-             leaf min-freq
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf max-freq
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf min-freq-deadband
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.000..4800.000 
-             leaf max-freq-deadband
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 0.000..4800.000 
-             leaf mc-bias
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -10.00..10.00 
-             leaf auto-delete
-             - Added default: FALSE 
-             leaf target-min-freq
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf target-max-freq
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf sncg-incarn
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-           list nmc
-           - Added leaf: paired-adj-tx-bias
-           - Added leaf: paired-adj-tx-type
-           - Added leaf: paired-adj-tx-mod-class
-           - Added leaf: paired-adj-tx-class
-           - Added leaf: paired-adj-tx-rate
-           - Added leaf: paired-adj-tx-sig-bw-3dB
-           - Added leaf: paired-adj-tx-sig-bw-10dB
-           - Added leaf: ctrl-freq-offset
-           - Added leaf: paired-ctrl-freq-offset
-           - Added leaf: trans-mode
-           - Added leaf: paired-trans-mode
-           - Added leaf: paired-source-port
-           - Added leaf: paired-source-form
-             leaf fromaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf toaid
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:IDENT to ciena-6500-types:aid
-             leaf cct
-             - Added default: 2WAY 
-             leaf frequency
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 191.325000..196.125000 
-             leaf width
-             - Added mandatory: true 
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 12.500..4800.000 
-             leaf cktid
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..64 
-             leaf active
-             - Added default: FALSE 
-             leaf snc-incarn
-               type ciena-6500-types:INT
-               - Added range: 1..65535 
-             leaf port-trail
-             - Changed type from ciena-6500-types:STRING to string
-               type string
-               - Added length: 0..521 
-             leaf dest-port
-             - Changed config from true to false
-             leaf dest-port-form
-             - Changed config from true to false
-             leaf adj-tx-bias
-             - Added default: 0.00 
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: -10.00..10.00 
-             leaf adj-tx-type
-             - Changed type from ciena-6500-enums:TXRXTYPES to ciena-6500-types:STRING
-             leaf adj-tx-rate
-             - Added default: UNKNOWN 
-             leaf adj-tx-sig-bw-3dB
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 12.500..4800.000 
-             leaf adj-tx-sig-bw-10dB
-             - Changed type from ciena-6500-types:DECIMAL to decimal64
-               type decimal64
-               - Added range: 12.500..4800.000 ";
-  }
-  revision 2016-09-23 {
-    description
-      "6500 Release 11.60 TU
-         container xconn
-         - Added list: och
-         - Added list: loopback-ready
-         - Added list: mc-ttp
-         - Added list: nmc";
-  }
-  revision 2016-07-21 {
-    description
-      "6500 Release 11.20 SV
-         container xconn
-         - Added list: odu
-           list phys
-           - Changed key from aid to fromaid toaid
-           - Removed leaf: aid
-           - Added leaf: fromaid
-             leaf toaid
-             - Removed config";
-  }
-  revision 2015-11-04 {
-    description
-      "6500 Release 10.30 JH
-       - Added container: xconn";
-  }
-
-  rpc xconn-show-crs-all {
-    description
-      "Retrieve provisioned cross connections";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf conn-type {
-        type ciena-6500-enums:CCT_default2WAY;
-        description
-          "Cross-Connect Type: Used for specifying one or two way connections";
-      }
-      leaf display {
-        type enumeration {
-          enum "PROV" {
-            description
-              "Retrieves provisioned cross-connects";
-          }
-          enum "ACT" {
-            description
-              "Activity of connection paths that are part of UPSR/SNCP provisioned cross-connect.";
-          }
-        }
-        description
-          "Display mode for connections";
-      }
-      leaf ckt-id {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.if CKTID=ALL, all connections are retrieved, regardless of their CKTID value.";
-      }
-    }
-    output {
-      list output {
-        leaf fromaid {
-          type ciena-6500-types:IDENT;
-          description
-            "fromaid";
-        }
-        leaf toaid {
-          type ciena-6500-types:IDENT;
-          description
-            "toaid";
-        }
-        leaf conn-type {
-          type ciena-6500-enums:CCT_default2WAY;
-          description
-            "Cross-Connect Type: Used for specifying one or two way connections";
-        }
-        leaf primary-xc {
-          type enumeration {
-            enum "SHELF" {
-              description
-                "The cross connection is made on shelf cross connect cards in slot 7 or 8";
-            }
-            enum "LOCAL" {
-              description
-                "The cross connection is made locally on the port cards";
-            }
-          }
-          description
-            "Cross-Connect Type: Used for specifying whether the cross connection uses shelf cross connect cards";
-        }
-        leaf sw-mate {
-          type ciena-6500-types:IDENT;
-          description
-            "Path Protection Switch Mate. Specifies the switch mate path endpoint used as the protection input signal for the fromaid. This parameter is provided at the destination end node.";
-        }
-        leaf dswmate {
-          type ciena-6500-types:IDENT;
-          description
-            "Path Protection Destination Mate. Specifies the destinations mate path endpoint used as the protection output signal for the toaid. This parameter is provided at the destination end node.";
-        }
-        leaf revertive {
-          type enumeration {
-            enum "N" {
-              description
-                "Path protection is non-revertive.";
-            }
-            enum "Y" {
-              description
-                "Path protection is revertive.";
-            }
-          }
-          description
-            "Revertive Path Protection switching supported.";
-        }
-        leaf guard-time {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..100";
-          }
-          description
-            "Guardtime specifies a holdoff time for path protection switch activation. Values are 0 to 100 representing 0 to 10.0 seconds in 0.1 second increments.";
-        }
-        leaf ckt-id {
-          type ciena-6500-types:STRING;
-          description
-            "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.if CKTID=ALL, all connections are retrieved, regardless of their CKTID value.";
-        }
-        leaf aend {
-          type ciena-6500-types:INT {
-            range "0..23";
-          }
-          description
-            "APS ID of AID originating node for BLSR systems. An integer between 0 and 23.";
-        }
-        leaf zend {
-          type ciena-6500-types:INT {
-            range "0..23";
-          }
-          description
-            "APS ID of AID terminating node for BLSR systems. An integer between 0 and 23.";
-        }
-        leaf fromenut {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "";
-        }
-        leaf toenut {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "";
-        }
-        leaf from-extra-traffic {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Extra Traffic";
-        }
-        leaf to-extra-traffic {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Extra Traffic";
-        }
-        leaf prime {
-          type enumeration {
-            enum "OSS" {
-              description
-                "Operation Support System Owned";
-            }
-            enum "CPS" {
-              description
-                "Control Plane System Owned";
-            }
-          }
-          description
-            "The default owner of payloads created for the connection";
-        }
-        leaf rate {
-          type ciena-6500-types:STRING;
-          description
-            "Connection Rate";
-        }
-      }
-    }
-  }
-  rpc xconn-show-crs-count {
-    description
-      "Retrieve Provisioned Connection Count - displays the number of cross-connects, by rate.";
-    input {
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format 10G-shelf-slot, 10G-shelf-ALL, 2G5-shelf-slot, 2G5-shelf-ALL, 155622M-shelf-slot, 155622M-shelf-ALL, GE-shelf-slot, GE-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, FE-shelf-slot, FE-shelf-ALL, L2RPR-shelf-slot, L2RPR-shelf-ALL, MXC-shelf-slot, MXC-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, 40GXCIF-shelf-slot, 40GXCIF-shelf-ALL, MRO-shelf-slot, MRO-shelf-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf rate {
-        type ciena-6500-enums:CRS_RATE;
-        description
-          "Cross-Connect Rate";
-      }
-    }
-    output {
-      list output {
-        leaf eqpt {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf rate {
-          type ciena-6500-enums:CRS_RATE;
-          description
-            "Cross-Connect Rate";
-        }
-        leaf count {
-          type ciena-6500-types:INT;
-          description
-            "Number of provisioned cross-connects of this rate.";
-        }
-      }
-    }
-  }
-  rpc xconn-delete-crs-otm2 {
-    description
-      "Deprovision a transparent traffic connection";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, OC192-shelf-slot-port, ETH10G-shelf-slot-port, FC1200-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port, OC192-shelf-slot-port, ETH10G-shelf-slot-port, FC1200-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf conn-type {
-        default "2WAY";
-        type ciena-6500-enums:CCT_OTM2;
-        description
-          "Transparent traffic Connection Type: Used for specifying one or two way connections";
-      }
-      leaf cktid {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.";
-      }
-    }
-  }
-  rpc xconn-show-crs-otm2 {
-    description
-      "Retrieve provisioned transparent traffic connections";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format OTM2-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf conn-type {
-        type ciena-6500-enums:CCT_OTM2;
-        description
-          "Transparent traffic connection Type: Used for specifying one or two way connections";
-      }
-    }
-    output {
-      list output {
-        leaf fromaid {
-          type ciena-6500-types:IDENT;
-          description
-            "fromaid";
-        }
-        leaf toaid {
-          type ciena-6500-types:IDENT;
-          description
-            "toaid";
-        }
-        leaf conn-type {
-          type ciena-6500-enums:CCT_OTM2;
-          description
-            "Transparent traffic connection Type: Used for specifying one or two way connections";
-        }
-      }
-    }
-  }
-  rpc xconn-delete-odu {
-    description
-      "Delete an ODU Cross Connection";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU2-shelf-slot-port-index, ODU3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU2-shelf-slot-port-index, ODU3-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf cct {
-        type ciena-6500-enums:CCT_CRSODU;
-        description
-          "Traffic Connection Type: Used for specifying two way connections or protected two way connections";
-      }
-      leaf swmate {
-        type ciena-6500-types:aid;
-        description
-          "Path Protection Switch Mate. Specifies the switch mate path endpoint used as the protection input signal for the fromaid.";
-      }
-      leaf cktid {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.";
-      }
-      leaf fromtsprov {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "The Rx trib slot is auto-detected by system.";
-          }
-          enum "MANUAL" {
-            description
-              "The Rx trib slot is user specified.";
-          }
-        }
-        description
-          "tribSlots provisioning mode associated with FROM end point.";
-      }
-      leaf totsprov {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "The Rx trib slot is auto-detected by system.";
-          }
-          enum "MANUAL" {
-            description
-              "The Rx trib slot is user specified ";
-          }
-        }
-        description
-          "tribSlots provisioning mode associated with TO end point.";
-      }
-      leaf swmatetsprov {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "The Rx trib slot is auto-detected by system.";
-          }
-          enum "MANUAL" {
-            description
-              "The Rx trib slot is user specified.";
-          }
-        }
-        description
-          "tribSlots provisioning mode associated with SWMATE end point.";
-      }
-      leaf fromtsassignment {
-        type ciena-6500-types:STRING;
-        description
-          "Assigned Tributary Slots(HEX) associated with FROM end point.";
-      }
-      leaf totsassignment {
-        type ciena-6500-types:STRING;
-        description
-          "Assigned Tributary Slots(HEX) associated with TO end point.";
-      }
-      leaf swmatetsassignment {
-        type ciena-6500-types:STRING;
-        description
-          "Assigned Tributary Slots(HEX) associated with SWMATE end point.";
-      }
-    }
-  }
-  rpc xconn-delete-crs-ctp {
-    description
-      "Delete a generic cross connection";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format CTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format CTP-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf conn-type {
-        type ciena-6500-enums:CCT_ODU;
-        description
-          "Traffic Connection Type: Used for specifying one or two way connections";
-      }
-      leaf ckt-id {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.";
-      }
-    }
-  }
-  rpc xconn-show-roll-all {
-    description
-      "Retrieve All Rollovers";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf conn-type {
-        type ciena-6500-enums:CCT_default2WAY;
-        description
-          "Cross-Connect Type: Used for specifying one or two way connections";
-      }
-      leaf rfrom {
-        type ciena-6500-types:IDENT;
-        description
-          "The endpoint Rollover Operation rolling from";
-      }
-      leaf rto {
-        type ciena-6500-types:IDENT;
-        description
-          "The endpoint Rollover Operation rolling to";
-      }
-      leaf ckt-id {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max. if CKTID=ALL, all connections are retrieved, regardless of their CKTID value.";
-      }
-    }
-    output {
-      list output {
-        leaf fromaid {
-          type ciena-6500-types:IDENT;
-          description
-            "fromaid";
-        }
-        leaf toaid {
-          type ciena-6500-types:IDENT;
-          description
-            "toaid";
-        }
-        leaf conn-type {
-          type ciena-6500-enums:CCT_default2WAY;
-          description
-            "Cross-Connect Type: Used for specifying one or two way connections";
-        }
-        leaf rollover-from-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "The endpoint Rollover Operation rolling from/or source endpoint affected by SWMATE Rollover";
-        }
-        leaf rollover-to-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "The endpoint Rollover Operation rolling to//or source endpoint affected by SWMATE Rollover";
-        }
-        leaf rollover-status {
-          type enumeration {
-            enum "BRIDGED" {
-              description
-                "Bridged state";
-            }
-            enum "SWITCHED" {
-              description
-                "Switched state";
-            }
-            enum "IDLE" {
-              description
-                "Idle state";
-            }
-          }
-          description
-            "Rollover Status.";
-        }
-        leaf swmate-roll-from-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "The Switch Mate to Rollover from.";
-        }
-        leaf swmate-roll-to-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "The Switch Mate to Rollover to.";
-        }
-        leaf swmate-roll-over-status {
-          type enumeration {
-            enum "BRIDGED" {
-              description
-                "Bridged state";
-            }
-            enum "SWITCHED" {
-              description
-                "Switched state";
-            }
-            enum "IDLE" {
-              description
-                "Idle state";
-            }
-          }
-          description
-            "Switch Mate Rollover Status.";
-        }
-      }
-    }
-  }
-  rpc xconn-show-timeslot-highorder {
-    description
-      "Retrieve High-order Backplane Timeslots";
-    input {
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format FE-shelf-slot, FE-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf min_ts {
-        default "1";
-        type ciena-6500-types:INT;
-        description
-          "First timeslot to query";
-      }
-      leaf max_ts {
-        type ciena-6500-types:INT;
-        description
-          "Last timeslot to query";
-      }
-    }
-    output {
-      list output {
-        leaf eqpt {
-          type ciena-6500-types:IDENT;
-          description
-            "Card AID";
-        }
-        leaf ts {
-          type ciena-6500-types:STRING;
-          description
-            "Timeslot";
-        }
-        leaf rate {
-          type ciena-6500-types:STRING;
-          description
-            "Payload Rate";
-        }
-        leaf payload-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "Payload AID";
-        }
-        leaf num-vt1.5 {
-          type ciena-6500-types:INT;
-          description
-            "Number of VT1.5 payloads provisioned in the timeslot";
-        }
-        leaf num-vt2 {
-          type ciena-6500-types:INT;
-          description
-            "Number of VT2 payloads provisioned in the timeslot";
-        }
-        leaf num-lovc3 {
-          type ciena-6500-types:INT;
-          description
-            "Number of low-order VC3 payloads provisioned in the timeslot";
-        }
-        leaf num-vc11 {
-          type ciena-6500-types:INT;
-          description
-            "Number of VC-11 payloads provisioned in the timeslot";
-        }
-        leaf num-vc12 {
-          type ciena-6500-types:INT;
-          description
-            "Number of VC-12 payloads provisioned in the timeslot";
-        }
-      }
-    }
-  }
-  rpc xconn-show-timeslot-loworder {
-    description
-      "Retrieve Low-order Backplane Timeslots";
-    input {
-      leaf eqpt {
-        mandatory true;
-        description
-          "AID in format FE-shelf-slot, FE-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf ts {
-        type ciena-6500-types:INT;
-        description
-          "Timeslot to query";
-      }
-    }
-    output {
-      list output {
-        leaf eqpt {
-          type ciena-6500-types:IDENT;
-          description
-            "Card AID";
-        }
-        leaf payload {
-          type ciena-6500-types:STRING;
-          description
-            "Payload mapping";
-        }
-        leaf ts {
-          type ciena-6500-types:INT;
-          description
-            "Timeslot to query";
-        }
-        leaf rate {
-          type ciena-6500-types:STRING;
-          description
-            "Payload Rate";
-        }
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "Payload AID";
-        }
-      }
-    }
-  }
-  rpc xconn-delete-fcc-row {
-    description
-      "Delete a row from an existing FCC";
-    input {
-      leaf fcc {
-        mandatory true;
-        description
-          "AID in format FCC-shelf-fccIdx";
-        type ciena-6500-types:aid;
-      }
-      leaf source-aid {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "SOURCEAID";
-      }
-      leaf sink-aid {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "SINKAID";
-      }
-    }
-  }
-  rpc xconn-delete-oductp {
-    description
-      "Delete a cross connection used by OTN switching";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf conn-type {
-        type ciena-6500-enums:CCT;
-        description
-          "Traffic Connection Type";
-      }
-      leaf sw-mate {
-        type ciena-6500-types:aid;
-        description
-          "Path Protection Switch Mate.";
-      }
-      leaf dswmate {
-        type ciena-6500-types:aid;
-        description
-          "Path Protection Destination Mate.";
-      }
-    }
-  }
-  rpc xconn-show-oductp {
-    description
-      "Retrieve a cross connection used by OTN switching. The only wildcarding supported is a single AID with a value of ALL.";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-ALL, ODUCTP-shelf-slot-port-ALL, ODUCTP-shelf-slot-ALL, ODUCTP-shelf-ALL, ODUCTP-shelf-slot-portSsubport-ALL, ODUCTP-shelf-slot-portPsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-ALL, ODUCTP-shelf-slot-port-ALL, ODUCTP-shelf-slot-ALL, ODUCTP-shelf-ALL, ODUCTP-shelf-slot-portSsubport-ALL, ODUCTP-shelf-slot-portPsubport-rt1Ptp1";
-        type ciena-6500-types:aid;
-      }
-      leaf conn-type {
-        type ciena-6500-enums:CCT;
-        description
-          "Traffic Connection Type";
-      }
-      leaf sw-mate {
-        type ciena-6500-types:aid;
-        description
-          "Path Protection Switch Mate.";
-      }
-      leaf dswmate {
-        type ciena-6500-types:aid;
-        description
-          "Path Protection Destination Mate.";
-      }
-      leaf ckt-id {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). ";
-      }
-    }
-    output {
-      list output {
-        leaf fromaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf toaid {
-          type ciena-6500-types:IDENT;
-          description
-            "aid";
-        }
-        leaf conn-type {
-          type ciena-6500-enums:CCT;
-          description
-            "Traffic Connection Type";
-        }
-        leaf sw-mate {
-          type ciena-6500-types:aid;
-          description
-            "Path Protection Switch Mate.";
-        }
-        leaf dswmate {
-          type ciena-6500-types:aid;
-          description
-            "Path Protection Destination Mate.";
-        }
-        leaf ckt-id {
-          type ciena-6500-types:STRING;
-          description
-            "Circuit Identifier - can be used to hold the CLCI (see GR-199). ";
-        }
-        leaf owner {
-          type enumeration {
-            enum "OSMINE";
-            enum "OSRP";
-            enum "USER";
-          }
-          description
-            " Owner Type.";
-        }
-        leaf fccid {
-          type ciena-6500-types:aid;
-          description
-            "FCC Identifier for OSMINE created FCCs.";
-        }
-      }
-    }
-  }
-  rpc xconn-delete-och {
-    description
-      "Deprovision optical cross-connection";
-    input {
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format OCH-shelf-slot-port-wavelength, OCH-shelf-slotSsubslot-port-wavelength";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format OCH-shelf-slot-port-wavelength, OCH-shelf-slotSsubslot-port-wavelength";
-        type ciena-6500-types:aid;
-      }
-      leaf dlt-time-window {
-        default "0";
-        type ciena-6500-types:INT {
-          range "0..3600";
-        }
-        description
-          "Maximum waiting time in seconds for DOC managed channel to become unmanaged so that the CRS can be deleted.";
-      }
-    }
-  }
-  container xconn {
-    container crs {
-      list all {
-        key "fromaid toaid";
-        config false;
-        leaf fromaid {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf toaid {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf conn-type {
-          type ciena-6500-enums:CCT_default2WAY;
-          description
-            "Cross-Connect Type: Used for specifying one or two way connections";
-          config false;
-        }
-        leaf primary-xc {
-          type enumeration {
-            enum "SHELF" {
-              description
-                "The cross connection is made on shelf cross connect cards in slot 7 or 8";
-            }
-            enum "LOCAL" {
-              description
-                "The cross connection is made locally on the port cards";
-            }
-          }
-          description
-            "Cross-Connect Type: Used for specifying whether the cross connection uses shelf cross connect cards";
-          config false;
-        }
-        leaf sw-mate {
-          type ciena-6500-types:IDENT;
-          description
-            "Path Protection Switch Mate. Specifies the switch mate path endpoint used as the protection input signal for the fromaid. This parameter is provided at the destination end node.";
-          config false;
-        }
-        leaf dswmate {
-          type ciena-6500-types:IDENT;
-          description
-            "Path Protection Destination Mate. Specifies the destinations mate path endpoint used as the protection output signal for the toaid. This parameter is provided at the destination end node.";
-          config false;
-        }
-        leaf revertive {
-          type enumeration {
-            enum "N" {
-              description
-                "Path protection is non-revertive.";
-            }
-            enum "Y" {
-              description
-                "Path protection is revertive.";
-            }
-          }
-          description
-            "Revertive Path Protection switching supported.";
-          config false;
-        }
-        leaf guard-time {
-          default "0";
-          type ciena-6500-types:INT {
-            range "0..100";
-          }
-          description
-            "Guardtime specifies a holdoff time for path protection switch activation. Values are 0 to 100 representing 0 to 10.0 seconds in 0.1 second increments.";
-          config false;
-        }
-        leaf ckt-id {
-          type ciena-6500-types:STRING;
-          description
-            "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.if CKTID=ALL, all connections are retrieved, regardless of their CKTID value.";
-          config false;
-        }
-        leaf aend {
-          type ciena-6500-types:INT {
-            range "0..23";
-          }
-          description
-            "APS ID of AID originating node for BLSR systems. An integer between 0 and 23.";
-          config false;
-        }
-        leaf zend {
-          type ciena-6500-types:INT {
-            range "0..23";
-          }
-          description
-            "APS ID of AID terminating node for BLSR systems. An integer between 0 and 23.";
-          config false;
-        }
-        leaf fromenut {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "";
-          config false;
-        }
-        leaf toenut {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "";
-          config false;
-        }
-        leaf from-extra-traffic {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Extra Traffic";
-          config false;
-        }
-        leaf to-extra-traffic {
-          type ciena-6500-enums:BOOL_TRUE_FALSE;
-          description
-            "Extra Traffic";
-          config false;
-        }
-        leaf prime {
-          type enumeration {
-            enum "OSS" {
-              description
-                "Operation Support System Owned";
-            }
-            enum "CPS" {
-              description
-                "Control Plane System Owned";
-            }
-          }
-          description
-            "The default owner of payloads created for the connection";
-          config false;
-        }
-        leaf rate {
-          type ciena-6500-types:STRING;
-          description
-            "Connection Rate";
-          config false;
-        }
-      }
-      list count {
-        key "eqpt";
-        config false;
-        leaf eqpt {
-          mandatory true;
-          description
-            "AID in format 10G-shelf-slot, 10G-shelf-ALL, 2G5-shelf-slot, 2G5-shelf-ALL, 155622M-shelf-slot, 155622M-shelf-ALL, GE-shelf-slot, GE-shelf-ALL, E1-shelf-slot, E1-shelf-ALL, DS3E3EC1-shelf-slot, DS3E3EC1-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL, FE-shelf-slot, FE-shelf-ALL, L2RPR-shelf-slot, L2RPR-shelf-ALL, MXC-shelf-slot, MXC-shelf-ALL, TMUX-shelf-slot, TMUX-shelf-ALL, 40GXCIF-shelf-slot, 40GXCIF-shelf-ALL, MRO-shelf-slot, MRO-shelf-ALL, SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf rate {
-          type ciena-6500-enums:CRS_RATE;
-          description
-            "Cross-Connect Rate";
-          config false;
-        }
-        leaf count {
-          type ciena-6500-types:INT;
-          description
-            "Number of provisioned cross-connects of this rate.";
-          config false;
-        }
-      }
-      list otm2 {
-        key "fromaid toaid";
-        config true;
-        leaf fromaid {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port, OC192-shelf-slot-port, ETH10G-shelf-slot-port, FC1200-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf toaid {
-          mandatory true;
-          description
-            "AID in format OTM2-shelf-slot-port, OC192-shelf-slot-port, ETH10G-shelf-slot-port, FC1200-shelf-slot-port";
-          type ciena-6500-types:aid;
-        }
-        leaf conn-type {
-          default "2WAY";
-          type ciena-6500-enums:CCT_OTM2;
-          description
-            "Transparent Traffic Connection Type: Used for specifying one or two way connections";
-          config true;
-        }
-      }
-      list ctp {
-        key "fromaid toaid";
-        config true;
-        leaf fromaid {
-          mandatory true;
-          description
-            "AID in format CTP-shelf-slot-port, CTP-shelf-slot-ALL, CTP-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf toaid {
-          mandatory true;
-          description
-            "AID in format CTP-shelf-slot-port, CTP-shelf-slot-ALL, CTP-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf conn-type {
-          type ciena-6500-enums:CCT_ODU;
-          default "2WAY";
-          description
-            "Traffic Connection Type: Used for specifying one or two way connections";
-          config true;
-        }
-        leaf ckt-id {
-          type ciena-6500-types:STRING;
-          description
-            "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.";
-          config true;
-        }
-        leaf type {
-          type ciena-6500-enums:CTPTYPE;
-          description
-            "Type of Connection Termination Point";
-          config false;
-        }
-      }
-    }
-    container roll {
-      list all {
-        key "fromaid toaid";
-        config false;
-        leaf fromaid {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf toaid {
-          mandatory true;
-          description
-            "AID in format SHELF-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf conn-type {
-          type ciena-6500-enums:CCT_default2WAY;
-          description
-            "Cross-Connect Type: Used for specifying one or two way connections";
-          config false;
-        }
-        leaf rollover-from-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "The endpoint Rollover Operation rolling from/or source endpoint affected by SWMATE Rollover";
-          config false;
-        }
-        leaf rollover-to-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "The endpoint Rollover Operation rolling to//or source endpoint affected by SWMATE Rollover";
-          config false;
-        }
-        leaf rollover-status {
-          type enumeration {
-            enum "BRIDGED" {
-              description
-                "Bridged state";
-            }
-            enum "SWITCHED" {
-              description
-                "Switched state";
-            }
-            enum "IDLE" {
-              description
-                "Idle state";
-            }
-          }
-          description
-            "Rollover Status.";
-          config false;
-        }
-        leaf swmate-roll-from-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "The Switch Mate to Rollover from.";
-          config false;
-        }
-        leaf swmate-roll-to-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "The Switch Mate to Rollover to.";
-          config false;
-        }
-        leaf swmate-roll-over-status {
-          type enumeration {
-            enum "BRIDGED" {
-              description
-                "Bridged state";
-            }
-            enum "SWITCHED" {
-              description
-                "Switched state";
-            }
-            enum "IDLE" {
-              description
-                "Idle state";
-            }
-          }
-          description
-            "Switch Mate Rollover Status.";
-          config false;
-        }
-      }
-    }
-    container timeslot {
-      list highorder {
-        key "eqpt";
-        config false;
-        leaf eqpt {
-          mandatory true;
-          description
-            "AID in format FE-shelf-slot, FE-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf ts {
-          type ciena-6500-types:STRING;
-          description
-            "Timeslot";
-          config false;
-        }
-        leaf rate {
-          type ciena-6500-types:STRING;
-          description
-            "Payload Rate";
-          config false;
-        }
-        leaf payload-aid {
-          type ciena-6500-types:IDENT;
-          description
-            "Payload AID";
-          config false;
-        }
-        leaf num-vt1.5 {
-          type ciena-6500-types:INT;
-          description
-            "Number of VT1.5 payloads provisioned in the timeslot";
-          config false;
-        }
-        leaf num-vt2 {
-          type ciena-6500-types:INT;
-          description
-            "Number of VT2 payloads provisioned in the timeslot";
-          config false;
-        }
-        leaf num-lovc3 {
-          type ciena-6500-types:INT;
-          description
-            "Number of low-order VC3 payloads provisioned in the timeslot";
-          config false;
-        }
-        leaf num-vc11 {
-          type ciena-6500-types:INT;
-          description
-            "Number of VC-11 payloads provisioned in the timeslot";
-          config false;
-        }
-        leaf num-vc12 {
-          type ciena-6500-types:INT;
-          description
-            "Number of VC-12 payloads provisioned in the timeslot";
-          config false;
-        }
-      }
-      list loworder {
-        key "eqpt";
-        config false;
-        leaf eqpt {
-          mandatory true;
-          description
-            "AID in format FE-shelf-slot, FE-shelf-ALL, L2SS-shelf-slot, L2SS-shelf-ALL, 20GL2SS-shelf-slot, 20GL2SS-shelf-ALL";
-          type ciena-6500-types:aid;
-        }
-        leaf payload {
-          type ciena-6500-types:STRING;
-          description
-            "Payload mapping";
-          config false;
-        }
-        leaf ts {
-          type ciena-6500-types:INT;
-          description
-            "Timeslot to query";
-          config false;
-        }
-        leaf rate {
-          type ciena-6500-types:STRING;
-          description
-            "Payload Rate";
-          config false;
-        }
-        leaf aid {
-          type ciena-6500-types:IDENT;
-          description
-            "Payload AID";
-          config false;
-        }
-      }
-    }
-    list odu {
-      key "fromaid toaid";
-      config true;
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU2-shelf-slot-port-index, ODU3-shelf-slot-port, ODU4-shelf-slot-port-timeslot";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format ODU4-shelf-slot-port-index, ODU3-shelf-slot-port-index, ODU0-shelf-slot-port-index, ODU1-shelf-slot-port-index, ODUFLEX-shelf-slot-port-index, ODU2-shelf-slot-portSsubport-index, ODU2-shelf-slot-port-index, ODU3-shelf-slot-port, ODU4-shelf-slot-port-timeslot";
-        type ciena-6500-types:aid;
-      }
-      leaf cct {
-        type ciena-6500-enums:CCT_CRSODU;
-        default "2WAY";
-        description
-          "Traffic Connection Type: Used for specifying two way connections or protected two way connections";
-        config true;
-      }
-      leaf swmate {
-        type ciena-6500-types:aid;
-        description
-          "Path Protection Switch Mate. Specifies the switch mate path endpoint used as the protection input signal for the fromaid.";
-        config true;
-      }
-      leaf cktid {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.";
-        config true;
-      }
-      leaf fromtsassignment {
-        type ciena-6500-types:STRING;
-        description
-          "Assigned Tributary Slots(HEX) associated with FROM end point.";
-        config true;
-      }
-      leaf totsassignment {
-        type ciena-6500-types:STRING;
-        description
-          "Assigned Tributary Slots(HEX) associated with TO end point.";
-        config true;
-      }
-      leaf swmatetsassignment {
-        type ciena-6500-types:STRING;
-        description
-          "Assigned Tributary Slots(HEX) associated with SWMATE end point.";
-        config true;
-      }
-      leaf swmatetsprov {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "The Rx trib slot is auto-detected by system.";
-          }
-          enum "MANUAL" {
-            description
-              "The Rx trib slot is user specified.";
-          }
-        }
-        default "AUTO";
-        description
-          "tribSlots provisioning mode associated with SWMATE end point.";
-        config true;
-      }
-      leaf fromtsprov {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "The Rx trib slot is auto-detected by system.";
-          }
-          enum "MANUAL" {
-            description
-              "The Rx trib slot is user specified.";
-          }
-        }
-        default "AUTO";
-        description
-          "tribSlots provisioning mode associated with FROM end point.";
-        config true;
-      }
-      leaf totsprov {
-        type enumeration {
-          enum "AUTO" {
-            description
-              "The Rx trib slot is auto-detected by system.";
-          }
-          enum "MANUAL" {
-            description
-              "The Rx trib slot is user specified.";
-          }
-        }
-        default "AUTO";
-        description
-          "tribSlots provisioning mode associated with TO end point.";
-        config true;
-      }
-    }
-    list phys {
-      key "fromaid toaid";
-      config false;
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format PHYS-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format PHYS-shelf-slot-port";
-        type ciena-6500-types:aid;
-      }
-      leaf cct {
-        type ciena-6500-enums:CCT_default2WAY;
-        description
-          "Cross-Connect Type: Used for specifying one or two way connections";
-        config false;
-      }
-      leaf primary-xc {
-        type enumeration {
-          enum "SHELF" {
-            description
-              "The cross connection is made on shelf cross connect cards in slot 7 or 8";
-          }
-          enum "LOCAL" {
-            description
-              "The cross connection is made locally on the port cards";
-          }
-        }
-        description
-          "Cross-Connect Type: Used for specifying whether the cross connection uses shelf cross connect cards";
-        config false;
-      }
-      leaf broadcast {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Broadcast";
-        config false;
-      }
-      leaf derived {
-        type ciena-6500-enums:BOOL_TRUE_FALSE;
-        description
-          "Derived";
-        config false;
-      }
-      leaf sw-mate {
-        type ciena-6500-types:IDENT;
-        description
-          "Path Protection Switch Mate. Specifies the switch mate path endpoint used as the protection input signal for the fromaid. This parameter is provided at the destination end node.";
-        config false;
-      }
-    }
-    list fcc {
-      key "fcc";
-      config true;
-      leaf fcc {
-        mandatory true;
-        description
-          "AID in format FCC-shelf-fccIdx, FCC-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf source-aid {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "SOURCEAID";
-        config true;
-      }
-      leaf sink-aid {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "SINKAID";
-        config true;
-      }
-      leaf label {
-        type string {
-          length "0..64";
-        }
-        description
-          "label";
-        config true;
-      }
-      leaf prot-type {
-        type enumeration {
-          enum "WORK";
-          enum "PROTECT";
-          enum "NONE";
-        }
-        default "NONE";
-        description
-          "Protection Type.";
-        config true;
-      }
-      leaf owner {
-        type enumeration {
-          enum "MACRO";
-          enum "OSRP";
-          enum "USER";
-        }
-        description
-          " Owner Type.";
-        config false;
-      }
-      leaf ckt-id {
-        type ciena-6500-types:STRING;
-        description
-          "Contains the associated OSRP Nodename and SNC. Format is NodeName_SNCAid where NodeName is the OSRP Node Name the SNC originates from and SNCAid is the AID of the SNC on the originating node. ";
-        config false;
-      }
-      leaf protcktid {
-        type ciena-6500-types:STRING;
-        description
-          "Contains the associated Protection OSRP Nodename and SNC. Format is NodeName_SNCAid where NodeName is the OSRP Node Name the SNC originates from and SNCAid is the AID of the SNC on the originating node. ";
-        config false;
-      }
-      leaf row {
-        type ciena-6500-types:STRING;
-        description
-          "Row";
-        config false;
-      }
-      leaf autocreated {
-        type ciena-6500-enums:BOOL_Y_N;
-        description
-          "If the FCC is AUTOCREATED.";
-        config false;
-      }
-    }
-    list fcc-row {
-      key "fcc";
-      config true;
-      leaf fcc {
-        mandatory true;
-        description
-          "AID in format FCC-shelf-fccIdx";
-        type ciena-6500-types:aid;
-      }
-      leaf source-aid {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "SOURCEAID";
-        config true;
-      }
-      leaf sink-aid {
-        type ciena-6500-types:aid;
-        mandatory true;
-        description
-          "SINKAID";
-        config true;
-      }
-      leaf prot-type {
-        type enumeration {
-          enum "WORK";
-          enum "PROTECT";
-          enum "NONE";
-        }
-        default "NONE";
-        description
-          "Protection Type.";
-        config true;
-      }
-    }
-    list oductp {
-      key "fromaid toaid";
-      config true;
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-ALL, ODUCTP-shelf-slot-port-ALL, ODUCTP-shelf-slot-ALL, ODUCTP-shelf-ALL, ODUCTP-shelf-slot-portSsubport-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format ODUCTP-shelf-slot-port-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4, ODUCTP-shelf-slot-portSsubport-rt1Ptp1, ODUCTP-shelf-slot-portSsubport-rt1Ptp1-rt2Ptp2, ODUCTP-shelf-slot-portPsubport-rt1Ptp1, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-rt4Ptp4-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-rt3Ptp3-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-rt2Ptp2-ALL, ODUCTP-shelf-slot-port-rt1Ptp1-ALL, ODUCTP-shelf-slot-port-ALL, ODUCTP-shelf-slot-ALL, ODUCTP-shelf-ALL, ODUCTP-shelf-slot-portSsubport-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf conn-type {
-        type ciena-6500-enums:CCT;
-        description
-          "Traffic Connection Type";
-        config true;
-      }
-      leaf sw-mate {
-        type ciena-6500-types:aid;
-        description
-          "Path Protection Switch Mate. Specifies the switch mate path endpoint used as the protection input signal for the fromaid.";
-        config true;
-      }
-      leaf dswmate {
-        type ciena-6500-types:aid;
-        description
-          "Path Protection Destination Mate.";
-        config true;
-      }
-      leaf ckt-id {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). ";
-        config true;
-      }
-      leaf owner {
-        type enumeration {
-          enum "OSMINE";
-          enum "OSRP";
-          enum "USER";
-        }
-        description
-          " Owner Type.";
-        config false;
-      }
-      leaf fccid {
-        type ciena-6500-types:aid;
-        description
-          "FCC Identifier for OSMINE created FCCs.";
-        config false;
-      }
-    }
-    list och {
-      key "fromaid toaid";
-      config true;
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format OCH-shelf-slot-port-wavelength, OCH-shelf-slotSsubslot-port-wavelength, OCH-shelf-ALL, OCH-shelf-slot-ALL, OCH-shelf-slotSsubslot-ALL, OCH-shelf-slot-port-ALL, OCH-shelf-slotSsubslot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format OCH-shelf-slot-port-wavelength, OCH-shelf-slotSsubslot-port-wavelength, OCH-shelf-ALL, OCH-shelf-slot-ALL, OCH-shelf-slotSsubslot-ALL, OCH-shelf-slot-port-ALL, OCH-shelf-slotSsubslot-port-ALL, SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf cct {
-        type enumeration {
-          enum "1WAY" {
-            description
-              "Unidirectional Connection";
-          }
-          enum "2WAY" {
-            description
-              "Bidirectional Connection";
-          }
-          enum "LPBK" {
-            description
-              "Loopback Connection";
-          }
-        }
-        default "2WAY";
-        description
-          "Cross-Connect Type: Used for specifying one or two way connections";
-        config true;
-      }
-      leaf active {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "The Channel will be automatically added when the DOC Auto Add Channel parameter is Enabled(This value can be used in create and edit operations)";
-          }
-          enum "FALSE" {
-            description
-              "The Channel will be automatically deleted when the DOC Auto Delete Channel parameter is Enabled(This value can be used in create and edit operations)";
-          }
-          enum "NOT_APPLICABLE" {
-            description
-              "Not supported in current configuration";
-          }
-        }
-        default "TRUE";
-        description
-          "Allows DOC control of channel creation";
-        config true;
-      }
-      leaf express-delete {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "DOC can invoke a FORCED delete action(This value can be used in edit operation)";
-          }
-          enum "FALSE" {
-            description
-              "DOC cannot invoke a FORCED delete action(This value can be used in edit operation)";
-          }
-          enum "NOT_APPLICABLE" {
-            description
-              "Not supported in current configuration";
-          }
-        }
-        default "FALSE";
-        description
-          "Allows DOC to invoke an Express Delete of the channel";
-        config true;
-      }
-      leaf auto-delete {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "Automatic CRS deletion enabled.(This value can be used in edit operation)";
-          }
-          enum "FALSE" {
-            description
-              "Automatic CRS deletion disabled.(This value can be used in edit operation)";
-          }
-          enum "NOT_APPLICABLE" {
-            description
-              "Not supported in current configuration";
-          }
-        }
-        default "FALSE";
-        description
-          "Allows the automatic deletion of the CRS when no longer managed by DOC";
-        config true;
-      }
-      leaf source-port {
-        type ciena-6500-types:STRING;
-        description
-          "CMD TX port";
-        config false;
-      }
-      leaf source-port-form {
-        type ciena-6500-enums:addr_form;
-        description
-          "CMD TX port format";
-        config false;
-      }
-      leaf dest-port {
-        type ciena-6500-types:STRING;
-        description
-          "CMD RX port";
-        config false;
-      }
-      leaf dest-port-form {
-        type ciena-6500-enums:addr_form;
-        description
-          "CMD RX port format";
-        config false;
-      }
-      leaf doc-care {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "The CRS is under DOC control";
-          }
-          enum "FALSE" {
-            description
-              "The CRS is not under DOC control";
-          }
-        }
-        description
-          "Status indicating whether DOC is actively controlling the CRS.";
-        config false;
-      }
-      leaf from-ots {
-        type ciena-6500-types:STRING;
-        description
-          "The cross-connect \"from\" OTS ID.";
-        config false;
-      }
-      leaf to-ots {
-        type ciena-6500-types:STRING;
-        description
-          "The cross-connect \"to\" OTS ID.";
-        config false;
-      }
-      leaf from-ch-status {
-        type ciena-6500-enums:CHSTATUSVALUES;
-        description
-          "The DOC (From) Channel Status of the wavelength.";
-        config false;
-      }
-      leaf to-ch-status {
-        type ciena-6500-enums:CHSTATUSVALUES;
-        description
-          "The DOC (To) Channel Status of the wavelength.";
-        config false;
-      }
-      leaf paired-crs {
-        type ciena-6500-types:STRING;
-        description
-          "the paired CRS of a two-way connection";
-        config false;
-      }
-      leaf-list mismatch {
-        type enumeration {
-          enum "FROM" {
-            description
-              "FromOCH mismatches with database record";
-          }
-          enum "TO" {
-            description
-              "ToOCH mismatches with database record";
-          }
-          enum "INTER" {
-            description
-              "An intermediate OCH in a cascaded OTSs configuration mismatches with database record";
-          }
-          enum "NONE" {
-            description
-              "No CRS mismatches";
-          }
-        }
-        description
-          "CRS configuration mismatches with the record in database";
-        config false;
-      }
-      leaf cktid {
-        type ciena-6500-types:STRING;
-        description
-          "Circuit Identifier - can be used to hold the CLCI (see GR-199). 64 characters max.";
-        config false;
-      }
-      leaf derived {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "System-derived cross-connect";
-          }
-          enum "FALSE" {
-            description
-              "User-provisioned cross-connect";
-          }
-        }
-        description
-          "Indicates if the cross-connect is derived or user-provisioned.";
-        config false;
-      }
-      leaf cst {
-        type enumeration {
-          enum "ADD" {
-            description
-              "Add subtype for a cross-connect";
-          }
-          enum "DROP" {
-            description
-              "Drop subtype for a cross-connect";
-          }
-          enum "PASSTHROUGH" {
-            description
-              "Passthrough subtype for a cross-connect";
-          }
-        }
-        description
-          "Cross-Connection SubType.";
-        config false;
-      }
-      leaf snc-cktid {
-        type string {
-          length "29..70";
-        }
-        description
-          "Circuit identifier tagged against cross-connections created by the photonic control plane.";
-        config false;
-      }
-      leaf snc-incarn {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "SNC incarnation number.";
-        config false;
-      }
-      leaf snc-label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label tagged against cross-connections created by the photonic control plane.";
-        config false;
-      }
-      leaf prime {
-        type enumeration {
-          enum "OSS" {
-            description
-              "Operation Support System Owned";
-          }
-          enum "CPS" {
-            description
-              "Control Plane System Owned";
-          }
-          enum "LPBK" {
-            description
-              "Loopback Connection";
-          }
-        }
-        description
-          "The owner of the connection";
-        config false;
-      }
-      leaf frequency {
-        type decimal64 {
-          range "191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Frequency aligned to the 50 GHz ITU wavelength in THz and in step of 0.0001 THz. The frequency will be in format of \"xxx.xxxxxx\".";
-        config false;
-      }
-      leaf crs-nmc-aid {
-        type ciena-6500-types:STRING;
-        description
-          "Associated RTRV-CRS-NMC AID. Available when this RTRV-CRS-OCH entry is generated from a CRS-NMC.";
-        config false;
-      }
-      leaf port-trail {
-        type string {
-          length "0..521";
-        }
-        description
-          "An ordered list of shelf-slot(subslot)-port(subport) representing the sequence of ports the CRS traverses.";
-        config false;
-      }
-    }
-    list loopback-ready {
-      key "cmdeqptaid lineeqptaid";
-      config false;
-      leaf cmdeqptaid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf lineeqptaid {
-        mandatory true;
-        description
-          "AID in format SHELF-shelf-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf tx-port-list {
-        type ciena-6500-types:STRING;
-        description
-          "List of channel ADJ Tx ports that are available for loopback test.";
-        config false;
-      }
-      leaf loopback-eqpt {
-        type ciena-6500-types:STRING;
-        description
-          "List of cards that have the capability to loopback a wavelength on that degree path.";
-        config false;
-      }
-      leaf loopback-wavelength-range {
-        type ciena-6500-types:STRING;
-        description
-          "List of ranges of available wavelengths for use in a loopback.";
-        config false;
-      }
-    }
-    list mc-ttp {
-      key "mc-ttp";
-      config true;
-      leaf mc-ttp {
-        mandatory true;
-        description
-          "AID in format MCTTP-shelf-slot-port-mcId, MCTTP-shelf-ALL, MCTTP-shelf-slot-ALL, MCTTP-shelf-slot-port-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf connection-type {
-        type enumeration {
-          enum "1WAY" {
-            description
-              "Unidirectional MC";
-          }
-          enum "2WAY" {
-            description
-              "Bidirectional MC";
-          }
-          enum "1WAYBLOCKED" {
-            description
-              "Unidirectional blocked spectrum. Cross-connections cannot use this spectral range.";
-          }
-          enum "2WAYBLOCKED" {
-            description
-              "Bidirectional blocked spectrum. Cross-connections cannot use this spectral range.";
-          }
-        }
-        default "2WAY";
-        description
-          "Connection Type";
-        config true;
-      }
-      leaf min-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        mandatory true;
-        description
-          "Minimum Frequency in THz. The frequency will be in format of \"xxx.xxxxxx\".";
-        config true;
-      }
-      leaf max-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        mandatory true;
-        description
-          "Maximum Frequency in THz. The frequency will be in format of \"xxx.xxxxxx\".";
-        config true;
-      }
-      leaf min-freq-deadband {
-        type decimal64 {
-          range "0.000..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Lower dead band in GHz. The dead band will be in format of \"xxxx.xxx\".";
-        config true;
-      }
-      leaf max-freq-deadband {
-        type decimal64 {
-          range "0.000..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Upper dead band in GHz. The dead band will be in format of \"xxxx.xxx\".";
-        config true;
-      }
-      leaf mc-bias {
-        type decimal64 {
-          range "-10.00..10.00";
-          fraction-digits 2;
-        }
-        description
-          "MC Bias correction in dB. The bias will be in format of \"+-xx.xx\".";
-        config true;
-      }
-      leaf auto-delete {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "Auto delete the MCTTP when all its associated NMC cross-connects are deleted.";
-          }
-          enum "FALSE" {
-            description
-              "Auto delete disabled.";
-          }
-        }
-        default "FALSE";
-        description
-          "Allows the automatic deletion of the MCTTP.";
-        config true;
-      }
-      leaf cc-mode {
-        type ciena-6500-enums:CapacityChangeMode;
-        default "MODE1";
-        description
-          "Allows to manage the restoration speed through the entire channel path.";
-        config true;
-      }
-      leaf target-min-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Target Lower Frequency. Allows the automatic adjustment of the MINFREQ when any associated NMCTP are deleted. Default is MINFREQ (no target lower frequency).";
-        config true;
-      }
-      leaf target-max-freq {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        description
-          "Target Upper Frequency. Allows the automatic adjustment of the MAXFREQ when any associated NMCTP are deleted. Default is MAXFREQ (no target upper frequency).";
-        config true;
-      }
-      leaf prime {
-        type enumeration {
-          enum "OSS" {
-            description
-              "Operation Support System Owned";
-          }
-          enum "CPS" {
-            description
-              "Control Plane System Owned";
-          }
-        }
-        description
-          "The prime of the MCTTP";
-        config false;
-      }
-      leaf paired-mc-ttp {
-        type ciena-6500-types:STRING;
-        description
-          "AID of paired MCTTP of a 2WAY MCTTP";
-        config false;
-      }
-      leaf sncg-cktid {
-        type string {
-          length "29..70";
-        }
-        description
-          "Circuit identifier tagged against MCTTP created by the photonic control plane.";
-        config false;
-      }
-      leaf sncg-incarn {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "SNCG incarnation number.";
-        config false;
-      }
-      leaf sncg-label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label tagged against MCTTP created by the photonic control plane.";
-        config false;
-      }
-      leaf derived {
-        type enumeration {
-          enum "FALSE" {
-            description
-              "User-provisioned MCTTP";
-          }
-          enum "TRUE" {
-            description
-              "System-derived MCTTP from a classic cross-connect or at an SP2, SPAP2, HDSP";
-          }
-        }
-        description
-          "Indicates if the MCTTP is derived or user-provisioned.";
-        config false;
-      }
-      leaf num-of-nmc {
-        type ciena-6500-types:INT;
-        description
-          "Number of NMC within this MCTTP.";
-        config false;
-      }
-    }
-    list nmc {
-      key "fromaid toaid";
-      config true;
-      leaf fromaid {
-        mandatory true;
-        description
-          "AID in format NMCLNCTP-shelf-slot-port-mcId-nmcId, NMCADCTP-shelf-slot-port-nmcId, NMCADCTP-shelf-slotSsubslot-port-nmcId, NMCIDLERCTP-shelf-slot-port-mcId-nmcId, NMCLNCTP-shelf-ALL, NMCLNCTP-shelf-slot-ALL, NMCLNCTP-shelf-slot-port-ALL, NMCLNCTP-shelf-slot-port-mcId-ALL, NMCADCTP-shelf-ALL, NMCADCTP-shelf-slot-ALL, NMCADCTP-shelf-slotSsubslot-ALL, NMCADCTP-shelf-slot-port-ALL, NMCADCTP-shelf-slotSsubslot-port-ALL, NMCIDLERCTP-shelf-ALL, NMCIDLERCTP-shelf-slot-ALL, NMCIDLERCTP-shelf-slot-port-mcId-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf toaid {
-        mandatory true;
-        description
-          "AID in format NMCLNCTP-shelf-slot-port-mcId-nmcId, NMCADCTP-shelf-slot-port-nmcId, NMCADCTP-shelf-slotSsubslot-port-nmcId, NMCIDLERCTP-shelf-slot-port-mcId-nmcId, NMCLNCTP-shelf-ALL, NMCLNCTP-shelf-slot-ALL, NMCLNCTP-shelf-slot-port-ALL, NMCLNCTP-shelf-slot-port-mcId-ALL, NMCADCTP-shelf-ALL, NMCADCTP-shelf-slot-ALL, NMCADCTP-shelf-slotSsubslot-ALL, NMCADCTP-shelf-slot-port-ALL, NMCADCTP-shelf-slotSsubslot-port-ALL, NMCIDLERCTP-shelf-ALL, NMCIDLERCTP-shelf-slot-ALL, NMCIDLERCTP-shelf-slot-port-mcId-ALL";
-        type ciena-6500-types:aid;
-      }
-      leaf cct {
-        type enumeration {
-          enum "1WAY" {
-            description
-              "Unidirectional NMC";
-          }
-          enum "2WAY" {
-            description
-              "Bidirectional NMC";
-          }
-        }
-        default "2WAY";
-        description
-          "Cross-Connect Type";
-        config true;
-      }
-      leaf frequency {
-        type decimal64 {
-          range "186.325000..190.975000 | 191.325000..196.125000";
-          fraction-digits 6;
-        }
-        mandatory true;
-        description
-          "Center Frequency in THz and in step of 0.0001THz. The frequency will be in format of \"xxx.xxxxxx\".";
-        config true;
-      }
-      leaf width {
-        type decimal64 {
-          range "12.500..4800.000";
-          fraction-digits 3;
-        }
-        mandatory true;
-        description
-          "Frequency width in step of 0.001 GHz. The width will be in format of \"xxxx.xxx\".";
-        config true;
-      }
-      leaf cktid {
-        type string {
-          length "0..64";
-        }
-        description
-          "Circuit Identifier configured at the ADJ-TX.";
-        config true;
-      }
-      leaf active {
-        type enumeration {
-          enum "TRUE" {
-            description
-              " The channel will be automatically added when DOC Auto add channel";
-          }
-          enum "FALSE" {
-            description
-              "The channel will be automatically deleted when the DOC auto delete parameter is enabled";
-          }
-        }
-        default "FALSE";
-        description
-          "Active allows DOC to control the cross-connect.";
-        config true;
-      }
-      leaf source-port {
-        type ciena-6500-types:STRING;
-        description
-          "CMD TX port of Channel originated from.";
-        config true;
-      }
-      leaf source-port-form {
-        type ciena-6500-enums:addr_form;
-        description
-          "Source port ADJ format";
-        config true;
-      }
-      leaf auto-delete {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "Automatic CRS deletion enabled.";
-          }
-          enum "FALSE" {
-            description
-              "Automatic CRS deletion disabled.";
-          }
-        }
-        description
-          "Allows the automatic deletion of the CRS when no longer managed by DOC";
-        config true;
-      }
-      leaf paired-crs {
-        type ciena-6500-types:STRING;
-        description
-          "AID of the paired CRS of a 2WAY cross-connect type";
-        config false;
-      }
-      leaf snc-cktid {
-        type string {
-          length "29..70";
-        }
-        description
-          "Circuit identifier tagged against cross-connections created by the photonic control plane.";
-        config false;
-      }
-      leaf snc-incarn {
-        type ciena-6500-types:INT {
-          range "1..65535";
-        }
-        description
-          "SNC incarnation number.";
-        config false;
-      }
-      leaf snc-label {
-        type string {
-          length "0..64";
-        }
-        description
-          "Label tagged against cross-connections created by the photonic control plane.";
-        config false;
-      }
-      leaf connection-subtype {
-        type enumeration {
-          enum "ADD" {
-            description
-              "Add subtype for a cross-connect";
-          }
-          enum "DROP" {
-            description
-              "Drop subtype for a cross-connect";
-          }
-          enum "PASSTHROUGH" {
-            description
-              "Passthrough subtype for a cross-connect";
-          }
-        }
-        description
-          "Cross-connection SubType (ADD, DROP or PASSTHROUGH)";
-        config false;
-      }
-      leaf prime {
-        type enumeration {
-          enum "OSS" {
-            description
-              "Operation Support System Owned";
-          }
-          enum "CPS" {
-            description
-              "Control Plane System Owned";
-          }
-        }
-        description
-          "The prime of the CRS";
-        config false;
-      }
-      leaf doc-care {
-        type enumeration {
-          enum "TRUE" {
-            description
-              "The CRS is under DOC control";
-          }
-          enum "FALSE" {
-            description
-              "The CRS is not under DOC control";
-          }
-        }
-        description
-          "Status indicating whether DOC is actively controlling the CRS.";
-        config false;
-      }
-      leaf from-ots {
-        type ciena-6500-types:STRING;
-        description
-          "The cross-connect \"from\" OTS ID.";
-        config false;
-      }
-      leaf to-ots {
-        type ciena-6500-types:STRING;
-        description
-          "The cross-connect \"to\" OTS ID.";
-        config false;
-      }
-      leaf from-ch-status {
-        type ciena-6500-enums:CHSTATUSVALUES;
-        description
-          "The DOC (From) Channel Status.";
-        config false;
-      }
-      leaf to-ch-status {
-        type ciena-6500-enums:CHSTATUSVALUES;
-        description
-          "The DOC (To) Channel Status.";
-        config false;
-      }
-      leaf-list mismatch {
-        type enumeration {
-          enum "FROM" {
-            description
-              "FromOCH mismatches with database record";
-          }
-          enum "TO" {
-            description
-              "ToOCH mismatches with database record";
-          }
-          enum "INTER" {
-            description
-              "An intermediate OCH in a cascaded OTSs configuration mismatches with database record";
-          }
-          enum "NONE" {
-            description
-              "No CRS mismatches";
-          }
-        }
-        description
-          "CRS configuration mismatches with the record in database";
-        config false;
-      }
-      leaf port-trail {
-        type string {
-          length "0..521";
-        }
-        description
-          "An ordered list of shelf-slot(subslot)-port(subport) representing the sequence of ports the CRS traverses.";
-        config false;
-      }
-      leaf dest-port {
-        type ciena-6500-types:STRING;
-        description
-          "CMD RX port of Channel destined to.";
-        config false;
-      }
-      leaf dest-port-form {
-        type ciena-6500-enums:addr_form;
-        description
-          "Destination port ADJ format";
-        config false;
-      }
-      leaf adj-tx-bias {
-        default "0.00";
-        type decimal64 {
-          range "-10.00..10.00";
-          fraction-digits 2;
-        }
-        description
-          "OSNR bias in dB and in format of \"xx.xx\".";
-        config true;
-      }
-      leaf paired-adj-tx-bias {
-        default "0.00";
-        type decimal64 {
-          range "-10.00..10.00";
-          fraction-digits 2;
-        }
-        description
-          "OSNR bias in dB and in format of \"xx.xx\".";
-        config true;
-      }
-      leaf adj-tx-type {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitter type.";
-        config true;
-      }
-      leaf paired-adj-tx-type {
-        type ciena-6500-types:STRING;
-        description
-          "Transmitter type.";
-        config true;
-      }
-      leaf adj-tx-mod-class {
-        type ciena-6500-enums:adjTxModClass;
-        description
-          "Modulation class.";
-        config true;
-      }
-      leaf paired-adj-tx-mod-class {
-        type ciena-6500-enums:adjTxModClass;
-        description
-          "Modulation class.";
-        config true;
-      }
-      leaf adj-tx-class {
-        type ciena-6500-enums:txClass;
-        description
-          "Transmitter class.";
-        config true;
-      }
-      leaf paired-adj-tx-class {
-        type ciena-6500-enums:txClass;
-        description
-          "Transmitter class.";
-        config true;
-      }
-      leaf adj-tx-rate {
-        type ciena-6500-enums:adj_rate;
-        default "UNKNOWN";
-        description
-          "Line rate.";
-        config true;
-      }
-      leaf paired-adj-tx-rate {
-        type ciena-6500-enums:adj_rate;
-        default "UNKNOWN";
-        description
-          "Line rate.";
-        config true;
-      }
-      leaf adj-tx-sig-bw-3dB {
-        type decimal64 {
-          range "12.500..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Tx Signal Bandwidth in GHz measured at 3 dBm less than peak power.";
-        config true;
-      }
-      leaf paired-adj-tx-sig-bw-3dB {
-        type decimal64 {
-          range "12.500..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Tx Signal Bandwidth in GHz measured at 3 dBm less than peak power.";
-        config true;
-      }
-      leaf adj-tx-sig-bw-10dB {
-        type decimal64 {
-          range "12.500..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Tx Signal Bandwidth in GHz measured at 10 dBm less than peak power.";
-        config true;
-      }
-      leaf paired-adj-tx-sig-bw-10dB {
-        type decimal64 {
-          range "12.500..4800.000";
-          fraction-digits 3;
-        }
-        description
-          "Tx Signal Bandwidth in GHz measured at 10 dBm less than peak power.";
-        config true;
-      }
-      leaf ctrl-freq-offset {
-        type decimal64 {
-          range "-4800..4800";
-          fraction-digits 1;
-        }
-        description
-          "Control frequency offset in GHz.";
-        config true;
-      }
-      leaf paired-ctrl-freq-offset {
-        type decimal64 {
-          range "-4800..4800";
-          fraction-digits 1;
-        }
-        description
-          "Control frequency offset in GHz.";
-        config true;
-      }
-      leaf trans-mode {
-        type ciena-6500-types:STRING;
-        description
-          "Transponder Transmission Mode";
-        config true;
-      }
-      leaf paired-trans-mode {
-        type ciena-6500-types:STRING;
-        description
-          "Transponder Transmission Mode";
-        config true;
-      }
-      leaf paired-source-port {
-        type ciena-6500-types:STRING;
-        description
-          "CMD RX port of Channel destined to.";
-        config true;
-      }
-      leaf paired-source-form {
-        type ciena-6500-enums:addr_form;
-        description
-          "Destination port ADJ format";
-        config true;
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-aaa.yang b/models/ciena-waveserver-aaa.yang
deleted file mode 100644
index 242c7ea40620691fd7169a64b74eed1a4e96d568..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-aaa.yang
+++ /dev/null
@@ -1,1157 +0,0 @@
-module ciena-waveserver-aaa {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-aaa";
-  prefix aaa;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-system {
-    prefix system;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-              Hanover, Maryland 21076
-              U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines the Authentication, Authorization and Accounting (AAA)
-     functionality for Ciena's Waveserver platform.";
-
-  revision 2019-09-18 {
-    description
-      "Changed range definition for RADIUS 'key' and 'secret'.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2019-02-20 {
-    description
-      "Added pattern definition for leaf 'trusted-fingerprint'.
-       Increased user name length from 32 to 64 characters max.
-       Made 'access-level' a mandatory leaf for the user list.
-       Changed range definition for TACACS 'privilege-level-rw'
-       and 'privilege-level-diag'.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-09-19 {
-    description
-      "Added support for TACACS+ server data model.
-       Added support for RADIUS server data model.
-       Added support for RADSEC server data model.
-       Added support for 'waveserver-aaa-authentication-statistics-clear' rpc.
-       Added support for 'waveserver-aaa-tacacs-server-statistics-clear' rpc.
-       Added support for 'waveserver-aaa-radsec-server-statistics-clear' rpc.
-       Added support for 'waveserver-aaa-kill-user' rpc.
-       Added scope attribute to authentication method.
-       Added statistics container to authentication method.
-       Added user lockout attributes.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-05-17 {
-    description
-      "Publishing the AAA external data model for general availability.
-       Added ncx:password support.
-       Enforce uniqueness on authentication-method type.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2018-01-04 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of the AAA external data model.
-       In Waveserver R1.1, this module is intended for internal use only, and
-       should not be published externally. The data model is not yet finalized.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-
-  typedef server-search-method {
-    type enumeration {
-      enum priority {
-        description
-          "Priority is used to order to loop over the available servers for each request.";
-      }
-      enum cached {
-        description
-          "The last used server will be queried first with the request.";
-      }
-    }
-    description
-      "Server Search Method";
-  }
-
-  typedef server-entry-type {
-    type enumeration {
-      enum global {
-        value 1;
-        description
-          "The AAA server entry is a member of the global server list.";
-      }
-      enum authentication {
-        description
-          "The AAA server entry is a member of the authentication server list.";
-      }
-      enum authorization {
-        description
-          "The AAA server entry is a member of the authorization server list.";
-      }
-      enum accounting {
-        description
-          "The AAA server entry is a member of the accounting server list.";
-      }
-    }
-    description
-      "Identifies a AAA server list type for the purposes of querying or
-       clearing server statistics.";
-  }
-
-  typedef authentication-method-type {
-    type enumeration {
-      enum local {
-        description
-          "Authentication based on local user list.";
-      }
-      enum radius {
-        description
-          "Remote authentication via RADIUS, if configured/enabled.";
-      }
-      enum tacacs {
-        description
-          "Remote authentication via TACACS+, if configured/enabled.";
-      }
-      enum radsec {
-        description
-          "Remote authentication via RADSEC, if configured/enabled.";
-      }
-    }
-    description
-      "Identifies an authentication method / provider type.";
-  }
-
-  typedef authentication-scope-type {
-    type enumeration {
-      enum all {
-        description
-          "Accessing the node through all (remote or serial).";
-      }
-      enum serial {
-        description
-          "Aceessing the node through serial (RS232) port.";
-      }
-      enum remote {
-        description
-          "Accessing the node through SSH or REST interfaces.";
-      }
-    }
-    description
-      "Scope of the authentication method (or provider).";
-  }
-
-  typedef user-access-level {
-    type enumeration {
-      enum limited {
-        description
-          "User has limited (mostly read-only) privileges. This user's role
-           is used for system monitoring and gathering information about the
-           configuration and performance of the system. Limited users can
-           change their own password, but not another user's password. Cannot
-           create/delete/modify other user accounts, but can view users with
-           same or lower access-level.";
-      }
-      enum admin {
-        description
-          "User has administrative privileges. This user's role includes
-           ability to configure most system attributes, excluding security
-           files such as password files and SSH/SSL server keys. Admin users
-           can change their own password, but not another user's password.
-           Cannot create/delete/modify other user accounts, but can view
-           users with same or lower access-level.";
-      }
-      enum super {
-        description
-          "User has superuser privileges. This user's role includes
-           managing local user accounts, authentication methods, and other
-           security configuration.";
-      }
-      enum diag {
-        description
-          "User has diagnostic privileges. This user's role includes access
-           to the diag shell (native Linux OS shell), but excludes access to
-           user security configuration.";
-      }
-    }
-    description
-      "The access-level or role assigned to the local user.";
-  }
-
-  grouping common-server-attributes {
-    description
-      "Set of server attributes common for various server definitions.";
-    leaf address {
-      type cienawstypes:ipaddr-or-hostname;
-      description
-        "Configured IP address or Domain Name of the remote server.";
-    }
-    leaf ip-address {
-      type cienawstypes:ip-address;
-      config false;
-      description
-        "Operational IP address associated with the remote server,
-         if configured/available, or 'Unresolved' otherwise.";
-    }
-    leaf admin-state {
-      type cienawstypes:enabled-disabled-enum;
-      description
-        "Server administrative state.";
-    }
-    leaf operational-state {
-      type cienawstypes:up-down-enum;
-      config false;
-      description
-        "Server operational state.";
-    }
-    leaf priority {
-      type uint8 {
-        range "1..8";
-      }
-      description
-        "Server priority.";
-    }
-  }
-
-  grouping common-server-statistics {
-    description
-      "Common server statistics attributes.";
-    leaf access-requests {
-      type uint32;
-      config false;
-      description
-        "server access requests.";
-    }
-    leaf access-rejects {
-      type uint32;
-      config false;
-      description
-        "server access rejects.";
-    }
-    leaf access-accepts {
-      type uint32;
-      config false;
-      description
-        "server access accepts.";
-    }
-    leaf bad-authenticator-packets {
-      type uint32;
-      config false;
-      description
-        "bad authenticator server packets.";
-    }
-    leaf malformed-responses {
-      type uint32;
-      config false;
-      description
-        "malformed server responses.";
-    }
-  }
-
-  grouping tacacs-server-statistics {
-    description
-      "TACACS+ server statistics attributes.";
-    leaf access-retransmissions {
-      type uint32;
-      config false;
-      description
-        "server access retransmissions.";
-    }
-    leaf packet-timeouts {
-      type uint32;
-      config false;
-      description
-        "server packet timeouts.";
-    }
-    leaf packet-rx-with-bad-seq {
-      type uint32;
-      config false;
-      description
-        "server packets received with bad sequence.";
-    }
-  }
-
-  grouping radius-server-statistics {
-    description
-      "RADIUS server statistics attributes.";
-    leaf access-retransmissions {
-      type uint32;
-      config false;
-      description
-        "server access retransmissions.";
-    }
-    leaf packet-timeouts {
-      type uint32;
-      config false;
-      description
-        "server packet timeouts.";
-    }
-    leaf access-challenges {
-      type uint32;
-      config false;
-      description
-        "server access challenges.";
-    }
-    leaf pending-requests {
-      type uint32;
-      config false;
-      description
-        "pending server requests.";
-    }
-    leaf packets-dropped {
-      type uint32;
-      config false;
-      description
-        "server packets dropped.";
-    }
-  }
-
-  grouping radsec-server-statistics {
-    description
-      "RADSec server statistics attributes.";
-    leaf access-challenges {
-      type uint32;
-      config false;
-      description
-        "server access challenges.";
-    }
-    leaf packets-dropped {
-      type uint32;
-      config false;
-      description
-        "server packets dropped.";
-    }
-    leaf connection-attempts {
-      type uint32;
-      config false;
-      description
-        "server connection attempts.";
-    }
-    leaf successful-connections {
-      type uint32;
-      config false;
-      description
-        "server successful connections.";
-    }
-    leaf failed-tcp-connections {
-      type uint32;
-      config false;
-      description
-        "server failed tcp connections.";
-    }
-    leaf failed-tls-connections {
-      type uint32;
-      config false;
-      description
-        "server failed tls connections.";
-    }
-    leaf timeout-connections {
-      type uint32;
-      config false;
-      description
-        "server timeout connections.";
-    }
-    leaf unexpected-closes {
-      type uint32;
-      config false;
-      description
-        "server unexpected closes.";
-    }
-    leaf closed-connections {
-      type uint32;
-      config false;
-      description
-        "server closed connections.";
-    }
-    leaf responses {
-      type uint32;
-      config false;
-      description
-        "server responses.";
-    }
-    leaf unknown-types {
-      type uint32;
-      config false;
-      description
-        "server unknown types.";
-    }
-  }
-
-  grouping tacacs-server-attributes {
-    description
-      "Set of additional attributes specific to TACACS+ servers.";
-    leaf tcp-port {
-      type uint16 {
-        range "1..65535";
-      }
-      default "49";
-      description
-        "TACACS+ server TCP Port. Default value is 49.";
-    }
-    leaf source-address {
-      type cienawstypes:string-maxl-64;
-      config false;
-      description
-        "Source IP address used in messages to the TACACS+ server.";
-    }
-  }
-
-  container waveserver-aaa {
-    description
-      "Waveserver AAA configuration and operational data. Defines authentication,
-       authorization and accounting services.";
-    container authentication {
-      description
-        "Global authentication configuration.";
-      list authentication-method {
-        key "priority";
-        unique "type";
-        max-elements 4;
-        description
-          "Ordered list of authentication methods for user login attempts,
-           indexed by priority. If an authentication attempt fails using the
-           first method, the next defined method will be attempted, until all
-           specified authentication methods have been tried, at which point the
-           user will be denied access. By default, this list will have a single
-           entry with type 'local'.";
-        leaf priority {
-          type uint8 {
-            range "1..4";
-          }
-          description
-            "Authentication priority, indicating the order in which each of the
-             authentication providers will be consulted.";
-        }
-        leaf type {
-          type authentication-method-type;
-          description
-            "The authentication method / provider type. Must be unique within the list.";
-        }
-        leaf scope {
-          type authentication-scope-type;
-          description
-            "Scope of the authentication method.";
-        }
-        container statistics {
-          config false;
-          description
-            "User Authentication Statistics.";
-          leaf called {
-            type uint32;
-            description
-              "Number of times the authentication method has been called.";
-          }
-          leaf success {
-            type uint32;
-            description
-              "Number of times the authentication method has been successful.";
-          }
-          leaf failure {
-            type uint32;
-            description
-              "Number of failed authentication attempts via this method.";
-          }
-          leaf skipped {
-            type uint32;
-            description
-              "Number of skipped authentication attempts via this method.";
-          }
-        }
-      }
-    }
-    container user-management {
-      description
-        "User management.";
-      leaf max-limited-users {
-        type uint8 {
-          range "0..9";
-        }
-        description
-          "Maximum number of network logins of limited-level users.";
-      }
-      leaf current-limited-users {
-        type uint8;
-        config false;
-        description
-          "Current number of network logins of limited-level users.";
-      }
-      leaf max-admin-users {
-        type uint8 {
-          range "0..9";
-        }
-        description
-          "Maximum number of network logins of admin-level users.";
-      }
-      leaf current-admin-users {
-        type uint8;
-        config false;
-        description
-          "Current number of network logins of admin-level users.";
-      }
-      leaf max-super-users {
-        type uint8 {
-          range "1..10";
-        }
-        description
-          "Maximum number of network logins of super users.";
-      }
-      leaf current-super-users {
-        type uint8;
-        config false;
-        description
-          "Current number of network logins of super users.";
-      }
-      leaf min-password-length {
-        type uint16 {
-          range "1..128";
-        }
-        description
-          "Minimum length of the user password.";
-      }
-      leaf max-login-attempt {
-        type uint16 {
-          range "2..10";
-        }
-        description
-          "Maximum number of consecutive unsuccessful login attempts allowed
-           before a user account is locked out. Applies only to local user
-           accounts. System default is 5.";
-      }
-      leaf lockout-interval {
-        type uint16 {
-          range "1..30";
-        }
-        units "minutes";
-        description
-          "User lockout time interval, in minutes. Applies only to local user
-           accounts. System default is 10 min.";
-      }
-      list active-users {
-        key "session-id";
-        config false;
-        description
-          "display active users.";
-        leaf session-id {
-          type uint64;
-          description
-            "Session Id.";
-        }
-        leaf username {
-          type cienawstypes:string-maxl-64;
-          description
-            "User name.";
-        }
-        leaf idle-time {
-          type uint64;
-          description
-            "Idle time.";
-        }
-        leaf interface-type {
-          type cienawstypes:string-maxl-15;
-          description
-            "Interface type.";
-        }
-        leaf terminal {
-          type cienawstypes:string-maxl-128;
-          description
-            "Terminal.";
-        }
-      }
-    }
-    list user {
-      key "user-name";
-      max-elements 50;
-      description
-        "List of local user accounts used for local authentication.";
-      leaf user-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "The configured username for this local user. Must be unique across
-           the list of configured local users.";
-      }
-      leaf password {
-        type cienawstypes:string-maxl-128;
-        description
-          "The user password, supplied as cleartext. This is a write-only
-           attribute that should not be stored nor returned on user retrieval.
-           The password will be encrypted via one-way hash function and stored
-           only in its encrypted format. The hashed password string can be
-           retrieved via the 'secret' attribute.";
-        ncx:password;
-      }
-      leaf secret {
-        type cienawstypes:string-maxl-256;
-        description
-          "The encrypted user password string, supplied as a hashed value. This
-           should only be configured at user creation time, and will be ignored
-           if the user account already exists.";
-      }
-      leaf access-level {
-        type enumeration {
-          enum limited {
-            description
-              "User has limited (mostly read-only) privileges. This user's role
-               is used for system monitoring and gathering information about the
-               configuration and performance of the system. Limited users can
-               change their own password, but not another user's password. Cannot
-               create/delete/modify other user accounts, but can view users with
-               same or lower access-level.";
-          }
-          enum admin {
-            description
-              "User has administrative privileges. This user's role includes
-               ability to configure most system attributes, excluding security
-               files such as password files and SSH/SSL server keys. Admin users
-               can change their own password, but not another user's password.
-               Cannot create/delete/modify other user accounts, but can view
-               users with same or lower access-level.";
-          }
-          enum super {
-            description
-              "User has superuser privileges. This user's role includes
-               managing local user accounts, authentication methods, and other
-               security configuration. This is the required privilege level for
-               accessing various NETCONF,REST, WebSocket, and other northbound
-               interfaces.";
-          }
-          enum diag {
-            description
-              "User has diagnostic privileges. This user's role includes access
-               to the diag shell (native Linux OS shell) and is restricted to the
-               console port only.";
-          }
-        }
-        mandatory true;
-        description
-          "The access-level or role assigned to the local user.";
-      }
-      leaf locked-out {
-        type boolean;
-        config false;
-        description
-          "Indicates whether this local user account is currently locked out.";
-      }
-      leaf login-failures {
-        type uint32;
-        config false;
-        description
-          "Number of consecutive failed login attempts for this user account.";
-      }
-      leaf last-failure {
-        type cienawstypes:string-maxl-32;
-        config false;
-        description
-          "The date and time of the most recent failed login attempt in
-           'YYYY-MM-DD HH:MM:SS' format, or empty string if not applicable or
-           unknown.";
-      }
-    }
-    container tacacs {
-      description
-        "Top-level TACACS+ container.";
-      container global-config {
-        description
-          "Global TACACS+ configuration attributes.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "TACACS+ administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "TACACS+ operational state.";
-        }
-        leaf authentication-admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "TACACS+ authentication administrative state.";
-        }
-        leaf authorization-admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "TACACS+ authorization administrative state.";
-        }
-        leaf accounting-admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "TACACS+ accounting administrative state.";
-        }
-        leaf accounting-command-enabled {
-          type boolean;
-          description
-            "Specifies whether TACACS+ command accounting is enabled.";
-        }
-        leaf accounting-session-enabled {
-          type boolean;
-          description
-            "Specifies whether TACACS+ session accounting is enabled.";
-        }
-        leaf syslog-admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "TACACS+ syslog administrative state.";
-        }
-        leaf global-servers {
-          type cienawstypes:on-off-enum;
-          description
-            "Specifies whether the TACACS+ global servers list is enabled for all AAA functions.";
-        }
-        leaf search-method {
-          type server-search-method;
-          default "priority";
-          description
-            "set the search method for TACACS+ servers (Default: priority)";
-        }
-        leaf privilege-level-admin {
-          type uint16 {
-            range "1..13";
-          }
-          default "2";
-          description
-            "value for read-write privilege level (Default: 2).";
-        }
-        leaf privilege-level-rw {
-          type uint16 {
-            range "2..15";
-          }
-          default "10";
-          description
-            "value for read-write-create privilege level (Default: 10)";
-        }
-        leaf privilege-level-diag {
-          type uint16 {
-            range "2..15";
-          }
-          default "15";
-          description
-            "value for diagnostic privilege level (Default: 15).";
-        }
-        leaf timeout {
-          type uint16 {
-            range "1..30";
-          }
-          units "seconds";
-          description
-            "Global timeout period in seconds on responses from a TACACS+ server.";
-        }
-        leaf key {
-          type string {
-            length "0|2..64";
-          }
-          ncx:password;
-          description
-            "The non-encrypted key that can be configured to generate a shared
-             secret between the authentication server and the device. This string
-             is clear-text and will not be retrievable nor stored directly on the
-             device. Specifying a zero-length string will clear the key value.";
-        }
-        leaf key-min-length {
-          type uint16 {
-            range "2..64";
-          }
-          description
-            "The minimum secret key length in bytes.";
-        }
-        leaf secret {
-          type string {
-            length "0|4..128";
-          }
-          description
-            "The encrypted shared secret key used between the authentication
-             server and the device. Specifying a zero-length string will clear
-             the shared secret value.";
-        }
-      }
-      list server {
-        key "address";
-        max-elements 8;
-        description
-          "Global list of TACACS+ servers to use for AAA functions.";
-        uses common-server-attributes;
-        uses tacacs-server-attributes;
-        container statistics {
-          config false;
-          description
-            "TACACS+ Global AAA Server Statistics.";
-          container authentication {
-            description
-              "TACACS+ Global Server Authentication Statistics.";
-            uses common-server-statistics;
-            uses tacacs-server-statistics;
-          }
-          container authorization {
-            description
-              "TACACS+ Global Server Authorization Statistics.";
-            uses common-server-statistics;
-            uses tacacs-server-statistics;
-          }
-          container accounting {
-            description
-              "TACACS+ Global Server Accounting Statistics.";
-            uses common-server-statistics;
-            uses tacacs-server-statistics;
-          }
-        }
-      }
-      list authentication-server {
-        key "address";
-        max-elements 8;
-        description
-          "List of TACACS+ authentication servers to use for AAA functions.";
-        uses common-server-attributes;
-        uses tacacs-server-attributes;
-        container statistics {
-          config false;
-          description
-            "TACACS+ Authentication Server Statistics.";
-          uses common-server-statistics;
-          uses tacacs-server-statistics;
-        }
-      }
-      list authorization-server {
-        key "address";
-        max-elements 8;
-        description
-          "List of TACACS+ authorization servers to use for AAA functions.";
-        uses common-server-attributes;
-        uses tacacs-server-attributes;
-        container statistics {
-          config false;
-          description
-            "TACACS+ Authorization Server Statistics.";
-          uses common-server-statistics;
-          uses tacacs-server-statistics;
-        }
-      }
-      list accounting-server {
-        key "address";
-        max-elements 8;
-        description
-          "List of TACACS+ accounting servers to use for AAA functions.";
-        uses common-server-attributes;
-        uses tacacs-server-attributes;
-        container statistics {
-          config false;
-          description
-            "TACACS+ Accounting Server Statistics.";
-          uses common-server-statistics;
-          uses tacacs-server-statistics;
-        }
-      }
-    }
-    container radius {
-      description
-        "Top-level RADIUS container.";
-      container global-config {
-        description
-          "Global RADIUS configuration attributes.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "RADIUS administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "RADIUS operational state.";
-        }
-        leaf timeout {
-          type uint16 {
-            range "1..30";
-          }
-          units "seconds";
-          description
-            "Global timeout period in seconds on responses from a RADIUS server.";
-        }
-        leaf search-method {
-          type server-search-method;
-          default "priority";
-          description
-            "RADIUS Search Method (Default: priority)";
-        }
-        leaf key {
-          type string {
-            length "0|8..64";
-          }
-          description
-            "The non-encrypted key that can be configured to generate a shared
-             secret between the authentication server and the device. This string
-             is clear-text and will not be retrievable nor stored directly on the
-             device. Specifying a zero-length string will clear the key value.";
-          ncx:password;
-        }
-        leaf secret {
-          type string {
-            length "0|16..128";
-          }
-          description
-            "The encrypted shared secret key used between the authentication
-             server and the device. Specifying a zero-length string will clear
-             the shared secret value.";
-        }
-        leaf retries {
-          type uint16 {
-            range "0..3";
-          }
-          default "3";
-          description
-            "The number of retries. Default is 3.";
-        }
-      }
-      list server {
-        key "address";
-        max-elements 8;
-        description
-          "Global list of RADIUS servers to use for AAA functions.";
-        uses common-server-attributes;
-        leaf udp-port {
-          type uint16 {
-            range "1..65535";
-          }
-          description
-            "RADIUS server UDP Port. Default value is 1812.";
-        }
-        container statistics {
-          config false;
-          description
-            "RADIUS Server Statistics.";
-          uses common-server-statistics;
-          uses radius-server-statistics;
-        }
-      }
-    }
-    container radsec {
-      description
-        "Top-level RADSec container.";
-      container global-config {
-        description
-          "Global RADSec configuration attributes.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "RADSec administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "RADSec operational state.";
-        }
-        leaf timeout {
-          type uint16 {
-            range "1..30";
-          }
-          units "seconds";
-          description
-            "Global timeout period in seconds on responses from a RADSec server.";
-        }
-        leaf search-method {
-          type server-search-method;
-          default "priority";
-          description
-            "RADSec Search Method (Default: priority)";
-        }
-        leaf certificate-name {
-          type string {
-            length "0..32";
-          }
-          description
-            "RADSec device certificate name.";
-        }
-        leaf certificate-status {
-          type cienawstypes:string-maxl-254;
-          config false;
-          description
-            "RADSec device certificate/key status string to indicate if the certificate 
-             exists (irrespective of active or expired), in which case the displayed 
-             result is OK. If the certificate doesn't exist, the displayed result will 
-             be one of the appropriate error strings, like no private key, no device
-             certificate, etc.";
-        }
-        leaf certificate-fingerprint {
-          type string {
-            length "0..95";
-          }
-          config false;
-          description
-            "RADSec device certificate fingerprint.";
-        }
-        leaf check-ip-host {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Check peer's specified ip or hostname against it's certificate.";
-        }
-        leaf check-fingerprint {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Check the fingerprint of the peer's certificate.";
-        }
-      }
-      container ocsp-config {
-        description
-          "RADSec Online Certificate Status Protocol (OCSP) configuration attributes.";
-        uses system:common-ocsp-group;
-      }
-      list server {
-        key "address";
-        max-elements 8;
-        description
-          "Global list of RADSec servers to use for AAA functions.";
-        uses common-server-attributes;
-        leaf port {
-          type uint16 {
-            range "1..65535";
-          }
-          default "2083";
-          description
-            "RADSec server TCP Port. Default value is 2083.";
-        }
-        leaf trusted-dns {
-          type string {
-            length "0..255";
-          }
-          description
-            "Trusted dns name used to check peer's certificate. The
-             name should be fully qualified whenever possible, and can
-             accept a leading wildcard period.";
-        }
-        leaf trusted-fingerprint {
-          type string {
-            length "0|7|95";
-            pattern '(([0-9A-F]{2}[:]){31}([0-9A-F]{2}))?|(Not Set)';
-          }
-          description
-            "Trusted fingerprint for peer's certificate. The string should have 
-             length of 95, except when it is empty or 'Not Set'.";
-        }
-        container statistics {
-          config false;
-          description
-            "RADSec Server Statistics.";
-          uses common-server-statistics;
-          uses radsec-server-statistics;
-        }
-      }
-    }
-  }
-  rpc waveserver-aaa-authentication-statistics-clear {
-    description
-      "Clear user authentication provider statistics.";
-    input {
-      leaf provider {
-        type authentication-method-type;
-        mandatory true;
-        description
-          "Identifies the provider type for which the statistics will be cleared.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-aaa-tacacs-server-statistics-clear {
-    description
-      "Clear TACACS+ server statistics.";
-    input {
-      leaf address {
-        type cienawstypes:ipaddr-or-hostname;
-        mandatory true;
-        description
-          "Configured IP address or Domain Name of the remote server.";
-      }
-      leaf type {
-        type server-entry-type;
-        description
-          "Optional input argument to specify the server list containing the
-           entry to be cleared. The default behavior is to consult the global
-           TACACS+ server list.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-aaa-radsec-server-statistics-clear {
-    description
-      "Clear RADSec server statistics.";
-    input {
-      leaf address {
-        type cienawstypes:ipaddr-or-hostname;
-        description
-          "Configured IP address or Domain Name of the remote server. If
-           omitted, all server statistics will be cleared.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-aaa-kill-user {
-    description
-      "Call to kill a specific user session or all sessions except own";
-    input {
-      leaf session {
-        type uint64;
-        description
-          "User session. This input needs to be specified to kill specific session.";
-      }
-      leaf all {
-        type boolean;
-        description
-          "Kill all user sessions but mine. Default is false.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-alarm.yang b/models/ciena-waveserver-alarm.yang
deleted file mode 100644
index 3744e7b7dbc20b0cdfb74a6455488f9e54bf04a6..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-alarm.yang
+++ /dev/null
@@ -1,417 +0,0 @@
-module ciena-waveserver-alarm {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-alarm";
-  prefix alarm;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines alarm data for the Waveserver Platform.";
-
-  revision 2019-01-08 {
-    description
-      "Groupify the module for inclusion into other external modules.
-       Added 'info' alarm-severity value for alarm history list.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2017-12-15 {
-    description
-      "Updated defined alarm severity type from enum to bits, to accommodate multi-severity alarms.
-       Added 'reset' alarm-reason enum value for alarm history.
-       Added 'intermittent' boolean attribute to active alarms container.
-       Added 'return-string' to provide description in responses to RPC requests.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-06-16 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Added alarm-instance-string typedef with chassis-specific descriptions.
-       Removed 'cleared' and 'info' alarm-severity enum values.
-       Removed 'reset', 'delete', and 'config' alarm-reason enum values.
-       Updated description strings.
-       Moved 'reason' leaf into 'alarm-group' grouping.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef alarm-severity {
-    type enumeration {
-      enum critical {
-        value 3;
-        description
-          "Critical Alarm Severity.";
-      }
-      enum major {
-        value 4;
-        description
-          "Major Alarm Severity.";
-      }
-      enum minor {
-        value 5;
-        description
-          "Minor Alarm Severity.";
-      }
-      enum warning {
-        value 6;
-        description
-          "Warning Alarm Severity.";
-      }
-      enum info {
-        value 8;
-        description
-          "Info Alarm Severity. Applicable for historical alarms only.";
-      }
-    }
-    description
-      "Alarm Severity.";
-  }
-
-  typedef alarm-severity-bits {
-    type bits {
-      bit critical {
-        position 3;
-        description
-          "Critical Alarm Severity";
-      }
-      bit major {
-        position 4;
-        description
-          "Major Alarm Severity";
-      }
-      bit minor {
-        position 5;
-        description
-          "Minor Alarm Severity";
-      }
-      bit warning {
-        position 6;
-        description
-          "Warning Alarm Severity";
-      }
-    }
-    description
-      "Alarm Severity bits. A list of the supported severities of the defined alarm.";
-  }
-
-  typedef alarm-reason {
-    type enumeration {
-      enum reset {
-        value 1;
-        description
-          "Alarm was raised due to reset/restart operation.";
-      }
-      enum set {
-        value 2;
-        description
-          "Alarm is active or became active.";
-      }
-      enum acknowledge {
-        value 5;
-        description
-          "Alarm has been manually acknowledged.";
-      }
-      enum clear {
-        value 6;
-        description
-          "Alarm was cleared.";
-      }
-      enum intermittent {
-        value 10;
-        description
-          "Alarm is intermittent.";
-      }
-    }
-    description
-      "The reason for the alarm entry.";
-  }
-
-  typedef alarm-instance-string {
-    type string {
-      length "0..32";
-    }
-    description
-      "The object instance the alarm is raised against.
-
-       Example formats: 
-
-       Waveserver      Waveserver Ai
-       ----------      -------------
-       Chassis         Chassis
-       DCN             DCN
-       ILAN-<n>        ILAN-<n>
-       PSU-<n>         PSU-<n>
-       CFU-<n>         CFU-<n>
-       n/a             Module-<s>
-       XCVR-<p>        XCVR-<s>-<p>
-       PTP-<p>         PTP-<s>-<p>
-       Port-<p>        Port-<s>-<p>
-       n/a             Channel-<s>-<p>.<c>
-       Service-<n>     Service-<n>
-      ";
-  }
-
-  grouping alarm-group {
-    description
-      "Grouping for common alarm attributes used in 'active' and 'history' lists.";
-    leaf alarm-table-id {
-      type uint32;
-      config false;
-      description
-        "A unique identifier per alarm description on a product. Alarm table id may not represent the same alarm type on a Waveserver 400G and Waverver Ai";
-    }
-    leaf reason {
-      type alarm-reason;
-      config false;
-      description
-        "The reason for the alarm entry.";
-    }
-    leaf severity {
-      type alarm-severity;
-      config false;
-      description
-        "The alarm severity. Critical alarms are service affecting. Other severities are not service affecting.";
-    }
-    leaf local-date-time {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "The local date and time when alarm was updated, in human-readable
-         string format. If the system time-stamp is configured for 'local'
-         time, the time will reflect the local offset from UTC. If the system
-         time-stamp is configured for 'UTC' time, the time will reflect
-         Coordinated Universal Time (UTC).";
-    }
-    leaf instance {
-      type alarm-instance-string;
-      config false;
-      description
-        "The object instance the alarm is raised against.";
-    }
-    leaf description {
-      type cienawstypes:string-maxl-44;
-      config false;
-      description
-        "The alarm description.";
-    }
-    leaf site-identifier {
-      type uint16 {
-        range "0..65535";
-      }
-      config false;
-      description
-        "An integer to uniquely identify the site where this Waveserver is located.";
-    }
-    leaf group-identifier {
-      type uint8 {
-        range "0..99";
-      }
-      config false;
-      description
-        "An integer to uniquely identify a group of Waveservers within a site.";
-    }
-    leaf member-identifier {
-      type uint8 {
-        range "0..254";
-      }
-      config false;
-      description
-        "An integer to uniquely identify a Waveserver chassis within a group of Waveservers.";
-    }
-  }
-
-  grouping waveserver-alarms-group {
-    description
-      "Waveserver alarms operational data.";
-    list active {
-      key "alarm-instance-id";
-      config false;
-      description
-        "Active alarms";
-      leaf alarm-instance-id {
-        type uint32;
-        description
-          "The alarm Instance ID uniquely identifies the occurence of the alarm since the last restart of the Waveserver. It can be used to correlate the raise and clear of the occurence.";
-      }
-      leaf acknowledged {
-        type boolean;
-        config false;
-        description
-          "Alarm has been acknowledged. Acknowledged alarms are not counted in the alarm statistics.";
-      }
-      leaf intermittent {
-        type boolean;
-        config false;
-        description
-          "Alarm condition is intermittent.";
-      }
-      uses alarm-group;
-    }
-    list history {
-      key "history-id";
-      config false;
-      description
-        "Alarm history";
-      leaf history-id {
-        type uint32;
-        config false;
-        description
-          "The alarm history ID uniquely identifies the alarm and action (set or clear) since the Waveserver was installed.";
-      }
-      leaf alarm-instance-id {
-        type uint32;
-        config false;
-        description
-          "The alarm instance ID.";
-      }
-      uses alarm-group;
-    }
-    list defined {
-      key "alarm-table-id";
-      config false;
-      description
-        "Defined Alarm Table";
-      leaf alarm-table-id {
-        type uint32;
-        config false;
-        description
-          "The alarm table ID.";
-      }
-      leaf enabled {
-        type boolean;
-        config false;
-        description
-          "Alarm is enabled.";
-      }
-      leaf active {
-        type boolean;
-        config false;
-        description
-          "Alarm is active.";
-      }
-      leaf threshold {
-        type uint32;
-        config false;
-        description
-          "The alarm threshold.";
-      }
-      leaf cap {
-        type uint32;
-        config false;
-        description
-          "The alarm cap.";
-      }
-      leaf severity {
-        type alarm-severity-bits;
-        config false;
-        description
-          "The alarm severity (or severities) supported for this alarm type.";
-      }
-      leaf instance {
-        type alarm-instance-string;
-        config false;
-        description
-          "The object instance the alarm is raised against.";
-      }
-      leaf description {
-        type cienawstypes:string-maxl-44;
-        config false;
-        description
-          "The alarm description.";
-      }
-    }
-    list statistics {
-      key "index";
-      config false;
-      description
-        "Waveserver Alarm Statistics.";
-      leaf index {
-        type uint32;
-        config false;
-        description
-          "The alarm statistics table index.";
-      }
-      leaf active {
-        type boolean;
-        description
-          "There is alarm active for the alarm type. Acknowledged alarms are not counted.";
-      }
-      leaf disabled {
-        type boolean;
-        description
-          "There is alarm disabled for the alarm type.";
-      }
-      leaf count {
-        type uint32;
-        description
-          "The count of active alarms for the alarm type. Acknowledged alarms are not counted.";
-      }
-      leaf cumulative {
-        type uint32;
-        description
-          "The cumulative count of active alarms for the alarm type ";
-      }
-      leaf type {
-        type cienawstypes:string-maxl-32;
-        description
-          "The alarm type.";
-      }
-    }
-  }
-
-  container waveserver-alarms {
-    config false;
-    description
-      "Waveserver alarms operational data.";
-    uses waveserver-alarms-group;
-  }
-  rpc waveserver-alarm-acknowledge-active {
-    description
-      "Acknowledge an active alarm";
-    input {
-      leaf alarm-instance-id {
-        type uint32;
-        description
-          "The instance ID of the active alarm. If not specified, all alarms will be acknowledged.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-alarm-clear-history {
-    description
-      "Clear the alarm history.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-application-dispersion-scan.yang b/models/ciena-waveserver-application-dispersion-scan.yang
deleted file mode 100644
index 791c89382fce389d1f11b8a67add81f9544bee0d..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-application-dispersion-scan.yang
+++ /dev/null
@@ -1,127 +0,0 @@
-module ciena-waveserver-application-dispersion-scan {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-application-dispersion-scan";
-  prefix app-ds;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's Waveserver Dispersion Scan application
-     support.";
-
-  revision 2019-02-18 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of the Dispersion Scan Application external data
-       model.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-
-  grouping dispersion-scan-configs-group {
-    description
-      "Input parameters from the last Dispersion Scan Test.";
-    leaf from {
-      type int32 {
-        range "-40000..40000";
-      }
-      units "nm";
-      description
-        "Polarization Mode Dispersion Lower limit <-40000..40000>";
-    }
-    leaf to {
-      type int32 {
-        range "-40000..40000";
-      }
-      units "nm";
-      description
-        "Polarization Mode Dispersion Upper limit <-40000..40000>";
-    }
-    leaf step {
-      type uint16 {
-        range "100|200|300|400|500|600|700|800|900|1000";
-      }
-      units "nm";
-      default "100";
-      description
-        "Polarization Mode Dispersion step Increments: <100|200|300|400|500|600|700|800|900|1000>";
-    }
-    leaf dwell {
-      type uint8 {
-        range "1..100";
-      }
-      units "sec";
-      default "1";
-      description
-        "Dispersion Scan dwell time in seconds <SECONDS: 1..100>";
-    }
-  }
-
-  rpc waveserver-application-dispersion-scan-start {
-    description
-      "Start a user-initiated Q-based pre-dispersion compensation scan on a line port.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp.";
-      }
-      uses dispersion-scan-configs-group;
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-dispersion-scan-stop {
-    description
-      "Stop a dispersion scan for a line port before it is complete.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-dispersion-scan-show {
-    description
-      "Show the dispersion scan results for a line port.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-      uses dispersion-scan-configs-group;
-      uses cienawstypes:rpc-oper-status-group;
-      leaf pre-dispersion {
-        type uint32;
-        description
-          "TX dispersion precompensation value";
-      }
-      leaf q-factor {
-        type uint32;
-        description
-          "Optimized Q-Factor that is associated with the Tx pre-compensation value.";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-application-its.yang b/models/ciena-waveserver-application-its.yang
deleted file mode 100644
index e85b84972bed38bb77cd94b7918d94e3da1576ba..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-application-its.yang
+++ /dev/null
@@ -1,249 +0,0 @@
-module ciena-waveserver-application-its {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-application-its";
-  prefix app-its;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-port {
-    prefix port;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's Waveserver Integrated Test Set (ITS)
-     application support.";
-
-  revision 2019-02-18 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of the ITS Application external data model for.
-       performing Integrated Test Set operations on Ethernet client ports.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-
-  typedef its-status {
-    type enumeration {
-      enum idle {
-        description
-          "ITS status is unknown, which is the default value. This means
-           monitor has not been started.";
-      }
-      enum in-progress {
-        description
-          "ITS status is in progress.";
-      }
-      enum pass {
-        description
-          "ITS status is pass.";
-      }
-      enum fail {
-        description
-          "ITS status is failed.";
-      }
-      enum disabled {
-        description
-          "ITS is disabled.";
-      }
-    }
-    description
-      "Integrated Test Set (ITS) status.";
-  }
-
-  typedef its-sync-status {
-    type enumeration {
-      enum none {
-        description
-          "ITS sync status is none, which is the default value.";
-      }
-      enum red {
-        description
-          "ITS sync status is red, indicating active sync loss.";
-      }
-      enum yellow {
-        description
-          "ITS sync status is yellow, indicating active sync loss occurred at
-           some point in the past, but is synced now.";
-      }
-      enum green {
-        description
-          "ITS sync status is green, meaning it is synced and there is no sync
-           loss in history since the start of the test.";
-      }
-      enum disabled {
-        description
-          "ITS status is disabled.";
-      }
-    }
-    description
-      "Integrated Test Set (ITS) sync status.";
-  }
-
-  typedef its-fail-reason {
-    type enumeration {
-      enum none {
-        description
-          "No failure has occured.";
-      }
-      enum pattern-sync-lost {
-        description
-          "ITS failed due to loss of pattern sync.";
-      }
-      enum ber-exceeded {
-        description
-          "ITS failed due to excessive BER..";
-      }
-      enum warm-restart {
-        description
-          "ITS failed due to warm restart.";
-      }
-    }
-    description
-      "Integrated Test Set (ITS) failure reason.";
-  }
-
-  augment "/port:waveserver-ports/port:ports/port:properties" {
-    when "../port:id/port:type = 'ethernet'" {
-      description
-        "Augment for ITS properties applicable to ethernet ports.";
-    }
-    description
-      "Integrated Test Set (ITS) port properties.";
-    container its {
-      description
-        "Integrated Test Set (ITS) related properties.";
-      leaf test-mode {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Enable or disable ITS on the port. The port must be adminstratively
-           disabled in order to enable ITS. The ITS test-mode must be enabled
-           in order to start the ITS test.";
-      }
-      leaf duration {
-        type uint32;
-        units "seconds";
-        description
-          "The amount of time (in seconds) the test signal will be generated.";
-      }
-      leaf ber-threshold {
-        type uint8 {
-          range "0|5..16";
-        }
-        description
-          "The Bit Error Ratio (BER) threshold exponent value for defect
-           reporting. This value is an integer taking values: 0 or 5 to 16.";
-      }
-      container status {
-        config false;
-        description
-          "ITS status.";
-        leaf monitor-status {
-          type its-status;
-          description
-            "ITS test monitor status.";
-        }
-        leaf sync-status {
-          type its-sync-status;
-          description
-            "ITS test sync status.";
-        }
-        leaf fail-reason {
-          type its-fail-reason;
-          description
-            "ITS test failure reason.";
-        }
-        leaf payload-errors {
-          type uint64;
-          description
-            "Payload errors.";
-        }
-        leaf estimated-ber {
-          type cienawstypes:string-sci;
-          description
-            "Estimated BER, expressed in exponential notation, e.g. '1E-06'";
-        }
-        leaf error-free-duration {
-          type uint64;
-          units "seconds";
-          description
-            "Error free duration, in seconds.";
-        }
-        leaf elapsed-time {
-          type uint64;
-          units "seconds";
-          description
-            "Elapsed time, in seconds.";
-        }
-      }
-    }
-  }
-  rpc waveserver-application-its-start {
-    description
-      "Start the integrated test set on the specified port.";
-    input {
-      leaf port-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The port slot/ptp string.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-its-stop {
-    description
-      "Stop the integrated test set on the specified port.";
-    input {
-      leaf port-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The port slot/ptp string.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-its-upload-logs {
-    description
-      "Upload the the detailed integrated test set logs for a given port to a remote server.";
-    input {
-      uses cienawstypes:rpc-log-upload-group;
-      leaf port-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The port slot/ptp string.";
-      }
-      leaf scp-server {
-        type cienawstypes:ipaddr-or-hostname;
-        description
-          "The remote scp server to where the logfile will be copied.";
-      }
-      leaf remote-path {
-        type cienawstypes:string-maxl-254;
-        description
-          "The full path on the server to where the logfile will be copied.";
-      }
-      leaf suffix {
-        type cienawstypes:string-maxl-32;
-        description
-          "A String to add to the name of the logfile as a suffix.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-}
diff --git a/models/ciena-waveserver-application-link-data-collection.yang b/models/ciena-waveserver-application-link-data-collection.yang
deleted file mode 100644
index 432b7f4c74b85d4b36ec3684893e744531bc4ce2..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-application-link-data-collection.yang
+++ /dev/null
@@ -1,126 +0,0 @@
-module ciena-waveserver-application-link-data-collection {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-application-link-data-collection";
-  prefix app-ldc;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's Waveserver Link Data Collection
-     application support.";
-
-  revision 2019-02-18 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of the Link Data Collection Application external
-       data model.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-
-  grouping link-data-collection-configs-group {
-    description
-      "Input parameters from the last Link data Collection Test.";
-    leaf interval {
-      type uint16 {
-        range "10..60000";
-      }
-      units "ms";
-      default "60000";
-      description
-        "Interval in Milliseconds <10-60000>";
-    }
-    leaf num-records {
-      type uint16 {
-        range "100..50000";
-      }
-      default "100";
-      description
-        "Record count <100-50000>";
-    }
-  }
-
-  rpc waveserver-application-link-data-start {
-    description
-      "Start the Link Data Collection on a line port.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp";
-      }
-      uses link-data-collection-configs-group;
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-link-data-stop {
-    description
-      "Stop the Link Data Collection on a line port.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-link-data-show {
-    description
-      "Show the Optical Link Data collection statistics for a line port.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-      uses cienawstypes:rpc-oper-status-group;
-      uses link-data-collection-configs-group;
-    }
-  }
-  rpc waveserver-application-link-data-upload {
-    description
-      "Upload the optical link statistics for a line port from the link data collector to an server.";
-    input {
-      uses cienawstypes:rpc-log-upload-group;
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp";
-      }
-      leaf scp-server {
-        type cienawstypes:ipaddr-or-hostname;
-        description
-          "The remote scp server to where the logfile will be copied.";
-      }
-      leaf file-name {
-        type cienawstypes:string-maxl-254;
-        description
-          "The full path name of the file on the remote server.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-}
diff --git a/models/ciena-waveserver-application-otdr.yang b/models/ciena-waveserver-application-otdr.yang
deleted file mode 100644
index 824b82fc98918c43ecf6d647ac96e28f8017b7e5..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-application-otdr.yang
+++ /dev/null
@@ -1,515 +0,0 @@
-module ciena-waveserver-application-otdr {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-application-otdr";
-  prefix app-otdr;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's Waveserver Optical Time Domain
-     Reflectometer (OTDR) application support.";
-
-  revision 2019-09-13 {
-    description
-      "Added Auto OTDR Tracing.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2019-03-25 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of the OTDR Application external data model for
-       performing Optical Time Domain Reflectometer testing on CMD modules.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-
-  typedef otdr-direction {
-    type enumeration {
-      enum tx {
-        description
-          "Facility Tx fiber for OTDR test";
-      }
-      enum rx {
-        description
-          "Facility Rx fiber for OTDR test";
-      }
-    }
-    description
-      "Direction of OTDR test TX or RX.";
-  }
-
-  typedef otdr-trace-type {
-    type enumeration {
-      enum office {
-        description
-          "fibre cable range from faceplate to 8km.";
-      }
-      enum short {
-        description
-          "fibre cable range from 8km to 20km.";
-      }
-      enum long {
-        description
-          "fibre cable range beyond 20km.";
-      }
-      enum manual {
-        description
-          "fibre cable range defined in a user provisioned OTDR Profile.";
-      }
-    }
-    description
-      "The OTDR Type of trace: office, short, long or manual";
-  }
-
-  grouping otdr-profile-group {
-    description
-      "Optical Time Domain Reflectometer Profile.";
-    leaf description {
-      type cienawstypes:string-maxl-32;
-      description
-        "A description of the OTDR Profile.";
-    }
-    leaf measure-time {
-      type uint8 {
-        range "1..180";
-      }
-      units "sec";
-      description
-        "Measure time in seconds Range <1..180>";
-    }
-    leaf pulse-width {
-      type uint16 {
-        range "10|30|100|300|1000|3000|10000|20000";
-      }
-      units "ns";
-      description
-        "Pulse width in nano-seconds Range  <10|30|100|300|1000|3000|10000|20000>";
-    }
-    leaf distance {
-      type uint32 {
-        range "10..128000";
-      }
-      units "m";
-      description
-        "Distance in meters Range <10..128000>";
-    }
-  }
-
-  grouping otdr-trace-instance {
-    description
-      "A Trace instance.";
-    leaf trace-file {
-      type cienawstypes:string-maxl-254;
-      description
-        "Trace report filename containing a OTDR test's report data in TX direction.";
-    }
-    leaf start-time-stamp {
-      type cienawstypes:name-string;
-      description
-        "Trace start time.";
-    }
-    leaf stop-time-stamp {
-      type cienawstypes:name-string;
-      description
-        "Trace stop time.";
-    }
-    leaf abort-reason {
-      type cienawstypes:name-string;
-      description
-        "Reason if trace aborted.";
-    }
-    leaf trigger-reason {
-      type cienawstypes:name-string;
-      description
-        "Reason for starting trace.";
-    }
-    leaf driver-response {
-      type cienawstypes:name-string;
-      description
-        "Driver Response.";
-    }
-    leaf number-of-events {
-      type uint8;
-      description
-        "The number of Events during the trace.";
-    }
-    leaf latest-trace-instance {
-      type boolean;
-      description
-        "Boolean Flag to state whether this is the latest trace for given direction, trace-type and trace-instance.";
-    }
-    leaf operational-status {
-      type cienawstypes:name-string;
-      description
-        "Operational Status of an OTDR Trace.";
-    }
-    leaf profile-id {
-      type cienawstypes:name-string;
-      description
-        "Unique ID of an OTDR Profile: <1..16>, office, short, long.";
-    }
-  }
-
-  grouping otdr-trace-key-event {
-    description
-      "Details associated with an optical impairment of the fiber link detected from an OTDR trace.";
-    leaf event-spacing {
-      type cienawstypes:decimal-1-dig;
-      units "ns";
-      description
-        "The time taken for an OTDR pulse to reach the target link.";
-    }
-    leaf computed-distance {
-      type cienawstypes:decimal-1-dig;
-      units "meters";
-      description
-        "The estimated distance traveled by the OTDR pulse to the target link.";
-    }
-    leaf slope {
-      type cienawstypes:decimal-3-dig;
-      units "dB/km";
-      description
-        "The attenuation coefficient characteristic of the fiber.";
-    }
-    leaf loss {
-      type cienawstypes:decimal-3-dig;
-      units "dB";
-      description
-        "The estimated attenuation loss determined at the target link.";
-    }
-    leaf reflectance {
-      type cienawstypes:decimal-3-dig;
-      units "dB";
-      description
-        "The estimated reflectance of the target link.";
-    }
-    leaf event-type {
-      type enumeration {
-        enum LOSS {
-          description
-            "An impairment predominantely characterized by attenuation loss.";
-        }
-        enum REFL {
-          description
-            "An impairment predominantely characterized by reflectance.";
-        }
-        enum SAT {
-          description
-            "An impairment predominantely characterized by saturation.";
-        }
-      }
-      description
-        "The characterization of an impairment: LOSS, REFL, SAT";
-    }
-  }
-
-  container waveserver-application-otdr {
-    description
-      "Optical Time Domain Reflectometer (OTDR) configuration data.";
-    list profile {
-      key "profile-id";
-      description
-        "Configuration data for the OTDR Profiles";
-      leaf profile-id {
-        type cienawstypes:name-string;
-        description
-          "Unique ID of an OTDR Profile: <1..16>, office, short, long. Only profile-ids <2..16> can be created/deleted.";
-      }
-      uses otdr-profile-group;
-    }
-    list traces {
-      key "ptp-id";
-      config false;
-      description
-        "OTDR traces for a specific PTP";
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp";
-      }
-      list direction {
-        key "trace-direction";
-        config false;
-        description
-          "The direction in which the trace was performed.";
-        leaf trace-direction {
-          type otdr-direction;
-          mandatory true;
-          description
-            "The direction of the test: tx or rx";
-        }
-        list type {
-          key "trace-type";
-          config false;
-          description
-            "The type of trace that was performed.";
-          leaf trace-type {
-            type otdr-trace-type;
-            mandatory true;
-            description
-              "The type of trace: office, short, long or manual";
-          }
-          list instance {
-            key "trace-instance";
-            config false;
-            description
-              "The details of a trace.";
-            leaf trace-instance {
-              type cienawstypes:name-string;
-              mandatory true;
-              description
-                "Unique identifier of a trace type in a specific direction: <1 .. 10>, baseline or latest.";
-            }
-            uses otdr-trace-instance;
-            list key-event {
-              key "key-event-index";
-              config false;
-              description
-                "The details of a key event.";
-              leaf key-event-index {
-                type uint8 {
-                  range "1..60";
-                }
-                mandatory true;
-                description
-                  "Unique identifier of a Key Event for a given trace.";
-              }
-              uses otdr-trace-key-event;
-            }
-          }
-        }
-      }
-    }
-  }
-  rpc waveserver-application-otdr-start {
-    description
-      "Start an OTDR test on a line port.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp";
-      }
-      leaf profile-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique ID of an OTDR Profile: <1..16>, office, short, long or auto.";
-      }
-      leaf direction {
-        type otdr-direction;
-        mandatory true;
-        description
-          "The Facility Tx/Rx fiber for the OTDR test";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-otdr-stop {
-    description
-      "Stop an OTDR test on a line port before it completes.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-otdr-show-status {
-    description
-      "Show the status of the OTDR tests on a line port";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        description
-          "The line port slot/ptp.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-      leaf rx-profile-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique ID of an OTDR Profile in the RX direction: <1..16>, office, short, long";
-      }
-      leaf rx-profile-measure-time {
-        type uint8 {
-          range "1..180";
-        }
-        units "sec";
-        description
-          "Measure time in seconds Range <1..180>";
-      }
-      leaf rx-profile-pulse-width {
-        type uint16 {
-          range "10|30|100|300|1000|3000|10000|20000";
-        }
-        units "ns";
-        description
-          "Pulse width in nano-seconds Range  <10|30|100|300|1000|3000|10000|20000>";
-      }
-      leaf rx-profile-distance {
-        type uint32 {
-          range "10..128000";
-        }
-        units "m";
-        description
-          "Distance in meters Range <10..128000>";
-      }
-      leaf rx-profile-description {
-        type cienawstypes:string-maxl-256;
-        description
-          "Profile description of OTDR test in the RX direction.";
-      }
-      leaf rx-start-time {
-        type cienawstypes:string-maxl-64;
-        description
-          "The start time of the OTDR test in the RX direction";
-      }
-      leaf rx-trace-status {
-        type cienawstypes:string-maxl-64;
-        description
-          "The trace status of the OTDR test in the RX direction";
-      }
-      leaf rx-reason-initiated {
-        type cienawstypes:string-maxl-64;
-        description
-          "The reason to start the OTDR test in the RX direction";
-      }
-      leaf rx-trace-file {
-        type cienawstypes:string-maxl-254;
-        description
-          "Trace report filename containing an OTDR test's report data in RX direction.";
-      }
-      leaf tx-profile-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique ID of an OTDR Profile in the TX direction: <1..16>, office, short, long";
-      }
-      leaf tx-profile-measure-time {
-        type uint8 {
-          range "1..180";
-        }
-        units "sec";
-        description
-          "Measure time in seconds Range <1..180>";
-      }
-      leaf tx-profile-pulse-width {
-        type uint16 {
-          range "10|30|100|300|1000|3000|10000|20000";
-        }
-        units "ns";
-        description
-          "Pulse width in nano-seconds Range  <10|30|100|300|1000|3000|10000|20000>";
-      }
-      leaf tx-profile-distance {
-        type uint32 {
-          range "10..128000";
-        }
-        units "m";
-        description
-          "Distance in meters Range <10..128000>";
-      }
-      leaf tx-profile-description {
-        type cienawstypes:string-maxl-256;
-        description
-          "Profile description of OTDR test in the TX direction.";
-      }
-      leaf tx-start-time {
-        type cienawstypes:string-maxl-32;
-        description
-          "The start time of the OTDR test in the TX direction";
-      }
-      leaf tx-trace-status {
-        type cienawstypes:string-maxl-32;
-        description
-          "The trace status of the OTDR test in the TX direction";
-      }
-      leaf tx-reason-initiated {
-        type cienawstypes:string-maxl-64;
-        description
-          "The reason to start the OTDR test in the TX direction";
-      }
-      leaf tx-trace-file {
-        type cienawstypes:string-maxl-254;
-        description
-          "Trace report filename containing a OTDR test's report data in TX direction.";
-      }
-    }
-  }
-  rpc waveserver-application-otdr-upload {
-    description
-      "Upload the logs of an OTDR test on a line port";
-    input {
-      uses cienawstypes:rpc-log-upload-group;
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp";
-      }
-      leaf direction {
-        type otdr-direction;
-        mandatory true;
-        description
-          "The direction of the test: tx or rx";
-      }
-      leaf trace-type {
-        type otdr-trace-type;
-        mandatory true;
-        description
-          "The type of trace: office, short, long or manual";
-      }
-      leaf trace-instance {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique identifier of a trace type in a specific direction: <1 .. 10>, baseline or latest";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-application-otdr-create-baseline {
-    description
-      "Start the office,short and long OTDR traces in the given direction.
-       The traces in both TX and RX are started if direction is omitted.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "The line port slot/ptp";
-      }
-      leaf direction {
-        type otdr-direction;
-        description
-          "The direction of the test RX or TX. Test is run in both directions if omitted.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-}
diff --git a/models/ciena-waveserver-chassis.yang b/models/ciena-waveserver-chassis.yang
deleted file mode 100644
index c87726f3f42a4e53650826771278fc922eac6b4d..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-chassis.yang
+++ /dev/null
@@ -1,824 +0,0 @@
-module ciena-waveserver-chassis {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-chassis";
-  prefix chassis;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-interfaces {
-    prefix ciena-ws-if;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines Chassis data for the Waveserver Platform.";
-
-  revision 2019-05-23 {
-    description
-      "Made power-state attribute configurable.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2018-12-06 {
-    description
-      "Moved chassis-type enum to waveserver-typedefs.yang.
-       Deprecated ethernet-specific grouping in the 'management-port' list.
-       Added 'connector-type' to 'management-port' list.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-09-19 {
-    description
-      "Add 'secure-erase' read-only container.
-       Add 'type-2' wcs type enum value.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-06-14 {
-    description
-      "Added 'restart-info' list for Chassis, WCS, and Module restart reason and time.
-       Moved several 'management-port' attributes into groupings in the ciena-waveserver-interfaces module.
-       Removed unused/unsupported sub-containers from the chassis/mac-address container.
-       Added ncx:user-write to 'power-supply-units', 'cooling-fan-units', 'management-port', and 'slot' lists.
-       Increased max string length for device-id 'model' attribute from 50 to 128 characters.
-       Added container 'power/state' with leaf 'total-power'.
-       Added new 'AC/240VDC' PSU type enum value.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-12-20 {
-    description
-      "Added management-port 'mode', 'speed', and 'duplex' for wayside channel configuration.
-       Added return code for waveserver-wcs-restart and waveserver-wcs-restart-cold.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-09-05 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Added 'waveserver ai chassis' type.
-       Updated several UI and description strings.
-       Added access-panel container, wcs container, and inventory view of components.
-       Added slot power management and wcs-restart RPCs.
-       Removed 10-second delay from restart RPCs and remove restart-cancel RPCs.
-       Added access-panel capabilities.
-       Moved several device-id attributes into common grouping used by all components.
-       Removed 'number-of-fans', 'number-of-temperature-sensors' and 'status' list from 'cooling-fan-units/properties' container.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef mac-block-size {
-    type uint32;
-    description
-      "MAC address block size.";
-  }
-
-  typedef chassis-operation-state {
-    type enumeration {
-      enum uninstalled {
-        description
-          "Device is not present.";
-      }
-      enum normal {
-        description
-          "Device is up/operational.";
-      }
-      enum faulted {
-        description
-          "Device is in a failed/faulted state.";
-      }
-    }
-    description
-      "Chassis operational state. Applies to PSU, CFU, AP, WCS components in
-       the chassis.";
-  }
-
-  grouping device-id-group {
-    description
-      "Common group of device identification attributes for components in the
-       chassis.";
-    leaf model {
-      type cienawstypes:string-maxl-128;
-      config false;
-      description
-        "Device model information.";
-    }
-    leaf description {
-      type cienawstypes:string-maxl-254;
-      config false;
-      description
-        "Device description.";
-    }
-    leaf serial-number {
-      type cienawstypes:string-maxl-50;
-      config false;
-      description
-        "Device serial number information.";
-    }
-    leaf part-number {
-      type cienawstypes:string-maxl-50;
-      config false;
-      description
-        "Device part number information.";
-    }
-    leaf revision {
-      type cienawstypes:string-maxl-50;
-      config false;
-      description
-        "Device revision information.";
-    }
-    leaf manufacture-date {
-      type cienawstypes:string-maxl-50;
-      config false;
-      description
-        "Device Manufacture Date, in string format.";
-    }
-  }
-
-  container waveserver-chassis {
-    description
-      "Waveserver chassis configuration data and operational data.";
-    container identification {
-      config false;
-      description
-        "Waveserver chassis identification attributes.";
-      leaf type {
-        type cienawstypes:chassis-type;
-        config false;
-        description
-          "Type enum value of the Chassis.";
-      }
-      uses device-id-group;
-    }
-    container capabilities {
-      config false;
-      description
-        "Waveserver chassis capabilities attributes.";
-      container control {
-        description
-          "Control module capabilities for this chassis.";
-        leaf count {
-          type uint8;
-          config false;
-          description
-            "Number of control modules available to the Waveserver chassis.";
-        }
-        leaf type {
-          type cienawstypes:module-type-bits;
-          config false;
-          description
-            "Chassis control module type. Can be integrated or field-replaceable.";
-        }
-      }
-      container access-panel {
-        description
-          "Access Panel capabilities for this chassis.";
-        leaf count {
-          type uint8;
-          config false;
-          description
-            "Number of access panel modules available to the Waveserver chassis.";
-        }
-        leaf type {
-          type cienawstypes:module-type-bits;
-          config false;
-          description
-            "Chassis access panel module type. Can be integrated or field-replaceable.";
-        }
-      }
-      container switch {
-        description
-          "Switch module capabilities for this chassis.";
-        leaf count {
-          type uint8;
-          config false;
-          description
-            "Number of switch modules available to the Waveserver chassis.";
-        }
-        leaf type {
-          type cienawstypes:module-type-bits;
-          config false;
-          description
-            "Chassis switch module type. Can be integrated or field-replaceable.";
-        }
-      }
-      container modules {
-        description
-          "Service module capabilities for this chassis.";
-        leaf count {
-          type uint8;
-          config false;
-          description
-            "Total number of service modules available to a fully-equipped
-             Waveserver chassis.";
-        }
-        leaf type {
-          type cienawstypes:module-type-bits;
-          config false;
-          description
-            "Chassis service module type. Can be integrated or field-replaceable.";
-        }
-      }
-      container fan {
-        description
-          "Fan unit capabilities for this chassis.";
-        leaf count {
-          type uint8;
-          config false;
-          description
-            "Number of fan units available to the Waveserver chassis.";
-        }
-        leaf type {
-          type cienawstypes:module-type-bits;
-          config false;
-          description
-            "Chassis fan unit type. Can be integrated or field-replaceable.";
-        }
-      }
-      container air-filter {
-        description
-          "Air filter capabilities for this chassis.";
-        leaf supported {
-          type cienawstypes:yes-no-enum;
-          config false;
-          description
-            "Is the air filter supported on the Waveserver chassis.";
-        }
-        leaf type {
-          type cienawstypes:module-type-bits;
-          config false;
-          description
-            "Chassis air filter type. Can be integrated or field-replaceable.";
-        }
-        leaf active {
-          type cienawstypes:yes-no-enum;
-          config false;
-          description
-            "Is the air filter active on the Waveserver chassis.";
-        }
-      }
-      container power {
-        description
-          "Power supply capabilities for this chassis.";
-        leaf count {
-          type uint8;
-          config false;
-          description
-            "Number of power supply units available to the Waveserver chassis.";
-        }
-        leaf type {
-          type cienawstypes:module-type-bits;
-          config false;
-          description
-            "Power supply unit type. Can be integrated or field-replaceable.";
-        }
-        leaf redundant {
-          type cienawstypes:yes-no-enum;
-          config false;
-          description
-            "Is redundant power present for the Waveserver chassis.";
-        }
-        leaf dc-support {
-          type cienawstypes:yes-no-enum;
-          config false;
-          description
-            "Whether or not DC power is supported.";
-        }
-      }
-    }
-    container mac-addresses {
-      config false;
-      description
-        "MAC Addresses used by this chassis.";
-      container chassis {
-        description
-          "Chassis MAC address information.";
-        leaf base {
-          type cienawstypes:mac-string;
-          config false;
-          description
-            "The Chassis Base MAC address. All MACs used in shelf offset from
-             this address.";
-        }
-        leaf block-size {
-          type mac-block-size;
-          config false;
-          description
-            "Number of MACs allocated by manufacturing.";
-        }
-      }
-      container local-management {
-        description
-          "Local management MAC address information.";
-        leaf base {
-          type cienawstypes:mac-string;
-          config false;
-          description
-            "Local Management MAC address.";
-        }
-        leaf block-size {
-          type mac-block-size;
-          config false;
-          description
-            "Local Management MAC Block Size.";
-        }
-      }
-      container reserved {
-        description
-          "Reserved MAC address information.";
-        leaf base {
-          type cienawstypes:mac-string;
-          config false;
-          description
-            "Reserved MAC address.";
-        }
-        leaf block-size {
-          type mac-block-size;
-          config false;
-          description
-            "Reserved MAC address Block Size.";
-        }
-      }
-    }
-    list power-supply-units {
-      ncx:user-write "update";
-      key "psu-number";
-      description
-        "Power Supply Unit Status.";
-      leaf psu-number {
-        type uint8;
-        description
-          "Unique index number for the Power Supply Unit list entry.";
-      }
-      leaf name {
-        type cienawstypes:string-maxl-16;
-        config false;
-        description
-          "Name of the power supply unit. In the format of PSU-<slot #>. Contains
-           the slot number of the power supply unit.";
-      }
-      container state {
-        description
-          "Power Supply Unit state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether admin state of the Power Supply Unit is enabled or disabled.
-             Disabled state masks the alarms only.";
-        }
-        leaf operational-state {
-          type chassis-operation-state;
-          config false;
-          description
-            "Operational state of the Power Supply Unit.";
-        }
-      }
-      container properties {
-        config false;
-        description
-          "All the operational data fields of this Power Supply Unit.";
-        leaf type {
-          type enumeration {
-            enum AC {
-              description
-                "Power supply unit uses AC power.";
-            }
-            enum DC {
-              description
-                "Power supply unit uses DC power.";
-            }
-            enum unequipped {
-              description
-                "Power supply unit is unequipped.";
-            }
-            enum AC/240VDC {
-              description
-                "Power supply unit is capable of AC or 240 Volt DC power.";
-            }
-          }
-          config false;
-          description
-            "The Power Supply Unit type.";
-        }
-      }
-      container device-id {
-        config false;
-        description
-          "Device identification information of this Power Supply Unit.";
-        uses device-id-group;
-      }
-    }
-    list cooling-fan-units {
-      ncx:user-write "update";
-      key "cfu-number";
-      description
-        "Cooling Fan Unit Status.";
-      leaf cfu-number {
-        type uint8;
-        description
-          "Unique index number for the Cooling Fan Unit list entry.";
-      }
-      leaf name {
-        type cienawstypes:string-maxl-16;
-        config false;
-        description
-          "Name of the cooling fan unit. In the format of CFU-<slot #>. Contains
-           the slot number of the cooling fan unit.";
-      }
-      container state {
-        description
-          "Cooling Fan Unit state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether Admin State of the cooling fan unit is enabled or disabled.
-             Disabled state masks the alarms only.";
-        }
-        leaf operational-state {
-          type chassis-operation-state;
-          config false;
-          description
-            "Operational state of the Cooling Fan unit.";
-        }
-      }
-      container properties {
-        config false;
-        description
-          "All the operational data fields of this Cooling Fan Unit.";
-        leaf automatic-control {
-          type cienawstypes:enabled-disabled-enum;
-          config false;
-          description
-            "Whether Automatic Control of the cooling fan unit is enabled or
-             disabled.";
-        }
-      }
-      container device-id {
-        config false;
-        description
-          "Device Identification information of this Cooling Fan Unit.";
-        uses device-id-group;
-      }
-    }
-    list management-port {
-      ncx:user-write "update";
-      key "index";
-      description
-        "A list to manage chassis ports.";
-      leaf index {
-        type uint16;
-        description
-          "Index value of the management port.";
-      }
-      container id {
-        config false;
-        description
-          "Identification information of this management port.";
-        leaf name {
-          type cienawstypes:string-maxl-16;
-          config false;
-          description
-            "Name of the Port. The names are predefined.";
-        }
-      }
-      container state {
-        description
-          "Management port state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether Admin State is enabled or disabled for this management port.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Operational state of this management port.";
-        }
-      }
-      container properties {
-        description
-          "All the operational data of this management port.";
-        leaf type {
-          type enumeration {
-            enum ethernet {
-              description
-                "Management port uses Ethernet protocol for communications.";
-            }
-            enum serial {
-              description
-                "Management port is a Serial interface.";
-            }
-          }
-          config false;
-          description
-            "Management port protocol type. If the port is DCN, ILAN-1, or
-             ILAN-2, the protocol type will be Ethernet. If the port is Console,
-             the port type will be Serial.";
-        }
-        leaf connector-type {
-          type enumeration {
-            enum RJ45 {
-              description
-                "Management port connector type is RJ45.";
-            }
-          }
-          config false;
-          description
-            "Management port connector type.";
-        }
-        uses ciena-ws-if:management-if-properties-group;
-        uses ciena-ws-if:ethernet-if-properties-group {
-          status deprecated;
-        }
-      }
-    }
-    container access-panel {
-      description
-        "Access Panel";
-      container state {
-        description
-          "Access Panel state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether admin state of the Access Panel is enabled or disabled.";
-        }
-        leaf operational-state {
-          type chassis-operation-state;
-          config false;
-          description
-            "Operational state of the Access Panel.";
-        }
-      }
-      container properties {
-        config false;
-        description
-          "All the operational data fields of the Access Panel.";
-        leaf type {
-          type enumeration {
-            enum type-1 {
-              description
-                "Access Panel Type 1.";
-            }
-            enum unequipped {
-              description
-                "Access Panel is unequipped.";
-            }
-          }
-          config false;
-          description
-            "The Access Panel type.";
-        }
-      }
-      container device-id {
-        config false;
-        description
-          "Device identification information of the Access Panel.";
-        uses device-id-group;
-      }
-    }
-    container wcs {
-      description
-        "Waveserver Control Subsystem. This is the control module for the
-         Waveserver Ai chassis.";
-      container state {
-        description
-          "WCS control module state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether admin state of the WCS is enabled or disabled.";
-        }
-        leaf operational-state {
-          type chassis-operation-state;
-          config false;
-          description
-            "Operational state of the WCS.";
-        }
-      }
-      container properties {
-        config false;
-        description
-          "All the operational data fields of the WCS.";
-        leaf type {
-          type enumeration {
-            enum unequipped {
-              description
-                "WCS is unequipped.";
-            }
-            enum type-1 {
-              description
-                "WCS Type 1.";
-            }
-            enum type-2 {
-              description
-                "WCS Type 2.";
-            }
-          }
-          config false;
-          description
-            "The WCS module type.";
-        }
-      }
-      container device-id {
-        config false;
-        description
-          "Device identification information of the WCS.";
-        uses device-id-group;
-      }
-    }
-    container secure-erase {
-      config false;
-      description
-        "Chassis secure erase status attributes, if applicable.";
-      leaf last-secure-erase-result {
-        type enumeration {
-          enum unknown {
-            description
-              "Secure erase status is unknown or not applicable.";
-          }
-          enum passed {
-            description
-              "Secure erase was successful.";
-          }
-          enum failed {
-            description
-              "Secure erase failed.";
-          }
-        }
-        description
-          "The result of the most recent secure erase on this system.";
-      }
-      leaf last-secure-erase-type {
-        type enumeration {
-          enum unknown {
-            description
-              "Secure erase type is unknown or not applicable.";
-          }
-          enum rtfd-user {
-            description
-              "Reset to factory defaults (RTFD) initiated by user command via
-               management interface. The WCS will reboot after the reset
-               operation is complete.";
-          }
-          enum rtfd-and-halt {
-            description
-              "Reset to factory defaults (RTFD) without rebooting the WCS.";
-          }
-          enum rtfd-push-button {
-            description
-              "Reset to factory defaults (RTFD) initiated via push button on
-               the chassis.";
-          }
-          enum rtfd-recovery-menu {
-            description
-              "Reset to factory defaults (RTFD) initiated by user via ONIE
-               recovery menu.";
-          }
-        }
-        description
-          "The type of the most recent secure erase on this system.";
-      }
-      leaf last-secure-erase-date {
-        type cienawstypes:string-maxl-50;
-        description
-          "Last secure erase date and time, in 'YYYY-MM-DD HH:MM:SS' format, or
-           empty string if not applicable or unavailable.";
-      }
-    }
-    container inventory {
-      config false;
-      description
-        "The inventory view of all of the components in the chassis.";
-      list component {
-        key "index";
-        config false;
-        description
-          "Inventory component details.";
-        leaf index {
-          type uint16;
-          description
-            "Index value of the inventory component.";
-        }
-        leaf name {
-          type cienawstypes:string-maxl-16;
-          config false;
-          description
-            "Name of the inventory component (e.g., Chassis, DCN, WCS, AP,
-             PSU-<n>, CFU-<n>, etc.).";
-        }
-        uses device-id-group;
-      }
-    }
-    list slot {
-      ncx:user-write "update";
-      key "slot-id";
-      description
-        "Chassis slot power management.";
-      leaf slot-id {
-        type uint8 {
-          range "1..3";
-        }
-        description
-          "Chassis slot number, Key value for the chassis slot list.";
-      }
-      leaf power-state {
-        type cienawstypes:power-state;
-        description
-          "Slot power state.";
-      }
-      leaf actual-power-state {
-        type cienawstypes:on-off-enum;
-        config false;
-        description
-          "The actual power state (on or off) of the specified slot.";
-      }
-    }
-    list restart-info {
-      key "component";
-      config false;
-      description
-        "Chassis, WCS, and Module restart information.";
-      leaf component {
-        type cienawstypes:string-maxl-16;
-        description
-          "Component name.";
-      }
-      leaf last-restart {
-        type cienawstypes:string-maxl-32;
-        description
-          "The date and time of last restart in 'YYYY-MM-DD HH:MM:SS' format,
-           or empty string if unknown.";
-      }
-      leaf last-restart-reason {
-        type cienawstypes:restart-reason;
-        description
-          "Cause for the last restart.";
-      }
-    }
-    container power {
-      config false;
-      description
-        "Chassis power operational data.";
-      container state {
-        description
-          "Chassis power state attributes.";
-        leaf total-power {
-          type cienawstypes:decimal-1-dig;
-          units "watts";
-          description
-            "The total chassis input power in watts.";
-        }
-      }
-    }
-  }
-  rpc waveserver-chassis-restart {
-    description
-      "Initiates a chassis warm restart. This restarts the WCS and all modules.";
-  }
-  rpc waveserver-chassis-restart-cold {
-    description
-      "Initiates a chassis cold restart. This restarts the WCS and all modules.";
-  }
-  rpc waveserver-wcs-restart {
-    description
-      "Initiates a WCS warm restart.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-wcs-restart-cold {
-    description
-      "Initiates a WCS cold restart.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-configuration.yang b/models/ciena-waveserver-configuration.yang
deleted file mode 100644
index 4200be14e48031a0c39fc82ee657891e6acc7ab5..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-configuration.yang
+++ /dev/null
@@ -1,895 +0,0 @@
-module ciena-waveserver-configuration {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-configuration";
-  prefix configuration;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-system {
-    prefix system;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines configuration data for the Waveserver.";
-
-  revision 2018-12-03 {
-    description
-      "Added waveserver-configuration-clear-backup-config-warning RPC.
-       Added waveserver-configuration-clear-config-errors-warning RPC.
-       Added waveserver-configuration-clear-no-config-warning RPC.
-       Added waveserver-configuration-copy RPC.
-       Added waveserver-configuration-rename RPC.
-       Added waveserver-configuration-upload-running-config RPC.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-06-19 {
-    description
-      "Added waveserver-configuration-reset-to-defaults RPC.
-       Added waveserver-configuration-reset-to-factory-defaults RPC.
-       Added Zero Touch Provisioning (ZTP) support.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-04-17 {
-    description
-      "Added 'state' container.
-       Added waveserver-configuration-delete RPC.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-08-24 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Added 'include-default-settings' option to waveserver-configuration-save RPC (from WS 1.5).
-       Added 'include-default-settings' option to waveserver-configuration-backup RPC (from WS 1.5).
-       Remove 'max-elements' from the configuration-files/file-list.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef ztp-operational-state {
-    type enumeration {
-      enum unknown {
-        value 0;
-        description
-          "ZTP operational state is unknown.";
-      }
-      enum idle {
-        value 1;
-        description
-          "ZTP is idle.";
-      }
-      enum start {
-        value 2;
-        description
-          "ZTP has started.";
-      }
-      enum restarting {
-        value 3;
-        description
-          "ZTP is restarting.";
-      }
-      enum waiting-for-dhcp-lease {
-        value 4;
-        description
-          "ZTP is waiting for dhcp lease renewal.";
-      }
-      enum downloading-boot-file {
-        value 5;
-        description
-          "ZTP is downloading a boot file.";
-      }
-      enum parsing-boot-file {
-        value 6;
-        description
-          "ZTP is parsing a boot file.";
-      }
-      enum processing-ztp-timeout {
-        value 7;
-        description
-          "ZTP is processing ztpTimeout attribute.";
-      }
-      enum processing-license-id {
-        value 8;
-        description
-          "ZTP is processing license registrationId attribute.";
-      }
-      enum processing-combo-license {
-        value 9;
-        description
-          "ZTP is processing combo license.";
-      }
-      enum downloading-licenses {
-        value 10;
-        description
-          "ZTP is downloading the license file.";
-      }
-      enum installing-licenses {
-        value 11;
-        description
-          "ZTP is installing the license file.";
-      }
-      enum downloading-login-banner {
-        value 12;
-        description
-          "ZTP is downloading and processing the login banner.";
-      }
-      enum downloading-welcome-banner {
-        value 13;
-        description
-          "ZTP is downloading and processing the welcome banner.";
-      }
-      enum downloading-config-file {
-        value 14;
-        description
-          "ZTP is downloading the config file.";
-      }
-      enum applying-config-file {
-        value 15;
-        description
-          "ZTP is applying the config file.";
-      }
-      enum downloading-script-file {
-        value 16;
-        description
-          "ZTP is downloading the script file.";
-      }
-      enum applying-script-file {
-        value 17;
-        description
-          "ZTP is applying the script file.";
-      }
-      enum processing-software-package {
-        value 18;
-        description
-          "ZTP is processing the software package.";
-      }
-      enum requesting-reboot {
-        value 19;
-        description
-          "ZTP is requesting a cold reboot.";
-      }
-      enum upgrading-software {
-        value 20;
-        description
-          "ZTP is upgrading the software load.";
-      }
-      enum booting {
-        value 21;
-        description
-          "ZTP is booting.";
-      }
-      enum failed {
-        value 22;
-        description
-          "ZTP has failed.";
-      }
-      enum completed {
-        value 23;
-        description
-          "ZTP has completed.";
-      }
-    }
-    description
-      "ZTP operational states.";
-  }
-
-  typedef ztp-error {
-    type enumeration {
-      enum unknown {
-        value 0;
-        description
-          "Unknown ZTP Error.";
-      }
-      enum none {
-        value 1;
-        description
-          "No ZTP Errors.";
-      }
-      enum boot-file-download-failed {
-        value 2;
-        description
-          "ZTP Boot File Download Failed.";
-      }
-      enum boot-file-parse-error {
-        value 3;
-        description
-          "ZTP Error Parsing Boot File.";
-      }
-      enum ztp-timeout-error {
-        value 4;
-        description
-          "Error Processing ZTP Timeout.";
-      }
-      enum license-id-error {
-        value 5;
-        description
-          "ZTP Error Setting License Registration ID.";
-      }
-      enum combo-license-error {
-        value 6;
-        description
-          "ZTP Combo License Error.";
-      }
-      enum license-download-error {
-        value 7;
-        description
-          "ZTP Error Downloading Licenses.";
-      }
-      enum license-install-error {
-        value 8;
-        description
-          "ZTP Error Installing Licenses.";
-      }
-      enum license-host-id-mismatch-error {
-        value 9;
-        description
-          "ZTP Error Installing Licenses: Host Id Mismatch.";
-      }
-      enum license-warm-reboot-required {
-        value 10;
-        description
-          "ZTP Error Installing Licenses: Warm Reboot Required.";
-      }
-      enum license-unsupported-file-type {
-        value 11;
-        description
-          "ZTP Error Installing Licenses: Unsupported File Type.";
-      }
-      enum expired-license-file {
-        value 12;
-        description
-          "ZTP Error Installing Licenses: Expired License File.";
-      }
-      enum system-time-not-set {
-        value 13;
-        description
-          "ZTP Error System Time Not Set.";
-      }
-      enum login-banner-error {
-        value 14;
-        description
-          "ZTP Error Downloading/Installing Login Banner.";
-      }
-      enum welcome-banner-error {
-        value 15;
-        description
-          "ZTP Error Downloading/Installing Welcome Banner.";
-      }
-      enum script-file-download-failed {
-        value 16;
-        description
-          "ZTP Failed to Download Script File.";
-      }
-      enum script-file-apply-failed {
-        value 17;
-        description
-          "ZTP Failed to Execute Script File.";
-      }
-      enum config-file-download-failed {
-        value 18;
-        description
-          "ZTP Failed to Download Config File.";
-      }
-      enum config-file-apply-failed {
-        value 19;
-        description
-          "ZTP Failed to Apply Config File.";
-      }
-      enum software-upgrade-failed {
-        value 20;
-        description
-          "ZTP Software Package Upgrade Failed.";
-      }
-      enum software-download-failed {
-        value 21;
-        description
-          "ZTP Software Download Failed.";
-      }
-      enum software-already-running {
-        value 22;
-        description
-          "ZTP Did Not Upgrade Software. Correct 
-           Software Load is Already Installed.";
-      }
-    }
-    description
-      "ZTP errors.";
-  }
-
-  container waveserver-configuration {
-    description
-      "Waveserver Configuration: configuration data and operational data.";
-    container state {
-      config false;
-      description
-        "System configuration status operational data.";
-      leaf operational-state {
-        type enumeration {
-          enum idle {
-            description
-              "Configuration subsystem is idle.";
-          }
-          enum loading {
-            description
-              "Configuration subsystem is loading the default, startup or
-               installed configuration.";
-          }
-          enum augmenting {
-            description
-              "Configuration is being augmented from another file. The config
-               data will be applied to the running config without replacing it.";
-          }
-          enum checking {
-            description
-              "Configuration subsystem is performing syntax validation on a
-               configuration file.";
-          }
-        }
-        description
-          "The operational state of the configuration management subsystem.";
-      }
-      leaf loaded-configuration {
-        type enumeration {
-          enum default {
-            description
-              "The default/primary configuration was loaded.";
-          }
-          enum backup {
-            description
-              "The backup configuration was loaded.";
-          }
-          enum zero-touch-provisioning {
-            description
-              "The ZTP configuration was loaded. Not currently supported.";
-          }
-          enum none {
-            description
-              "No configuration has been loaded.";
-          }
-        }
-        description
-          "Specifies the active configuration most recently loaded by the
-           configuration subsystem.";
-      }
-      leaf errors {
-        type boolean;
-        description
-          "Specifies whether the previously loaded configuration had errors
-           when being applied.";
-      }
-      leaf dirty {
-        type boolean;
-        description
-          "The dirty flag indicates whether the running configuration differs
-           from the saved configuration.";
-      }
-    }
-    container configuration-files {
-      config false;
-      description
-        "List of saved configuration files on the Waveserver.";
-      leaf-list file-list {
-        type cienawstypes:string-maxl-254;
-        config false;
-        description
-          "The filename list for all the saved configuration files.";
-      }
-    }
-    container default-files {
-      description
-        "Waveserver Configuration: default configuration files.";
-      leaf save-filename {
-        type cienawstypes:string-maxl-254;
-        description
-          "The filename for the default save configuration file.";
-      }
-      leaf load-filename {
-        type cienawstypes:string-maxl-254;
-        description
-          "The filename for the default load configuration file.";
-      }
-      leaf backup-load-filename {
-        type cienawstypes:string-maxl-254;
-        description
-          "The filename for the backup load configuration file.";
-      }
-    }
-    container ztp {
-      description
-        "Waveserver Configuration: zero touch provisioning data";
-      container state {
-        description
-          "ZTP configuration and operational data.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether the ZTP admin state is enabled or disabled.
-             When ZTP is disabled, DHCP bootfile requests will be ignored.";
-        }
-        leaf operational-state {
-          type ztp-operational-state;
-          config false;
-          description
-            "The current status or functional step being executed in the 
-             ZTP process. ZTP operational state will be 'idle' before ZTP 
-             is run, and 'completed' when the bootfile has been fully 
-             processed and applied.";
-        }
-        leaf last-failure {
-          type ztp-error;
-          config false;
-          description
-            "The most recent failure encountered while running ZTP. This 
-             failure will be blank if no failure has occurred, or if the 
-             failure has been cleared due to successful completion of 
-             ZTP procedure.";
-        }
-        leaf ztp-timeout {
-          type uint16 {
-            range "30 .. 3600";
-          }
-          units "seconds";
-          config false;
-          description
-            "ZTP timeout value setting in seconds. The default is
-             30 seconds unless changed by the user in the boot file. 
-             This is the timeout value used before requesting a DHCP
-             lease renewal on a ZTP failure.";
-        }
-        leaf last-command-file {
-          type cienawstypes:string-maxl-256;
-          config false;
-          description
-            "The filename of the most recent command file (bootfile) 
-             processed by DHCP/ZTP.";
-        }
-        leaf last-config-file {
-          type cienawstypes:string-maxl-256;
-          config false;
-          description
-            "The filename of the most recent config file processed by ZTP.";
-        }
-        leaf tftp-server {
-          type cienawstypes:string-maxl-64;
-          config false;
-          description
-            "Tftp Server Name received in DHCP option 66.";
-        }
-      }
-    }
-  }
-  rpc waveserver-configuration-save {
-    description
-      "Save configuration.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        description
-          "The name of the configuration file.";
-      }
-      leaf strip-user-comments {
-        type boolean;
-        description
-          "Indicates whether to remove user comments when saving the
-           configuration file.";
-      }
-      leaf include-default-settings {
-        type boolean;
-        description
-          "Indicates whether to include the default settings when saving the
-           configuration file.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-backup {
-    description
-      "Backup configuration to the specified file.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the backup configuration file.";
-      }
-      leaf strip-user-comments {
-        type boolean;
-        description
-          "Indicates whether to remove user comments when saving the backup
-           configuration file.";
-      }
-      leaf include-default-settings {
-        type boolean;
-        description
-          "Indicates whether to include the default settings when saving the
-           backup configuration file.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-install {
-    description
-      "Install configuration from specified file.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the configuration file to install.";
-      }
-      uses system:server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-check {
-    description
-      "Check the configuration file for errors.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the configuration file to check.";
-      }
-      uses system:server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-delete {
-    description
-      "Delete local configuration file.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the configuration file to delete.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-reset-to-user-config {
-    description
-      "Restart the Waveserver and apply the user-specified configuration file.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the user-specified configuration file.";
-      }
-      leaf revert-timeout {
-        type cienawstypes:string-maxl-32;
-        description
-          "The amount of time before auto-reversion to the previous configuration
-           file after the Waveserver restarts. Must follow format: number/time:
-           N[ymwdhms], e.g 1h10m3s for 1 hour 10 minutes and 3 seconds.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-reset-to-defaults {
-    description
-      "Reset the configuration file to system default settings.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-reset-to-factory-defaults {
-    description
-      "Perform a full RTFD operation on the configuration and system files.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-cancel-revert {
-    description
-      "Cancel the configuration automatic revert when the auto-revert timer is
-       running.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-ztp-reset-last-command-file {
-    description
-      "Reset the last command file processed by ZTP";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-ztp-reset-last-config-file {
-    description
-      "Reset the last config file processed by ZTP";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-clear-backup-config-warning {
-    description
-      "Clear the warning indicating the backup configuration file is currently
-       loaded.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-clear-config-errors-warning {
-    description
-      "Clear the warning indicating that the previously loaded configuration
-       encountered errors when being applied.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-clear-no-config-warning {
-    description
-      "Clear the warning indicating no configuration file was loaded.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-copy {
-    description
-      "Copy configuration file to another file.";
-    input {
-      leaf source-filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the file to be copied from.";
-      }
-      leaf destination-filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the file to be copied to.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-rename {
-    description
-      "Rename configuration file to another filename.";
-    input {
-      leaf source-filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the file to be renamed.";
-      }
-      leaf destination-filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The renamed filename.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-configuration-upload-running-config {
-    description
-      "Upload a snapshot of the running configuration to a specified remote 
-       location ... without changing the saved configuration on the local
-       system.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the uploaded configuration file.";
-      }
-      leaf brief {
-        type boolean;
-        description
-          "Indicates whether to produce a minimal version of the running 
-           configuration, without any comments, defaults, or extra whitespace in
-           the generated output.";
-      }
-      leaf differences-from-saved {
-        type boolean;
-        description
-          "Indicates whether to limit the output to only include differences 
-           between the running configuration and the saved configuration.";
-      }
-      leaf include-default-settings {
-        type boolean;
-        description
-          "Indicates whether to include the default settings when saving the
-           configuration file.";
-      }
-      leaf line-numbered {
-        type boolean;
-        description
-          "Indicates whether to include line numbers when saving the
-           configuration file.";
-      }
-      leaf strip-user-comments {
-        type boolean;
-        description
-          "Indicates whether to remove user comments when saving the
-           configuration file.";
-      }
-      uses system:server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-encryption.yang b/models/ciena-waveserver-encryption.yang
deleted file mode 100644
index e2d61cd28dfd403f51c99d56308020d8d337f3fa..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-encryption.yang
+++ /dev/null
@@ -1,234 +0,0 @@
-module ciena-waveserver-encryption {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-encryption";
-  prefix encryption;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-port {
-    prefix port;
-  }
-  import ciena-waveserver-system {
-    prefix system;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "Datapath encryption support on Waveserver.
-
-     Encryption support includes global encryption status and per-channel pre-shared-key
-     provisioning, authentication, and state.";
-
-  revision 2019-08-09 {
-    description
-      "Added re-keying-period leaf.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2018-09-19 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.6 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Removed several unsupported attributes/containers/RPCs.
-       Changed the augment's target node from 'ports/properties' to 'channel/properties'.
-       Added container peer-authenticaltion with leafs: status and status-update-time.
-       Added typedef authentication-material-type-enum.
-       Added augment for '/system:waveserver-system', added container 'encryption' 
-       and its leafs.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-
-  typedef authentication-material-type-enum {
-    type enumeration {
-      enum pre-shared-key {
-        value 1;
-        description
-          "Pre-shared key(PSK).";
-      }
-      enum certificate-ECC {
-        value 2;
-        description
-          "Elliptic Curve Cryptography(ECC) based X 509 certificate.";
-      }
-    }
-    description
-      "Enum definitions for the type of authentication material to be used in 
-       datapath encryption peer authentication.";
-  }
-
-  grouping pre-shared-key-configuration {
-    description
-      "Pre-shared key (PSK) configurations and attributes.";
-    leaf value {
-      type string {
-        length "0..1 | 32..512";
-        pattern '[0-9a-fA-F]*|\*';
-      }
-      description
-        "Value for a pre-shared-key (PSK). 
-         The value must be specified as a hexadecimal encoded string.
-         The string must be 32 characters to 512 characters consisting of (0-9, a-f, A-F).
-         This is for support of 128bit key to 2048bit key in increment of 8 bits.
-         Setting this attribute to an empty or blank string will clear the PSK.
-         A read of this attribute will always return '*' to protect the plaintext value.
-
-         Note: This is a write-only attribute.";
-    }
-    leaf fingerprint {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "A system generated hash value based on the provisioned pre-shared-key. 
-         If no key is provisioned, the fingerprint is empty.";
-    }
-    leaf status {
-      type boolean;
-      config false;
-      description
-        "Boolean value to indicate whether the pre-shared-key has been 
-         setup by user or not.";
-    }
-    leaf description {
-      type string {
-        length "0..60";
-      }
-      description
-        "A human-readable description for the applied pre-shared-key.
-         Eg. 'PSK for site 1 and site 2'";
-    }
-  }
-
-  augment "/port:waveserver-ports/port:ports/port:channels/port:properties" {
-    description
-      "Data path encryption properties for the channels of line port 1 on the 
-       Waveserver modules that support data path encryption.";
-    container encryption {
-      description
-        "Data path encryption properties for a channel.";
-      container pre-shared-key {
-        description
-          "Channel data path encryption pre-shared-key properties.";
-        uses pre-shared-key-configuration;
-      }
-      container peer-authentication {
-        config false;
-        description
-          "Channel data path encryption peer-authentication properties.";
-        leaf re-keying-period {
-          type uint16;
-          units "seconds";
-          description
-            "The peer authentication session key negotiation interval, in seconds.";
-        }
-        leaf status {
-          type enumeration {
-            enum unknown {
-              value 0;
-              description
-                "Peer Authentication Status is unknown.";
-            }
-            enum pass {
-              value 1;
-              description
-                "Peer Authentication Status is pass.";
-            }
-            enum fail {
-              value 2;
-              description
-                "Peer Authentication Status is fail.";
-            }
-          }
-          description
-            "Whether the channel is authenticated with its peer.";
-        }
-        leaf status-update-time {
-          type cienawstypes:string-maxl-32;
-          description
-            "Last time when the channel's peer authentication status was updated.";
-        }
-      }
-    }
-  }
-  augment "/system:waveserver-system" {
-    description
-      "System level datapath encryption configuration and status.";
-    container encryption {
-      description
-        "System level datapath encryption properties.";
-      leaf authentication-material-type {
-        type authentication-material-type-enum;
-        config false;
-        description
-          "The authentication material type for this Waveserver, 
-           the default type is pre-shared-key.";
-      }
-      leaf warm-restart-type {
-        type enumeration {
-          enum FIPS {
-            value 1;
-            description
-              "The warm restart type is FIPS(Federal Information Processing Standard).";
-          }
-          enum non-FIPS {
-            value 2;
-            description
-              "The warm restart type is non-FIPS.";
-          }
-        }
-        description
-          "Defines the chassis warm-restart type for this Waveserver. 
-           The default type is FIPS. 
-           When warm restart type is set to FIPS, traffic squelching will be 
-           enforced during FIPS power up self-tests, i.e. traffic affecting.
-           When warm restart type is set to non-FIPS, traffic squelching will not 
-           be enforced during FIPS power up self-tests, i.e. non-traffic affecting.";
-      }
-      leaf signing-ca-certificate {
-        type cienawstypes:string-maxl-32;
-        config false;
-        description
-          "The signing Certifate Authority(CA) certificate.";
-      }
-      leaf entity-certificate {
-        type cienawstypes:string-maxl-32;
-        description
-          "The entity certificate name, issued by a Certificate Authority(CA).";
-      }
-    }
-  }
-  rpc waveserver-encryption-clear-critical-security-parameters {
-    description
-      "Clear all critical-security-parameters (CSP) from the Waveserver.
-       Must be super or higher user privilege level to call this RPC.";
-    input {
-      leaf authentication-material-type {
-        type authentication-material-type-enum;
-        description
-          "The authentication material type used after clear all the 
-           critical-security-parameters. 
-           If not specified, the current authentication material type 
-           will be maintained.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-interfaces.yang b/models/ciena-waveserver-interfaces.yang
deleted file mode 100644
index c06369d9b4da4bece3626dfc42f28fefc11991a6..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-interfaces.yang
+++ /dev/null
@@ -1,1220 +0,0 @@
-module ciena-waveserver-interfaces {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-interfaces";
-  prefix if;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines Ethernet and IP management interfaces support for
-     Ciena's Waveserver Platform.";
-
-  revision 2019-07-30 {
-    description
-      "Added container 'bgp'.
-       Added grouping 'bgp-route-properties-group'.
-       Added enum 'redundant-bgp' in 'management-if-properties-group/mode'.
-       Added rpc 'waveserver-interfaces-bgp-clear'.
-       Deleted leaf 'index' as key in 'list logical-interface'.
-       Deleted leaf 'index' from 'list logical-interface/id' container.
-       Added leaf 'name' as key for 'list logical-interface'.
-       Removed 'when' statement for 'logical-interface/properties/ipv4' and 
-          'logical-interface/properties/ipv6' containers.
-       Added container 'inband-if-neighbor-status'.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2019-02-20 {
-    description
-      "Added access control list (ACL) support for IPv6.
-       Added 'grouping acl-properties-group'.
-       Added 'grouping route-gateway-group'. 
-       Added container 'logical-interface/stacks'.
-       Added container 'logical-interface/properties/ipv6'.
-       Added 'list ipv6-static-route'.
-       Added 'list ipv6-dynamic-route'.
-       Added 'list ipv4-dynamic-route'.
-       Added 'rpc waveserver-interfaces-ipv6-stack-flush'.
-       Added typedef for 'ip-address-type', 'stack-preference'.
-       Added 'type' and 'associated-physical-interface' to 'logical-interface/id'.
-       Removed 'max-elements' from 'physical-interface' and 'logical-interface' lists.
-       Removed 'management' container from the 'physical-interface' list.
-       Updated values for 'physical-interface/id/type'.
-       Updated values for 'physical-interface/properties/ethernet/speed'.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-06-26 {
-    description
-      "Added access control list (ACL) support.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-04-27 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of the interfaces external data model.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-
-  typedef ip-protocol-type {
-    type uint8 {
-      range "0..255";
-    }
-    description
-      "The IP protocol expressed as an integer value. 0 indicates ALL protocols.";
-    reference "IANA Assigned Internet Protocol Numbers";
-  }
-
-  typedef ip-address-type {
-    type enumeration {
-      enum manual {
-        description
-          "Manually assigned IP address.";
-      }
-      enum dhcp {
-        description
-          "DHCP-assigned dynamic IPv4 address.";
-      }
-      enum apipa {
-        description
-          "The Automatic Private IP Addressing (APIPA) assigned IP address.";
-      }
-      enum dhcpv6 {
-        description
-          "DHCP assigned dynamic IPv6 address.";
-      }
-      enum slaac {
-        description
-          "Stateless Address Auto-configuration.";
-      }
-      enum local {
-        description
-          "Local or internal IP address.";
-      }
-    }
-    description
-      "The IP address type.";
-  }
-
-  typedef acl-action {
-    type enumeration {
-      enum allow {
-        description
-          "Allow the IP packet matching the specified filter.";
-      }
-      enum drop {
-        description
-          "Drop the IP packet matching the specified filter.";
-      }
-    }
-    description
-      "The ACL forwarding action type.";
-  }
-
-  typedef stack-preference {
-    type enumeration {
-      enum ipv4 {
-        description
-          "Stack preference is IPv4.";
-      }
-      enum ipv6 {
-        description
-          "Stack preference is IPv6.";
-      }
-    }
-    description
-      "The interface stack preference.";
-  }
-
-  grouping management-if-properties-group {
-    description
-      "Common group of attributes for physical management interfaces.";
-    leaf mode {
-      type enumeration {
-        enum management {
-          description
-            "Management port is configured as a local management interface.
-             This is the default mode.";
-        }
-        enum wayside-channel {
-          description
-            "Management port is configured as a wayside communications channel.";
-        }
-        enum redundant-bgp {
-          description
-            "Management port is configured to run BGP protocol.";
-        }
-      }
-      description
-        "Management port mode. Specifies whether the port is configured as a
-         local management interface or wayside communications channel (carry
-         through).";
-    }
-  }
-
-  grouping ethernet-if-properties-group {
-    description
-      "Common group of attributes for physical Ethernet interfaces.";
-    leaf speed {
-      type enumeration {
-        enum Unknown {
-          description
-            "Unknown port speed.";
-        }
-        enum 10M {
-          value 10;
-          description
-            "10 Mbps Ethernet port speed.";
-        }
-        enum 13M {
-          value 13;
-          description
-            "13 Mbps Ethernet port speed.";
-        }
-        enum 100M {
-          value 100;
-          description
-            "100 Mbps Ethernet port speed.";
-        }
-        enum 1G {
-          value 1000;
-          description
-            "1 Gbps Ethernet port speed.";
-        }
-        enum 10G {
-          value 10000;
-          description
-            "10 Gbps Ethernet port speed.";
-        }
-      }
-      config false;
-      description
-        "Ethernet port speed. For ports with auto-negotiation enabled, this
-         represents the negotiated port speed.";
-    }
-    leaf duplex {
-      type enumeration {
-        enum Unknown {
-          description
-            "Unknown port duplex.";
-        }
-        enum full {
-          description
-            "Port is full-duplex.";
-        }
-        enum half {
-          description
-            "Port is half-duplex.";
-        }
-      }
-      config false;
-      description
-        "Ethernet interface duplex mode. For ports with auto-negotiation
-         enabled, this represents the negotiated duplex mode.";
-    }
-    leaf flow-control {
-      type boolean;
-      config false;
-      description
-        "Specifies whether this interface will participate in Ethernet flow
-         control, via pause frames.";
-    }
-    leaf auto-negotiation {
-      type boolean;
-      config false;
-      description
-        "Specifies whether the interface should negotiate common transmission
-         parameters, such as speed, duplex, and flow control with its peer.";
-      reference "IEEE 802.3-2012 auto-negotiation transmission parameters";
-    }
-    leaf mac-address {
-      type cienawstypes:mac-string;
-      config false;
-      description
-        "The system-assigned MAC address of the Ethernet interface.";
-    }
-  }
-
-  grouping route-next-hop-group {
-    description
-      "Common group of attributes for IP routing next-hop entries.";
-    leaf metric {
-      type uint32 {
-        range "0..2147483648";
-      }
-      default "0";
-      description
-        "Routing metric cost.";
-    }
-    leaf associated-interface {
-      type cienawstypes:string-maxl-16;
-      config false;
-      description
-        "Reference to the associated logical-interface name of the route entry.
-         Defaults to the 'local' interface for routes within the subnet
-         associated with the active IP address configured on the local
-         management interface.";
-    }
-    leaf static {
-      type boolean;
-      config false;
-      description
-        "Specifies whether the route entry is user-created (static) or
-         dynamically created by a routing protocol.";
-    }
-    leaf active {
-      type boolean;
-      config false;
-      description
-        "Specifies whether the route is active (present in the kernel IP
-         routing table).";
-    }
-  }
-
-  grouping route-gateway-group {
-    description
-      "Common group of attributes for IP routing gateway entries.";
-    leaf associated-interface {
-      type cienawstypes:string-maxl-16;
-      config false;
-      description
-        "Reference to the associated logical-interface name of the route entry.
-         Defaults to the 'local' interface for routes within the subnet
-         associated with the active IP address configured on the local
-         management interface.";
-    }
-    leaf static {
-      type boolean;
-      config false;
-      description
-        "Specifies whether the route entry is user-created (static) or
-         dynamically created by a routing protocol.";
-    }
-    leaf active {
-      type boolean;
-      config false;
-      description
-        "Specifies whether the route is active (present in the kernel IP
-         routing table).";
-    }
-  }
-
-  grouping acl-properties-group {
-    description
-      "All the configuration data of ACL entry.";
-    leaf protocol {
-      type ip-protocol-type;
-      description
-        "The transport protocol of the IPv4 packet to match. A value of 0
-         matches ALL protocols, 1=ICMP, 6=TCP, and 17=UDP.";
-      reference "IANA Assigned Internet Protocol Numbers";
-    }
-    leaf source-ip-address {
-      type cienawstypes:ip-opt-prefix;
-      mandatory true;
-      description
-        "The source IPv4 or IPv4 address and optional prefix length for this ACL
-         entry.";
-    }
-    leaf source-port {
-      type uint16 {
-        range "0..65535";
-      }
-      description
-        "Source TCP or UDP port number, if applicable. 0 indicates 'all'
-         or wildcard matching behavior.";
-    }
-    leaf destination-ip-address {
-      type cienawstypes:ip-opt-prefix;
-      description
-        "The destination IPv4 or IPv6 address and optional prefix length for this
-         ACL entry.";
-    }
-    leaf destination-port {
-      type uint16 {
-        range "0..65535";
-      }
-      description
-        "Source TCP or UDP port number, if applicable. 0 indicates 'all'
-         or wildcard matching behavior.";
-    }
-    leaf action {
-      type acl-action;
-      mandatory true;
-      description
-        "The forwarding action defined for packets matching the filtering
-         rules for this ACL entry.";
-    }
-  }
-
-  grouping bgp-route-properties-group {
-    description
-      "Operational fields for various BGP route types.";
-    leaf network {
-      type cienawstypes:string-maxl-32;
-      description
-        "Network address.";
-    }
-    leaf next-hop {
-      type cienawstypes:string-maxl-32;
-      description
-        "Next hop.";
-    }
-    leaf metric {
-      type int32;
-      description
-        "Metric.";
-    }
-    leaf local-preference {
-      type int32;
-      description
-        "Local preference.";
-    }
-    leaf weight {
-      type int32;
-      description
-        "Weight.";
-    }
-    leaf path {
-      type cienawstypes:string-maxl-256;
-      description
-        "Autonomous System Path.";
-    }
-  }
-
-  container waveserver-interfaces {
-    description
-      "Top level container for configuration and operational data for physical
-       and logical network interfaces.";
-    list physical-interface {
-      ncx:user-write "update";
-      key "name";
-      description
-        "List of physical Ethernet management interfaces (or interface ports).";
-      leaf name {
-        type leafref {
-          path "../id/name";
-        }
-        description
-          "References the system-assigned name of the interface.";
-      }
-      container id {
-        description
-          "Identification information of this management interface.";
-        leaf name {
-          type cienawstypes:string-maxl-16;
-          description
-            "The system-assigned name of the physical interface (e.g. ifp0-dcn-1,
-             ifp0-ilan-1, ifp0-1-1, etc.). The names are predefined.";
-        }
-        leaf type {
-          type enumeration {
-            enum Unknown {
-              description
-                "Interface port type is unknown.";
-            }
-            enum DCN {
-              description
-                "Interface port type is DCN.";
-            }
-            enum ILAN {
-              description
-                "Interface port type is ILAN.";
-            }
-            enum GCC0 {
-              description
-                "Interface port type is GCC0.";
-            }
-            enum OSC {
-              description
-                "Interface port type is OSC.";
-            }
-          }
-          config false;
-          description
-            "The physical interface port type.";
-        }
-        leaf ifindex {
-          type uint32;
-          config false;
-          description
-            "The system-assigned interface index number, corresponding to the
-             ifIndex in SNMP IF-MIB.";
-          reference "RFC 2863 - The Interfaces Group MIB";
-        }
-      }
-      container state {
-        description
-          "Physical management interface state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether Admin State is enabled or disabled for this management
-             interface.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Operational state of this management interface.";
-        }
-      }
-      container properties {
-        description
-          "All the configuration data of the physical management interface.";
-        container ethernet {
-          config false;
-          description
-            "Ethernet interface attributes.";
-          uses ethernet-if-properties-group;
-        }
-      }
-    }
-    list logical-interface {
-      ncx:user-write "update";
-      key "name";
-      description
-        "List of logical IP management interfaces (e.g. 'local').";
-      leaf name {
-        type leafref {
-          path "../id/name";
-        }
-        description
-          "References the system-assigned name of the logical interface.";
-      }
-      container id {
-        description
-          "Identification information of this logical management interface.";
-        leaf name {
-          type cienawstypes:string-maxl-16;
-          description
-            "The name of the logical management interface, e.g. 'local'.";
-        }
-        leaf ifindex {
-          type uint32;
-          config false;
-          description
-            "The system-assigned interface index number, corresponding to the
-             ifIndex in SNMP IF-MIB.";
-          reference "RFC 2863 - The Interfaces Group MIB";
-        }
-        leaf internal {
-          type boolean;
-          config false;
-          description
-            "Specifies whether the logical-interface is an internal interface,
-             such as in-band GCC/OSC, or external management interface.";
-        }
-        leaf bgp {
-          type boolean;
-          config false;
-          description
-            "Specifies whether the logical-interface is a bgp interface.";
-        }
-        leaf-list associated-physical-interface {
-          type leafref {
-            path "../../../physical-interface/id/name";
-          }
-          config false;
-          description
-            "Reference to the entry or entries in the physical-interface list
-             associated with this logical-interface instance. For bridged
-             interfaces, such as the 'local' management interface, there may be
-             more than one physical interface associated with the same logical
-             interface.";
-        }
-      }
-      container state {
-        description
-          "Logical interface state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether Admin State is enabled or disabled for this management
-             interface.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Operational state of this management interface.";
-        }
-      }
-      container inband-if-neighbor-status {
-        config false;
-        description
-          "IPv4 OSPF and IPv6 OSPF neighbor status for the internal inband (GCC/OSC) interfaces.";
-        leaf metric {
-          type uint32;
-          description
-            "The metric for this interface.";
-        }
-        leaf ipv4-neighbor-router-id {
-          type string {
-            length "0..40";
-          }
-          description
-            "The IPv4 neighbor router id.";
-        }
-        leaf ipv4-operational-state {
-          type cienawstypes:up-down-enum;
-          description
-            "The IPv4 operational state.";
-        }
-        leaf ipv6-neighbor-router-id {
-          type string {
-            length "0..40";
-          }
-          description
-            "The IPv6 neighbor route id.";
-        }
-        leaf ipv6-operational-state {
-          type cienawstypes:up-down-enum;
-          description
-            "The IPv6 Operational state.";
-        }
-      }
-      container properties {
-        description
-          "All the configuration data of the logical management interface.";
-        container ipv4 {
-          description
-            "IPv4 configuration and operational data. It only applies to external interfaces";
-          leaf admin-state {
-            type cienawstypes:enabled-disabled-enum;
-            description
-              "Whether IPv4 stack is enabled or disabled on this interface.
-               Always enabled for the local management interface.";
-          }
-          leaf user-ip-address {
-            type cienawstypes:ipv4-prefix;
-            description
-              "The user-configured IPv4 address and prefix on the interface.";
-          }
-          leaf oper-ip-address {
-            type cienawstypes:ipv4-prefix;
-            config false;
-            description
-              "The operational IPv4 address and prefix on the interface.";
-          }
-          leaf dhcp-ip-address {
-            type cienawstypes:ipv4-prefix;
-            config false;
-            description
-              "The DHCP-assigned IPv4 address and prefix on the interface.";
-          }
-          leaf apipa-ip-address {
-            type cienawstypes:ipv4-prefix;
-            config false;
-            description
-              "The Automatic Private IP Addressing (APIPA) assigned IPv4 address
-               and prefix on the interface.";
-          }
-          leaf user-gateway {
-            type cienawstypes:ipv4-address;
-            description
-              "The user-configured primary IPv4 gateway on the interface.";
-          }
-          leaf backup-gateway {
-            type cienawstypes:ipv4-address;
-            description
-              "The user-configured backup IPv4 gateway on the interface.";
-          }
-          leaf oper-gateway {
-            type cienawstypes:ipv4-address;
-            config false;
-            description
-              "The operational IPv4 gateway on the interface.";
-          }
-          leaf dhcp-gateway {
-            type cienawstypes:ipv4-address;
-            config false;
-            description
-              "The DHCP-assigned IPv4 gateway on the interface.";
-          }
-        }
-        container ipv6 {
-          description
-            "IPv6 configuration and operational data. It only applies to external interfaces";
-          list user-ip-address {
-            key "ip-address";
-            max-elements 2;
-            description
-              "List of provisioned IPv6 addresses.";
-            leaf ip-address {
-              type cienawstypes:ipv6-prefix;
-              description
-                "The user-configured IPv6 address and prefix on the interface.";
-            }
-          }
-          list oper-ip-address {
-            key "ip-address";
-            config false;
-            description
-              "List of operational IPv6 addresses.";
-            leaf ip-address {
-              type cienawstypes:ipv6-prefix;
-              description
-                "The operational IPv6 address and prefix on the interface.";
-            }
-            leaf source {
-              type ip-address-type;
-              description
-                "The IPv6 address type.";
-            }
-            leaf dad-failure {
-              type boolean;
-              description
-                "The IPv6 address has dad failure or not.";
-            }
-          }
-          container gateway-configuration {
-            description
-              "All the configuration data of IPv6 gateway.";
-            leaf ip-address {
-              type cienawstypes:ipv6-address;
-              description
-                "The user-configured IPv6 gateway on the interface.";
-            }
-            leaf source {
-              type ip-address-type;
-              description
-                "The IPv6 gateway address type.";
-            }
-            leaf operational-state {
-              type cienawstypes:enabled-disabled-enum;
-              config false;
-              description
-                "Operational state of the gateway.";
-            }
-          }
-          list oper-gateway {
-            key "ip-address";
-            config false;
-            description
-              "List of operational IPv6 gateways.";
-            leaf ip-address {
-              type cienawstypes:ipv6-address;
-              description
-                "The operational IPv6 gateway address.";
-            }
-            leaf source {
-              type ip-address-type;
-              description
-                "The IPv6 gateway address type.";
-            }
-            leaf metric {
-              type uint32;
-              description
-                "The metric for this gateway address.";
-            }
-            leaf interface-name {
-              type cienawstypes:string-maxl-16;
-              description
-                "The name of the logical management interface, e.g. 'local'.";
-            }
-          }
-        }
-      }
-    }
-    container routes {
-      description
-        "Top-level container for IP route configuration and operational data.";
-      list ipv4-static-route {
-        key "destination";
-        max-elements 32;
-        description
-          "List of IPv4 static routing entries.";
-        leaf destination {
-          type cienawstypes:ipv4-prefix;
-          description
-            "IPv4 route destination prefix for the static route. Only one static
-             routing entry per unique destination ip/prefix can be configured.";
-        }
-        list next-hop {
-          key "index";
-          min-elements 1;
-          max-elements 1;
-          description
-            "A list of next-hop entries associated with the static route.";
-          leaf index {
-            type uint32 {
-              range "1";
-            }
-            description
-              "The index key of the entry in the next-hop list. Currently only
-               one static entry is supported per destination prefix, so the
-               index should always be 1.";
-          }
-          leaf ip-address {
-            type cienawstypes:ipv4-address;
-            description
-              "IPv4 route next-hop or gateway address associated with the route. If
-               not specified, the default gateway value for the local management
-               interface will be used.";
-          }
-          uses route-next-hop-group;
-        }
-      }
-      list ipv4-dynamic-route {
-        key "destination";
-        config false;
-        description
-          "List of IPv4 dynamic routing entries.";
-        leaf destination {
-          type cienawstypes:ipv4-prefix;
-          description
-            "IPv4 route destination prefix for the dynamic route.";
-        }
-        list next-hop {
-          key "index";
-          min-elements 1;
-          max-elements 1;
-          description
-            "A list of next-hop entries associated with the dynamic route.";
-          leaf index {
-            type uint32 {
-              range "1";
-            }
-            description
-              "The index key of the entry in the next-hop list. Currently only
-               one entry is supported per destination prefix, so the
-               index should always be 1.";
-          }
-          leaf ip-address {
-            type cienawstypes:ipv4-address;
-            description
-              "IPv4 route next-hop or gateway address associated with the route.";
-          }
-          uses route-next-hop-group;
-        }
-      }
-      list ipv6-static-route {
-        key "destination gateway metric";
-        max-elements 32;
-        description
-          "List of IPv6 static routing entries.";
-        leaf destination {
-          type cienawstypes:ipv6-prefix;
-          description
-            "IPv6 route destination prefix for the static route. Only one static
-             routing entry per unique destination ip/prefix can be configured.";
-        }
-        leaf gateway {
-          type cienawstypes:ipv6-address;
-          description
-            "IPv6 route gateway address associated with the route. If
-             not specified, the default gateway value for the local management
-             interface will be used.";
-        }
-        leaf metric {
-          type uint32 {
-            range "0..2147483648";
-          }
-          description
-            "Routing metric cost.";
-        }
-        uses route-gateway-group;
-      }
-      list ipv6-dynamic-route {
-        key "destination gateway metric";
-        config false;
-        description
-          "List of IPv6 dynamic routing entries.";
-        leaf destination {
-          type cienawstypes:ipv6-prefix;
-          description
-            "IPv6 route destination prefix for the dynamic route. Only one dynamic
-             routing entry per unique destination ip/prefix.";
-        }
-        leaf gateway {
-          type cienawstypes:ipv6-address;
-          description
-            "IPv6 route gateway address associated with the route. If
-             not specified, the default gateway value for the local management
-             interface will be used.";
-        }
-        leaf metric {
-          type uint32 {
-            range "0..2147483648";
-          }
-          description
-            "Routing metric cost.";
-        }
-        uses route-gateway-group;
-      }
-    }
-    container stacks {
-      description
-        "Top-level container for IP stacks configuration and operational data.";
-      container ipv6-stack-state {
-        description
-          "IPv6 stack state configuration and operational data.";
-        leaf state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "IPv6 stack state.";
-        }
-        leaf preference {
-          type stack-preference;
-          description
-            "Interface stack preference. IPv4 or IPv6.";
-        }
-        leaf accept-router-advertisement {
-          type boolean;
-          description
-            "Whether accept the router advertisement.";
-        }
-        leaf max-slaac-addresses {
-          type uint32 {
-            range "1..32";
-          }
-          description
-            "Max number of the SLAAC addresses.";
-        }
-      }
-    }
-    container acl {
-      description
-        "Top-level container for Access Control List configuration for the
-         local management interface. Not currently supported on Waveserver.";
-      list ipv4-acl-entry {
-        key "index";
-        max-elements 100;
-        description
-          "List IPv4 ACL entries.";
-        leaf index {
-          type uint32;
-          description
-            "The index uniquely identifies the ACL entry in the IPv4 list, and
-             indicates the order in which the ACL entries are applied.";
-        }
-        container properties {
-          description
-            "All the configuration data of ACL entry.";
-          uses acl-properties-group;
-        }
-      }
-      list ipv6-acl-entry {
-        key "index";
-        max-elements 100;
-        description
-          "List IPv6 ACL entries.";
-        leaf index {
-          type uint32;
-          description
-            "The index uniquely identifies the ACL entry in the IPv6 list, and
-             indicates the order in which the ACL entries are applied.";
-        }
-        container properties {
-          description
-            "All the configuration data of ACL entry.";
-          uses acl-properties-group;
-        }
-      }
-    }
-    container bgp {
-      description
-        "Waveserver Border Gateway Protocol (BGP) configuration data and peer 
-         information.";
-      container state {
-        description
-          "BGP state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether Admin State is enabled or disabled for BGP protocol.";
-        }
-        leaf operational-state {
-          type cienawstypes:enabled-disabled-enum;
-          config false;
-          description
-            "Operational state of BGP protocol.";
-        }
-      }
-      container properties {
-        description
-          "BGP properties.";
-        leaf autonomous-system {
-          type uint32;
-          description
-            "This is the autonomous system number which is an identification 
-             number for the node. An autonomous system is a group of networks 
-             under a common administration. Each node within that group gets 
-             an AS number.";
-        }
-        leaf keep-alive-time {
-          type uint16 {
-            range "1..65535";
-          }
-          units "seconds";
-          description
-            "The time in seconds between sending a keep-alive heartbeat between 
-             BGP nodes.";
-        }
-        leaf holdoff-time {
-          type uint16 {
-            range "3..65535";
-          }
-          units "seconds";
-          description
-            "The time in seconds that the node waits to receive a keep-alive 
-             message. If the node does not receive a keep-alive within the 
-             hold-off time, it will mark the BGP connection as down. The 
-             hold-off timer should be set to at least 3 times the keep-alive 
-             timer.";
-        }
-        leaf advertised-network {
-          type cienawstypes:ipv4-prefix;
-          config false;
-          description
-            "IP address (with mask) of the advertised network.";
-        }
-      }
-      list peer {
-        ncx:user-write "update";
-        key "name";
-        description
-          "A list of BGP peers. BGP peers are created by the system when BGP 
-           is enabled. Users are not allowed to create or delete peers";
-        leaf name {
-          type enumeration {
-            enum peer-1 {
-              value 0;
-              description
-                "Peer 1 node";
-            }
-            enum peer-2 {
-              value 1;
-              description
-                "Peer 2 node";
-            }
-          }
-          description
-            "Peer name. Read-only attribute.";
-        }
-        leaf interface {
-          type leafref {
-            path "../../../physical-interface/id/name";
-          }
-          description
-            "The name of the peer interface, e.g. 'dcn', 'ilan-1'.";
-        }
-        leaf ip {
-          type cienawstypes:ipv4-address;
-          description
-            "IP address of peer.";
-        }
-        leaf up-time {
-          type cienawstypes:string-maxl-16;
-          config false;
-          description
-            "System up time since last failure, in human-readable string format. 
-             (year, day, hour, minute, second, etc.)";
-        }
-        leaf operational-state {
-          type enumeration {
-            enum established {
-              value 0;
-              description
-                "Peer established";
-            }
-            enum active {
-              value 1;
-              description
-                "Peer active";
-            }
-          }
-          config false;
-          description
-            "Operational state of the peer.";
-        }
-        leaf autonomous-system {
-          type uint32;
-          description
-            "Autonomous system number of the peer.";
-        }
-        leaf messages-received {
-          type uint32;
-          config false;
-          description
-            "The number of BGP protocol messages received on this interface.";
-        }
-        leaf messages-sent {
-          type uint32;
-          config false;
-          description
-            "The number of BGP protocol messages sent on this interface.";
-        }
-        list received-routes {
-          key "route-index";
-          config false;
-          description
-            "Collection of BGP routes, expressed in AS group hops, that this 
-             node has received from the peer as reachable from its interface.";
-          leaf route-index {
-            type uint32;
-            description
-              "Route Index.";
-          }
-          uses bgp-route-properties-group;
-        }
-        list advertised-routes {
-          key "route-index";
-          config false;
-          description
-            "Collection of BGP routes, expressed in AS group hops, that this 
-             node has advertised to the peer as reachable from this interface.";
-          leaf route-index {
-            type uint32;
-            description
-              "Route Index.";
-          }
-          uses bgp-route-properties-group;
-        }
-      }
-      list runtime-routes {
-        key "route-index";
-        config false;
-        description
-          "Collection of current routes that the local node can access from 
-           all interfaces and an indication of which peer has access to which
-           route.";
-        leaf route-index {
-          type uint32;
-          mandatory true;
-          description
-            "Route Index.";
-        }
-        leaf prefix {
-          type cienawstypes:string-maxl-32;
-          description
-            "Route prefix.";
-        }
-        leaf gateway {
-          type cienawstypes:string-maxl-32;
-          description
-            "The IP address of the gateway that this route is accessible through.";
-        }
-        leaf interface {
-          type cienawstypes:string-maxl-16;
-          description
-            "The interface that this route is accessible through.";
-        }
-        leaf up-time {
-          type cienawstypes:string-maxl-16;
-          description
-            "System UP time that this route has been accessible, in 
-             human-readable string format.
-             (year, day, hour, minute, second, etc.)";
-        }
-        leaf type {
-          type cienawstypes:string-maxl-32;
-          description
-            "Route type.";
-        }
-      }
-    }
-  }
-  rpc waveserver-interfaces-ipv4-acl-clear-all {
-    description
-      "Clear all IPv4 entries from the ACL table.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-interfaces-ipv6-acl-clear-all {
-    description
-      "Clear all IPv6 entries from the ACL table.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-interfaces-ipv6-stack-flush {
-    description
-      "Flush IPv6 SLAAC addresses.";
-    input {
-      leaf interface-name {
-        type cienawstypes:string-maxl-16;
-        description
-          "The name of the logical management interface, e.g. 'local'.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-interfaces-bgp-clear {
-    description
-      "Reset the BGP session.";
-    input {
-      leaf reset-type {
-        type enumeration {
-          enum hard {
-            value 0;
-            description
-              "BGP network is torn down and recreated.";
-          }
-          enum soft {
-            value 1;
-            description
-              "BGP network remains intact but Waveserver sends BGP route update message to peer(s).";
-          }
-        }
-        mandatory true;
-        description
-          "Type of BGP session reset operation.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-license.yang b/models/ciena-waveserver-license.yang
deleted file mode 100644
index cc77a12561ea5971ab067f826b4307077b10404e..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-license.yang
+++ /dev/null
@@ -1,422 +0,0 @@
-module ciena-waveserver-license {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-license";
-  prefix license;
-
-  import ciena-waveserver-alarm {
-    prefix alarm;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines the software licensing state for Ciena's Waveserver, including installed licenses, and compliance to licensing requirements.";
-
-  revision 2019-02-21 {
-    description
-      "Added license compliance state enum.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-06-20 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.6 YANG model.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-
-  typedef license-compliance-state {
-    type enumeration {
-      enum not-compliant {
-        description
-          "The system is not compliant with all licensing requirements.";
-      }
-      enum compliant {
-        description
-          "The system complies with all licensing requirements.";
-      }
-      enum not-initialized {
-        description
-          "The  licensing system is not initialized yet as time is not set.";
-      }
-    }
-    description
-      "Whether the system complies with all licensing requirements.";
-  }
-
-  typedef license-type {
-    type enumeration {
-      enum trial {
-        description
-          "Trial License";
-      }
-      enum served {
-        description
-          "Served License";
-      }
-      enum pre-authorized {
-        description
-          "Pre-Authorized License";
-      }
-    }
-    description
-      "License type.";
-  }
-
-  typedef license-status {
-    type enumeration {
-      enum valid {
-        description
-          "Valid License";
-      }
-      enum invalid {
-        description
-          "Invalid License";
-      }
-      enum expired {
-        description
-          "Expired License";
-      }
-    }
-    description
-      "Validity of the license.";
-  }
-
-  typedef license-source {
-    type enumeration {
-      enum pre-install {
-        description
-          "Pre-Installed License";
-      }
-      enum local {
-        description
-          "Locally Held License";
-      }
-      enum pre-authorized {
-        description
-          "Pre-Authorized License";
-      }
-    }
-    description
-      "The source of the license.";
-  }
-
-  container waveserver-license {
-    description
-      "Waveserver license information parameters.";
-    container client {
-      description
-        "License client information.";
-      container id {
-        description
-          "License client identification information.";
-        leaf registration-id {
-          type cienawstypes:string-maxl-64;
-          description
-            "License client registration id";
-        }
-      }
-      container state {
-        description
-          "License client state information.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Administrative state of the license service. Always enabled.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Operational state of the license service.";
-        }
-        leaf compliance-state {
-          type license-compliance-state;
-          config false;
-          description
-            "Whether the license client is compliant.";
-        }
-      }
-      list alarm-instances {
-        key "instance";
-        config false;
-        description
-          "A reference table of the defined alarm instances associated with
-           the license client. Each alarm instance is associated with a
-           specific software feature that may be supported on the system.";
-        leaf instance {
-          type alarm:alarm-instance-string;
-          description
-            "The object instance the license alarm may be raised against.";
-        }
-        leaf feature {
-          type cienawstypes:string-maxl-128;
-          description
-            "The name of the feature associated with the license instance.";
-        }
-        leaf description {
-          type cienawstypes:string-maxl-128;
-          description
-            "Description of the feature associated with the license instance.";
-        }
-      }
-    }
-    container licenses {
-      config false;
-      description
-        "Waveserver licenses.";
-      list licenses-list {
-        key "license-index";
-        description
-          "List of waveserver licenses.";
-        leaf license-index {
-          type uint32;
-          mandatory true;
-          description
-            "License index, unique, key value for the License List.";
-        }
-        leaf name {
-          type cienawstypes:string-maxl-128;
-          description
-            "Name of the License.";
-        }
-        leaf description {
-          type cienawstypes:string-maxl-128;
-          description
-            "Description of the License.";
-        }
-        leaf version {
-          type cienawstypes:string-maxl-16;
-          description
-            "Version of the License.";
-        }
-        leaf status {
-          type license-status;
-          description
-            "Status of the License.";
-        }
-        leaf source {
-          type license-source;
-          description
-            "Source of the License.";
-        }
-        leaf issuer-name {
-          type cienawstypes:string-maxl-128;
-          description
-            "Name of the Issuer of the License.";
-        }
-        leaf issued-date {
-          type cienawstypes:string-maxl-128;
-          description
-            "Date the License was issued.";
-        }
-        leaf type {
-          type license-type;
-          description
-            "Type of the License.";
-        }
-        leaf host-id {
-          type cienawstypes:string-maxl-128;
-          description
-            "Host Id of the License.";
-        }
-        leaf count {
-          type cienawstypes:string-maxl-16;
-          description
-            "Number of License instances available.";
-        }
-        leaf checked-out-count {
-          type cienawstypes:string-maxl-16;
-          description
-            "Number of License instances checked out.";
-        }
-        leaf expiry-date {
-          type cienawstypes:string-maxl-32;
-          description
-            "Date the License expires.";
-        }
-        leaf notice {
-          type cienawstypes:string-maxl-128;
-          description
-            "Notice of the License.";
-        }
-      }
-    }
-    container server {
-      description
-        "License server information.";
-      leaf host-address {
-        type string {
-          length "0..256";
-          pattern '.+:[0-9]+';
-        }
-        description
-          "The license server host name and port number, separated by a colon.";
-      }
-      leaf num-license-servers {
-        type uint32;
-        config false;
-        description
-          "The number of license servers.";
-      }
-    }
-  }
-  rpc waveserver-license-file-delete {
-    description
-      "Perform a license file delete.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        description
-          "Filename of the license file.";
-      }
-    }
-    output {
-      leaf license-return-code {
-        type uint32;
-        description
-          "License return code: 0 is successful; non-zero is failure";
-      }
-      leaf license-return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "License return code description";
-      }
-    }
-  }
-  rpc waveserver-license-file-generate-request {
-    description
-      "Generate a license capability file.";
-    output {
-      leaf license-return-code {
-        type uint32;
-        description
-          "License return code: 0 is successful; non-zero is failure";
-      }
-      leaf license-return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "License return code description";
-      }
-    }
-  }
-  rpc waveserver-license-file-activate {
-    description
-      "Activate a downloaded license file.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        description
-          "Filename of the license file.";
-      }
-    }
-    output {
-      leaf license-return-code {
-        type uint32;
-        description
-          "License return code: 0 is successful; non-zero is failure";
-      }
-      leaf license-return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "License return code description";
-      }
-    }
-  }
-  rpc waveserver-license-server-clear {
-    description
-      "Clear the license server information.";
-    output {
-      leaf license-return-code {
-        type uint32;
-        description
-          "License return code: 0 is successful; non-zero is failure";
-      }
-      leaf license-return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "License return code description";
-      }
-    }
-  }
-  rpc waveserver-license-file-download {
-    description
-      "Download a license file.";
-    input {
-      leaf mode {
-        type enumeration {
-          enum none {
-            value 0;
-            description
-              "No FTP mode is specified.";
-          }
-          enum tftp {
-            value 1;
-            description
-              "Trivial File Transfer Protocol (TFTP) mode.";
-          }
-          enum ftp {
-            value 2;
-            description
-              "File Transfer Protocol (FTP) mode.";
-          }
-          enum sftp {
-            value 3;
-            description
-              "Secure File Transfer Protocol (SFTP) mode.";
-          }
-          enum scp {
-            value 4;
-            description
-              "Secure Copy Protocol (SCP) mode.";
-          }
-        }
-        mandatory true;
-        description
-          "XFP mode: TFTP, FTP, SFTP, or SCP.";
-      }
-      leaf server {
-        type cienawstypes:string-maxl-64;
-        mandatory true;
-        description
-          "Server IP Address.";
-      }
-      leaf login-id {
-        type cienawstypes:string-maxl-32;
-        description
-          "Login ID.";
-      }
-      leaf password {
-        type cienawstypes:string-maxl-128;
-        description
-          "Password in clear text.";
-      }
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "Filename of the license file.";
-      }
-    }
-    output {
-      leaf license-return-code {
-        type uint32;
-        description
-          "License return code: 0 is successful; non-zero is failure";
-      }
-      leaf license-return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "License return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-lldp.yang b/models/ciena-waveserver-lldp.yang
deleted file mode 100644
index 5d42579c3cc5b5a427e4881670d476bf3af1866b..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-lldp.yang
+++ /dev/null
@@ -1,1507 +0,0 @@
-module ciena-waveserver-lldp {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-lldp";
-  prefix lldp;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-interfaces {
-    prefix if;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines the configuration and operational data for Link Layer Discovery Protocol (LLDP) on the Waveserver.";
-
-  revision 2019-02-11 {
-    description
-      "Updated description strings, fixed several lint errors/warnings.
-       Added support for DCN interface port.
-       Added new attribute PDU length errors attribute in the statistics.
-       Deprecated In-errored-tlv attribute in LLDP statistics";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-04-09 {
-    description
-      "Added ncx:user-write to 'ports' list.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-06-16 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Changed 'port-id' from integer to string format.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef chassis-id {
-    type string {
-      length "1..256";
-    }
-    description
-      "Chassis Identifier";
-  }
-
-  typedef chassis-id-subtype {
-    type enumeration {
-      enum unknown {
-        value 0;
-        description
-          "Unknown/reserved sub-type.";
-      }
-      enum chassis-component {
-        value 1;
-        description
-          "Chassis component sub-type.";
-      }
-      enum interface-alias {
-        value 2;
-        description
-          "Interface alias sub-type.";
-      }
-      enum port-component {
-        value 3;
-        description
-          "Port component sub-type.";
-      }
-      enum mac-address {
-        value 4;
-        description
-          "MAC address sub-type.";
-      }
-      enum network-address {
-        value 5;
-        description
-          "Network address sub-type.";
-      }
-      enum interface-name {
-        value 6;
-        description
-          "Interface name sub-type.";
-      }
-      enum local {
-        value 7;
-        description
-          "Local sub-type.";
-      }
-    }
-    description
-      "Chassis Identifier subtype enum type.";
-    reference "IEEE 802.1ab-2016, Section 8.5.2.2";
-  }
-
-  typedef lldp-system-capability-bits {
-    type bits {
-      bit other {
-        position 0;
-        description
-          "Other";
-      }
-      bit repeater {
-        position 1;
-        description
-          "Repeater - IETF RFC 2108 [B7]";
-      }
-      bit bridge {
-        position 2;
-        description
-          "MAC Bridge component - IEEE Std 802.1Q";
-      }
-      bit wlan-access-point {
-        position 3;
-        description
-          "802.11 Access Point (AP) - IEEE Std 802.11 MIB";
-      }
-      bit router {
-        position 4;
-        description
-          "Router - IETF RFC 1812 [B6]";
-      }
-      bit telephone {
-        position 5;
-        description
-          "Telephone - IETF RFC 4293 [B10]";
-      }
-      bit docsis {
-        position 6;
-        description
-          "DOCSIS capable device - IETF RFC 4639 and 4546 [B12]";
-      }
-      bit station-only {
-        position 7;
-        description
-          "Station Only - IETF RFC 4293 [B10]";
-      }
-    }
-    description
-      "LLDP system capability bits type.";
-    reference "IEEE 802.1ab-2016, Section 8.5.8.1";
-  }
-
-  typedef lldp-management-address-subtype {
-    type enumeration {
-      enum reserved {
-        value 0;
-        description
-          "Reserved";
-      }
-      enum ipv4 {
-        value 1;
-        description
-          "IP (IP version 4)";
-      }
-      enum ipv6 {
-        value 2;
-        description
-          "IP6 (IP version 6)";
-      }
-      enum nsap {
-        value 3;
-        description
-          "NSAP";
-      }
-      enum hdlc {
-        value 4;
-        description
-          "HDLC (8-bit multidrop)";
-      }
-      enum bbn-1822 {
-        value 5;
-        description
-          "BBN 1822";
-      }
-      enum ieee-802 {
-        value 6;
-        description
-          "IEEE 802";
-      }
-      enum e-163 {
-        value 7;
-        description
-          "E.163";
-      }
-      enum e164-smds-atm {
-        value 8;
-        description
-          "E.164 (SMDS, Frame Relay, ATM)";
-      }
-      enum f69-telex {
-        value 9;
-        description
-          "F.69 (Telex)";
-      }
-      enum x121-x25-fr {
-        value 10;
-        description
-          "X.121 (X.25, Frame Relay)";
-      }
-      enum ipx {
-        value 11;
-        description
-          "IPX";
-      }
-      enum appletalk {
-        value 12;
-        description
-          "Appletalk";
-      }
-      enum decnet-iv {
-        value 13;
-        description
-          "Decnet IV";
-      }
-      enum banyan-vines {
-        value 14;
-        description
-          "Banyan Vines";
-      }
-      enum e164-w-nsap {
-        value 15;
-        description
-          "E.164 with NSAP format subaddress";
-      }
-      enum dns {
-        value 16;
-        description
-          "DNS (Domain Name Subsystem)";
-      }
-      enum distinguish-name {
-        value 17;
-        description
-          "Distinguished Name";
-      }
-      enum as-number {
-        value 18;
-        description
-          "AS Number";
-      }
-      enum xtp-over-ipv4 {
-        value 19;
-        description
-          "XTP over IPv4";
-      }
-      enum xtp-over-ipv6 {
-        value 20;
-        description
-          "XTP over IPv6";
-      }
-      enum xtp-native-mode {
-        value 21;
-        description
-          "XTP native mode";
-      }
-      enum fibre-ch-ww-port {
-        value 22;
-        description
-          "Fibre Channel World-Wide Port Name";
-      }
-      enum fibre-ch-ww-node {
-        value 23;
-        description
-          "Fibre Channel World-Wide Node Name";
-      }
-      enum gwid {
-        value 24;
-        description
-          "GWID";
-      }
-    }
-    description
-      "Management address subtype, IANA Address Family.";
-    reference "IEEE 802.1ab-2016, Section 8.5.9.3";
-  }
-
-  typedef lldp-management-address-interface-subtype {
-    type enumeration {
-      enum unknown {
-        value 0;
-        description
-          "Unknown/invalid value.";
-      }
-      enum un-known {
-        value 1;
-        description
-          "Unknown (IEEE standard value)";
-      }
-      enum if-index {
-        value 2;
-        description
-          "ifIndex";
-      }
-      enum system-port-number {
-        value 3;
-        description
-          "System port number";
-      }
-    }
-    description
-      "Management address interface numbering subtype.";
-    reference "IEEE 802.1ab-2016, Section 8.5.9.5";
-  }
-
-  typedef lldp-port-id-sub-type {
-    type enumeration {
-      enum unknown {
-        value 0;
-        description
-          "Unknown/reserved";
-      }
-      enum interface-alias {
-        value 1;
-        description
-          "Interface alias";
-      }
-      enum port-component {
-        value 2;
-        description
-          "Port component";
-      }
-      enum mac-address {
-        value 3;
-        description
-          "MAC address";
-      }
-      enum network-address {
-        value 4;
-        description
-          "Network address";
-      }
-      enum interface-name {
-        value 5;
-        description
-          "Interface name";
-      }
-      enum agent-circuit-id {
-        value 6;
-        description
-          "Agent Circuit ID";
-      }
-      enum local {
-        value 7;
-        description
-          "Locally assigned";
-      }
-    }
-    description
-      "Local port id sub-type.";
-    reference "IEEE 802.1ab-2016, Section 8.5.3.2";
-  }
-
-  typedef lldp-auto-neg-capability {
-    type enumeration {
-      enum unknown {
-        value 0;
-        description
-          "Unknown";
-      }
-      enum b-10base-t {
-        value 1;
-        description
-          "10BASE-T";
-      }
-      enum b-10base-t-fd {
-        value 2;
-        description
-          "10BASE-T full duplex mode";
-      }
-      enum b-100base-t4 {
-        value 3;
-        description
-          "10BASE-T4";
-      }
-      enum b-100base-tx {
-        value 4;
-        description
-          "100BASE-10X";
-      }
-      enum b-100base-tx-full-duplex {
-        value 5;
-        description
-          "100BASE-TX full duplex mode";
-      }
-      enum b-100base-t2 {
-        value 6;
-        description
-          "100BASE-T2";
-      }
-      enum b-100base-t2-full-duplex {
-        value 7;
-        description
-          "100BASE-T2 fulle duplex mode";
-      }
-      enum b-full-duplex-pause {
-        value 8;
-        description
-          "full duplex mode, with pause";
-      }
-      enum b-full-duplex-asymmetric-pause {
-        value 9;
-        description
-          "full duplex mode, with asymmetric pause";
-      }
-      enum b-full-duplex-symmetric-pause {
-        value 10;
-        description
-          "full duplex mode, with symmetric pause";
-      }
-      enum b-full-duplex-asymmetric-symmetric-pause {
-        value 11;
-        description
-          "full duplex mode, with asymmetric/symmetric pause";
-      }
-      enum b-1000base-x {
-        value 12;
-        description
-          "100BASE-X";
-      }
-      enum b-1000base-x-full-duplex {
-        value 13;
-        description
-          "1000BASE-X full duplex mode";
-      }
-      enum b-1000base-t {
-        value 14;
-        description
-          "1000BASE-T";
-      }
-      enum b-1000base-t-full-duplex {
-        value 15;
-        description
-          "1000BASE-T full duplex mode";
-      }
-    }
-    description
-      "Auto-negotiation capability.";
-  }
-
-  typedef lldp-operational-mau-type {
-    type enumeration {
-      enum unknown {
-        value 0;
-        description
-          "IEEE 802.3 MAU type unknown/other.";
-      }
-      enum dot3-mau-type-aui {
-        value 1;
-        description
-          "IEEE 802.3 MAU type AUI.";
-      }
-      enum dot3-mau-type-10-base-5 {
-        value 2;
-        description
-          "IEEE 802.3 MAU type 10BASE-5.";
-      }
-      enum dot3-mau-type-foirl {
-        value 3;
-        description
-          "IEEE 802.3 MAU type FOIRL.";
-      }
-      enum dot3-mau-type-10-base-2 {
-        value 4;
-        description
-          "IEEE 802.3 MAU type 10BASE-2.";
-      }
-      enum dot3-mau-type-10-base-t {
-        value 5;
-        description
-          "IEEE 802.3 MAU type 10BASE-T.";
-      }
-      enum dot3-mau-type-10-base-fp {
-        value 6;
-        description
-          "IEEE 802.3 MAU type 10BASE-FP.";
-      }
-      enum dot3-mau-type-10-base-fb {
-        value 7;
-        description
-          "IEEE 802.3 MAU type 10BASE-FB.";
-      }
-      enum dot3-mau-type-10-base-fl {
-        value 8;
-        description
-          "IEEE 802.3 MAU type 10BASE-FL.";
-      }
-      enum dot3-mau-type-10-broad36 {
-        value 9;
-        description
-          "IEEE 802.3 MAU type 10BROAD36.";
-      }
-      enum dot3-mau-type-10-base-thd {
-        value 10;
-        description
-          "IEEE 802.3 MAU type 10BASE-T half duplex mode.";
-      }
-      enum dot3-mau-type-10-base-tfd {
-        value 11;
-        description
-          "IEEE 802.3 MAU type 10BASE-T full duplex mode.";
-      }
-      enum dot3-mau-type-10-base-flhd {
-        value 12;
-        description
-          "IEEE 802.3 MAU type 10BASE-FL half duplex mode.";
-      }
-      enum dot3-mau-type-10-base-flfd {
-        value 13;
-        description
-          "IEEE 802.3 MAU type 10BASE-FL full duplex mode.";
-      }
-      enum dot3-mau-type-100-base-t4 {
-        value 14;
-        description
-          "IEEE 802.3 MAU type 100BASE-T4.";
-      }
-      enum dot3-mau-type-100-base-txhd {
-        value 15;
-        description
-          "IEEE 802.3 MAU type 100BASE-TX half duplex mode.";
-      }
-      enum dot3-mau-type-100-base-txfd {
-        value 16;
-        description
-          "IEEE 802.3 MAU type 100BASE-TX full duplex mode.";
-      }
-      enum dot3-mau-type-100-base-fxhd {
-        value 17;
-        description
-          "IEEE 802.3 MAU type 100BASE-FX half duplex mode.";
-      }
-      enum dot3-mau-type-100-base-fxfd {
-        value 18;
-        description
-          "IEEE 802.3 MAU type 100BASE-FX full duplex mode.";
-      }
-      enum dot3-mau-type-100-base-t2hd {
-        value 19;
-        description
-          "IEEE 802.3 MAU type 100BASE-T2 half duplex mode.";
-      }
-      enum dot3-mau-type-100-base-t2fd {
-        value 20;
-        description
-          "IEEE 802.3 MAU type 100BASE-T2 full duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-xhd {
-        value 21;
-        description
-          "IEEE 802.3 MAU type 1000BASE-X half duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-xfd {
-        value 22;
-        description
-          "IEEE 802.3 MAU type 1000BASE-X full duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-lxhd {
-        value 23;
-        description
-          "IEEE 802.3 MAU type 1000BASE-LX half duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-lxfd {
-        value 24;
-        description
-          "IEEE 802.3 MAU type 1000BASE-LX full duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-sxhd {
-        value 25;
-        description
-          "IEEE 802.3 MAU type 1000BASE-SX half duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-sxfd {
-        value 26;
-        description
-          "IEEE 802.3 MAU type 1000BASE-SX full duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-cxhd {
-        value 27;
-        description
-          "IEEE 802.3 MAU type 1000BASE-CX half duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-cxfd {
-        value 28;
-        description
-          "IEEE 802.3 MAU type 1000BASE-CX full duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-thd {
-        value 29;
-        description
-          "IEEE 802.3 MAU type 1000BASE-T half duplex mode.";
-      }
-      enum dot3-mau-type-1000-base-tfd {
-        value 30;
-        description
-          "IEEE 802.3 MAU type 1000BASE-T full duplex mode.";
-      }
-      enum dot3-mau-type-10Gig-base-x {
-        value 31;
-        description
-          "IEEE 802.3 MAU type 10GBASE-X.";
-      }
-      enum dot3-mau-type-10Gig-base-lx4 {
-        value 32;
-        description
-          "IEEE 802.3 MAU type 10GBASE-LX4.";
-      }
-      enum dot3-mau-type-10Gig-base-r {
-        value 33;
-        description
-          "IEEE 802.3 MAU type 10GBASE-R.";
-      }
-      enum dot3-mau-type-10Gig-base-er {
-        value 34;
-        description
-          "IEEE 802.3 MAU type 10GBASE-ER.";
-      }
-      enum dot3-mau-type-10Gig-base-lr {
-        value 35;
-        description
-          "IEEE 802.3 MAU type 10GBASE-LR.";
-      }
-      enum dot3-mau-type-10Gig-base-sr {
-        value 36;
-        description
-          "IEEE 802.3 MAU type 10GBASE-SR.";
-      }
-      enum dot3-mau-type-10Gig-base-w {
-        value 37;
-        description
-          "IEEE 802.3 MAU type 10GBASE-W.";
-      }
-      enum dot3-mau-type-10Gig-base-ew {
-        value 38;
-        description
-          "IEEE 802.3 MAU type 10GBASE-EW.";
-      }
-      enum dot3-mau-type-10Gig-base-lw {
-        value 39;
-        description
-          "IEEE 802.3 MAU type 10GBASE-LW.";
-      }
-      enum dot3-mau-type-10Gig-base-sw {
-        value 40;
-        description
-          "IEEE 802.3 MAU type 10GBASE-SW.";
-      }
-      enum dot3-mau-type-10Gig-base-cx4 {
-        value 41;
-        description
-          "IEEE 802.3 MAU type 10GBASE-CX4.";
-      }
-      enum dot3-mau-type-2-base-tl {
-        value 42;
-        description
-          "IEEE 802.3 MAU type 2BASE-TL";
-      }
-      enum dot3-mau-type-10-pass-ts {
-        value 43;
-        description
-          "IEEE 802.3 MAU type 10PASS-TS.";
-      }
-      enum dot3-mau-type-100-base-bx10D {
-        value 44;
-        description
-          "IEEE 802.3 MAU type 100BASE-BX10D.";
-      }
-      enum dot3-mau-type-100-base-bx10u {
-        value 45;
-        description
-          "IEEE 802.3 MAU type 100BASE-BX10U.";
-      }
-      enum dot3-mau-type-100-base-lx10 {
-        value 46;
-        description
-          "IEEE 802.3 MAU type 100BASE-LX10.";
-      }
-      enum dot3-mau-type-1000-base-bx10d {
-        value 47;
-        description
-          "IEEE 802.3 MAU type 1000BASE-BX10D.";
-      }
-      enum dot3-mau-type-1000-base-bx10u {
-        value 48;
-        description
-          "IEEE 802.3 MAU type 1000BASE-BX10U.";
-      }
-      enum dot3-mau-type-1000-base-lx10 {
-        value 49;
-        description
-          "IEEE 802.3 MAU type 1000BASE-LX10.";
-      }
-      enum dot3-mau-type-1000-base-px10d {
-        value 50;
-        description
-          "IEEE 802.3 MAU type 1000BASE-PX10D.";
-      }
-      enum dot3-mau-type-1000-base-px10u {
-        value 51;
-        description
-          "IEEE 802.3 MAU type 1000BASE-PX10U.";
-      }
-      enum dot3-mau-type-1000-base-px20d {
-        value 52;
-        description
-          "IEEE 802.3 MAU type 1000BASE-PX20D.";
-      }
-      enum dot3-mau-type-1000-base-px20u {
-        value 53;
-        description
-          "IEEE 802.3 MAU type 1000BASE-PX20U.";
-      }
-      enum invalid {
-        value 54;
-        description
-          "Invalid type.";
-      }
-    }
-    description
-      "Operational Medium Attachment Unit (MAU) type.";
-    reference "IEEE 802.3, IETF RFC 4836";
-  }
-
-  typedef supported-notsupported-enum {
-    type enumeration {
-      enum not-supported {
-        value 0;
-        description
-          "Capability is not supported.";
-      }
-      enum supported {
-        value 1;
-        description
-          "Capability is supported.";
-      }
-    }
-    description
-      "Enumeration type indicating if a capability is supported or not.";
-  }
-
-  typedef lldp-port-class {
-    type enumeration {
-      enum pd {
-        value 0;
-        description
-          "Powered Device.";
-      }
-      enum pse {
-        value 1;
-        description
-          "Power Sourcing Equipment.";
-      }
-    }
-    description
-      "LLDP port class type.";
-  }
-
-  typedef lldp-pair-control {
-    type enumeration {
-      enum cannot {
-        value 0;
-        description
-          "Cannot control.";
-      }
-      enum can {
-        value 1;
-        description
-          "Can control.";
-      }
-    }
-    description
-      "LLDP pair control.";
-  }
-
-  typedef lldp-power-pair {
-    type enumeration {
-      enum not-support {
-        value 0;
-        description
-          "Not supported";
-      }
-      enum signal {
-        value 1;
-        description
-          "Signal";
-      }
-      enum spare {
-        value 2;
-        description
-          "Spare";
-      }
-      enum unknown {
-        value 3;
-        description
-          "Unknown";
-      }
-    }
-    description
-      "LLDP power pair type.";
-  }
-
-  typedef lldp-power-class {
-    type enumeration {
-      enum not-support {
-        value 0;
-        description
-          "Not supported";
-      }
-      enum class-0 {
-        value 1;
-        description
-          "Power class 0";
-      }
-      enum class-1 {
-        value 2;
-        description
-          "Power class 1";
-      }
-      enum class-2 {
-        value 3;
-        description
-          "Power class 2";
-      }
-      enum class-3 {
-        value 4;
-        description
-          "Power class 3";
-      }
-      enum class-4 {
-        value 5;
-        description
-          "Power class 4";
-      }
-      enum unknown {
-        value 6;
-        description
-          "Power class unknown";
-      }
-    }
-    description
-      "Power class.";
-  }
-
-  grouping system-capability-group {
-    description
-      "group of LLDP system capability data.";
-    leaf capabilities {
-      type lldp-system-capability-bits;
-      description
-        "LLDP system capabilities.";
-    }
-    leaf capability-enabled {
-      type lldp-system-capability-bits;
-      description
-        "Enabled LLDP system capability.";
-    }
-  }
-
-  grouping management-address-group {
-    description
-      "group of LLDP management address data.";
-    leaf address {
-      type cienawstypes:string-maxl-256;
-      config false;
-      description
-        "Management address.";
-    }
-    leaf subtype {
-      type lldp-management-address-subtype;
-      config false;
-      description
-        "Management adress subtype.";
-    }
-  }
-
-  grouping management-address-interface-group {
-    description
-      "group of LLDP management address data.";
-    leaf interface-subtype {
-      type lldp-management-address-interface-subtype;
-      config false;
-      description
-        "Management address interface subtype.";
-    }
-    leaf oid-if-number {
-      type uint32;
-      config false;
-      description
-        "Management address interface OID interface number.";
-    }
-    leaf oid {
-      type cienawstypes:string-maxl-128;
-      config false;
-      description
-        "Management address interface OID.";
-    }
-  }
-
-  grouping port-id-group {
-    description
-      "group of port identification data.";
-    leaf id {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "port identifier.";
-    }
-    leaf sub-type {
-      type lldp-port-id-sub-type;
-      config false;
-      description
-        "Port identificer sub-type.";
-    }
-    leaf descriptor {
-      type cienawstypes:string-maxl-256;
-      config false;
-      description
-        "Port descriptor";
-    }
-  }
-
-  grouping lldp-rpc-output-group {
-    description
-      "Group of output attributes of LLDP RPC calls.";
-    leaf return-code {
-      type uint32;
-      description
-        "return code: 0 is success; non-zero is failure";
-    }
-    leaf return-string {
-      type cienawstypes:string-maxl-254;
-      description
-        "Return code description";
-    }
-  }
-
-  grouping lldp-entity-group {
-    description
-      "Group of LLDP Entity configuration and operational data.";
-    container properties {
-      description
-        "LLDP port level properties.";
-      leaf mode {
-        type enumeration {
-          enum unknown {
-            value 0;
-            description
-              "LLDP port mode unknown.";
-          }
-          enum tx-only {
-            value 1;
-            description
-              "LLDP port tx-only mode.";
-          }
-          enum snoop {
-            value 2;
-            description
-              "LLDP port snoop mode.";
-          }
-          enum tx-rx {
-            value 3;
-            description
-              "LLDP port tx/rx mode.";
-          }
-          enum disabled {
-            value 4;
-            description
-              "LLDP port disabled.";
-          }
-        }
-        description
-          "LLDP port mode";
-      }
-      leaf notification {
-        type cienawstypes:on-off-enum;
-        description
-          "Turn notification on or off";
-      }
-    }
-    container statistics {
-      config false;
-      description
-        "Port level statistics.";
-      leaf out-packets-total {
-        type uint32;
-        config false;
-        description
-          "Out packets.";
-      }
-      leaf in-packets-total {
-        type uint32;
-        config false;
-        description
-          "In packets";
-      }
-      leaf in-err-packets-discarded {
-        type uint32;
-        config false;
-        description
-          "Discarded in error packets";
-      }
-      leaf in-errored-tlv {
-        type uint32;
-        config false;
-        status deprecated;
-        description
-          "In errored TLV";
-      }
-      leaf tlv-discarded {
-        type uint32;
-        config false;
-        description
-          "Discarded TLV.";
-      }
-      leaf unknown-tlv {
-        type uint32;
-        config false;
-        description
-          "Unknown TLV";
-      }
-      leaf aged-out-total {
-        type uint32;
-        config false;
-        description
-          "Aged out total.";
-      }
-      leaf pdu-length-errors {
-        type uint32;
-        config false;
-        description
-          "Number of LLDPDU Frames with Length Exceeding the maximum LLDPDU size";
-      }
-    }
-    container local {
-      config false;
-      description
-        "Port LLDP local data.";
-      container id {
-        description
-          "LLDP port identification.";
-        uses port-id-group;
-      }
-      container specification-802-3 {
-        config false;
-        description
-          "LLDP Specification 802.3.";
-        container mac-physical-config {
-          config false;
-          description
-            "Mac physical configuration.";
-          leaf auto-negotiation-support {
-            type supported-notsupported-enum;
-            description
-              "Auto-negotiation support.";
-          }
-          leaf auto-negotiation-status {
-            type cienawstypes:enabled-disabled-enum;
-            description
-              "Auto-negotiation status.";
-          }
-          leaf pmd-auto-negotiation-advertised-capability {
-            type lldp-auto-neg-capability;
-            description
-              "PMD Auto-negotiation advertised capability.";
-          }
-          leaf operational-mau-type {
-            type lldp-operational-mau-type;
-            description
-              "Operational MAU type.";
-          }
-        }
-        container power-via-mdi {
-          config false;
-          description
-            "Power Via MDI.";
-          leaf port-class {
-            type lldp-port-class;
-            description
-              "Port class";
-          }
-          leaf mdi {
-            type supported-notsupported-enum;
-            description
-              "Media Dependent Interface (MDI) support.";
-          }
-          leaf mdi-power-support {
-            type cienawstypes:enabled-disabled-enum;
-            description
-              "MDI power support.";
-          }
-          leaf pair-control {
-            type lldp-pair-control;
-            description
-              "Pair control.";
-          }
-          leaf power-pair {
-            type lldp-power-pair;
-            description
-              "Power pair.";
-          }
-          leaf power-class {
-            type lldp-power-class;
-            description
-              "Power class.";
-          }
-        }
-        leaf max-frame-size {
-          type uint16;
-          description
-            "Maximum frame size.";
-        }
-      }
-      list local-management-address-table {
-        key "index";
-        config false;
-        max-elements 4;
-        description
-          "Local management address table list.";
-        leaf index {
-          type uint32;
-          description
-            "Unique id, read-only attribute.";
-        }
-        uses management-address-group;
-        uses management-address-interface-group;
-      }
-    }
-    container remote {
-      config false;
-      description
-        "LLDP port level remote data.";
-      container chassis {
-        config false;
-        description
-          "LLDP remote chassis configuration and operational data.";
-        container chassis-id {
-          description
-            "Remote Chassis ID.";
-          leaf chassis-id {
-            type chassis-id;
-            description
-              "Chassis ID. Read only attribute.";
-          }
-          leaf chassis-id-subtype {
-            type chassis-id-subtype;
-            description
-              "Chassis Identifier subtype.";
-          }
-          leaf system-name {
-            type cienawstypes:string-maxl-256;
-            description
-              "System Name. Max string length of 255 characters.";
-          }
-          leaf system-description {
-            type cienawstypes:string-maxl-256;
-            description
-              "System escription. Max string length of 255 characters.";
-          }
-        }
-        leaf time-to-live {
-          type uint16;
-          config false;
-          description
-            "Time to live.";
-        }
-        container system-capabilities {
-          config false;
-          description
-            "LLDP remote system capabilities.";
-          uses system-capability-group;
-        }
-        list management-address-table {
-          key "index";
-          config false;
-          max-elements 4;
-          description
-            "LLDP remote management address table list.";
-          leaf index {
-            type uint32;
-            description
-              "Unique id, read-only attribute.";
-          }
-          uses management-address-group;
-          uses management-address-interface-group;
-        }
-      }
-      container port {
-        config false;
-        description
-          "LLDP remote port level data.";
-        container id {
-          config false;
-          description
-            "LLDP port identification.";
-          uses port-id-group;
-        }
-        container specification-802-3 {
-          config false;
-          description
-            "LLDP Specification 802.3.";
-          container mac-physical-config {
-            config false;
-            description
-              "Mac physical configuration.";
-            leaf auto-negotiation-support {
-              type supported-notsupported-enum;
-              description
-                "Auto-negotiation support.";
-            }
-            leaf auto-negotiation-status {
-              type cienawstypes:enabled-disabled-enum;
-              description
-                "Auto-negotiation status.";
-            }
-            leaf pmd-auto-negotiation-advertised-capability {
-              type lldp-auto-neg-capability;
-              description
-                "PMD Auto-negotiation advertised capability.";
-            }
-            leaf operational-mau-type {
-              type lldp-operational-mau-type;
-              description
-                "Operational MAU type.";
-            }
-          }
-          container power-via-mdi {
-            config false;
-            description
-              "Power Via MDI.";
-            leaf port-class {
-              type lldp-port-class;
-              description
-                "Port class";
-            }
-            leaf mdi {
-              type supported-notsupported-enum;
-              description
-                "mdi";
-            }
-            leaf mdi-power-support {
-              type cienawstypes:enabled-disabled-enum;
-              description
-                "MDI power support.";
-            }
-            leaf pair-control {
-              type lldp-pair-control;
-              description
-                "Pair control.";
-            }
-            leaf power-pair {
-              type lldp-power-pair;
-              description
-                "Power pair.";
-            }
-            leaf power-class {
-              type lldp-power-class;
-              description
-                "Power class.";
-            }
-          }
-          leaf max-frame-size {
-            type uint16;
-            description
-              "Maximum frame size.";
-          }
-        }
-        list organization-definition-information-table {
-          key "index";
-          config false;
-          description
-            "Remote organization definition information table.";
-          leaf index {
-            type uint32;
-            description
-              "Unique id, read-only attribute.";
-          }
-          leaf oui {
-            type cienawstypes:string-maxl-16;
-            description
-              "OUI.";
-          }
-          leaf subtype {
-            type uint8;
-            description
-              "Sub-Type.";
-          }
-          leaf information {
-            type cienawstypes:string-maxl-256;
-            description
-              "Information.";
-          }
-        }
-        list unrecognized-tlv-table {
-          key "index";
-          config false;
-          description
-            "Remote unrecognized TLV table.";
-          leaf index {
-            type uint32;
-            description
-              "Unique id, read-only attribute.";
-          }
-          leaf type {
-            type uint8;
-            description
-              "Type.";
-          }
-          leaf length {
-            type uint32;
-            description
-              "Length.";
-          }
-          leaf value {
-            type cienawstypes:string-maxl-256;
-            description
-              "Value.";
-          }
-        }
-      }
-    }
-  }
-
-  container waveserver-lldp {
-    description
-      "Waveserver LLDP configuration and operational data.";
-    reference "IEEE 802.1ab-2016 - Station and Media Access Control Connectivity Discovery (LLDP)";
-    container chassis {
-      description
-        "LLDP Chassis configuration and operational data.";
-      container state {
-        description
-          "LLDP Chassis state.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Administrative state of chassis level LLDP.";
-        }
-        leaf notification-interval {
-          type uint16 {
-            range "5 .. 32768";
-          }
-          description
-            "LLDP Notification interval.";
-        }
-      }
-      container id {
-        config false;
-        description
-          "LLDP Chassis identification.";
-        leaf chassis-id {
-          type chassis-id;
-          description
-            "Chassis ID.";
-        }
-        leaf chassis-id-subtype {
-          type chassis-id-subtype;
-          description
-            "Chassis Identifier subtype.";
-        }
-        leaf system-name {
-          type cienawstypes:string-maxl-256;
-          description
-            "System Name. Max string length of 255 characters.";
-        }
-        leaf system-description {
-          type cienawstypes:string-maxl-256;
-          description
-            "System escription. Max string length of 255 characters.";
-        }
-      }
-      leaf time-to-live {
-        type uint16;
-        config false;
-        description
-          "Time To Live.";
-      }
-      container system-capabilities {
-        config false;
-        description
-          "LLDP system capabilities.";
-        uses system-capability-group;
-      }
-      container local-management-address-table {
-        config false;
-        description
-          "LLDP local management address table.";
-        list address-table {
-          key "index";
-          config false;
-          max-elements 4;
-          description
-            "LLDP local management address table list.";
-          leaf index {
-            type uint32;
-            description
-              "Unique id, read-only attribute.";
-          }
-          uses management-address-group;
-          uses management-address-interface-group;
-        }
-      }
-      container statistics {
-        config false;
-        description
-          "LLDP statistics.";
-        leaf last-change {
-          type uint32;
-          description
-            "remote table last change in 1/100 seconds.";
-        }
-        leaf inserts {
-          type uint32;
-          description
-            "Inserts.";
-        }
-        leaf deletes {
-          type uint32;
-          description
-            "Deletes.";
-        }
-        leaf drops {
-          type uint32;
-          description
-            "Drops.";
-        }
-        leaf age-outs {
-          type uint32;
-          description
-            "Age outs.";
-        }
-      }
-    }
-    list port {
-      ncx:user-write "update";
-      key "port-id";
-      description
-        "LLDP Port configuration and operational data.";
-      leaf port-id {
-        type cienawstypes:port-name;
-        mandatory true;
-        description
-          "Port ID/name string.";
-      }
-      uses lldp-entity-group;
-    }
-    list interface-port {
-      ncx:user-write "update";
-      key "name";
-      description
-        "Interface Port LLDP configuration and operational data.";
-      leaf name {
-        type leafref {
-          path "/if:waveserver-interfaces/if:physical-interface/if:id/if:name";
-        }
-        mandatory true;
-        description
-          "Interface Port name string.";
-      }
-      uses lldp-entity-group;
-    }
-  }
-  rpc waveserver-lldp-clear-statistics {
-    description
-      "Clear the LLDP statistics.";
-    output {
-      uses lldp-rpc-output-group;
-    }
-  }
-  rpc waveserver-lldp-clear-port-statistics {
-    description
-      "Clear the LLDP statistics for the specified port.";
-    input {
-      leaf port-id {
-        type cienawstypes:port-name;
-        mandatory true;
-        description
-          "The port ID/name string.";
-      }
-    }
-    output {
-      uses lldp-rpc-output-group;
-    }
-  }
-  rpc waveserver-lldp-clear-interface-port-statistics {
-    description
-      "Clear the LLDP statistics for the specified interface port.";
-    input {
-      leaf name {
-        type cienawstypes:string-maxl-16;
-        mandatory true;
-        description
-          "Interface Port name string (e.g. ifp0-dcn-1, etc.).";
-      }
-    }
-    output {
-      uses lldp-rpc-output-group;
-    }
-  }
-}
diff --git a/models/ciena-waveserver-logging.yang b/models/ciena-waveserver-logging.yang
deleted file mode 100644
index 1b0d0272935cd57170e59ad83a1a986bd83231c6..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-logging.yang
+++ /dev/null
@@ -1,817 +0,0 @@
-module ciena-waveserver-logging {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-logging";
-  prefix log;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-system {
-    prefix system;
-  }
-  import ciena-waveserver-aaa {
-    prefix aaa;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines syslog configuration support for Ciena's Waveserver
-     Platform.";
-
-  revision 2018-12-18 {
-    description
-      "Added 'command-log' support for configuring and retrieving local command logs.
-       Added 'event-log' support for configuring and retrieving local event logs and filters.
-       Added pattern definition for leaf 'trusted-fingerprint'.
-       Added rpc 'waveserver-logging-upload-logs'.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-10-09 {
-    description
-      "Added 'syslog-tls' support for secure syslog.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-03-28 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of the logging external data model.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-
-  typedef log-destination {
-    type enumeration {
-      enum flash {
-        value 1;
-        description
-          "Identifies log entries stored in system flash persistence.";
-      }
-      enum ram {
-        value 2;
-        description
-          "Identifies log entries stored in system RAM.";
-      }
-    }
-    description
-      "A type describing a destination for a log entry or filter.";
-  }
-
-  typedef event-severity-bits {
-    type bits {
-      bit critical {
-        position 3;
-        description
-          "Critical Event Severity";
-      }
-      bit major {
-        position 4;
-        description
-          "Major Event Severity";
-      }
-      bit minor {
-        position 5;
-        description
-          "Minor Event Severity";
-      }
-      bit warning {
-        position 6;
-        description
-          "Warning Event Severity";
-      }
-      bit config {
-        position 7;
-        description
-          "Config Event Severity";
-      }
-      bit info {
-        position 8;
-        description
-          "Info Event Severity";
-      }
-      bit debug {
-        position 9;
-        description
-          "Debug Event Severity";
-      }
-    }
-    description
-      "Event Severity bits. Used for log filtering on one or more event
-       severity value(s).";
-  }
-
-  typedef syslog-severity-bits {
-    type bits {
-      bit emergency {
-        position 0;
-        description
-          "Emergency: system is unusable.";
-      }
-      bit alert {
-        position 1;
-        description
-          "Alert: action must be taken immediately.";
-      }
-      bit critical {
-        position 2;
-        description
-          "Critical: critical conditions.";
-      }
-      bit error {
-        position 3;
-        description
-          "Error: error conditions.";
-      }
-      bit warning {
-        position 4;
-        description
-          "Warning: warning conditions.";
-      }
-      bit notice {
-        position 5;
-        description
-          "Notice: normal but significant condition.";
-      }
-      bit info {
-        position 6;
-        description
-          "Informational: informational messages.";
-      }
-      bit debug {
-        position 7;
-        description
-          "Debug: debug-level messages.";
-      }
-    }
-    description
-      "Syslog severity bits.";
-    reference "RFC 5424 - The Syslog Protocol";
-  }
-
-  typedef syslog-scope {
-    type enumeration {
-      enum user {
-        value 1;
-        description
-          "The collector was manually configured by the user.";
-      }
-      enum dhcp {
-        value 2;
-        description
-          "The collector was automatically configured via DHCP, option 7.";
-      }
-      enum both {
-        value 4;
-        description
-          "The collector was configured by both DHCP and user.";
-      }
-    }
-    description
-      "Syslog scope, or config state. Specifies whether the syslog configuration
-       data was originated by the user, or auto-created via DHCP, or both.";
-  }
-
-  typedef filter-name {
-    type string {
-      length "1..15";
-      pattern '[^!%,?*]+';
-    }
-    description
-      "A typedef for event-log filter names, which should not contain certain
-       special characters.";
-  }
-
-  grouping common-syslog-group {
-    description
-      "Common group of attributes for syslog configuration.";
-    leaf port {
-      type uint16 {
-        range "1..65535";
-      }
-      description
-        "Sets the remote port number for syslog UDP/TCP messages sent to the
-         syslog collector server. Default syslog UDP port is 514, while syslog
-         over TLS uses TCP port 6514 by default.";
-    }
-    leaf custom-prefix {
-      type string {
-        length "0..15";
-      }
-      description
-        "Optional prefix string to include in outgoing syslog messages. Default
-         is blank or empty string.";
-    }
-    leaf facility {
-      type uint8 {
-        range "0..23";
-      }
-      description
-        "Numerical code representation of the syslog facility or class of log
-         messages associated with this collector. Default is 3 (system daemon).";
-      reference "RFC 5424 - The Syslog Protocol";
-    }
-    leaf severity {
-      type syslog-severity-bits;
-      description
-        "The severity or list of severities associated with this collector.";
-      reference "RFC 5424 - The Syslog Protocol";
-    }
-  }
-
-  grouping common-syslog-collector-state-group {
-    description
-      "Common group of syslog collector state attributes.";
-    leaf ip-address {
-      type cienawstypes:string-maxl-64;
-      config false;
-      description
-        "Operational IP address associated with the remote server, if
-         configured/available, or 'Unresolved' otherwise.";
-    }
-    leaf admin-state {
-      type cienawstypes:enabled-disabled-enum;
-      description
-        "Syslog collector administrative state.";
-    }
-    leaf operational-state {
-      type cienawstypes:up-down-enum;
-      config false;
-      description
-        "Syslog collector operational state.";
-    }
-  }
-
-  container waveserver-logging {
-    description
-      "Top level container for system logging configuration and operational data.";
-    container syslog {
-      description
-        "Syslog configuration and operational data.";
-      container global-config {
-        description
-          "Global syslog configuration data, including global defaults.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Global syslog administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Global syslog operational state.";
-        }
-        container defaults {
-          uses common-syslog-group;
-          description
-            "Syslog global default configuration settings.";
-        }
-      }
-      list collector {
-        key "address";
-        description
-          "List of remote syslog collectors.";
-        leaf address {
-          type cienawstypes:ipaddr-or-hostname;
-          description
-            "Configured IP address or Domain Name of the remote server.";
-        }
-        uses common-syslog-collector-state-group;
-        container config {
-          description
-            "Syslog collector configuration data. Unspecified attributes may be
-             ommited from this container, in which case the global default
-             values will be applied.";
-          uses common-syslog-group;
-        }
-        container operational {
-          config false;
-          description
-            "Syslog collector operational data. The config values will be used
-             whenever explicitly configured for the collector, otherwise the
-             global default values will be used.";
-          uses common-syslog-group;
-          leaf scope {
-            type syslog-scope;
-            config false;
-            description
-              "The source of the configuration for this collector. Specifies
-               whether the collector was user-created, auto-created via DHCP
-               (option 7), or both.";
-          }
-        }
-      }
-    }
-    container syslog-tls {
-      description
-        "Secure syslog TLS configuration and operational data.";
-      container global-config {
-        description
-          "Global syslog TLS configuration data, including global defaults.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Global syslog TLS administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Global syslog TLS operational state. If the syslog tls admin-state
-             is enabled and the certificate is installed, the operational state
-             will be 'up', otherwise it will be 'down'.";
-        }
-        leaf collector-timeout {
-          type uint16 {
-            range "1..30";
-          }
-          units "seconds";
-          description
-            "Global timeout period in seconds on responses from a syslog TLS server.";
-        }
-        leaf certificate-name {
-          type string {
-            length "0..32";
-          }
-          description
-            "Syslog TLS certificate name.";
-        }
-        leaf certificate-status {
-          type cienawstypes:string-maxl-254;
-          config false;
-          description
-            "Syslog TLS device certificate/key status string to indicate if the 
-             certificate exists (irrespective of active or expired), in which
-             case the displayed result is OK. If the certificate doesn't exist, 
-             the displayed result will be one of the appropriate error strings,
-             like no private key, no device certificate, etc.";
-        }
-        leaf certificate-fingerprint {
-          type string {
-            length "0..95";
-          }
-          config false;
-          description
-            "Syslog TLS device certificate fingerprint.";
-        }
-        leaf check-ip-host {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Check peer's specified ip or hostname against it's certificate.";
-        }
-        leaf check-fingerprint {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Check the fingerprint of the peer's certificate.";
-        }
-        container defaults {
-          uses common-syslog-group;
-          description
-            "Global default configuration settings for syslog over TLS.";
-        }
-      }
-      container ocsp-config {
-        description
-          "Secure syslog TLS Online Certificate Status Protocol (OCSP)
-           configuration attributes.";
-        uses system:common-ocsp-group;
-      }
-      list collector {
-        key "address";
-        description
-          "List of remote secure syslog collectors.";
-        leaf address {
-          type cienawstypes:ipaddr-or-hostname;
-          description
-            "Configured IP address or Domain Name of the remote server.";
-        }
-        uses common-syslog-collector-state-group;
-        container config {
-          description
-            "Syslog TLS collector configuration data. Unspecified attributes
-             may be ommited from this container, in which case the global
-             default values will be applied.";
-          uses common-syslog-group;
-          leaf trusted-dns {
-            type string {
-              length "0..255";
-            }
-            description
-              "Trusted dns name used to check peer's certificate. The
-               name should be fully qualified whenever possible, and can
-               accept a leading wildcard period.";
-          }
-          leaf trusted-fingerprint {
-            type string {
-              length "0|7|95";
-              pattern '(([0-9A-F]{2}[:]){31}([0-9A-F]{2}))?|(Not Set)';
-            }
-            description
-              "Trusted fingerprint for peer's certificate. The string should have 
-               length of 95, except when it is empty or 'Not Set'.";
-          }
-        }
-        container operational {
-          config false;
-          description
-            "Syslog TLS collector operational data. The config values will be
-             used whenever explicitly configured for the collector, otherwise
-             the global default values will be used.";
-          uses common-syslog-group;
-          leaf last-transport-result {
-            type string {
-              length "0..255";
-            }
-            description
-              "Last transport error message, if applicable.";
-          }
-          leaf greylist-remaining {
-            type uint32;
-            units "seconds";
-            description
-              "Time remaining in greylist. A syslog TLS collector is added to the
-               greylist if a TLS session cannot be established between the NE and
-               the collector.";
-          }
-          container statistics {
-            description
-              "Container of statistics attributes for the syslog TLS collector.";
-            leaf connection-attempts {
-              type uint32;
-              description
-                "Number of connection attempts.";
-            }
-            leaf successful-connections {
-              type uint32;
-              description
-                "Number of successful connections.";
-            }
-            leaf failed-tcp-connections {
-              type uint32;
-              description
-                "Number of failed TCP connections.";
-            }
-            leaf failed-tls-connections {
-              type uint32;
-              description
-                "Number of failed TLS connections.";
-            }
-            leaf timeout-connections {
-              type uint32;
-              description
-                "Number of connection time-outs.";
-            }
-            leaf unexpected-closes {
-              type uint32;
-              description
-                "Number of unexpected connection closes.";
-            }
-            leaf closed-connections {
-              type uint32;
-              description
-                "Number of closed connections.";
-            }
-            leaf overflow-messages-dropped {
-              type uint32;
-              description
-                "Number of messages dropped due to overflow.";
-            }
-          }
-        }
-      }
-    }
-    container command-log {
-      description
-        "Configuration and operational data for the system command log collected
-         on the various management interfaces, including CLI and NBI (RESTCONF,
-         NETCONF, etc.).";
-      container global-config {
-        description
-          "Global command-log configuration and operational data.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Global command-log administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Global command-log operational state.";
-        }
-        leaf destination {
-          type enumeration {
-            enum flash {
-              description
-                "Command logs are stored in system flash persistent storage.
-                 This is the default and only supported value on current
-                 Waveserver hardware.";
-            }
-          }
-          description
-            "Used to specify the storage location for the command log entries.";
-        }
-      }
-      list entry {
-        key "sequence-id";
-        config false;
-        description
-          "List of command-log entries.";
-        leaf sequence-id {
-          type uint32;
-          description
-            "The unique index number of the command-log entry in the list.";
-        }
-        leaf local-date-time {
-          type cienawstypes:string-maxl-32;
-          description
-            "The local date and time when the command was executed, in
-             'YYYY-MM-DD HH:MM:SS' format.";
-        }
-        leaf username {
-          type cienawstypes:string-maxl-32;
-          description
-            "The username associated with the management interface session that
-             initiated the request represented by the command log entry, if
-             applicable. Some system-initiated actions are logged without an
-             associated user account, in which case this leaf may be empty.";
-        }
-        leaf privilege {
-          type aaa:user-access-level;
-          description
-            "The user privilege level associated with the management interface
-             session that initiated the request represented by the command log
-             entry, if applicable. Some system-initiated actions are logged
-             without an associated user account, in which case this leaf may be
-             omitted from the response.";
-        }
-        leaf terminal {
-          type string {
-            length "0..80";
-          }
-          description
-            "The associated terminal session identifier, if applicable. The
-             terminal string will be in the following format:
-             '/<terminal-type>_<ip-address>[:<port-number>]'.";
-        }
-        leaf exit-status {
-          type uint32;
-          description
-            "The internal status code returned by the system after executing
-             the specified command.";
-        }
-        leaf command-string {
-          type string {
-            length "0..460";
-          }
-          description
-            "The content of the actual CLI command sent, or description of the
-             associated operation for other request types, such as NBI requests
-             or system operations. Note that REST/NETCONF commands are not
-             logged verbatim in the command-log, however a record is kept of
-             configuration operation types on each of the paths that are
-             modified.";
-        }
-      }
-    }
-    container event-log {
-      description
-        "Configuration and operational data for system event logs.";
-      container global-config {
-        description
-          "Global event-log configuration and operational data.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Global event-log administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Global event-log operational state.";
-        }
-        leaf flash-log-admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Flash event-log administrative state. Cannot currently be disabled.";
-        }
-        leaf flash-log-operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Flash event-log operational state.";
-        }
-        leaf ram-log-admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "RAM event-log administrative state. Cannot currently be disabled.";
-        }
-        leaf ram-log-operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "RAM event-log operational state.";
-        }
-      }
-      list filter {
-        key "name";
-        description
-          "List of event-log filter entries.";
-        leaf name {
-          type filter-name;
-          description
-            "A user-specified name string which uniquely identifies the filter
-             entry in the list.";
-        }
-        leaf index {
-          type uint32;
-          config false;
-          description
-            "A system-assigned index number for the event-log filter entry.";
-        }
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Filter administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "Filter operational state.";
-        }
-        leaf destination {
-          type log-destination;
-          mandatory true;
-          description
-            "Used to specify the storage location (e.g. 'flash' or 'ram') for
-             the event log entries associated with the filter.";
-        }
-        leaf severity {
-          type event-severity-bits;
-          description
-            "The severity or list of severities associated with this event log
-             filter. Events with a severity value included in this list will
-             match the filter criteria, and events with a severity value not in
-             this list will be omitted/ignored by this filter.";
-        }
-        leaf system-wide {
-          type boolean;
-          description
-            "Specifies whether the event-log filter origin is system-wide,
-             meaning all event origin types will match the filter. If the
-             system-wide origin flag is enabled, then the other origin flags in
-             the filter specification are ignored.";
-        }
-        leaf chassis-origin {
-          type boolean;
-          description
-            "Specifies that chassis-level events are associated with the filter.";
-        }
-        leaf-list slot-origin {
-          type uint8 {
-            range "1..3";
-          }
-          description
-            "List of slot-id values to which the event log filter is associated.";
-        }
-        leaf-list port-origin {
-          type cienawstypes:port-name;
-          description
-            "List of port-id instances in '<slot>-<port>' format to which the
-             event log filter is associated.";
-        }
-      }
-    }
-  }
-  rpc waveserver-logging-syslog-tls-clear-statistics {
-    description
-      "Clear syslog TLS statistics for all collectors.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-logging-syslog-tls-clear-collector-statistics {
-    description
-      "Clear syslog TLS statistics for a single specified collector.";
-    input {
-      leaf address {
-        type cienawstypes:ipaddr-or-hostname;
-        mandatory true;
-        description
-          "Configured IP address or Domain Name of the remote server.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-logging-command-log-clear {
-    description
-      "Clear the system command log.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-logging-event-log-clear {
-    description
-      "Clear the system event log.";
-    input {
-      leaf destination {
-        type log-destination;
-        mandatory true;
-        description
-          "Identifies the location (e.g. 'flash' or 'ram') of the log to be
-           cleared.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-logging-upload-logs {
-    description
-      "Upload a log from flash or ram.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the uploaded log file.";
-      }
-      leaf destination {
-        type log-destination;
-        mandatory true;
-        description
-          "Used to specify the storage location (e.g. 'flash' or 'ram') for
-           the event log entries associated with the filter.";
-      }
-      leaf tail {
-        type uint16;
-        description
-          "Limits the amount of lines from the end of the log to upload, if
-           omitted the entire log will be uploaded.";
-      }
-      leaf keyword {
-        type cienawstypes:string-maxl-16;
-        description
-          "Optional keyword search string to match in log entries.";
-      }
-      uses system:server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-module.yang b/models/ciena-waveserver-module.yang
deleted file mode 100644
index e15c53fcf2e832e5cf178cf5b02fb48bd688fed1..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-module.yang
+++ /dev/null
@@ -1,301 +0,0 @@
-module ciena-waveserver-module {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-module";
-  prefix mod;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-chassis {
-    prefix ciena-ws-chassis;
-  }
-  import ciena-waveserver-xcvr {
-    prefix xcvr;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines Module data for the Waveserver Platform.";
-
-  revision 2018-10-08 {
-    description
-      "Added 'cmd-10', 'motr-100-2p', and 'motr-agg-1' module type enum values.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-07-25 {
-    description
-      "Added 'reserved-1' module type enum value.";
-    reference "Internal use only (Ai R1.3-CP).";
-  }
-  revision 2018-07-19 {
-    description
-      "Added 'motr-crypto' module type support.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-05-07 {
-    description
-      "Added 'motr-100-1' module type support.
-       Specified module type as a create-only attribute.
-       Added 'properties' container and 'mode' leaf to the modules list.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-12-12 {
-    description
-      "Added 'cmd-4' module type support.
-       Renamed 'faulted' operational-state to 'fault' and add 'down' state.
-       Renamed 'motr-8x100' enum to 'motr-100-2'.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-09-05 {
-    description
-      "Waveserver Platform Data Model
-       Initial revision.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef module-type {
-    type enumeration {
-      enum unknown {
-        description
-          "Unknown module type.";
-      }
-      enum filler {
-        description
-          "Filler card. Operational only, cannot be used for user create.";
-      }
-      enum motr-100-2 {
-        description
-          "MOTR service module with 2 WaveLogic Ai line ports and 8 100G capable
-           client ports.";
-      }
-      enum cmd-4 {
-        description
-          "4-channel mux/demux passive photonics module.";
-      }
-      enum motr-100-1 {
-        description
-          "MOTR service module with 1 WaveLogic Ai line port and 4 100G capable
-           client ports.";
-      }
-      enum motr-crypto {
-        description
-          "MOTR service module with 1 WaveLogic Ai line port and 4 100G capable
-           client ports, and supports datapath encryption.";
-      }
-      enum cmd-10 {
-        description
-          "10-channel mux/demux photonics module with OSC.";
-      }
-      enum motr-100-2p {
-        description
-          "MOTR service module with 2 WaveLogic Ai line ports with integrated
-           OPS and 8 100G capable client ports.";
-      }
-      enum motr-agg-1 {
-        description
-          "MOTR service module with 1 WaveLogic Ai line port and 10 client
-           ports capable of 4x10G, 40G, or 100G signals.";
-      }
-      enum reserved-1 {
-        value 1000;
-        description
-          "Reserved for internal use.";
-      }
-    }
-    description
-      "Module type.";
-  }
-
-  typedef module-mode {
-    type enumeration {
-      enum none {
-        description
-          "Default module configuration mode.";
-      }
-      enum oducn-regen {
-        description
-          "Module will be configured for intra-card ODUCn regen application.";
-      }
-    }
-    description
-      "Module configuration mode.";
-  }
-
-  typedef module-operational-state {
-    type enumeration {
-      enum unequipped {
-        value 0;
-        description
-          "Module is not detected.";
-      }
-      enum deprovisioned {
-        value 1;
-        description
-          "Module is detected but uninitialized.";
-      }
-      enum initializing {
-        value 2;
-        description
-          "Module initialization started.";
-      }
-      enum up {
-        value 3;
-        description
-          "Module is up/operational.";
-      }
-      enum fault {
-        value 4;
-        description
-          "Module is faulted.";
-      }
-      enum shutdown {
-        value 5;
-        description
-          "Module is shutdown/powered off.";
-      }
-      enum shutting-down {
-        value 6;
-        description
-          "Module is shutting down.";
-      }
-      enum unsupported {
-        value 7;
-        description
-          "Module type is not supported.";
-      }
-      enum mismatched {
-        value 8;
-        description
-          "Detected module type does not match provisioned module type.";
-      }
-      enum down {
-        value 9;
-        description
-          "Module is down/disabled.";
-      }
-    }
-    description
-      "Module operational state.";
-  }
-
-  container waveserver-modules {
-    description
-      "Waveserver service module configuration data and operational data.";
-    list modules {
-      key "module-id";
-      description
-        "Module list.";
-      leaf module-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique access identifier string of the Module, which may just be a slot number (e.g. '1'). Key value for the Module list. Read-only attribute.";
-      }
-      container id {
-        description
-          "ID information of this Module instance.";
-        leaf type {
-          type module-type;
-          mandatory true;
-          ncx:user-write "create";
-          description
-            "The service module type. Must be specified on creation, and cannot be modified.";
-        }
-        leaf label {
-          type cienawstypes:description-string;
-          description
-            "The user-specified label string for this module.";
-        }
-        uses ciena-ws-chassis:device-id-group;
-      }
-      container state {
-        description
-          "State information of this Module instance.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether Admin State is enabled or disabled for this Module.";
-        }
-        leaf operational-state {
-          type module-operational-state;
-          config false;
-          description
-            "Operational state of this Module.";
-        }
-        leaf last-restart {
-          type cienawstypes:string-maxl-32;
-          config false;
-          description
-            "The date and time of last restart in the format of a human readable string. e.g 'Wed Jun 30 21:49:08 2015', or 'N/A' if unavailable.";
-        }
-        leaf last-restart-reason {
-          type cienawstypes:restart-reason;
-          config false;
-          description
-            "Cause for the last restart.";
-        }
-        leaf uptime {
-          type cienawstypes:string-maxl-32;
-          config false;
-          description
-            "The time since last restart of the module, in the format of a human readable string. e.g '041d 11h 29m 53s', or 'N/A' if unavailable.";
-        }
-      }
-      container properties {
-        description
-          "Configuration properties of this Module instance.";
-        leaf mode {
-          type module-mode;
-          description
-            "The module configuration mode.";
-        }
-      }
-      container subcomponents {
-        config false;
-        description
-          "Module subcomponent (XCVR) references.";
-        leaf-list xcvrs {
-          type leafref {
-            path "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:xcvr-id";
-          }
-          description
-            "Module subcomponent (XCVR) reference list.";
-        }
-      }
-    }
-  }
-  rpc waveserver-module-restart {
-    description
-      "Initiates a module warm restart.";
-    input {
-      leaf module-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique Module ID string.";
-      }
-    }
-  }
-  rpc waveserver-module-restart-cold {
-    description
-      "Initiates a module cold restart.";
-    input {
-      leaf module-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique Module ID string.";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-ndp.yang b/models/ciena-waveserver-ndp.yang
deleted file mode 100644
index f724f3710285a6ed46909c282f841af9f4d149c1..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-ndp.yang
+++ /dev/null
@@ -1,140 +0,0 @@
-module ciena-waveserver-ndp {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-ndp";
-  prefix ndp;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines the configuration and operational data for Neighbor Discovery Protocol (NDP) on the Waveserver.";
-
-  revision 2019-02-12 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of this module.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-
-  typedef neighbor-type-enum {
-    type enumeration {
-      enum deleted {
-        value 0;
-        description
-          "Neighboring node is deleted.";
-      }
-      enum dynamic {
-        value 1;
-        description
-          "Neighboring node is dynamically linked.";
-      }
-      enum static {
-        value 2;
-        description
-          "Neighboring node is statically linked.";
-      }
-    }
-    description
-      "Type of the NDP neighboring nodes.";
-  }
-
-  container waveserver-ndp {
-    description
-      "Waveserver NDP configuration and operational data.";
-    reference "RFC4861 Neighbor Discovery for IP version 6 (IPv6)";
-    container options {
-      description
-        "NDP configuration options.";
-      leaf cache-timeout {
-        type uint16 {
-          range "60 .. 3600";
-        }
-        description
-          "Cache Timeout.";
-      }
-    }
-    list neighbors {
-      key "ip-address";
-      config false;
-      description
-        "List of neighboring IPv6 nodes discovered through NDP.";
-      leaf ip-address {
-        type cienawstypes:ipv6-address;
-        description
-          "The IPv6 address of a neighboring node.";
-      }
-      leaf mac-address {
-        type cienawstypes:mac-string;
-        description
-          "The MAC address of a neighboring node.";
-      }
-      leaf type {
-        type neighbor-type-enum;
-        description
-          "Type of the discoverd neighboring node.";
-      }
-      leaf interface-name {
-        type cienawstypes:string-maxl-16;
-        description
-          "The name of the logical management interface of the neighboring node.";
-      }
-    }
-  }
-  rpc waveserver-ndp-delete-neighbor {
-    description
-      "Delete a neighbor node.";
-    input {
-      leaf ip-address {
-        type cienawstypes:ipv6-address;
-        mandatory true;
-        description
-          "The IPv6 address of a neighboring node to be deleted from the NDP table.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-ndp-flush {
-    description
-      "Flush the NDP data for the specified interface. If no interface-name
-       is provided, will flush the entire NDP data.";
-    input {
-      leaf interface-name {
-        type cienawstypes:string-maxl-16;
-        description
-          "The name of the logical management interface.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-pkix.yang b/models/ciena-waveserver-pkix.yang
deleted file mode 100644
index c4a43004e1a75ac9268d09d2eee06ab8d1b290d7..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-pkix.yang
+++ /dev/null
@@ -1,411 +0,0 @@
-module ciena-waveserver-pkix {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-pkix";
-  prefix pkix;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-system {
-    prefix system;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's Waveserver Public Key Infrastructure 
-     and X.509 representation.";
-
-  revision 2019-03-27 {
-    description
-      "Updated 'certificate-name' range in RPCs.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-09-11 {
-    description
-      "Waveserver Platform Data Model
-       Waveserver Public Key Infrastructure and X.509 configuration.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-
-  typedef csr-key-type-enum {
-    type enumeration {
-      enum rsa2048 {
-        value 1;
-        description
-          "RSA with 2048 bits key length.";
-      }
-      enum rsa3072 {
-        value 2;
-        description
-          "RSA with 3072 bits key length.";
-      }
-      enum rsa4096 {
-        value 3;
-        description
-          "RSA with 4096 bits key length.";
-      }
-      enum secp256r1 {
-        value 8;
-        description
-          "256-bit Elliptic Curve Domain Parameters recommended by NIST.";
-      }
-      enum secp384r1 {
-        value 9;
-        description
-          "384-bit Elliptic Curve Domain Parameters recommended by NIST.";
-      }
-      enum secp521r1 {
-        value 10;
-        description
-          "521-bit Elliptic Curve Domain Parameters recommended by NIST.";
-      }
-    }
-    description
-      "Enum for the type of key supported in generation of 
-       certificate signing request(CSR).";
-  }
-
-  grouping certificate-information-group {
-    description
-      "Grouping of common attributes for a certificate.";
-    leaf subject-common-name {
-      type cienawstypes:string-maxl-64;
-      description
-        "Identification of the entity associated with the public key stored 
-         in the subject public key field.";
-    }
-    leaf issuer-common-name {
-      type cienawstypes:string-maxl-64;
-      description
-        "Identification of the entity that has signed and issued the certificate.";
-    }
-    leaf valid-from {
-      type string {
-        length "0..45";
-      }
-      description
-        "The date that the certificate is valid from and the passed validity time.";
-    }
-    leaf valid-to {
-      type string {
-        length "0..45";
-      }
-      description
-        "The date that the certificate is valid to and the remaining time.";
-    }
-    leaf signature-algorithm {
-      type cienawstypes:string-maxl-64;
-      description
-        "Algorithm used by the CA to sign the certificate.";
-    }
-    leaf serial-number {
-      type string {
-        length "0..20";
-      }
-      description
-        "The certificate's serial number.";
-    }
-    leaf extended-key-usage {
-      type string {
-        length "0..255";
-      }
-      description
-        "Indicates purposes for which the certified public key may be used, 
-         in addition to or in place of the basic purposes.";
-    }
-  }
-
-  container waveserver-pkix {
-    description
-      "Waveserver Public-Key Infrastructure and X.509 configuration data and
-       operational data.";
-    container support-rsa2048 {
-      description
-        "A backward compatibility option to re-enable 2048bit RSA key length support.";
-      leaf admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Indicate whether backward compatibility to support 2048bit RSA key length
-           is enabled.";
-      }
-    }
-    list ca-certificates {
-      key "certificate-hash";
-      config false;
-      description
-        "Certificate Authority (CA) certificates list.";
-      leaf certificate-hash {
-        type cienawstypes:string-maxl-8;
-        description
-          "A string to uniquely identify a certificate.";
-      }
-      leaf status {
-        type enumeration {
-          enum ok {
-            value 0;
-            description
-              "The certificate file is valid.";
-          }
-          enum certificate-file-read-error {
-            value 1;
-            description
-              "The certificate file cannot be read.";
-          }
-        }
-        description
-          "The status of the CA certificate file.";
-      }
-      leaf key-type {
-        type cienawstypes:string-maxl-64;
-        description
-          "Name of the public key.";
-      }
-      leaf signature-algorithm {
-        type cienawstypes:string-maxl-64;
-        description
-          "Algorithm used by the CA to sign the certificate.";
-      }
-      leaf subject-common-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "Identification of the entity associated with the public key stored 
-           in the subject public key field.";
-      }
-      leaf issuer-common-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "Identification of the entity that has signed and issued the certificate.";
-      }
-      leaf valid-from {
-        type string {
-          length "0..45";
-        }
-        description
-          "The date that the certificate is valid from and the passed validity time.";
-      }
-      leaf valid-to {
-        type string {
-          length "0..45";
-        }
-        description
-          "The date that the certificate is valid to and the remaining time.";
-      }
-    }
-    list device-certificates {
-      key "certificate-name";
-      config false;
-      description
-        "Waveserver device certificates list.";
-      leaf certificate-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "The device certificate name.";
-      }
-      leaf private-key {
-        type enumeration {
-          enum not-present {
-            value 0;
-            description
-              "The private key is not present.";
-          }
-          enum present {
-            value 1;
-            description
-              "The private key is present.";
-          }
-        }
-        description
-          "The status of the private-key, indicating whether a private key is present.";
-      }
-      leaf key-type {
-        type cienawstypes:string-maxl-64;
-        description
-          "The key type.";
-      }
-      container device-certificate {
-        config false;
-        description
-          "Device certificate attributes.";
-        uses certificate-information-group;
-      }
-      list additional-certificates {
-        key "index";
-        config false;
-        description
-          "List of additional certificates.";
-        leaf index {
-          type uint8;
-          description
-            "Index of the additional certificates. The index should be 1 or higher.";
-        }
-        uses certificate-information-group;
-      }
-    }
-  }
-  rpc waveserver-pkix-install-ca-certificate {
-    description
-      "Install a CA certificate.";
-    input {
-      leaf file-name {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The file name for the CA certificate.";
-      }
-      uses system:server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pkix-uninstall-ca-certificate {
-    description
-      "Uninstall a CA certificate.";
-    input {
-      leaf ca-certificate-hash {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The hash value for an installed CA certificate.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pkix-install-device-certificate {
-    description
-      "Install a device certificate.";
-    input {
-      leaf certificate-name {
-        type string {
-          length "1..32";
-          pattern '[^!%,"\?\*]*';
-        }
-        mandatory true;
-        description
-          "The device certificate name.";
-      }
-      leaf file-name {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The file name for the device certificate.";
-      }
-      leaf certificate-only {
-        type boolean;
-        description
-          "Indicate whether the installation is for certificate only. 
-           E.g. a signed CSR.";
-      }
-      leaf cert-passphrase {
-        type cienawstypes:string-maxl-128;
-        description
-          "The passphrase. It should be none-zero string when 'certificate-only'
-           is set to false.";
-      }
-      uses system:server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pkix-uninstall-device-certificate {
-    description
-      "Uninstall a device certificate.";
-    input {
-      leaf certificate-name {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "The device certificate name.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pkix-generate-csr {
-    description
-      "Generate a new certificate signing request (CSR).";
-    input {
-      leaf certificate-name {
-        type string {
-          length "1..32";
-          pattern '[^!%,"\?\*]*';
-        }
-        mandatory true;
-        description
-          "The certificate name.";
-      }
-      leaf key-type {
-        type csr-key-type-enum;
-        mandatory true;
-        description
-          "The type of the key supported for CSR.";
-      }
-      leaf file-name {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The file name for the CSR.";
-      }
-      uses system:server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-pm-tca.yang b/models/ciena-waveserver-pm-tca.yang
deleted file mode 100644
index 053a834432e0d2b0423073745fba287dae7b5ab3..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-pm-tca.yang
+++ /dev/null
@@ -1,736 +0,0 @@
-module ciena-waveserver-pm-tca {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-pm-tca";
-  prefix pm-tca;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-pm {
-    prefix pm;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-            Hanover, Maryland 21076
-            U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines PM TCA profiles data for the Waveserver.";
-
-  revision 2019-09-16 {
-    description
-      "Initial revision for PM TCA profiles.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-
-  grouping tca-profile-id {
-    description
-      "Grouping for PM TCA profile id attributes.";
-    leaf profile-id {
-      type tca-profile-id;
-      config false;
-      description
-        "ID of TCA profile.";
-    }
-    leaf profile-type {
-      type pm:pm-profile-type;
-      config false;
-      description
-        "TCA profile type.";
-    }
-    leaf bin-type {
-      type tca-bin-type;
-      mandatory true;
-      description
-        "TCA profile bin type.";
-    }
-  }
-
-  grouping error-counts-thresholds {
-    description
-      "Grouping for common PM error counts (ES, SES, UAS) TCA thresholds.";
-    leaf errored-seconds {
-      type uint64 {
-        range "0 .. 86399";
-      }
-      description
-        "Threshold for the number of seconds that error happened.";
-    }
-    leaf severely-errored-seconds {
-      type uint64 {
-        range "0 .. 86399";
-      }
-      description
-        "Threshold for the number of seconds that severe error happened.";
-    }
-    leaf unavailable-seconds {
-      type uint64 {
-        range "0 .. 86399";
-      }
-      description
-        "Threshold for the number of seconds that the interface was unavailable.";
-    }
-  }
-
-  grouping tca-ethernet-thresholds-group {
-    description
-      "Grouping for Ethernet port TCA thresholds.";
-    leaf rx-link-utilization {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 100.000";
-      }
-      units "percent";
-      description
-        "Rx link utilization threshold as a percentage.";
-    }
-    leaf tx-link-utilization {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 100.000";
-      }
-      units "percent";
-      description
-        "Tx link utilization threshold as a percentage.";
-    }
-    leaf rx-frame-error-ratio {
-      type cienawstypes:string-sci;
-      description
-        "Rx frame error ratio threshold, expressed in scientific notation.";
-    }
-    leaf tx-frame-error-ratio {
-      type cienawstypes:string-sci;
-      description
-        "Tx frame error ratio threshold, expressed in scientific notation.";
-    }
-    leaf rx-crc-errored-packets {
-      type uint64 {
-        range "0 .. 4294967295";
-      }
-      description
-        "Threshold for the number of packets received which contained an FCS error and were 
-         between 64 and 1518 bytes in length.";
-    }
-    leaf tx-crc-errored-packets {
-      type uint64 {
-        range "0 .. 4294967295";
-      }
-      description
-        "Threshold for the number of transmitted packets with an FCS error";
-    }
-    container pcs-layer {
-      description
-        "PCS layer thresholds.";
-      uses error-counts-thresholds;
-    }
-  }
-
-  grouping tca-otdr-thresholds-group {
-    description
-      "Grouping for OTDR TCA thresholds.";
-    leaf event-max-loss {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 20.000";
-      }
-      units "dB";
-      description
-        "Event maximum loss offset in dB.";
-    }
-    leaf event-max-reflection {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 20.000";
-      }
-      units "dB";
-      description
-        "Event maximum reflection offset in dB.";
-    }
-    leaf cumulative-loss {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 20.000";
-      }
-      units "dB";
-      description
-        "Cumulative loss offset in dB.";
-    }
-    leaf cumulative-reflection {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 20.000";
-      }
-      units "dB";
-      description
-        "Cumulative reflection offset in dB.";
-    }
-  }
-
-  grouping tca-photonics-thresholds-group {
-    description
-      "Grouping for OTM PTP photonics TCA thresholds.";
-    leaf return-loss {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 40.000";
-      }
-      units "dB";
-      description
-        "Return Loss offset in dB.";
-    }
-    leaf rx-span-loss {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 40.000";
-      }
-      units "dB";
-      description
-        "Rx Span Loss offset in dB.";
-    }
-    leaf tx-span-loss {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 40.000";
-      }
-      units "dB";
-      description
-        "Tx Span Loss offset in dB.";
-    }
-    container tx-otdr-short {
-      description
-        "Tx OTDR short trace thresholds.";
-      uses tca-otdr-thresholds-group;
-    }
-    container tx-otdr-long {
-      description
-        "Tx OTDR long trace thresholds.";
-      uses tca-otdr-thresholds-group;
-    }
-    container rx-otdr-short {
-      description
-        "Rx OTDR short trace thresholds.";
-      uses tca-otdr-thresholds-group;
-    }
-    container rx-otdr-long {
-      description
-        "Rx OTDR long trace thresholds.";
-      uses tca-otdr-thresholds-group;
-    }
-  }
-
-  grouping tca-modem-thresholds-group {
-    description
-      "Grouping for PTP modem TCA thresholds.";
-    leaf q-factor {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 2.150";
-      }
-      units "dBQ";
-      description
-        "Rx FEC Q-Factor threshold, expressed in dBQ notation.";
-    }
-    leaf high-correction-count-seconds {
-      type uint64 {
-        range "0 .. 86399";
-      }
-      description
-        "FEC high correction count seconds threshold.";
-    }
-    leaf dgd {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 250.000";
-      }
-      units "ps/nm";
-      description
-        "Differential group delay (DGD) threshold, in picoseconds per nanometer (ps/nm).";
-    }
-    leaf pdl {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 250.000";
-      }
-      units "dB";
-      description
-        "Polarization dependent loss (PDL) threshold in dB.";
-    }
-    leaf esnr {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 50.000";
-      }
-      units "dB";
-      description
-        "Electrical Signal-to-Noise Ratio (ESNR) threshold in dB.";
-    }
-    leaf snr-external {
-      type decimal64 {
-        fraction-digits 3;
-        range "0.000 .. 50.000";
-      }
-      units "dB";
-      description
-        "Signal-to-Noise Ratio External threshold in dB.";
-    }
-    leaf chromatic-dispersion {
-      type int64 {
-        range "0 .. 2000000";
-      }
-      units "ps/nm";
-      description
-        "Chromatic Dispersion threshold, in picoseconds per nanometer (ps/nm).";
-    }
-    leaf csi {
-      type uint64 {
-        range "0 .. 1000000000";
-      }
-      description
-        "Cycle Slip Indicator (CSI) Threshold.";
-    }
-  }
-
-  grouping tca-otn-thresholds-group {
-    description
-      "Grouping for OTN port/channel TCA thresholds.";
-    leaf background-block-errors {
-      type uint64 {
-        range "0 .. 4294967295";
-      }
-      description
-        "Background Block Errors (BBE) threshold.";
-    }
-    uses error-counts-thresholds;
-    container far-end {
-      description
-        "Far-end OTN port/channel TCA thresholdss.";
-      leaf background-block-errors {
-        type uint64 {
-          range "0 .. 4294967295";
-        }
-        description
-          "Background Block Errors (BBE) threshold.";
-      }
-      uses error-counts-thresholds;
-    }
-  }
-
-  grouping tca-gcm-thresholds-group {
-    description
-      "Grouping for Encryption-GCM channel TCA thresholds.";
-    leaf error-count {
-      type uint64 {
-        range "0 .. 86399";
-      }
-      description
-        "GCM tag error count threshold.";
-    }
-    leaf severely-errored-seconds {
-      type uint64 {
-        range "0 .. 86399";
-      }
-      description
-        "Threshold for the number of seconds that severe errors happened.";
-    }
-    leaf unavailable-seconds {
-      type uint64 {
-        range "0 .. 86399";
-      }
-      description
-        "Threshold for the number of seconds that the interface was unavailable.";
-    }
-  }
-
-  typedef tca-profile-id {
-    type uint32 {
-      range "1..141";
-    }
-    description
-      "TCA Profile ID.";
-  }
-
-  typedef tca-bin-type {
-    type enumeration {
-      enum 15-min {
-        description
-          "Identifies the 15-min current bin only.";
-      }
-      enum 24-hr {
-        description
-          "Identifies the 24-hr current bin only.";
-      }
-      enum untimed {
-        description
-          "Identifies the untimed bin only.";
-      }
-    }
-    description
-      "TCA bin type.";
-  }
-
-  container waveserver-pm-tca {
-    description
-      "Waveserver performance monitoring threshold crossing alerts.";
-    container tca-profiles {
-      description
-        "Performance monitoring threshold crossing alerts profiles on the Waveserver.";
-      container auto-created {
-        config false;
-        description
-          "Auto created performance monitoring threshold crossing alerts profiles.";
-        list otu-profiles {
-          key "profile-name";
-          description
-            "OTU TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-otn-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:otu-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list odu-profiles {
-          key "profile-name";
-          description
-            "ODU TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-otn-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:odu-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list ethernet-profiles {
-          key "profile-name";
-          description
-            "Ethernet TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-ethernet-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:ethernet-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list encryption-gcm-profiles {
-          key "profile-name";
-          description
-            "Channel Encryption GCM TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-gcm-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:encryption-gcm-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list photonics-profiles {
-          key "profile-name";
-          description
-            "Photonics TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-photonics-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:photonics-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list optical-power-profiles {
-          key "profile-name";
-          description
-            "Optical power TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          leaf baseline-tx-offset {
-            type decimal64 {
-              fraction-digits 3;
-              range "0.000 .. 40.000";
-            }
-            units "dBm";
-            description
-              "Optical power baseline Tx offset, as a power level in dBm.";
-          }
-          leaf baseline-rx-offset {
-            type decimal64 {
-              fraction-digits 3;
-              range "0.000 .. 40.000";
-            }
-            units "dBm";
-            description
-              "Optical power baseline Rx offset, as a power level in dBm.";
-          }
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:optical-power-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list modem-profiles {
-          key "profile-name";
-          description
-            "Modem TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-modem-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:modem-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-      }
-      container user-created {
-        description
-          "User created performance monitoring threshold crossing alerts profiles.";
-        list otu-profiles {
-          key "profile-name";
-          description
-            "OTU TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-otn-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:otu-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list odu-profiles {
-          key "profile-name";
-          description
-            "ODU TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-otn-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:odu-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list ethernet-profiles {
-          key "profile-name";
-          description
-            "Ethernet TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-ethernet-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:ethernet-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list encryption-gcm-profiles {
-          key "profile-name";
-          description
-            "Channel Encryption GCM TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-gcm-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:encryption-gcm-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list photonics-profiles {
-          key "profile-name";
-          description
-            "Photonics TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-photonics-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:photonics-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list optical-power-profiles {
-          key "profile-name";
-          description
-            "Optical power TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          leaf baseline-tx-offset {
-            type decimal64 {
-              fraction-digits 3;
-              range "0.000 .. 40.000";
-            }
-            units "dBm";
-            description
-              "Optical power baseline Tx offset, as a power level in dBm.";
-          }
-          leaf baseline-rx-offset {
-            type decimal64 {
-              fraction-digits 3;
-              range "0.000 .. 40.000";
-            }
-            units "dBm";
-            description
-              "Optical power baseline Rx offset, as a power level in dBm.";
-          }
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:optical-power-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-        list modem-profiles {
-          key "profile-name";
-          description
-            "Modem TCA profiles.";
-          leaf profile-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "Unique name for TCA profile.";
-          }
-          uses tca-profile-id;
-          uses tca-modem-thresholds-group;
-          leaf-list assigned-pm-instances {
-            type leafref {
-              path "/pm:waveserver-pm/pm:modem-performance-instances/pm:instance-name";
-            }
-            config false;
-            description
-              "Assigned PM instance reference list.";
-          }
-        }
-      }
-    }
-  }
-  rpc waveserver-pm-tca-copy-profile {
-    description
-      "Copy profile to another profile.";
-    input {
-      leaf source-profile-name {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the profile to be copied from.";
-      }
-      leaf destination-profile-name {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The name of the profile to be copied to.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-pm.yang b/models/ciena-waveserver-pm.yang
deleted file mode 100644
index 42d64eedfd322032fd1f650b1dbecf4855188dcc..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-pm.yang
+++ /dev/null
@@ -1,2598 +0,0 @@
-module ciena-waveserver-pm {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-pm";
-  prefix pm;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-            Hanover, Maryland 21076
-            U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines performance monitoring data for the Waveserver.";
-
-  revision 2019-09-18 {
-    description
-      "Added support for Cycle slip indicator and SNR External count.
-       Added support for PM TCA thresholds and baseline values.
-       Added OTDR support to Photonics profile.
-       Added rpc 'waveserver-pm-tca-admin-state-set-interface'.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2019-01-15 {
-    description
-      "Added 'aggregate-power' container to the optical power PM profile.
-       Added new 'pm-profile-type' value 'photonics'.
-       Updated 'pm-counter-percent-group' counters to 3-digit decimal precision.
-       Added rpc 'waveserver-pm-clear-all'.
-       Added typedef pm-bin-type.
-       Updated 'pm-interface-type' enum values to { ptp | port | channel | slot }.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-07-30 {
-    description
-      "Updated counter type for 'dgd' counters from integer to decimal.
-       Added 'grouping pm-gcm-stats-group'.
-       Added 'list encryption-gcm-performance-instances'.
-       Updated 'pm-profile-type' enum values to { optical-power | modem-performance | 
-                  otu-performance | odu-performance | ethernet-performance | 
-                  encryption-gcm-performance }.
-       Added 'q-factor-standard-deviation' counter to PTP modem performance instances.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-06-27 {
-    description
-      "Obsoleted 'frame-error-count' and 'frame-error-count-second'.
-       Updated counter type for 'frame-error-ratio' to use exponential notation.
-       Added FEC 'uncorrected-second' counter to PTP modem performance instances.
-       Added ESNR, OSNR, and chromatic-dispersion min/max/avg counters to 
-         PTP modem performance instances.
-       Added ncx:user-write to the instances lists.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2018-01-16 {
-    description
-      "Added DGD max/avg and PDL max/avg PM counters to PTP modem performance instances.
-       Updated Valid range for history bin-numbers are defined.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-09-18 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Update 'pm-interface-type' enum values to { ptp | port | channel }.
-       Updated 'pm-profile-type' enum values to { optical-power | modem-performance | 
-                          otu-performance | odu-performance | ethernet-performance }.
-       Removed obsolete 'mac-layer' containers.
-       Removed 'instance-type' leafs and typedef.
-       Removed 'pm-bin-state' leafs and typedef.
-       Removed 'actual' from power-counts grouping.
-       Removed 'post-fec-bit-error-rate' leafs.
-       Removed 'alignment' from 'instance-properties' grouping.
-       Restructured pm bin and instance data into nested groupings.
-       Changed pm counters from leafs to containers with 'value', 'invalid-data-flag', and 'supported' leafs for each.
-       Updated several counter attributes to match the Waveserver Ai data model.
-       Removed 'current-bin-id' from pm instance state container.
-       Removed 'bin-number' from the current bin id containers, only needed for history bins list.
-       Removed 'persistence-interval' and 'persistence-storage-location' from 'global-config' container.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  grouping pm-instance-id-container {
-    description
-      "Grouping for PM instance id container and attributes.";
-    container id {
-      config false;
-      description
-        "PM instance identification.";
-      leaf instance-id {
-        type uint32;
-        description
-          "ID of the PM instance.";
-      }
-      leaf profile-type {
-        type pm-profile-type;
-        description
-          "The PM profile type.";
-      }
-    }
-  }
-
-  grouping pm-instance-state-container {
-    description
-      "Grouping for PM instance state container and attributes.";
-    container state {
-      description
-        "PM instance state.";
-      leaf admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "The configured administrative state of the port.";
-      }
-      leaf tca-admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "The configured TCA administrative state for this PM instance.";
-      }
-      leaf operational-state {
-        type cienawstypes:enabled-disabled-enum;
-        config false;
-        description
-          "The operational state of the PM instance.";
-      }
-      leaf collection-start-date-time {
-        type cienawstypes:string-maxl-64;
-        config false;
-        description
-          "The PM stats collection starting date and time.";
-      }
-      leaf collection-end-date-time {
-        type cienawstypes:string-maxl-64;
-        config false;
-        description
-          "The PM stats collection ending date and time.";
-      }
-    }
-  }
-
-  grouping pm-instance-properties-container {
-    description
-      "Grouping for PM instance properties container and attributes.";
-    container properties {
-      description
-        "PM instance properties.";
-      leaf configuration-mode {
-        type pm-configuration-mode;
-        config false;
-        description
-          "The PM instance configuration mode";
-      }
-      leaf tca-profile-15-min {
-        type cienawstypes:string-maxl-32;
-        description
-          "TCA profile name that is attached to the current 15 minute bin";
-      }
-      leaf tca-profile-24-hr {
-        type cienawstypes:string-maxl-32;
-        description
-          "TCA profile name that is attached to the current 24 hour bin";
-      }
-      leaf tca-profile-untimed {
-        type cienawstypes:string-maxl-32;
-        description
-          "TCA profile name that is attached to the untimed bin";
-      }
-      leaf configured-bin-count {
-        type uint32;
-        config false;
-        description
-          "The configured number of history bins.";
-      }
-      leaf configured-bin-duration {
-        type uint32;
-        units "minutes";
-        config false;
-        description
-          "The configured PM bin duration in minutes.";
-      }
-    }
-    container attached-interface {
-      config false;
-      description
-        "Attached interface.";
-      leaf type {
-        type pm-interface-type;
-        description
-          "Attached interface type.";
-      }
-      leaf name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Attached interface name.";
-      }
-      leaf operational-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Attached interface operational state.";
-      }
-    }
-  }
-
-  grouping pm-bin-id-container {
-    description
-      "Grouping for PM bin id container and attributes.";
-    container id {
-      config false;
-      description
-        "PM Bin identification.";
-      leaf bin-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "The PM bin name.";
-      }
-    }
-  }
-
-  grouping pm-current-bin-state-container {
-    description
-      "Grouping for PM current bin state container and attributes.";
-    container state {
-      config false;
-      description
-        "PM bin state.";
-      leaf start-date-time {
-        type cienawstypes:string-maxl-32;
-        description
-          "Start date and time.";
-      }
-      leaf cleared-date-time {
-        type cienawstypes:string-maxl-32;
-        description
-          "Cleared date and time.";
-      }
-    }
-  }
-
-  grouping pm-history-bin-state-container {
-    description
-      "Grouping for PM history bin state container and attributes.";
-    container state {
-      config false;
-      description
-        "PM bin state.";
-      leaf start-date-time {
-        type cienawstypes:string-maxl-32;
-        description
-          "Start date and time.";
-      }
-      leaf end-date-time {
-        type cienawstypes:string-maxl-32;
-        description
-          "End date and time.";
-      }
-    }
-  }
-
-  grouping pm-counter-meta {
-    description
-      "Grouping for PM counter metadata, including IDF and supported flags.";
-    leaf invalid-data-flag {
-      type boolean;
-      description
-        "Invalid Data Flag (IDF) value. Reports the validity of the corresponding 
-         PM data. Reported only with previous interval PM counters. A value of true 
-         indicates the PM data for the specified counter or interval is incomplete 
-         or invalid.";
-      reference "ITU-T G.997.2, sections 7.7.2 and 7.8.2.";
-    }
-    leaf supported {
-      type boolean;
-      description
-        "Indicates whether the specified counter is supported on associated 
-         hardware version and interface type.";
-    }
-    leaf tca-supported {
-      type boolean;
-      description
-        "Indicates whether the specified counter supports TCA.";
-    }
-    leaf tca-active {
-      type boolean;
-      description
-        "Indicates whether the specified counter has TCA raised against it.";
-    }
-  }
-
-  grouping pm-counter-group {
-    description
-      "Grouping for basic PM counters, including count value and metadata.";
-    leaf value {
-      type uint64;
-      description
-        "PM counter value.";
-    }
-    leaf tca-threshold {
-      type uint64;
-      description
-        "PM counter TCA threshold.";
-    }
-    uses pm-counter-meta;
-  }
-
-  grouping pm-counter-signed-group {
-    description
-      "Grouping for signed PM counters, including count value and metadata.";
-    leaf value {
-      type int64;
-      description
-        "PM counter value, for signed integer counter values.";
-    }
-    leaf tca-threshold {
-      type int64;
-      description
-        "PM counter TCA threshold, for signed integer counter values.";
-    }
-    uses pm-counter-meta;
-  }
-
-  grouping pm-counter-percent-group {
-    description
-      "Grouping for PM counters with percent units, including count value and metadata.";
-    leaf value {
-      type cienawstypes:decimal-3-dig;
-      units "percent";
-      description
-        "PM value, as a percentage.";
-    }
-    leaf tca-threshold {
-      type cienawstypes:decimal-3-dig;
-      units "percent";
-      description
-        "PM TCA threshold value, as a percentage.";
-    }
-    uses pm-counter-meta;
-  }
-
-  grouping pm-counter-dbm-group {
-    description
-      "Grouping for PM counters with dBm units, including count value and metadata.";
-    leaf value {
-      type cienawstypes:decimal-3-dig;
-      units "dBm";
-      description
-        "PM value, as a power level in dBm.";
-    }
-    leaf tca-threshold {
-      type cienawstypes:decimal-3-dig;
-      units "dBm";
-      description
-        "PM TCA threshold value, as a power level in dBm.";
-    }
-    uses pm-counter-meta;
-  }
-
-  grouping pm-counter-db-group {
-    description
-      "Grouping for PM counters with dB units, including count value and metadata.";
-    leaf value {
-      type cienawstypes:decimal-3-dig;
-      units "dB";
-      description
-        "PM value, as loss or gain in dB.";
-    }
-    leaf tca-threshold {
-      type cienawstypes:decimal-3-dig;
-      units "dB";
-      description
-        "PM TCA threshold value, as loss or gain in dB.";
-    }
-    uses pm-counter-meta;
-  }
-
-  grouping pm-counter-ps-nm-group {
-    description
-      "Grouping for PM counters with picosecond per nanometer (ps/nm) units,
-       including count value and metadata.";
-    leaf value {
-      type cienawstypes:decimal-3-dig;
-      units "ps/nm";
-      description
-        "PM value, in picoseconds per nanometer (ps/nm).";
-    }
-    leaf tca-threshold {
-      type cienawstypes:decimal-3-dig;
-      units "ps/nm";
-      description
-        "PM TCA threshold value, in picoseconds per nanometer (ps/nm).";
-    }
-    uses pm-counter-meta;
-  }
-
-  grouping pm-counter-qfac-group {
-    description
-      "Grouping for q-factor PMs, including count value and metadata.";
-    leaf value {
-      type cienawstypes:decimal-3-dig;
-      description
-        "PM value, as a q-factor.";
-    }
-    leaf tca-threshold {
-      type cienawstypes:decimal-3-dig;
-      description
-        "PM TCA threshold value, as a q-factor.";
-    }
-    uses pm-counter-meta;
-  }
-
-  grouping pm-counter-ber-group {
-    description
-      "Grouping for BER PM counters in scientific notation, including count value and metadata.";
-    leaf value {
-      type cienawstypes:string-sci;
-      description
-        "PM value, as a bit error rate in scientific notation.";
-    }
-    leaf tca-threshold {
-      type cienawstypes:string-sci;
-      description
-        "PM TCA threshold value, as a bit error rate in scientific notation.";
-    }
-    uses pm-counter-meta;
-  }
-
-  grouping ethernet-pm-counts-rx {
-    description
-      "Grouping for Ethernet port PM Rx counters.";
-    container bytes {
-      description
-        "Number of bytes received including good and bad packets. This includes
-         FCS bytes, but excludes framing bits.";
-      uses pm-counter-group;
-    }
-    container packets {
-      description
-        "Number of packets received, including all unicast, multicast, broadcast, 
-         MAC control, and bad packets";
-      uses pm-counter-group;
-    }
-    container crc-errored-packets {
-      description
-        "Number of packets received which contained an FCS error and were 
-         between 64 and 1518 bytes in length.";
-      uses pm-counter-group;
-    }
-    container multicast-packets {
-      description
-        "Number of good multicast packets received that were between 64 and 
-         1518 bytes in length. Excludes MAC control frames";
-      uses pm-counter-group;
-    }
-    container broadcast-packets {
-      description
-        "Number of good broadcast packets received that were between 64 and 
-         1518 bytes in length. Excludes MAC control frames";
-      uses pm-counter-group;
-    }
-    container undersized-packets {
-      description
-        "Number of packets received that were less than 64 bytes (excluding 
-         framing bits but including FCS bytes) and were otherwise well formed. 
-         This counter also includes the number of packets discarded because of 
-         Ethernet length check errors. Undersize packets are discarded.";
-      uses pm-counter-group;
-    }
-    container oversized-packets {
-      description
-        "Number of packets received (including unicast, multicast, and broadcast 
-         packets) that were longer than 1518 bytes up to the configured maximum 
-         frame size, that contained a valid FCS (excluding framing bits but 
-         including FCS bytes), and that were otherwise well formed";
-      uses pm-counter-group;
-    }
-    container fragment-packets {
-      description
-        "Number of packets received between 10 and 63 bytes in length (excluding 
-         framing bits but including FCS bytes) that had either a bad FCS with an
-         integral number of bytes (FCS Error) or a bad FCS with a non-integral 
-         number of bytes (Alignment Error). Fragment packets are discarded.";
-      uses pm-counter-group;
-    }
-    container jabber-packets {
-      description
-        "Number of packets received that were longer than 1518 bytes up to the 
-         configured maximum frame size (excluding framing bits, but including 
-         FCS bytes), and had either a bad FCS with an integral number of 
-         bytes (FCS Error) or a bad FCS with a non-integral number of 
-         bytes (Alignment Error). Jabber packets are discarded";
-      uses pm-counter-group;
-    }
-    container length-out-of-range-packets {
-      description
-        "Number of Rx length out-of-range packets transmitted";
-      uses pm-counter-group;
-    }
-    container pause-packets {
-      description
-        "Number of received valid pause packets that were between 64 and 1518 bytes in length";
-      uses pm-counter-group;
-    }
-    container packets-64-octet {
-      description
-        "Number of packets (including bad packets) received that were 64 bytes in 
-         length (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-65-127-octet {
-      description
-        "Number of good and bad packets received that were between 65 and 127 bytes in
-         length (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-128-255-octet {
-      description
-        "Number of good and bad packets received that were between 128 and 255 bytes in 
-         length inclusive (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-256-511-octet {
-      description
-        "Number of good and bad packets received that were between 256 and 511 bytes in 
-         length inclusive (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-512-1023-octet {
-      description
-        "Number of good and bad packets received that were between 512 and 1023 bytes in 
-         length inclusive (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-1024-1518-octet {
-      description
-        "Number of good and bad packets received that were between 1024 and 1518 bytes in 
-         length inclusive (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-1519-jumbo-octet {
-      description
-        "Number of good and bad packets received that were between 1519 bytes in 
-         length up to MTU size (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container jumbo-octet-packets {
-      description
-        "Number of good and bad packets received that were greater than MTU size.";
-      uses pm-counter-group;
-    }
-    container bytes-per-second {
-      description
-        "Average number bytes received per second during this period.";
-      uses pm-counter-group;
-    }
-    container frames-per-second {
-      description
-        "Average number frames received per second during this period.";
-      uses pm-counter-group;
-    }
-    container average-link-utilization {
-      description
-        "Average percent utilization derived from Rx bytes and port speed.";
-      uses pm-counter-percent-group;
-    }
-    container minimum-link-utilization {
-      description
-        "Minimum percent utilization derived from Rx bytes and port speed.";
-      uses pm-counter-percent-group;
-    }
-    container maximum-link-utilization {
-      description
-        "Maximum percent utilization derived from Rx bytes and port speed.";
-      uses pm-counter-percent-group;
-    }
-    container block-errors {
-      description
-        "PCS block errors.";
-      uses pm-counter-group;
-    }
-    container multilane-bip-errors {
-      description
-        "PCS lane BIP errors.";
-      uses pm-counter-group;
-    }
-    container frame-error-ratio {
-      description
-        "Frame error ratio, expressed in exponential notation.";
-      uses pm-counter-ber-group;
-    }
-  }
-
-  grouping ethernet-pm-counts-tx {
-    description
-      "Grouping for Ethernet port PM Tx counters.";
-    container bytes {
-      description
-        "Number of transmitted bytes in good and bad packets including FCS bytes and
-         excluding frame bits.";
-      uses pm-counter-group;
-    }
-    container packets {
-      description
-        "Number of transmitted packets, including all unicast, multicast, broadcast,
-         MAC control, and bad packets";
-      uses pm-counter-group;
-    }
-    container excessive-deferred-packets {
-      description
-        "Number of transmitted packets experiencing two or more deferrals. 
-         Applicable to copper ports only";
-      uses pm-counter-group;
-    }
-    container underrun-packets {
-      description
-        "Number of underrun packets transmitted";
-      uses pm-counter-group;
-    }
-    container crc-errored-packets {
-      description
-        "Number of transmitted packets with an FCS error";
-      uses pm-counter-group;
-    }
-    container length-check-error-packets {
-      description
-        "Number of length check packets transmitted";
-      uses pm-counter-group;
-    }
-    container length-out-of-range-packets {
-      description
-        "Number of Tx length out-of-range packets transmitted";
-      uses pm-counter-group;
-    }
-    container pause-packets {
-      description
-        "Number of pause packets transmitted";
-      uses pm-counter-group;
-    }
-    container giant-packets {
-      description
-        "Number of well-formed packets larger than 1518 bytes, including FCS bytes 
-         but excluding framing bits.";
-      uses pm-counter-group;
-    }
-    container multicast-packets {
-      description
-        "Number of good multicast packets transmitted";
-      uses pm-counter-group;
-    }
-    container broadcast-packets {
-      description
-        "Number of good broadcast packets transmitted";
-      uses pm-counter-group;
-    }
-    container packets-64-octet {
-      description
-        "Number of packets (including bad packets) transmitted that were 64 bytes in 
-         length (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-65-127-octet {
-      description
-        "Number of good and bad packets transmitted that were between 65 and 
-         127 bytes in length (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-128-255-octet {
-      description
-        "Number of good and bad packets transmitted that were between 128 and 
-         255 bytes in length inclusive (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-256-511-octet {
-      description
-        "Number of good and bad packets transmitted that were between 256 and 
-         511 bytes in length inclusive (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-512-1023-octet {
-      description
-        "Number of good and bad packets transmitted that were between 512 and 
-         1023 bytes in length inclusive (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-1024-1518-octet {
-      description
-        "Number of good and bad packets transmitted that were between 1024 and 
-         1518 bytes in length inclusive (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container packets-1519-jumbo-octet {
-      description
-        "Number of good and bad packets transmitted that were between 1519 bytes in 
-         length up to MTU size (excluding framing bits but including FCS bytes).";
-      uses pm-counter-group;
-    }
-    container jumbo-octet-packets {
-      description
-        "Number of good and bad packets transmitted that were greater than MTU size.";
-      uses pm-counter-group;
-    }
-    container bytes-per-second {
-      description
-        "Average number bytes transmitted per second during this period.";
-      uses pm-counter-group;
-    }
-    container frames-per-second {
-      description
-        "Average number frames transmitted per second during this period.";
-      uses pm-counter-group;
-    }
-    container average-link-utilization {
-      description
-        "Average percent utilization derived from Tx bytes and port speed.";
-      uses pm-counter-percent-group;
-    }
-    container minimum-link-utilization {
-      description
-        "Minimum percent utilization derived from Tx bytes and port speed.";
-      uses pm-counter-percent-group;
-    }
-    container maximum-link-utilization {
-      description
-        "Maximum percent utilization derived from Tx bytes and port speed.";
-      uses pm-counter-percent-group;
-    }
-    container block-errors {
-      description
-        "PCS block errors.";
-      uses pm-counter-group;
-    }
-    container multilane-bip-errors {
-      description
-        "PCS lane BIP errors.";
-      uses pm-counter-group;
-    }
-    container frame-error-ratio {
-      description
-        "Frame error ratio, expressed in exponential notation.";
-      uses pm-counter-ber-group;
-    }
-  }
-
-  grouping error-counts {
-    description
-      "Grouping for common PM error counts (ES, SES, UAS).";
-    container errored-seconds {
-      description
-        "Number of seconds that error happened.";
-      uses pm-counter-group;
-    }
-    container severely-errored-seconds {
-      description
-        "Number of seconds that severe error happened.";
-      uses pm-counter-group;
-    }
-    container unavailable-seconds {
-      description
-        "Number of seconds that the interface was unavailable.";
-      uses pm-counter-group;
-    }
-  }
-
-  grouping fec-layer-counts {
-    description
-      "Grouping for Ethernet port FEC layer counts.";
-    container corrected-codeword-count {
-      description
-        "FEC layer corrected codeword count";
-      uses pm-counter-group;
-    }
-    container uncorrected-codeword-count {
-      description
-        "FEC layer uncorrected codeword count";
-      uses pm-counter-group;
-    }
-    container symbol-error-count {
-      description
-        "FEC layer symbol error count. This is the total of error counts across 
-         all PMA lanes on this interface.";
-      uses pm-counter-group;
-    }
-  }
-
-  grouping dgd-counts {
-    description
-      "Differential Group Delay (DGD) Grouping.";
-    container maximum {
-      description
-        "Maximum differential group delay (in ps).";
-      uses pm-counter-ps-nm-group;
-    }
-    container average {
-      description
-        "Average differential group delay (in ps).";
-      uses pm-counter-ps-nm-group;
-    }
-  }
-
-  grouping pdl-counts {
-    description
-      "Polarization Dependent Loss (PDL) Grouping.";
-    container maximum {
-      description
-        "Maximum polarization dependent loss (in dB).";
-      uses pm-counter-db-group;
-    }
-    container average {
-      description
-        "Average polarization dependent loss (in dB).";
-      uses pm-counter-db-group;
-    }
-  }
-
-  grouping snr-counts {
-    description
-      "Signal-to-Noise Ratio (SNR) Grouping, for ESNR, SNR External and OSNR PM stats.";
-    container minimum {
-      description
-        "Minimum signal-to-noise ratio (in dB).";
-      uses pm-counter-db-group;
-    }
-    container maximum {
-      description
-        "Maximum signal-to-noise ratio (in dB).";
-      uses pm-counter-db-group;
-    }
-    container average {
-      description
-        "Average signal-to-noise ratio (in dB).";
-      uses pm-counter-db-group;
-    }
-  }
-
-  grouping csi-counts {
-    description
-      "Cycle Slip Indicator (CSI) Grouping.";
-    container maximum {
-      description
-        "Maximum cycle slip indicator.";
-      uses pm-counter-signed-group;
-    }
-    container average {
-      description
-        "Average cycle slip indicator.";
-      uses pm-counter-signed-group;
-    }
-  }
-
-  grouping cd-counts {
-    description
-      "Chromatic Dispersion Grouping.";
-    container minimum {
-      description
-        "Minimum chromatic dispersion value (in ps/nm).";
-      uses pm-counter-signed-group;
-    }
-    container maximum {
-      description
-        "Maximum chromatic dispersion value (in ps/nm).";
-      uses pm-counter-signed-group;
-    }
-    container average {
-      description
-        "Average chromatic dispersion value (in ps/nm).";
-      uses pm-counter-signed-group;
-    }
-  }
-
-  grouping power-counts {
-    description
-      "Optical Power Grouping. Can be used for Tx or Rx optical power PM instances.";
-    container minimum {
-      description
-        "Minimum power reading.";
-      uses pm-counter-dbm-group;
-    }
-    container maximum {
-      description
-        "Maximum power reading.";
-      uses pm-counter-dbm-group;
-    }
-    container average {
-      description
-        "Average power reading.";
-      uses pm-counter-dbm-group;
-    }
-    leaf baseline {
-      type cienawstypes:decimal-3-dig;
-      units "dBm";
-      description
-        "PM TCA baseline value, as a power level in dBm. Not applicable to history bins.";
-    }
-  }
-
-  grouping signal-loss-counts {
-    description
-      "Signal Loss Grouping, for Return Loss and Tx or Rx Span Loss stats.";
-    container minimum {
-      description
-        "Minimum loss (in dB).";
-      uses pm-counter-db-group;
-    }
-    container maximum {
-      description
-        "Maximum loss (in dB).";
-      uses pm-counter-db-group;
-    }
-    container average {
-      description
-        "Average loss (in dB).";
-      uses pm-counter-db-group;
-    }
-    leaf baseline {
-      type cienawstypes:decimal-3-dig;
-      units "dB";
-      description
-        "PM TCA baseline value in dB. Not applicable to history bins.";
-    }
-  }
-
-  grouping pm-otdr-counter-signed-group {
-    description
-      "OTDR Grouping, for OTDR trace counts for Tx or Rx, short and long.";
-    container minimum {
-      description
-        "Minimum count (int).";
-      uses pm-counter-signed-group;
-    }
-    container maximum {
-      description
-        "Maximum count (int).";
-      uses pm-counter-signed-group;
-    }
-    container current {
-      description
-        "Current count (int).";
-      uses pm-counter-signed-group;
-    }
-    leaf baseline {
-      type int64;
-      description
-        "PM baseline value (int). Not applicable to history bins.";
-    }
-  }
-
-  grouping pm-otdr-counter-db-group {
-    description
-      "OTDR Grouping, for OTDR trace counts for Tx or Rx, short and long.";
-    container minimum {
-      description
-        "Minimum count (in dB).";
-      uses pm-counter-db-group;
-    }
-    container maximum {
-      description
-        "Maximum count (in dB).";
-      uses pm-counter-db-group;
-    }
-    container current {
-      description
-        "Current count (in dB).";
-      uses pm-counter-db-group;
-    }
-    leaf baseline {
-      type cienawstypes:decimal-3-dig;
-      units "dB";
-      description
-        "PM TCA baseline value in dB. Not applicable to history bins.";
-    }
-  }
-
-  grouping otdr-counts {
-    description
-      "OTDR Counts Grouping, for OTDR trace counts for Tx or Rx, short and long.";
-    container event-count {
-      description
-        "Event count (int).";
-      uses pm-otdr-counter-signed-group;
-    }
-    container event-maximum-loss {
-      description
-        "Event maximum loss (in dB).";
-      uses pm-otdr-counter-db-group;
-    }
-    container event-maximum-loss-distance {
-      description
-        "Event maximum loss distance (in dB).";
-      uses pm-otdr-counter-db-group;
-    }
-    container event-maximum-reflection {
-      description
-        "Event maximum reflection (in dB).";
-      uses pm-otdr-counter-db-group;
-    }
-    container event-maximum-reflection-distance {
-      description
-        "Event maximum reflection distance (in dB).";
-      uses pm-otdr-counter-db-group;
-    }
-    container cumulative-loss {
-      description
-        "Cumulative loss (in dB).";
-      uses pm-otdr-counter-db-group;
-    }
-    container cumulative-reflection {
-      description
-        "Cumulative reflection (in dB).";
-      uses pm-otdr-counter-db-group;
-    }
-  }
-
-  grouping ber-counts {
-    description
-      "Grouping for common PM Bit-Error-Rate values.";
-    container bit-error-rate {
-      description
-        "Bit error rate reading.";
-      uses pm-counter-ber-group;
-    }
-    container maximum {
-      description
-        "Maximum BER reading.";
-      uses pm-counter-ber-group;
-    }
-  }
-
-  grouping q-factor-counts {
-    description
-      "Grouping for PM modem Q-Factor values.";
-    container q-factor {
-      description
-        "Average Q-Factor reading.";
-      uses pm-counter-qfac-group;
-    }
-    container minimum {
-      description
-        "Minimum Q-Factor reading.";
-      uses pm-counter-qfac-group;
-    }
-    container maximum {
-      description
-        "Maximum Q-Factor reading.";
-      uses pm-counter-qfac-group;
-    }
-    container standard-deviation {
-      description
-        "Q-Factor standard deviation value.";
-      uses pm-counter-qfac-group;
-    }
-  }
-
-  grouping fec-error-counts {
-    description
-      "Grouping for line PTP FEC counts.";
-    container frame-error-count {
-      status obsolete;
-      description
-        "FEC Frame error counts.";
-      uses pm-counter-group;
-    }
-    container frame-error-count-second {
-      status obsolete;
-      description
-        "FEC Frame error count second.";
-      uses pm-counter-group;
-    }
-    container uncorrected-block-count {
-      description
-        "FEC uncorrected block count.";
-      uses pm-counter-group;
-    }
-    container uncorrected-second {
-      description
-        "FEC uncorrected second count.";
-      uses pm-counter-group;
-    }
-    container high-correction-count-seconds {
-      description
-        "FEC high correction count seconds.";
-      uses pm-counter-group;
-    }
-  }
-
-  grouping pm-ethernet-stats-group {
-    description
-      "Grouping for Ethernet port statistics containers and attributes.";
-    container interface-counts {
-      description
-        "Ethernet PM interface counts.";
-      container rx {
-        description
-          "Ethernet interface Rx counts.";
-        uses ethernet-pm-counts-rx;
-      }
-      container tx {
-        description
-          "Ethernet interface Tx counts.";
-        uses ethernet-pm-counts-tx;
-      }
-    }
-    container pcs-layer {
-      description
-        "PCS layer statistics.";
-      container sync-header-errors {
-        description
-          "PCS sync header errors.";
-        uses pm-counter-group;
-      }
-      uses error-counts;
-    }
-    container fec-layer {
-      description
-        "Ethernet FEC layer PM statistics.";
-      uses fec-layer-counts;
-    }
-  }
-
-  grouping pm-optical-power-stats-group {
-    description
-      "Grouping for PTP optical power statistics containers and attributes.";
-    leaf number-of-lanes {
-      type uint16;
-      description
-        "Number of optical lanes.";
-    }
-    list optical-power {
-      key "lane-number";
-      config false;
-      max-elements 4;
-      description
-        "Statistics for a PTP optical lane.";
-      leaf lane-number {
-        type cienawstypes:lanes-number;
-        config false;
-        description
-          "Lane number.";
-      }
-      container rx-power {
-        config false;
-        uses power-counts;
-        description
-          "Rx power reading.";
-      }
-      container tx-power {
-        config false;
-        uses power-counts;
-        description
-          "Tx power reading.";
-      }
-    }
-    container channel-power {
-      config false;
-      description
-        "Total optical channel power readings. Only applies to line PTP in 'colourless' mode.";
-      container rx-power {
-        config false;
-        uses power-counts;
-        description
-          "Rx power reading.";
-      }
-    }
-    container aggregate-power {
-      config false;
-      description
-        "For OTM PTP instances, this contains the total DWDM + OSC power readings.";
-      container rx-power {
-        config false;
-        uses power-counts;
-        description
-          "Rx aggregate power reading.";
-      }
-      container tx-power {
-        config false;
-        uses power-counts;
-        description
-          "Tx aggregate power reading.";
-      }
-    }
-  }
-
-  grouping pm-photonics-stats-group {
-    description
-      "Grouping for OTM PTP photonics statistics.";
-    container return-loss {
-      config false;
-      uses signal-loss-counts;
-      description
-        "Return Loss measurements.";
-    }
-    container rx-span-loss {
-      config false;
-      uses signal-loss-counts;
-      description
-        "Rx Span Loss measurements.";
-    }
-    container tx-span-loss {
-      config false;
-      uses signal-loss-counts;
-      description
-        "Tx Span Loss measurements.";
-    }
-    container rx-otdr-trace-short {
-      config false;
-      uses otdr-counts;
-      description
-        "Rx OTDR trace counts short.";
-    }
-    container rx-otdr-trace-long {
-      config false;
-      uses otdr-counts;
-      description
-        "Rx OTDR trace counts long.";
-    }
-    container tx-otdr-trace-short {
-      config false;
-      uses otdr-counts;
-      description
-        "Tx OTDR trace counts short.";
-    }
-    container tx-otdr-trace-long {
-      config false;
-      uses otdr-counts;
-      description
-        "Tx OTDR trace counts long.";
-    }
-  }
-
-  grouping pm-modem-stats-group {
-    description
-      "Grouping for PTP modem statistics containers and attributes.";
-    container pre-fec-bit-error-rate {
-      config false;
-      uses ber-counts;
-      description
-        "Pre-FEC BER counts.";
-    }
-    container q-factor {
-      config false;
-      uses q-factor-counts;
-      description
-        "Q-Factor count.";
-    }
-    container fec-error {
-      config false;
-      uses fec-error-counts;
-      description
-        "FEC error counts.";
-    }
-    container dgd {
-      description
-        "Differential group delay (DGD) counts.";
-      uses dgd-counts;
-    }
-    container pdl {
-      description
-        "Polarization dependent loss (PDL) counts.";
-      uses pdl-counts;
-    }
-    container esnr {
-      description
-        "Electrical Signal-to-Noise Ratio (ESNR) counts.";
-      uses snr-counts;
-    }
-    container snre {
-      description
-        "Signal-to-Noise Ratio (SNR) External counts.";
-      uses snr-counts;
-    }
-    container osnr {
-      description
-        "Optical Signal-to-Noise Ratio (OSNR) counts.";
-      uses snr-counts;
-    }
-    container csi {
-      description
-        "Cycle Slip Indicator (CSI) counts.";
-      uses csi-counts;
-    }
-    container chromatic-dispersion {
-      description
-        "Chromatic Dispersion counts.";
-      uses cd-counts;
-    }
-  }
-
-  grouping pm-otn-stats-group {
-    description
-      "Grouping for OTN port/channel statistics containers and attributes.";
-    container background-block-errors {
-      description
-        "Background Block Errors (BBE).";
-      uses pm-counter-group;
-    }
-    uses error-counts;
-    container far-end {
-      description
-        "Far-end statistics.";
-      container background-block-errors {
-        description
-          "Background Block Errors (BBE).";
-        uses pm-counter-group;
-      }
-      uses error-counts;
-    }
-  }
-
-  grouping pm-gcm-stats-group {
-    description
-      "Grouping for Encryption-GCM channel statistics containers and attributes.";
-    container error-count {
-      description
-        "GCM tag error count.";
-      uses pm-counter-group;
-    }
-    container severely-errored-seconds {
-      description
-        "Number of seconds that severe errors happened.";
-      uses pm-counter-group;
-    }
-    container unavailable-seconds {
-      description
-        "Number of seconds that the interface was unavailable.";
-      uses pm-counter-group;
-    }
-  }
-
-  typedef pm-persistence-status {
-    type enumeration {
-      enum none {
-        description
-          "Save to persistence not attempted.";
-      }
-      enum inprogress {
-        description
-          "Save to persistence in progress.";
-      }
-      enum complete {
-        description
-          "Save to persistence complete.";
-      }
-      enum not-found {
-        description
-          "File not found.";
-      }
-      enum inaccessible {
-        description
-          "Unable to access persistence storage location.";
-      }
-      enum aborted {
-        description
-          "Save to persistence aborted.";
-      }
-      enum corrupt {
-        description
-          "Persistence file is corrupt.";
-      }
-      enum failed {
-        description
-          "Save to persistence failed.";
-      }
-      enum partial {
-        description
-          "Save to persistence was only partially successful.";
-      }
-      enum not-ready {
-        description
-          "Persistence not ready.";
-      }
-    }
-    description
-      "PM persistence status.";
-  }
-
-  typedef pm-persistence-state {
-    type enumeration {
-      enum not-initialized {
-        description
-          "PM persistence not-initialized";
-      }
-      enum initialized {
-        description
-          "PM persistence initialized";
-      }
-    }
-    description
-      "PM persistence state.";
-  }
-
-  typedef pm-configuration-mode {
-    type enumeration {
-      enum unknown {
-        description
-          "Unknown PM instance configuration mode.";
-      }
-      enum auto-created {
-        description
-          "PM instance is auto-created (default).";
-      }
-      enum user-created {
-        description
-          "PM instance is user-created.";
-      }
-    }
-    description
-      "PM configuration mode.";
-  }
-
-  typedef pm-interface-type {
-    type enumeration {
-      enum ptp {
-        description
-          "Associated interface is a PTP.";
-      }
-      enum port {
-        description
-          "Associated interface is an Ethernet or OTN port.";
-      }
-      enum channel {
-        description
-          "Associated interface is an ODU channel.";
-      }
-      enum slot {
-        description
-          "Associated interface is line module.";
-      }
-    }
-    description
-      "PM interface type. The object type on which the PMs are being collected/reported.";
-  }
-
-  typedef pm-profile-type {
-    type enumeration {
-      enum optical-power {
-        description
-          "PTP Optical Power PM profile type.";
-      }
-      enum modem-performance {
-        description
-          "PTP Modem PM profile type.";
-      }
-      enum otu-performance {
-        description
-          "Port OTU PM profile type.";
-      }
-      enum odu-performance {
-        description
-          "Port/Channel ODU profile type.";
-      }
-      enum ethernet-performance {
-        description
-          "Port Ethernet PM profile type.";
-      }
-      enum encryption-gcm-performance {
-        description
-          "Port Ethernet PM profile type.";
-      }
-      enum photonics {
-        description
-          "PTP Photonics PM profile type.";
-      }
-    }
-    description
-      "PM profile type.";
-  }
-
-  typedef pm-bin-type {
-    type enumeration {
-      enum 15-min {
-        description
-          "Identifies the 15-min current bin only.";
-      }
-      enum 24-hr {
-        description
-          "Identifies the 24-hr current bin only.";
-      }
-      enum untimed {
-        description
-          "Identifies the untimed bin only.";
-      }
-      enum history {
-        description
-          "Identifies all historical 15-min and 24-hour bins.";
-      }
-      enum all {
-        description
-          "Identifies all current and historical bins.";
-      }
-    }
-    description
-      "PM bin type.";
-  }
-
-  typedef tca-notification-type {
-    type enumeration {
-      enum summary-event {
-        description
-          "TCA generates summary events.";
-      }
-      enum summary-alarm {
-        description
-          "TCA generates summary alarms.";
-      }
-      enum event {
-        description
-          "TCA generates events against interface/bin.";
-      }
-      enum alarm {
-        description
-          "TCA generates alarms against interface/bin.";
-      }
-    }
-    description
-      "TCA notification type.";
-  }
-
-  container waveserver-pm {
-    description
-      "Waveserver performance monitoring configuration and operational data.";
-    container global-config {
-      description
-        "Performance monitoring global configuration on the Waveserver.";
-      leaf admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Global admin state.";
-      }
-      leaf tca-admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Global TCA administrative state.";
-      }
-      leaf tca-notification-type {
-        type tca-notification-type;
-        description
-          "Global TCA notification type.";
-      }
-    }
-    container persistence-state {
-      config false;
-      description
-        "Performance monitoring persistence state on the Waveserver.";
-      leaf state {
-        type pm-persistence-state;
-        description
-          "Persistence state initialized or not.";
-      }
-      leaf next-history-bin-save {
-        type uint32;
-        units "seconds";
-        description
-          "Number of seconds left before current bin is saved to history.";
-      }
-      leaf current-file-size {
-        type uint32;
-        units "bytes";
-        description
-          "Current file size.";
-      }
-      leaf save-status {
-        type pm-persistence-status;
-        description
-          "Persistence storage setting.";
-      }
-      leaf instances-saved {
-        type uint32;
-        description
-          "Number of the PM instances saved.";
-      }
-      leaf elapsed-save-time {
-        type uint32;
-        units "seconds";
-        description
-          "Number of seconds passed since the save begin.";
-      }
-      leaf load-status {
-        type pm-persistence-status;
-        description
-          "Persistence load status.";
-      }
-      leaf instances-in-file {
-        type uint32;
-        description
-          "Total number of PM instances in file.";
-      }
-      leaf instances-loaded {
-        type uint32;
-        description
-          "Number of loaded instances.";
-      }
-      leaf elapsed-load-time {
-        type uint32;
-        units "seconds";
-        description
-          "Elaspsed Load Time.";
-      }
-    }
-    container auto-created {
-      config false;
-      description
-        "PM auto created instances.";
-      list instances {
-        key "instance-id";
-        config false;
-        description
-          "PM auto-created instance list.";
-        leaf instance-id {
-          type uint32;
-          description
-            "ID of the PM instance.";
-        }
-        leaf instance-name {
-          type cienawstypes:string-maxl-32;
-          description
-            "The PM instance name.";
-        }
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "The configured administrative state of the PM instance.";
-        }
-        leaf operational-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "The operational state of the PM instance.";
-        }
-        leaf bin-count {
-          type uint32;
-          description
-            "The number of history bins.";
-        }
-        leaf bin-duration {
-          type uint32;
-          units "minutes";
-          description
-            "The PM bin duration in minutes.";
-        }
-        leaf attached-interface-type {
-          type pm-interface-type;
-          description
-            "Attached interface type.";
-        }
-        leaf attached-interface-name {
-          type cienawstypes:string-maxl-32;
-          description
-            "Attached interface name.";
-        }
-      }
-    }
-    list ethernet-performance-instances {
-      ncx:user-write "update";
-      key "instance-name";
-      description
-        "Ethernet port PM instances.";
-      leaf instance-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Unique name for PM instance.";
-      }
-      uses pm-instance-id-container;
-      uses pm-instance-state-container;
-      uses pm-instance-properties-container;
-      container current-bin {
-        config false;
-        description
-          "PM current 15-minute bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-ethernet-stats-group;
-        }
-      }
-      container current-24-hour-bin {
-        config false;
-        description
-          "PM current 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-ethernet-stats-group;
-        }
-      }
-      container untimed-bin {
-        config false;
-        description
-          "PM untimed bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-ethernet-stats-group;
-        }
-      }
-      container history {
-        config false;
-        description
-          "PM 15-minute bin history";
-        list bins {
-          key "bin-number";
-          config false;
-          description
-            "PM history 15-minute bin list.";
-          leaf bin-number {
-            type uint32 {
-              range "1..96";
-            }
-            description
-              "The PM bin number, an index value representing the current position
-               in the list of historical PM bins at the time the data is requested.
-               1 is the most recent history bin, and 96 is the oldest.";
-          }
-          uses pm-bin-id-container;
-          uses pm-history-bin-state-container;
-          container statistics {
-            config false;
-            description
-              "Statistics data.";
-            uses pm-ethernet-stats-group;
-          }
-        }
-      }
-      container history-24-hour-bin {
-        config false;
-        description
-          "PM History 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-history-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-ethernet-stats-group;
-        }
-      }
-    }
-    list optical-power-instances {
-      ncx:user-write "update";
-      key "instance-name";
-      description
-        "PTP Optical Power PM instances.";
-      leaf instance-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Unique name for PM instance.";
-      }
-      uses pm-instance-id-container;
-      uses pm-instance-state-container;
-      uses pm-instance-properties-container;
-      container current-bin {
-        config false;
-        description
-          "PM current 15-minute bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-optical-power-stats-group;
-        }
-      }
-      container current-24-hour-bin {
-        config false;
-        description
-          "PM current 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-optical-power-stats-group;
-        }
-      }
-      container untimed-bin {
-        config false;
-        description
-          "PM untimed bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-optical-power-stats-group;
-        }
-      }
-      container history {
-        config false;
-        description
-          "PM 15-minute bin history.";
-        list bins {
-          key "bin-number";
-          config false;
-          description
-            "PM history 15-minute bin list.";
-          leaf bin-number {
-            type uint32 {
-              range "1..96";
-            }
-            description
-              "The PM bin number, an index value representing the current position
-               in the list of historical PM bins at the time the data is requested.
-               1 is the most recent history bin, and 96 is the oldest.";
-          }
-          uses pm-bin-id-container;
-          uses pm-history-bin-state-container;
-          container statistics {
-            config false;
-            description
-              "Statistics data.";
-            uses pm-optical-power-stats-group;
-          }
-        }
-      }
-      container history-24-hour-bin {
-        config false;
-        description
-          "PM History 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-history-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-optical-power-stats-group;
-        }
-      }
-    }
-    list photonics-instances {
-      ncx:user-write "update";
-      key "instance-name";
-      description
-        "PTP Photonics PM instances.";
-      leaf instance-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Unique name for PM instance.";
-      }
-      uses pm-instance-id-container;
-      uses pm-instance-state-container;
-      uses pm-instance-properties-container;
-      container current-bin {
-        config false;
-        description
-          "PM current 15-minute bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-photonics-stats-group;
-        }
-      }
-      container current-24-hour-bin {
-        config false;
-        description
-          "PM current 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-photonics-stats-group;
-        }
-      }
-      container untimed-bin {
-        config false;
-        description
-          "PM untimed bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-photonics-stats-group;
-        }
-      }
-      container history {
-        config false;
-        description
-          "PM 15-minute bin history.";
-        list bins {
-          key "bin-number";
-          config false;
-          description
-            "PM history 15-minute bin list.";
-          leaf bin-number {
-            type uint32 {
-              range "1..96";
-            }
-            description
-              "The PM bin number, an index value representing the current position
-               in the list of historical PM bins at the time the data is requested.
-               1 is the most recent history bin, and 96 is the oldest.";
-          }
-          uses pm-bin-id-container;
-          uses pm-history-bin-state-container;
-          container statistics {
-            config false;
-            description
-              "Statistics data.";
-            uses pm-photonics-stats-group;
-          }
-        }
-      }
-      container history-24-hour-bin {
-        config false;
-        description
-          "PM History 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-history-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-photonics-stats-group;
-        }
-      }
-    }
-    list modem-performance-instances {
-      ncx:user-write "update";
-      key "instance-name";
-      description
-        "PTP Modem PM instances.";
-      leaf instance-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Unique name for PM instance.";
-      }
-      uses pm-instance-id-container;
-      uses pm-instance-state-container;
-      uses pm-instance-properties-container;
-      container current-bin {
-        config false;
-        description
-          "PM current 15-minute bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-modem-stats-group;
-        }
-      }
-      container current-24-hour-bin {
-        config false;
-        description
-          "PM current 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-modem-stats-group;
-        }
-      }
-      container untimed-bin {
-        config false;
-        description
-          "PM untimed bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-modem-stats-group;
-        }
-      }
-      container history {
-        config false;
-        description
-          "PM 15-minute bin history.";
-        list bins {
-          key "bin-number";
-          config false;
-          description
-            "PM history 15-minute bin list.";
-          leaf bin-number {
-            type uint32 {
-              range "1..96";
-            }
-            description
-              "The PM bin number, an index value representing the current position
-               in the list of historical PM bins at the time the data is requested.
-               1 is the most recent history bin, and 96 is the oldest.";
-          }
-          uses pm-bin-id-container;
-          uses pm-history-bin-state-container;
-          container statistics {
-            config false;
-            description
-              "Statistics data.";
-            uses pm-modem-stats-group;
-          }
-        }
-      }
-      container history-24-hour-bin {
-        config false;
-        description
-          "PM History 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-history-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-modem-stats-group;
-        }
-      }
-    }
-    list otu-performance-instances {
-      ncx:user-write "update";
-      key "instance-name";
-      description
-        "Port OTU PM instances.";
-      leaf instance-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Unique name for PM instance.";
-      }
-      uses pm-instance-id-container;
-      uses pm-instance-state-container;
-      uses pm-instance-properties-container;
-      container current-bin {
-        config false;
-        description
-          "PM current 15-minute bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-otn-stats-group;
-        }
-      }
-      container current-24-hour-bin {
-        config false;
-        description
-          "PM current 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-otn-stats-group;
-        }
-      }
-      container untimed-bin {
-        config false;
-        description
-          "PM untimed bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-otn-stats-group;
-        }
-      }
-      container history {
-        config false;
-        description
-          "PM 15-minute bin history.";
-        list bins {
-          key "bin-number";
-          config false;
-          description
-            "PM history 15-minute bin list.";
-          leaf bin-number {
-            type uint32 {
-              range "1..96";
-            }
-            description
-              "The PM bin number, an index value representing the current position
-               in the list of historical PM bins at the time the data is requested.
-               1 is the most recent history bin, and 96 is the oldest.";
-          }
-          uses pm-bin-id-container;
-          uses pm-history-bin-state-container;
-          container statistics {
-            config false;
-            description
-              "Statistics data.";
-            uses pm-otn-stats-group;
-          }
-        }
-      }
-      container history-24-hour-bin {
-        config false;
-        description
-          "PM History 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-history-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-otn-stats-group;
-        }
-      }
-    }
-    list odu-performance-instances {
-      ncx:user-write "update";
-      key "instance-name";
-      description
-        "Port/channel ODU PM instances.";
-      leaf instance-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Unique name for PM instance.";
-      }
-      uses pm-instance-id-container;
-      uses pm-instance-state-container;
-      uses pm-instance-properties-container;
-      container current-bin {
-        config false;
-        description
-          "PM current 15-minute bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-otn-stats-group;
-        }
-      }
-      container current-24-hour-bin {
-        config false;
-        description
-          "PM current 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-otn-stats-group;
-        }
-      }
-      container untimed-bin {
-        config false;
-        description
-          "PM untimed bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-otn-stats-group;
-        }
-      }
-      container history {
-        config false;
-        description
-          "PM 15-minute bin history.";
-        list bins {
-          key "bin-number";
-          config false;
-          description
-            "PM history 15-minute bin list.";
-          leaf bin-number {
-            type uint32 {
-              range "1..96";
-            }
-            description
-              "The PM bin number, an index value representing the current position
-               in the list of historical PM bins at the time the data is requested.
-               1 is the most recent history bin, and 96 is the oldest.";
-          }
-          uses pm-bin-id-container;
-          uses pm-history-bin-state-container;
-          container statistics {
-            config false;
-            description
-              "Statistics data.";
-            uses pm-otn-stats-group;
-          }
-        }
-      }
-      container history-24-hour-bin {
-        config false;
-        description
-          "PM History 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-history-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-otn-stats-group;
-        }
-      }
-    }
-    list encryption-gcm-performance-instances {
-      ncx:user-write "update";
-      key "instance-name";
-      description
-        "Channel Encryption-GCM PM instances.";
-      leaf instance-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Unique name for PM instance.";
-      }
-      uses pm-instance-id-container;
-      uses pm-instance-state-container;
-      uses pm-instance-properties-container;
-      container current-bin {
-        config false;
-        description
-          "PM current 15-minute bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-gcm-stats-group;
-        }
-      }
-      container current-24-hour-bin {
-        config false;
-        description
-          "PM current 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-gcm-stats-group;
-        }
-      }
-      container untimed-bin {
-        config false;
-        description
-          "PM untimed bin.";
-        uses pm-bin-id-container;
-        uses pm-current-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-gcm-stats-group;
-        }
-      }
-      container history {
-        config false;
-        description
-          "PM 15-minute bin history.";
-        list bins {
-          key "bin-number";
-          config false;
-          description
-            "PM history 15-minute bin list.";
-          leaf bin-number {
-            type uint32 {
-              range "1..96";
-            }
-            description
-              "The PM bin number, an index value representing the current position
-               in the list of historical PM bins at the time the data is requested.
-               1 is the most recent history bin, and 96 is the oldest.";
-          }
-          uses pm-bin-id-container;
-          uses pm-history-bin-state-container;
-          container statistics {
-            config false;
-            description
-              "Statistics data.";
-            uses pm-gcm-stats-group;
-          }
-        }
-      }
-      container history-24-hour-bin {
-        config false;
-        description
-          "PM History 24-hour bin.";
-        uses pm-bin-id-container;
-        uses pm-history-bin-state-container;
-        container statistics {
-          config false;
-          description
-            "Statistics data.";
-          uses pm-gcm-stats-group;
-        }
-      }
-    }
-  }
-  rpc waveserver-pm-clear-instance {
-    description
-      "Clear statistics for the specified instance.";
-    input {
-      leaf instance-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "Unique name for PM instance.";
-      }
-      leaf history {
-        type boolean;
-        description
-          "Whether to clear history.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pm-clear-interface {
-    description
-      "Clear statistics for the specified interface.";
-    input {
-      leaf interface-name {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "Interface name.";
-      }
-      leaf interface-type {
-        type pm-interface-type;
-        mandatory true;
-        description
-          "Interface type (PTP, Port, Channel, Slot)";
-      }
-      leaf profile-type {
-        type pm-profile-type;
-        description
-          "The PM profile type. Can be optionally specified to clear only a 
-           specific profile on this interface.";
-      }
-      leaf bin-type {
-        type pm-bin-type;
-        description
-          "The PM bin type. Can be optionally specified to clear only a 
-           specific bin or history on this interface.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pm-clear-all {
-    description
-      "Clear statistics for the specified interface.";
-    input {
-      leaf history {
-        type boolean;
-        description
-          "Whether to clear history.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pm-baseline-set-all {
-    description
-      "Set chassis baselines.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pm-baseline-set-interface {
-    description
-      "Set baseline for the specified interface.";
-    input {
-      leaf interface-name {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "Interface name for slot or ptp.";
-      }
-      leaf interface-type {
-        type enumeration {
-          enum slot {
-            description
-              "Slot interface.";
-          }
-          enum ptp {
-            description
-              "PTP interface type.";
-          }
-        }
-        mandatory true;
-        description
-          "Interface type slot or ptp.";
-      }
-      leaf direction {
-        type enumeration {
-          enum rx {
-            description
-              "Rx direction.";
-          }
-          enum tx {
-            description
-              "Tx direction.";
-          }
-        }
-        description
-          "Direction for ptp baseline.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pm-baseline-clear-all {
-    description
-      "Clear chassis baselines.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pm-baseline-clear-interface {
-    description
-      "Clear baseline for the specified interface.";
-    input {
-      leaf interface-name {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "Interface name for slot or ptp.";
-      }
-      leaf interface-type {
-        type enumeration {
-          enum slot {
-            description
-              "Slot interface.";
-          }
-          enum ptp {
-            description
-              "PTP interface type.";
-          }
-        }
-        mandatory true;
-        description
-          "Interface type slot or ptp.";
-      }
-      leaf direction {
-        type enumeration {
-          enum rx {
-            description
-              "Rx direction.";
-          }
-          enum tx {
-            description
-              "Tx direction.";
-          }
-        }
-        description
-          "Direction for ptp baseline.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-pm-tca-admin-state-set-interface {
-    description
-      "Set adminState for the specified interface.";
-    input {
-      leaf interface-name {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "Interface name for slot or ptp or port or channel.";
-      }
-      leaf interface-type {
-        type enumeration {
-          enum slot {
-            description
-              "Slot interface.";
-          }
-          enum ptp {
-            description
-              "PTP interface type.";
-          }
-          enum port {
-            description
-              "Port interface type.";
-          }
-          enum channel {
-            description
-              "Channel interface type.";
-          }
-        }
-        mandatory true;
-        description
-          "Interface type slot or ptp.";
-      }
-      leaf tca-admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "The TCA administrative state for this interface.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-port.yang b/models/ciena-waveserver-port.yang
deleted file mode 100644
index cbe946c82514435269c02031da9b98b40bfbac9b..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-port.yang
+++ /dev/null
@@ -1,1018 +0,0 @@
-module ciena-waveserver-port {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-port";
-  prefix port;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines port data for the Waveserver. Ports are related to
-     both client and line and represent the port through which the line or
-     client signal travels. They are automatically created by the system. By
-     default, line ports are automatically mapped to client ports via services
-     and service-domains.";
-
-  revision 2019-06-03 {
-    description
-      "Updated ports/properties/otn/conditioning-type to use common typedef.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2018-12-04 {
-    description
-      "Added 'connection-peer' list to the port and channel objects.
-       Added 'connection-state' to the port object for client ports.
-       Added 'maximum-bandwidth' and 'available-bandwidth' to the channel object.
-       Added 'link-state' for ethernet ports.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-05-31 {
-    description
-      "Added 'OTUk', 'OTUCn', and 'OTUCn-Flex' port types.
-       Obsoleted generic 'otn' port type.
-       Added 'OTUC5', 'OTUC6', 'OTUC7' port rates.
-       Updated range for 'channel-id' to accommodate up to 8 channels.
-       Deprecated 'forward-error-correction' on the port. Moved to PTP object.
-       Deprecated 'pre-fec-otu-sf-threshold', and 'pre-fec-otu-sd-threshold' on the port. Moved to PTP object.
-       Added support for OTN TTI sapi/dapi, tx-oper-actual, tx-oper-mode.
-       Added support for OTN TTI rx-sapi-hex, rx-dapi-hex, and rx-oper-hex strings.
-       Added 'waveserver-port-trace-copy-rx-to-exp' RPC.
-       Removed unused/unsupported 'capabilities' subcontainer.
-       Channel 'odu-termination' is a read-only attribute.
-       Added ncx:user-write to 'ports' and 'channels' lists.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-07-31 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Changed 'ports' list key from integer to string type to accommodate '<slot>-<port>' format.
-       Added support for OTN and Ethernet port types.
-       Added support for ODU4 channel sub-objects.
-       Updated 'port-type' enum values and add 'port-rate' enum. Update 'port-speed' typedef.
-       Updated 'operational-state' enum values.
-       Rename 'description' to 'label'.
-       Added common and port-type-specific capabilities and properties containers, and move/rename some attributes.
-       Added finer granularity of 'conditioning-holdoff' values (10ms increments between 0-100ms).
-       Moved 'conditioning-type' and 'conditioning-holdoff' enums to ciena-waveserver-typedefs.yang
-       Removed 'xcvr-type' from properties.
-       Removed 'statistics' container and groupings.
-       Added support for otn trace attributes.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef port-type-enum {
-    type enumeration {
-      enum unknown {
-        description
-          "Port type is unknown.";
-      }
-      enum ethernet {
-        description
-          "Port type is Ethernet.";
-      }
-      enum otn {
-        status obsolete;
-        description
-          "Port type is OTN. Replaced by OTUk, OTUCn, and OTUCn-Flex types.";
-      }
-      enum OTUk {
-        description
-          "Port type is OTUk.";
-      }
-      enum OTUCn {
-        description
-          "Port type is OTUCn.";
-      }
-      enum OTUCn-Flex {
-        description
-          "Port represents an aggregated logical OTUCn interface.";
-      }
-    }
-    description
-      "Port type";
-  }
-
-  typedef port-rate-enum {
-    type enumeration {
-      enum unknown {
-        description
-          "Port rate is unknown.";
-      }
-      enum 10GE {
-        description
-          "Port rate is 10 Gigabits per second Ethernet.";
-      }
-      enum 40GE {
-        description
-          "Port rate is 40 Gigabits per second Ethernet.";
-      }
-      enum 100GE {
-        description
-          "Port rate is 100 Gigabits per second Ethernet.";
-      }
-      enum OTU4 {
-        description
-          "Port rate is OTU4.";
-      }
-      enum OTUC1 {
-        description
-          "Port rate is OTUC1.";
-      }
-      enum OTUC2 {
-        description
-          "Port rate is OTUC2.";
-      }
-      enum OTUC3 {
-        description
-          "Port rate is OTUC3.";
-      }
-      enum OTUC4 {
-        description
-          "Port rate is OTUC4.";
-      }
-      enum OTUC5 {
-        description
-          "Port rate is OTUC5.";
-      }
-      enum OTUC6 {
-        description
-          "Port rate is OTUC6.";
-      }
-      enum OTUC7 {
-        description
-          "Port rate is OTUC7.";
-      }
-    }
-    description
-      "Nominal port rate of the specified interface.";
-  }
-
-  typedef ethernet-mapping-mode {
-    type enumeration {
-      enum None {
-        description
-          "No ethernet mapping.";
-      }
-      enum GMP {
-        description
-          "Generic Mapping Procedure (GMP).";
-      }
-    }
-    description
-      "Ethernet mapping mode.";
-  }
-
-  typedef port-speed {
-    type decimal64 {
-      fraction-digits 4;
-      range "0.0 .. 1000.0";
-    }
-    units "Gbps";
-    description
-      "Port speed, in Gbps. Decimal value up to 4 digits.";
-  }
-
-  typedef port-operational-state {
-    type enumeration {
-      enum down {
-        value 0;
-        description
-          "The port or channel is not carrying traffic due to a failure or
-           because it is disabled.";
-      }
-      enum up {
-        value 1;
-        description
-          "The port or channel is enabled and carrying traffic.";
-      }
-      enum loopback-tx {
-        value 4;
-        description
-          "The transmit direction of the port loops back internally at the PHY.";
-      }
-      enum loopback-rx {
-        value 5;
-        description
-          "The receive direction of the port loops back at the PHY to the transmit.";
-      }
-      enum fault {
-        value 7;
-        description
-          "Port or channel is faulted.";
-      }
-      enum unavailable {
-        value 11;
-        description
-          "Channel is unavailable due to bandwidth limitation of parent port rate.";
-      }
-      enum lower-layer-down {
-        description
-          "Parent layer is down (dependency or server signal failure).";
-      }
-    }
-    description
-      "Port operational state.";
-  }
-
-  typedef link-state-type {
-    type enumeration {
-      enum down {
-        description
-          "The port is administratively disabled or there is a fault condition
-           other than LF or RF.";
-      }
-      enum up {
-        description
-          "Link state is up/operational.";
-      }
-      enum local-fault {
-        description
-          "Ethernet port has a Local Fault condition.";
-      }
-      enum remote-fault {
-        description
-          "Ethernet port has a Remote Fault condition.";
-      }
-    }
-    description
-      "Ethernet port fault condition.";
-  }
-
-  typedef payload-type {
-    type string {
-      length "0..4";
-    }
-    description
-      "A string representation of an OPU payload type (PT) byte value in
-       hexadecimal notation, e.g. '0x07'.";
-  }
-
-  grouping otn-trace-group {
-    description
-      "OTN trail trace identifier (TTI) properties.";
-    leaf mismatch-mode {
-      type cienawstypes:trace-mismatch-mode;
-      description
-        "The trail trace identifier (TTI) mismatch mode, indicating which
-         fields of the TTI overhead are used for trace mismatch detection.";
-    }
-    leaf mismatch-fail-mode {
-      type cienawstypes:trace-mismatch-fail-mode;
-      description
-        "The trail trace identifier (TTI) mismatch failure mode. When TTI
-         mismatch condition occurs, this indicates the consequent action taken,
-         e.g. whether or not to raise an alarm.";
-    }
-    leaf tx-sapi {
-      type cienawstypes:string-maxl-15;
-      description
-        "The source access point identifier (SAPI) portion of the transmitted
-         trace string, up to 15 characters, excluding the first byte in the TTI
-         SAPI overhead, which is implicitly always null.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf tx-dapi {
-      type cienawstypes:string-maxl-15;
-      description
-        "The destination access point identifier (DAPI) portion of the
-         transmitted trace string, up to 15 characters, excluding the first
-         byte in the TTI DAPI overhead, which is implicitly always null.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf tx-oper {
-      type cienawstypes:string-maxl-32;
-      description
-        "The operator-specific portion of the transmitted trace string, up to
-         32 characters. Ignored if tx-oper-mode is 'automatic'.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf tx-oper-actual {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "The actual operator-specific portion of the transmitted trace string,
-         up to 32 characters. If tx-oper-mode is 'manual' this will be the same
-         as the tx-oper attribute, otherwise it will be a system-generated
-         string.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf tx-oper-mode {
-      type enumeration {
-        enum manual {
-          description
-            "The user will manually assign the operator-specific portion of the
-             transmitted trace string. The format is free-form text.";
-        }
-        enum automatic {
-          description
-            "Let the system will automatically configure the operator-specific
-             portion of the transmitted trace string. The format is pre-defined
-             based on chassis MAC address, module, port, sub-port, and channel
-             number of the interface. This is the default mode for Waveserver
-             OTN line and client ports.";
-        }
-      }
-      description
-        "Specifies whether to allow manual provisioning of the transmitted TTI
-         string, or let the system assign this value automatically based on a
-         pre-defined format.";
-    }
-    leaf rx-sapi {
-      type cienawstypes:string-maxl-15;
-      config false;
-      description
-        "The source access point identifier (SAPI) portion of the received
-         trace string, up to 15 characters, excluding the first byte in the TTI
-         SAPI overhead, which is implicitly always null.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf rx-dapi {
-      type cienawstypes:string-maxl-15;
-      config false;
-      description
-        "The destination access point identifier (DAPI) portion of the
-         received trace string, up to 15 characters, excluding the first byte
-         in the TTI DAPI overhead, which is implicitly always null.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf rx-oper {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "The operator-specific portion of the received trace string, up to 32
-         characters.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf rx-sapi-hex {
-      type string {
-        length "0..30";
-        pattern '[0-9a-fA-F]*';
-      }
-      config false;
-      description
-        "The source access point identifier (SAPI) portion of the received
-         trace string, represented in hexadecimal notation, excluding the first
-         byte in the TTI SAPI overhead, which is implicitly always null.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf rx-dapi-hex {
-      type string {
-        length "0..30";
-        pattern '[0-9a-fA-F]*';
-      }
-      config false;
-      description
-        "The destination access point identifier (DAPI) portion of the
-         received trace string, represented in hexadecimal notation, excluding
-         the first byte in the TTI DAPI overhead, which is implicitly always
-         null.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf rx-oper-hex {
-      type string {
-        length "0..64";
-        pattern '[0-9a-fA-F]*';
-      }
-      config false;
-      description
-        "The operator-specific portion of the received trace string, represented
-         in hexadecimal notation.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf exp-sapi {
-      type cienawstypes:string-maxl-15;
-      description
-        "The expected source access point identifier (SAPI) portion of the
-         received trace string, up to 15 characters, excluding the first byte
-         in the TTI SAPI overhead, which is implicitly always null.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf exp-dapi {
-      type cienawstypes:string-maxl-15;
-      description
-        "The expected destination access point identifier (DAPI) portion of the
-         received trace string, up to 15 characters, excluding the first byte
-         in the TTI DAPI overhead, which is implicitly always null.";
-      reference "ITU-T G.6709/Y1331";
-    }
-    leaf exp-oper {
-      type cienawstypes:string-maxl-32;
-      description
-        "The expected operator-specific portion of the received trace string,
-         up to 32 characters.";
-      reference "ITU-T G.6709/Y1331";
-    }
-  }
-
-  grouping connection-peer-group {
-    description
-      "Connection peer properties.";
-    leaf peer-id {
-      type cienawstypes:port-name;
-      description
-        "Specifies the client/line connection information for the port or
-         channel. Client ports can be connected to a line-side channel or port.
-         Line ports can be connected to a client side port. Line channels can
-         be connected to one or more client ports. The connection mappings are
-         static and provided by the system based on XCVR configuration.";
-    }
-    leaf peer-type {
-      type enumeration {
-        enum none {
-          description
-            "The connection peer-id is not specified or not applicable.";
-        }
-        enum port {
-          description
-            "The connection peer-id represents a port object.";
-        }
-        enum channel {
-          description
-            "The connection peer-id represents a channel object.";
-        }
-      }
-      config false;
-      description
-        "Indicates the port/channel type of the connection peer.";
-    }
-    leaf peer-bandwidth {
-      type uint16;
-      units "Gbps";
-      config false;
-      description
-        "Bandwidth capacity of the remote connection peer, in Gbps.";
-    }
-    leaf connected {
-      type boolean;
-      config false;
-      description
-        "Specifies whether the line-side bandwidth is allocated for the
-         connection between this port/channel and its connection peer.";
-    }
-  }
-
-  container waveserver-ports {
-    description
-      "Waveserver port configuration and operational data.";
-    list ports {
-      ncx:user-write "update";
-      key "port-id";
-      description
-        "Configuration and operational data for the port.";
-      leaf port-id {
-        type cienawstypes:port-name;
-        description
-          "Unique, access identifier string of the port in '<slot>-<port>' format.";
-      }
-      container id {
-        description
-          "Port identification attributes.";
-        leaf name {
-          type cienawstypes:port-name;
-          config false;
-          description
-            "Name of the port interface. Format is: '<slot>-<port>' or
-             '<slot>-<majorport>.<minorport>'.";
-        }
-        leaf label {
-          type cienawstypes:description-string;
-          description
-            "The user-specified label string for this port interface.";
-        }
-        leaf type {
-          type port-type-enum;
-          description
-            "The port interface type.";
-        }
-        leaf rate {
-          type port-rate-enum;
-          config false;
-          description
-            "The port interface rate.";
-        }
-        leaf speed {
-          type port-speed;
-          config false;
-          description
-            "The port speed in Gbps.";
-        }
-        leaf interface-type {
-          type enumeration {
-            enum i-nni {
-              value 0;
-              description
-                "Internal Network-to-Network Interface";
-            }
-            enum uni {
-              value 1;
-              description
-                "User Network Interface";
-            }
-            enum e-nni {
-              value 2;
-              description
-                "External Network-to-Network Interface";
-            }
-          }
-          config false;
-          description
-            "The port interface type.";
-        }
-      }
-      container state {
-        description
-          "Port administrative and operational states.";
-        leaf admin-state {
-          type enumeration {
-            enum enabled {
-              value 1;
-              description
-                "Port is administratively enabled and ready to carry traffic.";
-            }
-            enum disabled {
-              value 2;
-              description
-                "Port is administratively disabled and not ready to carry traffic.";
-            }
-          }
-          description
-            "The configured administrative state of the port.";
-        }
-        leaf operational-state {
-          type port-operational-state;
-          config false;
-          description
-            "The operational state of the port.";
-        }
-        leaf operational-state-duration {
-          type uint32;
-          units "seconds";
-          config false;
-          description
-            "Amount of time since last state transition.";
-        }
-        leaf link-state {
-          type link-state-type;
-          config false;
-          description
-            "The link state the port, if applicable. For non-Ethernet ports,
-             the state will be omitted from the response.";
-        }
-      }
-      container properties {
-        description
-          "Port properties.";
-        leaf loopback {
-          type enumeration {
-            enum disabled {
-              description
-                "Loopback is disabled.";
-            }
-            enum rx {
-              description
-                "Rx loopback is enabled.";
-            }
-            enum tx {
-              description
-                "Tx loopback is enabled.";
-            }
-          }
-          description
-            "Port PHY layer loopback. RX loopback is a loopback forwarding
-             ingress traffic from RX port directly to TX port. TX loopback is a
-             loopback forwarding egress traffic from TX port directly to RX
-             port, TX loopback is not supported in I-NNI ports. The RX/TX
-             loopback can only be enabled when the port admin-state is disabled.
-             Enable an RX/TX loopback shall fail when the port has its
-             admin-state enabled. Users shall be able to disable the xcvr/ptp
-             when its child port loopback enabled. Enable xcvr/ptp shall not
-             enable its child port with loopback enabled. A port shall has its
-             operational state rx loopback when rx loopback is enabled, and tx
-             loopback when tx loopback is enabled.";
-        }
-        leaf forward-error-correction {
-          type cienawstypes:enabled-disabled-enum;
-          status deprecated;
-          description
-            "Forward error correction. This is now configured on the PTP object.";
-        }
-        leaf service-index {
-          type cienawstypes:service-idx;
-          config false;
-          description
-            "The index number of the service the port is attached to. Only
-             applies to UNI interface type.";
-        }
-        leaf service-domain-index {
-          type cienawstypes:service-domain-idx;
-          config false;
-          description
-            "The index number of the service domain the port is attached to.
-             Only applies to I-NNI interface type.";
-        }
-        leaf connection-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Specifies whether the line-side bandwidth is allocated for the
-             connection between this client port and its connection peer. For most
-             client port types, this is enabled by default and cannot be disabled.
-             For certain client ports that can share line-side bandwidth with other
-             client ports (such as on MOTR-AGG modules), the connection state can
-             be manually configured by the user in order to assign or release the
-             line-side bandwidth to the desired client. On the line-side, the
-             connection state is read-only.";
-        }
-        list connection-peer {
-          ncx:user-write "update";
-          key "peer-id";
-          max-elements 1;
-          description
-            "Port connection peer list. Indicates the client/line port/channel
-             that may be connected to this line/client port. For certain client
-             ports, the connection state is user-configurable or can be system
-             assigned on port creation based on bandwidth availability. For
-             other ports, the connection state is fixed and cannot be manually
-             configured.";
-          uses connection-peer-group;
-        }
-        container ethernet {
-          when "../../id/type = 'ethernet'" {
-            description
-              "Ethernet properties container only applies when the port type is
-               'ethernet'.";
-          }
-          description
-            "Ethernet-specific properties.";
-          leaf max-frame-size {
-            type uint32 {
-              range "0|1522..16004";
-            }
-            config false;
-            description
-              "The maximum transmission unit value (bytes). Zero indicates
-               'none' or unsupported.";
-          }
-          leaf pause-profile {
-            type enumeration {
-              enum discard {
-                description
-                  "Ingress pause frames will be discarded and ignored.";
-              }
-              enum forward {
-                description
-                  "Ingress pause frames will be forwarded. This is the default.";
-              }
-              enum peer {
-                description
-                  "Ingress pause frames will be peered.";
-              }
-            }
-            config false;
-            description
-              "Port handling of ingress flow control";
-          }
-          leaf mapping-mode {
-            type ethernet-mapping-mode;
-            description
-              "Ethernet mapping mode.";
-          }
-          leaf conditioning-type {
-            type cienawstypes:conditioning-type;
-            description
-              "Egress UNI port consequent action for an EPL service to be
-               applied on a far-end ingress UNI failure or network failure.
-               Supported values are 'none', 'laser-off', and 'ethernet'.";
-          }
-          leaf conditioning-holdoff {
-            type cienawstypes:conditioning-holdoff;
-            description
-              "Number of milliseconds to delay Egress UNI port consequent
-               action for an EPL service.";
-          }
-        }
-        container otn {
-          when "../../id/type[.='OTUk' or .='OTUCn' or .='OTUCn-Flex']" {
-            description
-              "OTN properties container only applies when the port is an OTN
-               type.";
-          }
-          description
-            "OTN-specific properties.";
-          leaf odu-termination {
-            type enumeration {
-              enum terminated {
-                description
-                  "ODUk layer is terminated at this port.";
-              }
-              enum passthrough {
-                description
-                  "ODUk layer is not terminated at this port.";
-              }
-            }
-            description
-              "ODUk termination mode.";
-          }
-          leaf pre-fec-otu-sf-threshold {
-            type decimal64 {
-              fraction-digits 2;
-              range "-1.0 .. 1.0";
-            }
-            units "dBQ";
-            status deprecated;
-            description
-              "Pre-FEC OTU Signal Fail threshold value, expressed in dBQ
-               notation.";
-          }
-          leaf pre-fec-otu-sd-threshold {
-            type decimal64 {
-              fraction-digits 2;
-              range "-1.0 .. 3.50";
-            }
-            units "dBQ";
-            status deprecated;
-            description
-              "Pre-FEC OTU Signal Degrade threshold value, expressed in dBQ
-               notation.";
-          }
-          leaf otu-sd-threshold {
-            type cienawstypes:string-sci;
-            description
-              "OTU Signal Degrade threshold value, e.g. '1E-06' to '1E-09'.";
-          }
-          leaf odu-sd-threshold {
-            type cienawstypes:string-sci;
-            description
-              "ODUk Signal Degrade threshold value, e.g. '1E-05' to '1E-09'.";
-          }
-          leaf conditioning-type {
-            type cienawstypes:conditioning-type;
-            description
-              "Conditioning type for OTN ports. Supported values are 'laser-off' and 'otn'.";
-          }
-          container trace {
-            description
-              "OTN port trace attributes";
-            container section {
-              description
-                "OTUk section trace attributes for this port.";
-              uses otn-trace-group;
-            }
-            container path {
-              description
-                "ODUk path trace attributes for this port.";
-              uses otn-trace-group;
-            }
-          }
-        }
-      }
-      list channels {
-        when "../id/type[.='OTUk' or .='OTUCn' or .='OTUCn-Flex'] and ../properties/otn/odu-termination = 'terminated'" {
-          description
-            "Channels list only applies for OTUk ports that have ODUk layer
-             terminated.";
-        }
-        ncx:user-write "update";
-        key "channel-id";
-        description
-          "List of ODU4 channels within the parent OTU port object.";
-        leaf channel-id {
-          type uint8 {
-            range "1..8";
-          }
-          description
-            "Channel number or ODU4 tributary number within the parent OTU port
-             object. Key value for the channels list.";
-        }
-        container id {
-          description
-            "Channel identification attributes.";
-          leaf name {
-            type cienawstypes:name-string;
-            config false;
-            description
-              "Name of the channel object. Format is: '<slot>-<port>.<channel>'.";
-          }
-          leaf label {
-            type cienawstypes:description-string;
-            description
-              "The user-specified label string for this channel object.";
-          }
-          leaf type {
-            type enumeration {
-              enum odu {
-                description
-                  "ODU channel.";
-              }
-            }
-            config false;
-            description
-              "The channel interface type.";
-          }
-          leaf rate {
-            type enumeration {
-              enum odu4 {
-                description
-                  "ODU4 rate.";
-              }
-            }
-            config false;
-            description
-              "The channel rate.";
-          }
-          leaf speed {
-            type port-speed;
-            config false;
-            description
-              "The channel speed in Gbps.";
-          }
-        }
-        container state {
-          description
-            "Channel administrative and operational states.";
-          leaf admin-state {
-            type cienawstypes:enabled-disabled-enum;
-            description
-              "The configured administrative state of the channel.";
-          }
-          leaf operational-state {
-            type port-operational-state;
-            config false;
-            description
-              "The operational state of the channel.";
-          }
-          leaf operational-state-duration {
-            type uint32;
-            units "seconds";
-            config false;
-            description
-              "Amount of time since last state transition.";
-          }
-        }
-        container properties {
-          description
-            "Channel properties.";
-          leaf service-index {
-            type cienawstypes:service-idx;
-            config false;
-            description
-              "The index number of the service the channel is attached to, if
-               applicable.";
-          }
-          leaf service-domain-index {
-            type cienawstypes:service-domain-idx;
-            config false;
-            description
-              "The index number of the service domain the channel is attached
-               to, if applicable.";
-          }
-          leaf maximum-bandwidth {
-            type uint16;
-            units "Gbps";
-            config false;
-            description
-              "Maximum line side bandwidth associated with this channel, in Gbps.";
-          }
-          leaf available-bandwidth {
-            type uint16;
-            units "Gbps";
-            config false;
-            description
-              "Available bandwidth associated with this channel, in Gbps. When
-               client connection peers are created and enabled, the available
-               bandwidth on the line side channel will decrease.";
-          }
-          list connection-peer {
-            key "peer-id";
-            config false;
-            description
-              "Channel connection peer list. Indicates the client port(s) that
-               may be connected to this channel, and the status of each
-               connection. A connection-status of enabled indicates the client
-               has sucessfully reserved bandwidth on the channel. Disabled
-               indicates the bandwidth allocation has failed or has been been
-               intentionally declined for this client based on user provisioning.";
-            uses connection-peer-group;
-          }
-          leaf odu-sd-threshold {
-            type cienawstypes:string-sci;
-            description
-              "ODU4 Signal Degrade threshold value.";
-          }
-          leaf odu-termination {
-            type enumeration {
-              enum terminated {
-                description
-                  "ODU4 layer is terminated at this channel.";
-              }
-              enum passthrough {
-                description
-                  "ODU4 layer is not terminated at this channel.";
-              }
-            }
-            config false;
-            description
-              "ODU4 channel termination mode.";
-          }
-          leaf tx-payload-type {
-            type payload-type;
-            config false;
-            description
-              "The transmitted (and expected) OPU4 payload type for this channel
-               (e.g. 0x07).";
-          }
-          leaf rx-payload-type {
-            type payload-type;
-            config false;
-            description
-              "The actual received OPU4 payload type for this channel (e.g. 0x07).";
-          }
-          container trace {
-            description
-              "ODU4 path trace attributes for this channel.";
-            uses otn-trace-group;
-          }
-        }
-      }
-    }
-  }
-  rpc waveserver-port-trace-copy-rx-to-exp {
-    description
-      "Copy the current received trace value to the expected trace config string.";
-    input {
-      leaf interface-name {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "Interface name of the port or channel on which to perform the
-           action. If the trace-layer is 'section' or 'path', this should be a
-           port object identifier. If the trace-layer is 'channel', this should
-           be a channel object identifier.";
-      }
-      leaf trace-layer {
-        type enumeration {
-          enum section {
-            description
-              "Copy the OTUk section rx trace to exp.";
-          }
-          enum path {
-            description
-              "Copy the ODUk path rx trace to exp.";
-          }
-          enum channel {
-            description
-              "Copy the ODU4 channel path rx trace to exp.";
-          }
-        }
-        mandatory true;
-        description
-          "The trace layer on which to perform the copy action, either port
-           section/path or channel.";
-      }
-      leaf trace-type {
-        type enumeration {
-          enum sapi {
-            description
-              "Copy the SAPI portion of the trace string only.";
-          }
-          enum dapi {
-            description
-              "Copy the DAPI portion of the trace string only.";
-          }
-          enum operator {
-            description
-              "Copy the operator-specifiec portion of the trace string only.";
-          }
-        }
-        mandatory true;
-        description
-          "Specifies which portion(s) of the trace string to copy.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-protection.yang b/models/ciena-waveserver-protection.yang
deleted file mode 100644
index 59b1aa7c40967ee69082aa2e0d720a40309849c4..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-protection.yang
+++ /dev/null
@@ -1,169 +0,0 @@
-module ciena-waveserver-protection {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-protection";
-  prefix protection;
-
-  import ciena-waveserver-ptp {
-    prefix ptp;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines common protection attributes for the Waveserver
-     Platform. It augments the ciena-waveserver-ptp module. The PTP model
-     represents the signal carried by the modem transceiver at a physical line
-     port. The PTP objects are automatically provisioned during service module
-     installation.";
-
-  revision 2019-01-02 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of this module.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-
-  grouping protection-attributes-group {
-    description
-      "Grouping for common protection attributes.";
-    leaf revertive {
-      type boolean;
-      description
-        "Specifies whether protection switch reversion is enabled on the line.
-         If reversion is enabled, a switch from the working path to the
-         protection path will attempt to re-establish the working path once
-         it is available and the wait-to-restore period has elapsed.";
-    }
-    leaf max-reversion-attempts {
-      type uint8 {
-        range "0..10";
-      }
-      description
-        "Maximum tries for reversion. A value of zero indicates indefinite.";
-    }
-    leaf wait-to-restore {
-      type uint16 {
-        range "10..3600";
-      }
-      units "seconds";
-      description
-        "Time to wait before traffic will be restored to the working path, if
-         reversion is enabled.";
-    }
-    leaf user-switch-action {
-      type enumeration {
-        enum none {
-          description
-            "No user-initiated switching operation is active. The active path
-             will be selected by the system.";
-        }
-        enum force-working {
-          description
-            "Force the active path to the working path.";
-        }
-        enum force-protection {
-          description
-            "Force the active path to the protection path.";
-        }
-      }
-      description
-        "User-specified protection switching action on the specified line.";
-    }
-    leaf active-path {
-      type enumeration {
-        enum working {
-          description
-            "The working/primary protection path is currently active.";
-        }
-        enum protection {
-          description
-            "The protection/secondary protection path is currently active.";
-        }
-        enum none {
-          description
-            "No protection path is selected, or applicable.";
-        }
-      }
-      config false;
-      description
-        "Specifies which path is currently active on the line.";
-    }
-    leaf last-switch-reason {
-      type enumeration {
-        enum unknown {
-          description
-            "Last switch reason is unknown or not applicable.";
-        }
-        enum fault-detected {
-          description
-            "Modem reported a fault condition.";
-        }
-        enum wait-to-restore-expired {
-          description
-            "Switch reverted due to WTR expiry.";
-        }
-        enum forced-switch {
-          description
-            "User initiated a forced switch action.";
-        }
-        enum disabled {
-          description
-            "Line/port was administratively disabled.";
-        }
-      }
-      config false;
-      description
-        "Indicates the source that triggered the most recent switch action on
-         this line.";
-    }
-    leaf switch-status {
-      type enumeration {
-        enum uninitialized {
-          description
-            "Protection switch status has not been initialized or is
-             unavailable.";
-        }
-        enum disabled {
-          description
-            "Protection switching is disabled.";
-        }
-        enum idle {
-          description
-            "Protection switch is idle.";
-        }
-        enum wait-to-restore {
-          description
-            "Waiting to restore to the working path.";
-        }
-        enum forced-switch-active {
-          description
-            "User initiated a forced switch action.";
-        }
-      }
-      config false;
-      description
-        "Indicates the source that triggered the most recent switch action on
-         this line.";
-    }
-  }
-
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties" {
-    when "ptp:type = 'WLAi-iOPS'" {
-      description
-        "PTP properties specific to WaveLogic Ai modem with integrated OPS support.";
-    }
-    description
-      "PTP properties specific to WaveLogic Ai modem with integrated OPS support.";
-    container protection {
-      description
-        "Optical Protection Switching (OPS) properties for line PTPs.";
-      uses protection-attributes-group;
-    }
-  }
-}
diff --git a/models/ciena-waveserver-ptp-cmd.yang b/models/ciena-waveserver-ptp-cmd.yang
deleted file mode 100644
index fd67d232d6218554a255980720b7639689e31f60..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-ptp-cmd.yang
+++ /dev/null
@@ -1,310 +0,0 @@
-module ciena-waveserver-ptp-cmd {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-ptp-cmd";
-  prefix ptp-cmd;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-ptp {
-    prefix ptp;
-  }
-  import ciena-waveserver-xcvr {
-    prefix xcvr;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines type specific data for Channel Mux/Demux (CMD) specific
-     PTP objects on the Waveserver platform. It augments the ciena-waveserver-ptp
-     module. The PTP model represents the signal carried on a physical port. The
-     OCH, OTM, and OSC-Add-Drop PTP objects are automatically provisioned during
-     service CMD module installation, while the OSC PTP object is dependent on
-     explicit provisioning or SFP plug insertion.";
-
-  revision 2019-07-23 {
-    description
-      "Added support for OTDR.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2018-02-20 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of this module.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-
-  grouping optical-loss-group {
-    description
-      "Group of optical loss (span loss or return loss) related operational
-       data leafs. Can be used for Rx or Tx";
-    leaf actual {
-      type cienawstypes:decimal-2-dig;
-      units "dB";
-      config false;
-      description
-        "Actual Tx or Rx loss in dB.";
-    }
-    leaf maximum {
-      type cienawstypes:decimal-2-dig;
-      units "dB";
-      config false;
-      description
-        "Maximum actual recorded Tx or Rx loss in dB.";
-    }
-    leaf minimum {
-      type cienawstypes:decimal-2-dig;
-      units "dB";
-      config false;
-      description
-        "Minimum actual recorded Tx or Rx loss in dB.";
-    }
-    leaf maximum-recorded-time {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "The exact date and time when the maximum loss (Tx or Rx) was
-         recorded. In the format of a date time string.";
-    }
-    leaf minimum-recorded-time {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "The exact date and time when the minimum loss (Tx or Rx) was
-         recorded. In the format of a date time string.";
-    }
-  }
-
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties" {
-    when "ptp:type = 'OCH' or ../ptp:type = 'OSC-Add-Drop'" {
-      description
-        "PTP filter properties for OCH and OSC-Add-Drop PTP types.";
-    }
-    description
-      "PTP filter properties for OCH and OSC-Add-Drop PTP types.";
-    container filter {
-      config false;
-      description
-        "PTP filter operational data.";
-      leaf type {
-        type enumeration {
-          enum none {
-            description
-              "No filter.";
-          }
-          enum fixed {
-            description
-              "Filter is fixed.";
-          }
-          enum tunable {
-            description
-              "Filter is tunable.";
-          }
-        }
-        description
-          "Internal filter type of the PTP. For CMD10 PTPs this is fixed.";
-      }
-      leaf bandwidth {
-        type cienawstypes:decimal-1-dig;
-        units "GHz";
-        description
-          "Filter bandwidth of the OCH port, in GHz. For CMD10 PTPs this is
-           100GHz.";
-      }
-      leaf frequency {
-        type cienawstypes:decimal-1-dig;
-        units "GHz";
-        description
-          "The center filter frequency value of the OCH or OSC-Add-Drop port,
-           in GHz.";
-      }
-    }
-  }
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties" {
-    when "ptp:type = 'OCH'" {
-      description
-        "PTP adjacency properties for OCH (Optical Channel) PTP types.";
-    }
-    description
-      "PTP adjacency properties for OCH (Optical Channel) PTP types.";
-    container adjacency {
-      description
-        "OCH PTP adjacency attributes.";
-      leaf auto-provisioning {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Specifies whether the CMD Auto-Fiber Discovery Application (cluster
-           application) can automatically provision a defined adjacency (either
-           manually-created or auto-discovered) with correct frequency and
-           transmit power. If disabled, the user must provision the modem
-           frequency and power levels on the modem PTP manually.";
-      }
-      leaf far-end-chassis {
-        type cienawstypes:ip-address;
-        description
-          "The user-provisioned (or discovered) far-end chassis IP address, if
-           applicable, or 0 if unprovisioned";
-      }
-      leaf far-end-slot {
-        type string {
-          length "0..30";
-        }
-        description
-          "The user-provisioned (or discovered) far-end slot number, if
-           applicable, or empty string if unprovisioned. Data is represented
-           as a string rather than integer to allow for forward-compatibility
-           with future identifier formats.";
-      }
-      leaf far-end-port {
-        type string {
-          length "0..30";
-        }
-        description
-          "The user-provisioned (or discovered) far-end port number, if
-           applicable, or empty string if unprovisioned. Data is represented
-           as a string rather than integer to allow for forward-compatibility
-           with future identifier formats.";
-      }
-      leaf requested-tx-power {
-        type cienawstypes:decimal-1-dig;
-        units "dBm";
-        config false;
-        description
-          "When adjacency-auto-provisioning is enabled, this is the provisioned
-           tx-power that is being sent to the far-end modem. If adjacency auto-
-           provisioning is disabled, this parameter will be cleared.";
-      }
-    }
-  }
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties" {
-    when "ptp:type = 'OTM'" {
-      description
-        "PTP properties for OTM (Optical Transport Multiplex) PTP types.";
-    }
-    description
-      "PTP properties for OTM (Optical Transport Multiplex) PTP types.";
-    container span {
-      description
-        "OTM Span properties.";
-      leaf tx-amp-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Allows the user to enable or disable the transmit path amplifier
-           (EDFA), which shall reduce the transmit power at minimum 20 dB.";
-      }
-      leaf rx-amp-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Allows the user to enable or disable the receive path amplifier
-           (EDFA), which shall reduce the receive power at minimum 20 dB.";
-      }
-      leaf auto-span-loss-compensation {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "If enabled, shall allow the CMD state machine to autonomously and
-           continuously control the transmit VOA setting based on values
-           derived from OSC span loss. Setting to disabled shall provision the
-           transmit VOA with a calculation based on the manual span loss
-           parameter value.";
-      }
-      leaf span-loss-compensation-offset {
-        type decimal64 {
-          fraction-digits 1;
-          range "-20.0 .. 20.0";
-        }
-        units "dB";
-        description
-          "If configured, provides an input into the auto span loss compensation
-           calculation whereby the user can effect an increase (positive) or a
-           decrease (negative) to the span loss calculation.";
-      }
-      leaf manual-span-loss {
-        type decimal64 {
-          fraction-digits 1;
-          range "0.0 .. 34.0";
-        }
-        units "dB";
-        description
-          "The user-provisioned span loss setting, in dB, to be used if auto
-           span loss compensation is disabled. Default setting is 0.0.";
-      }
-      container tx-span-loss {
-        config false;
-        description
-          "Tx Span Loss operational attributes (actual, min/max recorded, time
-           recorded, etc.).";
-        uses optical-loss-group;
-      }
-      container rx-span-loss {
-        config false;
-        description
-          "Rx Span Loss operational attributes (actual, min/max recorded, time
-           recorded, etc.).";
-        uses optical-loss-group;
-      }
-      container optical-return-loss {
-        config false;
-        description
-          "Optical Return Loss due to reflection, in dB.";
-        uses optical-loss-group;
-      }
-    }
-    container otdr {
-      description
-        "OTM OTDR properties.";
-      leaf manual-otdr-tx-event-range {
-        type uint64 {
-          range "0 .. 128000";
-        }
-        units "meters";
-        description
-          "Allows the user to configure Tx event range (in meters) for Manual OTDR.";
-      }
-      leaf manual-otdr-rx-event-range {
-        type uint64 {
-          range "0 .. 128000";
-        }
-        units "meters";
-        description
-          "Allows the user to configure Rx event range (in meters) for Manual OTDR.";
-      }
-    }
-  }
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties/ptp:lanes/ptp:lane/ptp:rx/ptp:power" {
-    when "ptp:type = 'OTM'" {
-      description
-        "PTP Rx power properties specified to OTM (Optical Transport Multiplex) PTP types.";
-    }
-    description
-      "PTP Rx power properties specified to OTM (Optical Transport Multiplex) PTP types.";
-    container aggregate-power {
-      config false;
-      description
-        "The total DWDM + OSC receive power referenced to the faceplate (COM
-         IN LC) in dBm.";
-      uses xcvr:optical-power-group;
-    }
-  }
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties/ptp:lanes/ptp:lane/ptp:tx/ptp:power" {
-    when "ptp:type = 'OTM'" {
-      description
-        "PTP Tx power properties specified to OTM (Optical Transport Multiplex) PTP types.";
-    }
-    description
-      "PTP Tx power properties specified to OTM (Optical Transport Multiplex) PTP types.";
-    container aggregate-power {
-      config false;
-      description
-        "The total DWDM + OSC transmit power referenced to the faceplate (COM
-         OUT LC) in dBm.";
-      uses xcvr:optical-power-group;
-    }
-  }
-}
diff --git a/models/ciena-waveserver-ptp-modem.yang b/models/ciena-waveserver-ptp-modem.yang
deleted file mode 100644
index bc689b5b861e82e146c80455501412a87470e67a..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-ptp-modem.yang
+++ /dev/null
@@ -1,532 +0,0 @@
-module ciena-waveserver-ptp-modem {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-ptp-modem";
-  prefix ptp-modem;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-ptp {
-    prefix ptp;
-  }
-  import ciena-waveserver-xcvr {
-    prefix xcvr;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines modem-transceiver PTP data for the Waveserver. It
-     augments the ciena-waveserver-ptp module. The PTP model represents the
-     signal carried by the modem transceiver at a physical line port. The PTP
-     objects are automatically provisioned during service module installation.";
-
-  revision 2019-08-15 {
-    description
-      "Added leaves 'tx-dispersion-precompensation-max' and 'tx-dispersion-
-             precompensation-min' in 'modem' container.
-       Updated range and description for 'reach-limit' and description for 'actual-reach' to
-             reflect new 250km terrestrial reach license.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2018-11-16 {
-    description
-      "Updated range for 'tx-dispersion-precompensation-value'.
-       Added leaf 'tx-dispersion-search-mode-min' in 'modem' container.
-       Added leaf 'tx-dispersion-search-mode-max' in 'modem' container.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-06-22 {
-    description
-      "Added 'expected-restoration-time', 'far-end-class', 'actual-reach', and 'actual-link-optimization-mode' to modem container.
-       Added 'supported-3dbm-signal-bandwidth' and 'supported-10dbm-signal-bandwidth' to modem container.
-       Added 'actual' leafs to frequency and power containers.
-       Changed 'estimated-instance-of-differential-group-delay' and 'mean-supported-differential-group-delay' from integer to decimal type.
-       Added 'fast' laser-tuning-mode enum value.
-       Updated ranges for 'tx-dispersion-precompensation-value' and 'tx-path-dispersion-value'.
-       Added 'search' enum value to 'tx-dispersion-compensation-mode'.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2018-01-15 {
-    description
-      "Updated range and description for 'reach-limit' to match actual accepted values.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-08-10 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Removed WL3e-specific attributes ('performance-optimization-mode', 'interleaver-mode', 'rotation', 'tx-reduction-mode', 'differential-encoding', 'fast-rx-recovery').
-       Removed obsolete attribute 'fast-receiver-recovery-state'.
-       Removed 'band-plan' and some line-system related attributes.
-       Removed 'actual' frequency.
-       Removed 'performance-statistics' container, which will be represented in the ciena-waveserver-pm module in 'untimed' bins.
-       Removed 'alarms' and 'diagnostics' containers.
-       Renamed 'tx-tuning-mode' to 'laser-tuning-mode', and value 'performance-optimized' value to 'normal'.
-       Renamed 'carrier-centering-mode' to 'laser-centering-mode'.
-       Renamed/updated several dispersion compensation attributes for WLAi.
-       Updated 'channel-contention-detection-avoidance' type from on/off to enabled/disabled.
-       Moved 'colourless-rx-channel' attributes to lane/rx/power/optical-channel-power.
-       Added several WLAi modem-specific attributes.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties/ptp:transmitter" {
-    when "../ptp:xcvr-type = 'WaveLogic Ai'" {
-      description
-        "PTP transmitter properties specific to WaveLogic Ai modem.";
-    }
-    description
-      "PTP transmitter properties specific to WaveLogic Ai modem.";
-    container frequency {
-      description
-        "Tx Frequency attributes.";
-      leaf value {
-        type cienawstypes:modem-frequency;
-        units "GHz";
-        description
-          "The configured modem frequency value (GHz). Frequency cannot be
-           modified while Admin State is enabled (except when changing from
-           zero value to another value).";
-      }
-      leaf min-value {
-        type cienawstypes:modem-frequency;
-        units "GHz";
-        config false;
-        description
-          "The minimum supported frequency value, in GHz.";
-      }
-      leaf max-value {
-        type cienawstypes:modem-frequency;
-        units "GHz";
-        config false;
-        description
-          "The maximum supported frequency value, in GHz.";
-      }
-      leaf actual {
-        type cienawstypes:modem-frequency;
-        units "GHz";
-        config false;
-        description
-          "The actual transmitter frequency value applied on the modem (GHz).";
-      }
-    }
-    container power {
-      description
-        "Tx Power attributes.";
-      leaf value {
-        type cienawstypes:tx-power-lvl;
-        units "dBm";
-        description
-          "The provisioned transmit power in dBm.";
-      }
-      leaf min-value {
-        type cienawstypes:decimal-1-dig;
-        units "dBm";
-        config false;
-        description
-          "The minimum supported tx power value, in dBm.";
-      }
-      leaf max-value {
-        type cienawstypes:decimal-1-dig;
-        units "dBm";
-        config false;
-        description
-          "The maximum supported tx power value, in dBm.";
-      }
-      leaf actual {
-        type cienawstypes:tx-power-lvl;
-        units "dBm";
-        config false;
-        description
-          "The actual optical transmit power value, in dBm.";
-      }
-    }
-  }
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties" {
-    when "ptp:xcvr-type = 'WaveLogic Ai'" {
-      description
-        "PTP properties specific to WaveLogic Ai modem.";
-    }
-    description
-      "PTP properties specific to WaveLogic Ai modem.";
-    container line-system {
-      description
-        "Line System related attributes.";
-      leaf type {
-        type cienawstypes:line-sys-enum;
-        description
-          "Line system type. Default is coloured";
-      }
-    }
-    container modem {
-      description
-        "PTP Modem configuration and operational attributes.";
-      leaf baud-rate {
-        type uint32;
-        units "Gbaud";
-        config false;
-        description
-          "The baud rate value, based off the mode of the parent XCVR.";
-      }
-      leaf class {
-        type cienawstypes:modem-class;
-        description
-          "The modem class type, terrestrial or submarine. Configuration requires
-           proper license installed.";
-      }
-      leaf far-end-class {
-        type cienawstypes:modem-class;
-        config false;
-        description
-          "The modem class type on the remote end of the line, terrestrial or
-           submarine, if available.";
-      }
-      leaf reach-limit {
-        type int16 {
-          range "0|250|1000|2000|2100|3000|3500|4000|5000|8000|9000|14000";
-        }
-        units "km";
-        description
-          "The maximum reach allowed in km. The possible values are [250, 1000, 2000,
-           2100, 3000, 4000, 5000, 8000] for terrestrial modem class, and [3500, 9000, 14000] for
-           submarine modem class. Configuration requires proper license installed.
-           [0] if the value is unknown/unavailable or inapplicable.";
-      }
-      leaf actual-reach {
-        type int16;
-        units "km";
-        config false;
-        description
-          "The actual applied reach value, in km. The possible values are [250, 1000,
-           2000, 2100, 3000, 4000, 5000, 8000] for terrestrial modem class, and [3500, 9000, 14000] for
-           submarine modem class. Configuration requires proper license installed.
-           [0] if the value is unknown/unavailable or inapplicable.";
-      }
-      leaf link-optimization-mode {
-        type cienawstypes:link-optimization-mode;
-        description
-          "Link Optimization Mode. Default is standard.";
-      }
-      leaf actual-link-optimization-mode {
-        type cienawstypes:link-optimization-mode;
-        config false;
-        description
-          "Actual Link Optimization mode applied on the modem, if available.";
-      }
-      leaf laser-tuning-mode {
-        type enumeration {
-          enum normal {
-            description
-              "Normal (performance-optimized) laser tuning mode.";
-          }
-          enum accelerated {
-            description
-              "Accelerated laser tuning mode.";
-          }
-          enum fast {
-            description
-              "Fast laser tuning mode.";
-          }
-        }
-        description
-          "This is the Tuning Mode, which can be set as normal (performance-
-           optimized), accelerated, or fast tuning mode. Default is normal.";
-      }
-      leaf laser-centering-mode {
-        type enumeration {
-          enum disabled {
-            description
-              "Laser centering disabled.";
-          }
-          enum enabled {
-            description
-              "Laser centering enabled.";
-          }
-          enum holdover {
-            description
-              "Laser centering in holdover mode.";
-          }
-        }
-        description
-          "This parameter is used to configure which laser centering mode to
-           apply to the OTM signal.";
-      }
-      leaf laser-centering-range {
-        type decimal64 {
-          fraction-digits 1;
-          range "0.0 .. 3.0";
-        }
-        units "GHz";
-        description
-          "This parameter is used to configure the laser centering range.";
-      }
-      leaf laser-shutdown-mode {
-        type enumeration {
-          enum accelerated {
-            description
-              "Laser shutdown accelerated mode.";
-          }
-          enum normal {
-            description
-              "Laser shutdown normal mode.";
-          }
-        }
-        description
-          "Laser shutdown mode.";
-      }
-      leaf expected-restoration-time {
-        type uint32 {
-          range "0..255";
-        }
-        units "seconds";
-        description
-          "Expected link restoration time, in seconds. Prevents the laser from
-           dithering for a given period of time after traffic loss in order to
-           minimize re-acquisition time. Default is 10 seconds.";
-      }
-      leaf channel-contention-detection-avoidance {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Enables or disables the channel contention detection and avoidance
-           feature. This feature is used to detect the situation where the modem
-           port turns on a wavelength (or frequency in Gridless mode) that is in
-           use by an existing L0 connection on a colorless network. This feature
-           will be triggered by new frequency provisioning and will automatically
-           detects if the provisioned frequency is already used. If the
-           provisioned frequency is already used, it declares channel contention,
-           and then it will hold the Line port TX in a low power state (<-35 dBm)
-           and will raise a Channel Contention alarm. This feature will also
-           provide a mechanism to allow user to manually release the Line port TX
-           from being held in a low power state while the channel collision
-           declared.";
-      }
-      leaf tx-power-reduction-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "This parameter is used to enable Tx blanking functionality. Default is
-           Disabled.";
-      }
-      leaf tx-dispersion-compensation-mode {
-        type enumeration {
-          enum automatic {
-            description
-              "Automatic Tx dispersion compensation management mode. This is the
-               default.";
-          }
-          enum fixed {
-            description
-              "Fixed Tx dispersion compensation management mode.";
-          }
-          enum search {
-            description
-              "Search Tx dispersion compensation management mode.";
-          }
-        }
-        description
-          "Tx dispersion compensation management mode.";
-      }
-      leaf tx-dispersion-precompensation-value {
-        type int32 {
-          range "-44500..1000000";
-        }
-        units "ps/nm";
-        description
-          "Tx compensation dispersion value, in ps/nm. Default is 0 for automatic
-           mode.";
-      }
-      leaf tx-dispersion-precompensation-min {
-        type int32 {
-          range "-44500..1000000";
-        }
-        units "ps/nm";
-        description
-          "Tx compensation dispersion minimum value, in ps/nm.";
-      }
-      leaf tx-dispersion-precompensation-max {
-        type int32 {
-          range "-44500..1000000";
-        }
-        units "ps/nm";
-        description
-          "Tx compensation dispersion maximum value, in ps/nm.";
-      }
-      leaf tx-path-dispersion-value {
-        type int32 {
-          range "-89000..1044500";
-        }
-        units "ps/nm";
-        description
-          "Tx path dispersion value, in ps/nm.";
-      }
-      leaf tx-dispersion-min {
-        type int32;
-        units "ps/nm";
-        config false;
-        description
-          "Tx dispersion minimum value, in ps/nm.";
-      }
-      leaf tx-dispersion-max {
-        type int32;
-        units "ps/nm";
-        config false;
-        description
-          "Tx dispersion maximum value, in ps/nm.";
-      }
-      leaf tx-dispersion-search-mode-min {
-        type int32 {
-          range "-89000..1044500";
-        }
-        units "ps/nm";
-        description
-          "Minimum path dispersion sweeping range when operating in search mode,
-           in ps/nm.";
-      }
-      leaf tx-dispersion-search-mode-max {
-        type int32 {
-          range "-89000..1044500";
-        }
-        units "ps/nm";
-        description
-          "Maximum path dispersion sweeping range when operating in search mode,
-           in ps/nm.";
-      }
-      leaf actual-tx-link-dispersion {
-        type int32;
-        units "ps/nm";
-        config false;
-        description
-          "Total actual Tx link dispersion, in ps/nm.";
-      }
-      leaf actual-rx-link-dispersion {
-        type int32;
-        units "ps/nm";
-        config false;
-        description
-          "Total actual Rx link dispersion, in ps/nm.";
-      }
-      leaf actual-tx-precompensation-dispersion {
-        type int32;
-        units "ps/nm";
-        config false;
-        description
-          "Actual Tx precompensation dispersion value, in ps/nm. This is the
-           total link dispersion in the near-to-far direction.";
-      }
-      leaf rx-post-compensation-dispersion {
-        type int32;
-        units "ps/nm";
-        config false;
-        description
-          "Rx post-compensation dispersion, in ps/nm.";
-      }
-      leaf estimated-instance-of-differential-group-delay {
-        type cienawstypes:decimal-3-dig;
-        units "ps";
-        config false;
-        description
-          "Estimated instance of differential group delay, in picoseconds (ps).";
-      }
-      leaf mean-supported-differential-group-delay {
-        type cienawstypes:decimal-3-dig;
-        units "ps";
-        config false;
-        description
-          "Mean supported differential group delay, in picoseconds (ps).";
-      }
-      leaf estimated-round-trip-delay {
-        type uint32;
-        units "us";
-        config false;
-        description
-          "Estimated round trip delay, in microseconds (us).";
-      }
-      leaf estimated-unidirectional-latency {
-        type uint32;
-        units "us";
-        config false;
-        description
-          "Estimated unidirectional latency, in microseconds (us).";
-      }
-      leaf estimated-fiber-length {
-        type uint32;
-        units "km";
-        config false;
-        description
-          "Estimated fiber length, in kilometers (km).";
-      }
-      leaf allocated-spectral-width {
-        type cienawstypes:decimal-1-dig;
-        units "GHz";
-        config false;
-        description
-          "Allocated spectral width, in GHz.";
-      }
-      leaf min-spectral-width {
-        type cienawstypes:decimal-1-dig;
-        units "GHz";
-        config false;
-        description
-          "Minimum spectral width, in GHz.";
-      }
-      leaf supported-3dbm-signal-bandwidth {
-        type cienawstypes:decimal-1-dig;
-        units "GHz";
-        config false;
-        description
-          "Supported 3 dBm signal bandwidth, in GHz.";
-      }
-      leaf supported-10dbm-signal-bandwidth {
-        type cienawstypes:decimal-1-dig;
-        units "GHz";
-        config false;
-        description
-          "Supported 10 dBm signal bandwidth, in GHz.";
-      }
-    }
-  }
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties/ptp:lanes/ptp:lane/ptp:rx/ptp:power" {
-    when "../../../../ptp:xcvr-type = 'WaveLogic Ai'" {
-      description
-        "PTP Rx power properties specific to WaveLogic Ai modem.";
-    }
-    description
-      "PTP Rx power properties specific to WaveLogic Ai modem.";
-    container optical-channel-power {
-      config false;
-      description
-        "The actual Rx power attributes for the channel to which the receiver
-         is tuned. For PTPs that support OPS protection, this reflects the
-         active path only.";
-      uses xcvr:optical-power-group;
-    }
-  }
-  augment "/ptp:waveserver-ptps/ptp:ptps/ptp:properties/ptp:lanes/ptp:lane/ptp:rx/ptp:status" {
-    when "../../../../ptp:xcvr-type = 'WaveLogic Ai'" {
-      description
-        "PTP Rx status properties specific to WaveLogic Ai modem.";
-    }
-    description
-      "PTP Rx status properties specific to WaveLogic Ai modem.";
-    container optical-channel-power {
-      config false;
-      description
-        "Optical Channel Rx Power high/low alarm/warning status/thresholds,
-         where applicable for the XCVR type.";
-      uses xcvr:optical-power-status-group;
-      uses xcvr:optical-power-threshold-group;
-      leaf loss-of-signal {
-        type boolean;
-        description
-          "Rx Loss of Optical Channel.";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-ptp.yang b/models/ciena-waveserver-ptp.yang
deleted file mode 100644
index fff6f785811cedb6d075a0943cf69291d6c097da..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-ptp.yang
+++ /dev/null
@@ -1,532 +0,0 @@
-module ciena-waveserver-ptp {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-ptp";
-  prefix ptp;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-xcvr {
-    prefix xcvr;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "Physical Termination Point. This module models the physical characteristics
-     of the signal. This base module contains generic definitions for all PTPs.
-     Specific characteristics of PTPs can augment this model to provide more
-     detail. PTPs are automatically provisioned by the system.";
-
-  revision 2019-09-12 {
-    description
-      "Added XCVR optical power threshold source attributes to indicate if the power 
-             thresholds are the defaults from the device or from profile.
-       Added ptp HCCS threshold leaf 'hccs-dbq' and and its BER version 'hccs-ber'.
-       Added read-only actual-state leaf for PTP transmitter state.
-       Set nominal-bit-rate as deprecated.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2018-12-14 {
-    description
-      "Added ptp 'type' leaf.
-       Added rpc 'waveserver-ptp-clear-statistics'.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-04-13 {
-    description
-      "Added 'forward-error-correction' support (moved from Port object).
-       Added 'thresholds' container for pre-fec threshold data.
-       Added 'spli-management-status' to state container.
-       Added 'actual' to wavelength container.
-       Added ncx:user-write to 'ptps' list.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-11-27 {
-    description
-      "Added conditional 'when' statements to line-specific and client-specific leafs.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-08-10 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Changed 'ptps' list key from 'ptp-index' (integer type) to 'ptp-id' (string type) to accommodate '<slot>-<port>' format.
-       Changed 'parent-index' to 'parent-id' (this is the parent xcvr-id) and type to leafref.
-       Changed 'rate' enum to 'nominal-bit-rate' string type, in Gbps units.
-       Renamed 'channels' container to 'lanes'.
-       Removed 'diagnostics' container.
-       Added 'lower-level-down' operational state value.
-       Wavelength is operational (config false) now. Also moved 'actual' wavelength attribute to per-lane attributes. 
-       Moved ptp-pluggable operational attributes (tx loss-of-signal, loss-of-lock) into this common module. The pluggable-only attributes will be omitted from the display of line-side/modem PTP queries.
-       Added 'spli-management' support.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef ptp-op-enum {
-    type enumeration {
-      enum up {
-        description
-          "The PTP is enabled/operational and capable of carrying traffic.";
-      }
-      enum down {
-        description
-          "The PTP is disabled.";
-      }
-      enum tuning {
-        description
-          "Wavelength or CDR tuning in progress.";
-      }
-      enum fault {
-        description
-          "There is an active alarm associated with the PTP.";
-      }
-      enum lower-layer-down {
-        description
-          "The PTP is enabled, but a parent object is faulted.";
-      }
-    }
-    description
-      "PTP operational state.";
-  }
-
-  typedef optical-power-threshold-source-enum {
-    type enumeration {
-      enum none {
-        description
-          "Not initialized.";
-      }
-      enum device {
-        description
-          "Threshold value set from EEPROM data.";
-      }
-      enum profile {
-        description
-          "Threshold value applied from a user-configured XCVR profile.";
-      }
-    }
-    description
-      "Enumeration value indicating the source of the specified XCVR power threshold value.";
-  }
-
-  grouping optical-power-threshold-source-group {
-    description
-      "Group of optical power threshold sources. Can be used for Rx or Tx.";
-    leaf high-alarm-threshold-source {
-      type optical-power-threshold-source-enum;
-      config false;
-      description
-        "Source of Optical power high alarm threshold.";
-    }
-    leaf low-alarm-threshold-source {
-      type optical-power-threshold-source-enum;
-      config false;
-      description
-        "Source of Optical power low alarm threshold.";
-    }
-    leaf high-warning-threshold-source {
-      type optical-power-threshold-source-enum;
-      config false;
-      description
-        "Source of Optical power high warning threshold.";
-    }
-    leaf low-warning-threshold-source {
-      type optical-power-threshold-source-enum;
-      config false;
-      description
-        "Source of Optical power low warning threshold.";
-    }
-  }
-
-  container waveserver-ptps {
-    description
-      "Waveserver Physical Termination Point (PTP) configuration and operational data.";
-    list ptps {
-      ncx:user-write "update";
-      key "ptp-id";
-      description
-        "List of PTP objects.";
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique, access identifier string of the PTP (e.g., '1-1'). Key value for the PTP list. Read-only attribute.";
-      }
-      container id {
-        config false;
-        description
-          "Identification information of this PTP instance.";
-        leaf name {
-          type cienawstypes:name-string;
-          config false;
-          description
-            "Name of the PTP instance. Read only attribute.";
-        }
-      }
-      container state {
-        description
-          "State information of this PTP instance.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Administrative state (enabled or disabled) of the PTP. If Admin State is set to enabled, majority of the PTP fields will no longer be modifiable. When PTP Transmitter State is Disabled, PTP Admin State cannot be changed from Disabled to Enabled.";
-        }
-        leaf operational-state {
-          type ptp-op-enum;
-          config false;
-          description
-            "Operational state of the PTP. Read-only attribute.";
-        }
-        leaf spli-management {
-          when "../../properties/xcvr-type = 'WaveLogic Ai'" {
-            description
-              "SPLI management supported on line-side PTPs only.";
-          }
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether or not Service Photonic Layer Interoperations management
-             protocol is enabled on this PTP.";
-        }
-        leaf spli-management-status {
-          when "../../properties/xcvr-type = 'WaveLogic Ai'" {
-            description
-              "SPLI management supported on line-side PTPs only.";
-          }
-          type enumeration {
-            enum matched {
-              description
-                "SPLI is in matched state.";
-            }
-            enum mismatched {
-              description
-                "SPLI is in mismatched state.";
-            }
-            enum unavailable {
-              description
-                "SPLI state is unknown or SPLI management is disabled.";
-            }
-          }
-          config false;
-          description
-            "The operational status of the SPLI management subsystem.";
-        }
-      }
-      container properties {
-        description
-          "All the configurable and operational data of this PTP instance.";
-        leaf xcvr-type {
-          type cienawstypes:xcvr-type;
-          description
-            "Transceiver type of the XCVR that's associated with this PTP. Type depends on what is physically plugged in. Read only attribute.";
-        }
-        leaf parent-id {
-          type leafref {
-            path "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:xcvr-id";
-          }
-          config false;
-          description
-            "Reference to the name of the transceiver (XCVR) associated with the PTP. Read-only attribute.";
-        }
-        leaf type {
-          type enumeration {
-            enum unknown {
-              description
-                "Unknown PTP type.";
-            }
-            enum WLAi {
-              description
-                "WaveLogic Ai PTP type.";
-            }
-            enum WLAi-iOPS {
-              description
-                "WaveLogic Ai PTP type, with integrated OPS protection.";
-            }
-            enum 4x25G {
-              description
-                "100G PTP type, composed of 4x 25G lanes.";
-            }
-            enum 10G {
-              description
-                "10G PTP type, composed of 1 10G lane.";
-            }
-            enum OCH {
-              description
-                "Optical Channel PTP type.";
-            }
-            enum OSC {
-              description
-                "Optical Supervisory Channel PTP type.";
-            }
-            enum OSC-Add-Drop {
-              description
-                "Optical Supervisory Channel Add/Drop PTP type.";
-            }
-            enum OTM {
-              description
-                "Optical Transport Multiplex PTP type.";
-            }
-          }
-          description
-            "Physical Termination Point type.";
-        }
-        leaf nominal-bit-rate {
-          type cienawstypes:string-maxl-16;
-          units "Gbps";
-          config false;
-          status deprecated;
-          description
-            "Bit rate, nominal, in Gbps.";
-        }
-        leaf forward-error-correction {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Forward error correction.";
-        }
-        container thresholds {
-          description
-            "Common container for PTP threshold configuration data.";
-          leaf pre-fec-sf-dbq {
-            type decimal64 {
-              fraction-digits 2;
-              range "-1.00 .. 1.00";
-            }
-            units "dBQ";
-            description
-              "Pre-FEC Signal Fail threshold value, expressed in dBQ notation.";
-          }
-          leaf pre-fec-sd-dbq {
-            type decimal64 {
-              fraction-digits 2;
-              range "-1.00 .. 3.50";
-            }
-            units "dBQ";
-            description
-              "Pre-FEC Signal Degrade threshold value, expressed in dBQ notation.";
-          }
-          leaf hccs-dbq {
-            type decimal64 {
-              fraction-digits 2;
-              range "-1.00 .. 4.00";
-            }
-            units "dBQ";
-            description
-              "High Correction Count Second (HCCS) Threshold, expressed in dBQ notation.";
-          }
-          leaf pre-fec-sf-ber {
-            type cienawstypes:string-sci;
-            units "errored-bits / bit";
-            config false;
-            description
-              "Pre-FEC Signal Fail threshold value, expressed in exponential
-               notation, e.g. '1E-06' to '1E-09'.";
-          }
-          leaf pre-fec-sd-ber {
-            type cienawstypes:string-sci;
-            units "errored-bits / bit";
-            config false;
-            description
-              "Pre-FEC Signal Degrade threshold value, expressed in exponential
-               notation, e.g. '1E-06' to '1E-09'.";
-          }
-          leaf hccs-ber {
-            type cienawstypes:string-sci;
-            units "errored-bits / bit";
-            config false;
-            description
-              "High Correction Count Second (HCCS) threshold, expressed in exponential
-               notation, e.g. '1E-06' to '1E-09'.";
-          }
-        }
-        container transmitter {
-          description
-            "PTP transmitter related config and operational data fields.";
-          leaf state {
-            type cienawstypes:enabled-disabled-na-enum;
-            description
-              "Transmitter state (enabled or disabled) of the PTP. PTP Admin State cannot be changed to enabled unless the transmitter state is enabled.";
-          }
-          leaf actual-state {
-            type cienawstypes:enabled-disabled-na-enum;
-            config false;
-            description
-              "Transmitter actual-state (enabled or disabled) of the PTP.";
-          }
-          container wavelength {
-            config false;
-            description
-              "PTP tx wavelength related operational data fields.";
-            leaf value {
-              type cienawstypes:decimal-2-dig;
-              units "nm";
-              config false;
-              description
-                "Wavelength value setting of the PTP, in nm. Read-only attribute.";
-            }
-            leaf min-value {
-              when "../../../xcvr-type = 'WaveLogic Ai'" {
-                description
-                  "XCVR min-value supported on line-side PTPs only.";
-              }
-              type cienawstypes:decimal-2-dig-small;
-              units "nm";
-              config false;
-              description
-                "The minimum wavelength supported by the XCVR. Supported on line-side ports only.";
-            }
-            leaf max-value {
-              when "../../../xcvr-type = 'WaveLogic Ai'" {
-                description
-                  "XCVR max-value supported on line-side PTPs only.";
-              }
-              type cienawstypes:decimal-2-dig-small;
-              units "nm";
-              config false;
-              description
-                "The maximum wavelength supported by the XCVR. Supported on line-side ports only.";
-            }
-            leaf actual {
-              type cienawstypes:decimal-2-dig;
-              units "nm";
-              config false;
-              description
-                "Actual wavelength value of the PTP, in nm. Read-only attribute.";
-            }
-          }
-        }
-        container lanes {
-          config false;
-          description
-            "PTP lanes related operational data fields.";
-          leaf number-of-lanes {
-            type cienawstypes:lanes-number;
-            config false;
-            description
-              "Number of lanes this PTP has.";
-          }
-          list lane {
-            key "lane-number";
-            config false;
-            max-elements 4;
-            description
-              "Operational data of a specific PTP lane.";
-            leaf lane-number {
-              type cienawstypes:lanes-number;
-              config false;
-              description
-                "Lane number of the PTP being queried.";
-            }
-            leaf actual-wavelength {
-              type cienawstypes:decimal-2-dig;
-              units "nm";
-              config false;
-              description
-                "Actual wavelength value for the lane, in nm.";
-            }
-            container rx {
-              description
-                "Lane Rx attributes.";
-              container power {
-                description
-                  "Lane Rx Power operational attributes (actual power, min/max recorded power, etc.).";
-                uses xcvr:optical-power-group;
-              }
-              container status {
-                description
-                  "Lane Rx Power high/low alarm/warning status/thresholds, where applicable for the XCVR type.";
-                uses xcvr:optical-power-status-group;
-                uses xcvr:optical-power-threshold-group;
-                uses optical-power-threshold-source-group;
-                leaf loss-of-signal {
-                  type boolean;
-                  config false;
-                  description
-                    "Rx Loss of Signal.";
-                }
-                leaf loss-of-lock {
-                  when "../../../../../xcvr-type = 'QSFP28'" {
-                    description
-                      "Returned for on pluggables only.";
-                  }
-                  type boolean;
-                  config false;
-                  description
-                    "Rx Loss of Lock.";
-                }
-              }
-            }
-            container tx {
-              description
-                "Lane Tx attributes.";
-              container power {
-                description
-                  "Lane Tx Power operational attributes (actual power, min/max recorded power, etc.).";
-                uses xcvr:optical-power-group;
-              }
-              container status {
-                description
-                  "Lane Tx Power high/low alarm/warning status/thresholds, where applicable for the XCVR type.";
-                uses xcvr:optical-power-status-group;
-                uses xcvr:optical-power-threshold-group;
-                uses optical-power-threshold-source-group;
-                leaf loss-of-signal {
-                  when "../../../../../xcvr-type = 'QSFP28'" {
-                    description
-                      "Returned for on pluggables only.";
-                  }
-                  type boolean;
-                  config false;
-                  description
-                    "Tx Loss of Signal.";
-                }
-                leaf loss-of-lock {
-                  when "../../../../../xcvr-type = 'QSFP28'" {
-                    description
-                      "Returned for on pluggables only.";
-                  }
-                  type boolean;
-                  config false;
-                  description
-                    "Tx Loss of Lock.";
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  rpc waveserver-ptp-clear-statistics {
-    description
-      "Clears the minimum and maximum values recorded for real-time statistics such as optical power measurements.";
-    input {
-      leaf ptp-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique, access identifier string of the PTP (e.g., '1-1').";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-snmp.yang b/models/ciena-waveserver-snmp.yang
deleted file mode 100644
index 1c98975c447af98eef4e3484333da1eca8234149..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-snmp.yang
+++ /dev/null
@@ -1,734 +0,0 @@
-module ciena-waveserver-snmp {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-snmp";
-  prefix snmp-if;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-port {
-    prefix port;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-              Hanover, Maryland 21076
-              U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines the configuration and operational data for the Simple
-     Network Management Protocol (SNMP) server on Ciena's Waveserver platform.";
-
-  revision 2019-02-19 {
-    description
-      "Added lists: 'snmp/user','snmp/viewtree','snmp/security-to-group',
-                    'snmp/access','snmp/notify', and related typedefs.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-09-19 {
-    description
-      "Waveserver Platform Data Model
-       The initial definition of the SNMP external data model.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-
-  typedef priv-protocol {
-    type enumeration {
-      enum noPriv {
-        value 1;
-        description
-          "Uses Uses no privacy protocol.";
-      }
-      enum des {
-        value 2;
-        description
-          "Uses privacy protocol des.";
-      }
-      enum 3des {
-        value 3;
-        description
-          "Uses privacy protocol 3des.";
-      }
-      enum aes-128 {
-        value 4;
-        description
-          "Uses privacy protocol aes-128.";
-      }
-    }
-    description
-      "Defines the supported SNMP privacy protocols.";
-    reference
-      "RFC 3414: User-based Security Model (USM) for version 3 of the Simple
-       Network Management Protocol (SNMPv3).";
-  }
-
-  typedef auth-protocol {
-    type enumeration {
-      enum noAuth {
-        value 1;
-        description
-          "Uses no authentication protocol.";
-      }
-      enum md5 {
-        value 2;
-        description
-          "Uses authentication protocol md5.";
-      }
-      enum sha {
-        value 3;
-        description
-          "Uses authentication protocol sha.";
-      }
-    }
-    description
-      "Defines the supported SNMP authentication protocols.";
-    reference
-      "RFC 3414: User-based Security Model (USM) for version 3 of the Simple
-       Network Management Protocol (SNMPv3).";
-  }
-
-  typedef security-model {
-    type enumeration {
-      enum v1 {
-        value 1;
-        description
-          "Uses SNMPv1 community-based security model.";
-      }
-      enum v2c {
-        value 2;
-        description
-          "Uses SNMPv2c community-based security model.";
-      }
-      enum usm {
-        value 3;
-        description
-          "Uses SNMPv3 User-based Security Model (USM).";
-      }
-    }
-    description
-      "Defines the supported SNMP security model types.";
-    reference
-      "RFC 3411: An Architecture for Describing Simple Network Management
-       Protocol (SNMP) Management Frameworks.";
-  }
-
-  typedef security-level {
-    type enumeration {
-      enum no-auth-no-priv {
-        value 1;
-        description
-          "No authentication and no encrpytion.";
-      }
-      enum auth-no-priv {
-        value 2;
-        description
-          "Messages are authenticated but not encrypted (i.e., no privacy).";
-      }
-      enum auth-priv {
-        value 3;
-        description
-          "Messages are authenticated and encrypted (i.e., with privacy).";
-      }
-    }
-    description
-      "SNMP security level.";
-    reference
-      "RFC 3411: An Architecture for Describing Simple Network
-       Management Protocol (SNMP) Management Frameworks";
-  }
-
-  typedef mp-model {
-    type uint32;
-    description
-      "The Message Processing Model type identifies the format of a particular
-       version of an SNMP message. Values between 0 and 255 are managed by IANA
-       with the following reserved values:
-         0     - Reserved for SNMPv1
-         1     - Reserved for SNMPv2c
-         2     - Reserved for SNMPv2u and SNMPv2
-         3     - Reserved for SNMPv3
-         4-255 - Unassigned";
-    reference
-      "RFC 3411: An Architecture for Describing Simple Network Management
-       Protocol (SNMP) Management Frameworks.";
-  }
-
-  typedef snmp-name-string {
-    type string {
-      length "1..32";
-    }
-    description
-      "A string that uniquely identifies an SNMP object instance in a list,
-       including target, target-params, and community object types.";
-    reference "RFC 3413: Simple Network Management Protocol (SNMP) Applications.";
-  }
-
-  typedef tag-value {
-    type string {
-      length "0..32";
-    }
-    description
-      "Represents SnmpTagValue as defined in RFC 3413. A zero length string
-       indicates an empty list.";
-    reference
-      "RFC 3413: Simple Network Management Protocol (SNMP) Applications.
-       SNMP-TARGET-MIB.SnmpTagValue";
-  }
-
-  container waveserver-snmp {
-    description
-      "Waveserver SNMP configuration and operational data.";
-    container global-config {
-      description
-        "Global configuration attributes for the SNMP engine.";
-      leaf admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "SNMP engine administrative state.";
-      }
-      leaf operational-state {
-        type cienawstypes:up-down-enum;
-        config false;
-        description
-          "SNMP engine operational state.";
-      }
-      leaf standard-link-traps-admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Specifies whether standard link up/down trap notifications are
-           enabled or disabled.";
-      }
-      leaf contact {
-        type string {
-          length "0..255";
-        }
-        description
-          "SNMP system contact string.";
-      }
-      leaf location {
-        type string {
-          length "0..255";
-        }
-        description
-          "SNMP system location string.";
-      }
-      leaf engine-id {
-        type string {
-          pattern '([0-9a-fA-F]){2}(:([0-9a-fA-F]){2}){4,31}';
-        }
-        config false;
-        description
-          "The local SNMP engine's system-assigned unique identifier, expressed
-           as a series of colon-separated hexadecimal octets.";
-        reference
-          "RFC 3411: An Architecture for Describing Simple Network Management
-           Protocol (SNMP) Management Frameworks";
-      }
-      leaf engine-boots {
-        type uint32;
-        config false;
-        description
-          "The number of times that the SNMP engine has (re-)initialized itself
-           since the engine-id was last configured, or assigned at system boot.";
-        reference
-          "RFC 3411: An Architecture for Describing Simple Network Management
-           Protocol (SNMP) Management Frameworks";
-      }
-      leaf engine-time {
-        type uint32;
-        units "seconds";
-        config false;
-        description
-          "The number of seconds since the engine-boots counter was last
-           incremented (i.e. since the SNMP engine was last booted).";
-        reference
-          "RFC 3411: An Architecture for Describing Simple Network Management
-           Protocol (SNMP) Management Frameworks";
-      }
-      leaf engine-max-message-size {
-        type uint32;
-        config false;
-        description
-          "The maximum length in octets of an SNMP message which this SNMP
-           engine can send or receive and process, determined as the minimum
-           of the maximum message size value supported among all of the
-           transports available to and supported by the engine.";
-        reference
-          "RFC 3411: An Architecture for Describing Simple Network Management
-           Protocol (SNMP) Management Frameworks";
-      }
-    }
-    container statistics {
-      config false;
-      description
-        "Statistics associated with the SNMP engine, including a collection
-         of counters associated with the SNMP User-based Security Model (USM).";
-      reference
-        "RFC 2574: User-based Security Model (USM) for version 3 of the Simple
-         Network Management Protocol (SNMPv3)";
-      leaf unknown-security-models {
-        type uint32;
-        description
-          "The total number of packets received by the SNMP engine which were
-           dropped because the packets referenced a security model that the
-           SNMP agent does not support or recognize.";
-      }
-      leaf invalid-messages {
-        type uint32;
-        description
-          "The total number of packets received by the SNMP engine which were
-           dropped because the packets contained invalid or inconsistent
-           components.";
-      }
-      leaf unknown-pdu-handlers {
-        type uint32;
-        description
-          "The total number of packets received by the SNMP engine which were
-           dropped because the agent had no handler registered for the
-           Protocol Data Unit (PDU) type of the packet.";
-      }
-      leaf unsupported-security-levels {
-        type uint32;
-        description
-          "The total number of packets received by the SNMP engine which were
-           dropped because they requested a security level that was unknown
-           to the SNMP engine or otherwise unavailable.";
-      }
-      leaf not-in-time-windows {
-        type uint32;
-        description
-          "The total number of packets received by the SNMP engine which were
-           dropped because they appeared outside of the authoritative SNMP
-           engine's window.";
-      }
-      leaf unknown-user-names {
-        type uint32;
-        description
-          "The total number of packets received by the SNMP engine which were
-           dropped because they referenced a user that was not known to the
-           SNMP engine.";
-      }
-      leaf unknown-engine-ids {
-        type uint32;
-        description
-          "The total number of packets received by the SNMP engine which were
-           dropped because they referenced an engine-id that was not known to
-           the SNMP engine.";
-      }
-    }
-    list target {
-      key "name";
-      description
-        "List of target transport addresses (e.g. trap destinations) to be used
-         in the generation of SNMP messages.";
-      reference "RFC 3413: Simple Network Management Protocol (SNMP) Applications.";
-      leaf name {
-        type snmp-name-string;
-        description
-          "SNMP trap target name. Uniquely identifies the target entry in the
-           list.";
-      }
-      leaf address {
-        type cienawstypes:ipaddr-or-hostname;
-        mandatory true;
-        description
-          "The SNMP target transport address, as an IPv4 address with optional
-           prefix length, or hostname format.";
-      }
-      leaf target-params {
-        type snmp-name-string;
-        mandatory true;
-        description
-          "Identifies an entry in the target-params list. The identified entry
-           contains SNMP parameters to be used when generating messages to be
-           sent to this target transport address. If the selected entry in the
-           target-params list does not exist, the management target will not be
-           used to generate notifications.";
-      }
-      leaf tag {
-        type tag-value;
-        description
-          "Tag value used to select one or more target address entries for a
-           particular operation.";
-      }
-      leaf port {
-        type uint16;
-        description
-          "UDP port number associated with the target entry. Default is 162.";
-      }
-      leaf transport-domain {
-        type enumeration {
-          enum snmp-udp {
-            description
-              "SNMP over UDP. This is the default domain value.";
-          }
-          enum v4-udp {
-            description
-              "SNMP over UDP over Ipv4.";
-          }
-          enum v6-udp {
-            description
-              "SNMP over UDP over Ipv6.";
-          }
-        }
-        description
-          "Indicates the transport type of the address contained in this SNMP
-           target entry. Default is 'snmp-udp'.";
-        reference
-          "RFC 3417: Transport Mappings for the Simple Network Management
-           Protocol (SNMP).";
-      }
-      leaf timeout {
-        type uint32;
-        units "0.01 seconds";
-        description
-          "The expected maximum round trip time for communicating with this
-           target transport address, expressed in hundredths of a second.";
-      }
-      leaf retry-count {
-        type uint32;
-        description
-          "The default number of retries to be attempted when a response is not
-           received for a generate message to this target transport address.";
-      }
-    }
-    list target-params {
-      key "name";
-      description
-        "List of objects containing one ore more SNMP parameters which can be
-         associated with an SNMP transport target.";
-      reference "RFC 3413: Simple Network Management Protocol (SNMP) Applications.";
-      leaf name {
-        type snmp-name-string;
-        description
-          "An arbitrary name which uniquely identifies this target-params entry
-           in the list.";
-      }
-      leaf security-name {
-        type snmp-name-string;
-        mandatory true;
-        description
-          "SNMP security name, represented as a string.";
-      }
-      leaf security-model {
-        type security-model;
-        description
-          "The security model associated with this target-params entry. Default
-           is v1.";
-      }
-      leaf security-level {
-        type security-level;
-        description
-          "The security level associated with this target-params entry. Default
-           is no-auth-no-priv.";
-      }
-      leaf message-processing-model {
-        type mp-model;
-        config false;
-        description
-          "The Message Processing Model associated with this target-params entry.
-           Derived from the security-model.";
-      }
-    }
-    list community {
-      key "index";
-      description
-        "List of community entries for SNMP v1 and v2c security.";
-      leaf index {
-        type snmp-name-string;
-        description
-          "Index into the community list.";
-      }
-      leaf community-name {
-        type string {
-          length "1..64";
-        }
-        mandatory true;
-        description
-          "SNMP community name, represented as a string.";
-      }
-      leaf security-name {
-        type snmp-name-string;
-        mandatory true;
-        description
-          "SNMP security name, represented as a string.";
-      }
-      leaf transport-tag {
-        type tag-value;
-        description
-          "Used to limit access for this community to the specified target(s).";
-      }
-      leaf context-name {
-        type string {
-          length "0..32";
-        }
-        description
-          "The context in which management information is accessed when using
-           the community string specified by this entry.";
-      }
-    }
-    list user {
-      key "name engine-id";
-      description
-        "List of SNMPv3 user profiles. A double-keyed list that consists of a
-         user name and an Engine Id value. The combination of user name and
-         Engine Id make up SNMP MIB user profile.";
-      reference
-        "RFC 3414: User-based Security Model (USM) for version 3 of the Simple
-         Network Management Protocol (SNMPv3).";
-      leaf name {
-        type snmp-name-string;
-        description
-          "SNMP user name. Uniquely identifies the user entry in the
-           list.";
-      }
-      leaf engine-id {
-        type string {
-          pattern '([0-9a-fA-F]){2}(:([0-9a-fA-F]){2}){4,31}';
-        }
-        description
-          "The SNMP user engine id, unique identifier, expressed
-           as a series of colon-separated hexadecimal octets.";
-        reference
-          "RFC 3411: An Architecture for Describing Simple Network Management
-           Protocol (SNMP) Management Frameworks";
-      }
-      leaf auth-protocol {
-        type auth-protocol;
-        mandatory true;
-        description
-          "The SNMP user authentication protocol.";
-        reference
-          "RFC 3414: User-based Security Model (USM) for version 3 of the Simple
-           Network Management Protocol (SNMPv3).";
-      }
-      leaf auth-password {
-        type cienawstypes:string-maxl-128;
-        description
-          "The user authentication protocol password, supplied as cleartext.
-           This is a write-only attribute that should not be stored nor returned
-           on user retrieval. The password will be encrypted via one-way hash
-           function and stored only in its encrypted format.";
-        ncx:password;
-      }
-      leaf auth-secret {
-        type cienawstypes:string-maxl-256;
-        description
-          "The encrypted user authentication protocol password string, supplied
-           as a hashed value. This should only be configured at user creation
-           time, and will be ignored if the user account already exists.";
-      }
-      leaf priv-protocol {
-        type priv-protocol;
-        description
-          "The SNMP user privacy protocol.";
-        reference
-          "RFC 3414: User-based Security Model (USM) for version 3 of the Simple
-           Network Management Protocol (SNMPv3).";
-      }
-      leaf priv-password {
-        type cienawstypes:string-maxl-128;
-        description
-          "The user privacy protocol password, supplied as cleartext. This is a
-           write-only attribute that should not be stored nor returned on user
-           retrieval. The password will be encrypted via one-way hash function
-           and stored only in its encrypted format.";
-        ncx:password;
-      }
-      leaf priv-secret {
-        type cienawstypes:string-maxl-256;
-        description
-          "The encrypted user privacy protocol password string, supplied as a
-           hashed value. This should only be configured at user creation time,
-           and will be ignored if the user account already exists.";
-      }
-    }
-    list viewtree {
-      key "name sub-tree";
-      description
-        "List of view tree definitions. A double-keyed list that consists of a
-         view tree name and sub-tree OID string value. The combination of
-         sub-tree entries with the same viewtree name make up an SNMP MIB
-         Viewtree or View Tree Family.";
-      reference
-        "RFC 3415: View-based Access Control Model (VACM) for the Simple Network
-         Management Protocol (SNMP).";
-      leaf name {
-        type snmp-name-string;
-        description
-          "SNMP viewtree name. Identifies the viewtree entries in the list that
-           belong to the same viewtree family.";
-      }
-      leaf sub-tree {
-        type snmp-name-string;
-        description
-          "SNMP Sub-tree definition, OID format, Ex:1.3.6.1.4.1.1271.35,
-           and predefined system defaults snmpResearch and iso.";
-      }
-      leaf type {
-        type enumeration {
-          enum include {
-            description
-              "Sub-tree include type.";
-          }
-          enum exclude {
-            description
-              "Sub-tree exclude type.";
-          }
-        }
-        mandatory true;
-        description
-          "The SNMP Sub-tree type.";
-      }
-      leaf mask {
-        type string {
-          pattern '([0-9a-fA-F]){2}(:([0-9a-fA-F]){2}){1,32}';
-        }
-        description
-          "Sub-tree mask or family mask, a colon-separated octet string.";
-      }
-    }
-    list security-to-group {
-      key "user sec-model";
-      description
-        "List of security-to-group entries. A double-keyed list of entries
-         identified by security criteria (name and model) which can be assigned
-         to an access group name. Security groups can be created to identify
-         sets of users with similar read/write access control permissions or
-         notification view filtering.";
-      reference
-        "RFC 3415: View-based Access Control Model (VACM) for the Simple Network
-         Management Protocol (SNMP).";
-      leaf user {
-        type snmp-name-string;
-        description
-          "User name string (SNMPv3) or community string (SNMPv1, SNMPv2)
-           associated with the security group.";
-      }
-      leaf sec-model {
-        type security-model;
-        description
-          "The security model associated with this security-to-group entry.";
-      }
-      leaf group {
-        type snmp-name-string;
-        mandatory true;
-        description
-          "A user-assigned access entry group name identifying a group of users
-           with similar access control permissions, notification view, etc.
-           This group name is used as an index into the access list to select
-           an access control policy, however it does not imply or guarantee that
-           an instance with this name actually exists in the access table.";
-      }
-    }
-    list access {
-      key "entry sec-model sec-level";
-      description
-        "List of access entry profiles, defining access privileges and MIB
-         read/write and notification view filters for a particular user class
-         group of users.";
-      reference
-        "RFC 3415: View-based Access Control Model (VACM) for the Simple Network
-         Management Protocol (SNMP).";
-      leaf entry {
-        type snmp-name-string;
-        description
-          "Entry name. Uniquely identifies the access entry/group in the list.";
-      }
-      leaf sec-model {
-        type security-model;
-        mandatory true;
-        description
-          "The security model associated with this access entry.";
-      }
-      leaf sec-level {
-        type security-level;
-        mandatory true;
-        description
-          "The security level associated with this access entry.";
-      }
-      leaf read-view {
-        type string {
-          length "0..33";
-        }
-        mandatory true;
-        description
-          "Read view type. Each access entry profile must have a read view
-           assigned to it.";
-      }
-      leaf write-view {
-        type string {
-          length "0..33";
-        }
-        description
-          "Write view type, optional.";
-      }
-      leaf notify-view {
-        type string {
-          length "0..33";
-        }
-        description
-          "Notify view type, optional.";
-      }
-    }
-    list notify {
-      key "name";
-      description
-        "List of notification target entries. Used to select management targets
-         which should receive notifications, as well as the type of notification
-         which should be sent to each selected management target.";
-      reference "RFC 3413: Simple Network Management Protocol (SNMP) Applications.";
-      leaf name {
-        type snmp-name-string;
-        description
-          "Notify name. Uniquely identifies the notify entry in the list.";
-      }
-      leaf notify-tag {
-        type snmp-name-string;
-        mandatory true;
-        description
-          "Notify tag name. Contains a single tag value which is used to select
-           entries in the target list (target address table). Any entry in the
-           target list which contains this tag value will be selected for this
-           notify target. If the tag value is an empty string, then no entries
-           will be selected.";
-      }
-      leaf notify-type {
-        type enumeration {
-          enum trap {
-            value 1;
-            description
-              "Create trap notification. Notification messages generated will
-               contain Unconfirmed-Class PDUs. This is the default value.";
-          }
-          enum inform {
-            value 2;
-            description
-              "Create inform notification. Notification messages generated will
-               contain Confirmed-Class PDUs.";
-          }
-        }
-        description
-          "The type of notification to be generated for entries in the target
-           list selected by the notify-tag value. Default is trap.";
-      }
-    }
-  }
-  augment "/port:waveserver-ports/port:ports/port:properties" {
-    description
-      "SNMP related port properties.";
-    leaf snmp-standard-link-traps {
-      type cienawstypes:enabled-disabled-enum;
-      description
-        "Indicates whether standard SNMP traps are enabled or disabled on the
-         port object. Applies to all line and client port types.";
-      reference "RFC 3413: Simple Network Management Protocol (SNMP) Applications.";
-    }
-  }
-}
diff --git a/models/ciena-waveserver-software.yang b/models/ciena-waveserver-software.yang
deleted file mode 100644
index 79763abada9c4d0c18a72766eb743239a0f94d63..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-software.yang
+++ /dev/null
@@ -1,800 +0,0 @@
-module ciena-waveserver-software {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-software";
-  prefix software;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines Software Status and Upgrade support for Ciena's Waveserver Platform.";
-
-  revision 2019-09-27 {
-    description
-      "Changed input descriptions for rpc's 'waveserver-software-check-local',
-        'waveserver-software-activate', and 'waveserver-software-delete'.
-       Added support for group software upgrade.
-       Added leaf 'version-name' in grouping 'software-release-group'.
-       Added grouping 'network-member-attribute-group'.
-       Added container 'network'.
-       Changed input 'url' to optional for rpc 'waveserver-software-download'.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2018-06-01 {
-    description
-      "Added 'delete-from-load' optional input argument to the install/activate/commit RPCs.
-       Added 'software-clear-log', 'software-check-local', and 'software-check-remote' RPCs.
-       Added new 'software-op-state' enum value for license check.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-12-07 {
-    description
-      "Added support for multi-step upgrade RPCs for 'download', 'activate', and 'commit'.
-       Added 'upgrade-log' attribute support.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-09-07 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Updated 'software-op-state' and 'upgrade-op-state' enum values.
-       Removed several unsupported attributes/containers/RPCs.
-       Added WCS and Module status containers/attributes.
-       Moved some common attributes into groupings.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  grouping software-device-status-group {
-    description
-      "Grouping for WCS and Module software status attributes.";
-    leaf boot-zone {
-      type boot-zone;
-      description
-        "The boot zone for the specified device.";
-    }
-    leaf last-restart {
-      type cienawstypes:string-maxl-32;
-      description
-        "The date and time of last restart in 'YYYY-MM-DD HH:MM:SS' format, or
-         empty string if unknown.";
-    }
-    leaf last-restart-reason {
-      type cienawstypes:restart-reason;
-      description
-        "Cause for the last restart.";
-    }
-    leaf boot-image-a {
-      type cienawstypes:string-maxl-64;
-      description
-        "The boot image or firmware image name for zone A.";
-    }
-    leaf boot-image-b {
-      type cienawstypes:string-maxl-64;
-      description
-        "The boot image or firmware image name for zone B.";
-    }
-  }
-
-  grouping software-release-group {
-    description
-      "Grouping for active and installed software release attributes.";
-    leaf version {
-      type cienawstypes:string-maxl-32;
-      description
-        "The software release version.";
-    }
-    leaf build-number {
-      type cienawstypes:string-maxl-32;
-      description
-        "The software release build number.";
-    }
-    leaf build-tag {
-      type cienawstypes:string-maxl-32;
-      description
-        "The software release build tag.";
-    }
-    leaf build-date {
-      type cienawstypes:string-maxl-32;
-      description
-        "The software release build date.";
-    }
-    leaf version-name {
-      type cienawstypes:string-maxl-64;
-      description
-        "The software release version name.";
-    }
-  }
-
-  typedef software-rtncode {
-    type uint32;
-    description
-      "Return code value used in the software module. 0 indicate success. A
-       non-zero value indicates failure.";
-  }
-
-  typedef software-check-status {
-    type enumeration {
-      enum pass {
-        description
-          "The validation check passed.";
-      }
-      enum fail {
-        description
-          "The validation check failed.";
-      }
-    }
-    description
-      "The pass/fail result of a validation check performed in one of the
-       software-check RPCs.";
-  }
-
-  typedef software-op-state {
-    type enumeration {
-      enum unknown {
-        description
-          "Software operational state is unknown.";
-      }
-      enum normal {
-        description
-          "Software operational state is normal.";
-      }
-      enum upgrade-in-progress {
-        description
-          "Software upgrade is in progress.";
-      }
-      enum automatic-upgrade-in-progress {
-        description
-          "Automatic software upgrade is in progress.";
-      }
-      enum restart-in-progress {
-        description
-          "System restart is in progress. WCS is initializing but not yet in
-           'boot-complete' state.";
-      }
-      enum module-restart-in-progress {
-        description
-          "One or more modules is initializing and has not yet reached run-mode
-           'run' state.";
-      }
-      enum application-failed {
-        description
-          "One or more required applications is not running.";
-      }
-    }
-    description
-      "Software operational state.";
-  }
-
-  typedef upgrade-op-state {
-    type enumeration {
-      enum unknown {
-        description
-          "Upgrade operational state is unknown.";
-      }
-      enum idle {
-        description
-          "Software upgrade is idle.";
-      }
-      enum download-in-progress {
-        description
-          "Software download is in progress.";
-      }
-      enum download-complete {
-        description
-          "Software download is complete.";
-      }
-      enum download-failed {
-        description
-          "Software download failed.";
-      }
-      enum activation-in-progress {
-        description
-          "Software activation is in progress.";
-      }
-      enum activation-complete {
-        description
-          "Software activation is complete.";
-      }
-      enum activation-failed {
-        description
-          "Software activation failed.";
-      }
-      enum installation-in-progress {
-        description
-          "Software installation is in progress.";
-      }
-      enum installation-failed {
-        description
-          "Software installation failed.";
-      }
-      enum commit-in-progress {
-        description
-          "Software commit is in progress.";
-      }
-      enum commit-failed {
-        description
-          "Software commit failed.";
-      }
-      enum cancel-in-progress {
-        description
-          "Software cancel operation is in progress.";
-      }
-      enum cancel-failed {
-        description
-          "Software cancel operation failed.";
-      }
-      enum delete-in-progress {
-        description
-          "Software delete operation is in progress.";
-      }
-      enum delete-failed {
-        description
-          "Software delete operation failed.";
-      }
-      enum automatic-upgrade-in-progress {
-        description
-          "Automatic software upgrade is in progress.";
-      }
-      enum automatic-upgrade-failed {
-        description
-          "Automatic software upgrade failed.";
-      }
-      enum module-cold-restart-required {
-        description
-          "A cold restart is required on one or more modules.";
-      }
-      enum license-check-failed {
-        description
-          "License check failed. Licensing alarms need to be cleared.";
-      }
-    }
-    description
-      "Software upgrade operational state.";
-  }
-
-  typedef boot-zone {
-    type enumeration {
-      enum unknown {
-        description
-          "Boot zone is unknown.";
-      }
-      enum a {
-        description
-          "Boot zone A.";
-      }
-      enum b {
-        description
-          "Boot zone B.";
-      }
-    }
-    description
-      "The boot zone type.";
-  }
-
-  grouping network-member-attribute-group {
-    description
-      "Common attributes of network member";
-    leaf network-id {
-      type uint8;
-      description
-        "The network-id.";
-    }
-    leaf site-id {
-      type uint8;
-      description
-        "The site-id.";
-    }
-    leaf group-id {
-      type uint8;
-      description
-        "The group-id.";
-    }
-    leaf member-name {
-      type cienawstypes:string-maxl-64;
-      description
-        "The member-name.";
-    }
-    leaf member-id {
-      type uint8;
-      description
-        "The member-id.";
-    }
-  }
-
-  container waveserver-software {
-    description
-      "Waveserver software upgrade and load management.";
-    container status {
-      config false;
-      description
-        "Waveserver software status information.";
-      leaf software-operational-state {
-        type software-op-state;
-        description
-          "The current software operational state.";
-      }
-      leaf upgrade-operational-state {
-        type upgrade-op-state;
-        description
-          "The current upgrade operational state.";
-      }
-      leaf committed-version {
-        type cienawstypes:string-maxl-64;
-        description
-          "The committed software release version.";
-      }
-      leaf active-version {
-        type cienawstypes:string-maxl-64;
-        description
-          "The active software release version.";
-      }
-      leaf upgrade-to-version {
-        type cienawstypes:string-maxl-64;
-        description
-          "The software release version currently being upgraded to, if
-           applicable.";
-      }
-      leaf last-operation {
-        type cienawstypes:string-maxl-128;
-        description
-          "The software upgrade last operation.";
-      }
-      leaf upgrade-log {
-        type cienawstypes:string-maxl-128;
-        description
-          "The software upgrade log file URI on the Waveserver.";
-      }
-    }
-    container wcs-status {
-      config false;
-      description
-        "Software status information for the Waveserver Control Subsystem
-         control module.";
-      leaf boot-image-version {
-        type cienawstypes:string-maxl-32;
-        description
-          "The current boot image version for the WCS.";
-      }
-      leaf fpga-id {
-        type cienawstypes:string-maxl-64;
-        description
-          "The current FPGA image identifier for the WCS.";
-      }
-      uses software-device-status-group;
-    }
-    container module-status {
-      config false;
-      description
-        "Module software status information.";
-      list module {
-        key "module-id";
-        description
-          "List containing module-specific software status information.";
-        leaf module-id {
-          type cienawstypes:name-string;
-          mandatory true;
-          description
-            "Unique access identifier string of the Module, which may just be
-             a slot number (e.g. '1'). Key value for the Module list.";
-        }
-        uses software-device-status-group;
-      }
-    }
-    container active {
-      config false;
-      description
-        "Waveserver active software information.";
-      uses software-release-group;
-    }
-    container installed {
-      config false;
-      description
-        "Waveserver installed software release information.";
-      list versions {
-        key "index";
-        description
-          "A list of installed software releases on this Waveserver.";
-        leaf index {
-          type uint8;
-          description
-            "Unique id, read-only attribute.";
-        }
-        uses software-release-group;
-      }
-    }
-    container network {
-      description
-        "Network upgrade status.";
-      container upgrade {
-        description
-          "Network upgrade.";
-        leaf auto-member-upgrade {
-          type boolean;
-          default "false";
-          description
-            "Auto-upgrade enabled for network.";
-        }
-        leaf upgrade-operational-state {
-          type upgrade-op-state;
-          config false;
-          description
-            "The current network upgrade operational state.";
-        }
-      }
-      list member-status {
-        key "network-id site-id group-id member-name";
-        config false;
-        description
-          "Network member software status.";
-        uses network-member-attribute-group;
-        leaf software-operational-state {
-          type software-op-state;
-          description
-            "The current software operational state.";
-        }
-        leaf upgrade-operational-state {
-          type upgrade-op-state;
-          description
-            "The current upgrade operational state.";
-        }
-        leaf committed-version {
-          type cienawstypes:string-maxl-64;
-          description
-            "The committed software release version.";
-        }
-        leaf active-version {
-          type cienawstypes:string-maxl-64;
-          description
-            "The active software release version.";
-        }
-        leaf upgrade-to-version {
-          type cienawstypes:string-maxl-64;
-          description
-            "The software release version currently being upgraded to, if
-             applicable.";
-        }
-        leaf last-operation {
-          type cienawstypes:string-maxl-128;
-          description
-            "The software upgrade last operation.";
-        }
-      }
-      list member-log {
-        key "network-id site-id group-id member-name";
-        config false;
-        description
-          "Network member log.";
-        uses network-member-attribute-group;
-        leaf upgrade-log-file {
-          type cienawstypes:string-maxl-128;
-          description
-            "The software upgrade log file URI on the Waveserver.";
-        }
-      }
-      list software-library {
-        key "network-id site-id group-id member-name";
-        config false;
-        description
-          "Network member software library.";
-        uses network-member-attribute-group;
-        container installed {
-          description
-            "Installed Version.";
-          list versions {
-            key "index";
-            description
-              "Network member installed version.";
-            leaf index {
-              type uint8;
-              description
-                "Unique id, read-only attribute.";
-            }
-            uses software-release-group;
-          }
-        }
-      }
-    }
-  }
-  rpc waveserver-software-install {
-    description
-      "Perform one-step software upgrade (download, activate, and commit) via
-       url string.";
-    input {
-      leaf url {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The URL specifying the remote location and package name to be installed.
-           Example format is 'scp://<uid>:<pwd>@<ip-address>/<path>/<filename>'.";
-      }
-      leaf group {
-        type boolean;
-        description
-          "Indicates that this RPC op is for the whole network group or for 
-           the local system only.";
-      }
-      leaf delete-from-load {
-        type boolean;
-        default "false";
-        description
-          "Optionally delete the 'from' load upon successful completion.";
-      }
-    }
-    output {
-      leaf return-code {
-        type software-rtncode;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-software-download {
-    description
-      "Download software load via url string.";
-    input {
-      leaf url {
-        type cienawstypes:string-maxl-254;
-        description
-          "The URL specifying the remote location and package name to be installed.
-           Example format is 'scp://<uid>:<pwd>@<ip-address>/<path>/<filename>'.
-           Optional for group download.";
-      }
-      leaf group {
-        type boolean;
-        description
-          "Indicates that this RPC op is for the whole network group or for 
-           the local system only.";
-      }
-    }
-    output {
-      leaf return-code {
-        type software-rtncode;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-software-activate {
-    description
-      "Perform software activate via version string.";
-    input {
-      leaf version {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "The load version string including the build number and tag (Ex: waveserver-1.5.0.281-GA).";
-      }
-      leaf group {
-        type boolean;
-        description
-          "Indicates that this RPC op is for the whole network group or for 
-           the local system only.";
-      }
-      leaf auto-commit {
-        type boolean;
-        default "false";
-        description
-          "Optionally specify that the software load be automatically committed
-           after activation.";
-      }
-      leaf delete-from-load {
-        type boolean;
-        default "false";
-        description
-          "Optionally delete the 'from' load upon successful completion.";
-      }
-    }
-    output {
-      leaf return-code {
-        type software-rtncode;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-software-delete {
-    description
-      "Perform software delete via version string.";
-    input {
-      leaf version {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "The load version string including the build number and tag (Ex: waveserver-1.5.0.281-GA).";
-      }
-      leaf group {
-        type boolean;
-        description
-          "Indicates that this RPC op is for the whole network group or for 
-           the local system only.";
-      }
-    }
-    output {
-      leaf return-code {
-        type software-rtncode;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-software-commit {
-    description
-      "Perform software commit operation in the current load has not been
-       committed and it is in boot completion state.";
-    input {
-      leaf delete-from-load {
-        type boolean;
-        default "false";
-        description
-          "Optionally delete the 'from' load upon successful completion.";
-      }
-      leaf group {
-        type boolean;
-        description
-          "Indicates that this RPC op is for the whole network group or for 
-           the local system only.";
-      }
-    }
-    output {
-      leaf return-code {
-        type software-rtncode;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-software-cancel {
-    description
-      "Cancel an existing software upgrade operation that is in a failed state.";
-    input {
-      leaf group {
-        type boolean;
-        description
-          "Indicates that this RPC op is for the whole network group or for 
-           the local system only.";
-      }
-    }
-    output {
-      leaf return-code {
-        type software-rtncode;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-software-clear-log {
-    description
-      "Clear the contents of the local software upgrade log file.";
-    output {
-      leaf return-code {
-        type software-rtncode;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-software-check-local {
-    description
-      "Perform software check of a local load version.";
-    input {
-      leaf version {
-        type cienawstypes:string-maxl-32;
-        mandatory true;
-        description
-          "The load version string including the build number and tag (Ex: waveserver-1.5.0.281-GA).";
-      }
-    }
-    output {
-      leaf version {
-        type cienawstypes:string-maxl-32;
-        description
-          "The software release version.";
-      }
-      leaf disk-space-check {
-        type software-check-status;
-        description
-          "The pass/fail result of the disk space check.";
-      }
-      leaf rpm-checksum-verification {
-        type software-check-status;
-        description
-          "The pass/fail result of the RPM checksum verification.";
-      }
-      leaf license-check {
-        type software-check-status;
-        description
-          "The pass/fail result of the base software license check.";
-      }
-      leaf overall-status {
-        type software-check-status;
-        description
-          "The the overall pass/fail result of the software check operation.";
-      }
-    }
-  }
-  rpc waveserver-software-check-remote {
-    description
-      "Perform software check of a remote candidate load url string.";
-    input {
-      leaf url {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The URL specifying the remote location and package name to be checked.
-           Example format is 'scp://<uid>:<pwd>@<ip-address>/<path>/<filename>'.";
-      }
-    }
-    output {
-      leaf version {
-        type cienawstypes:string-maxl-32;
-        description
-          "The software release version.";
-      }
-      leaf disk-space-check {
-        type software-check-status;
-        description
-          "The pass/fail result of the disk space check.";
-      }
-      leaf url-validation {
-        type software-check-status;
-        description
-          "The pass/fail result of the input URL validation.";
-      }
-      leaf license-check {
-        type software-check-status;
-        description
-          "The pass/fail result of the base software license check.";
-      }
-      leaf overall-status {
-        type software-check-status;
-        description
-          "The the overall pass/fail result of the software check operation.";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-system.yang b/models/ciena-waveserver-system.yang
deleted file mode 100644
index 4e442b32c5d9c9c874245187e1e0da0812b63cae..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-system.yang
+++ /dev/null
@@ -1,2338 +0,0 @@
-module ciena-waveserver-system {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-system";
-  prefix system;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's Waveserver System representation.";
-
-  revision 2019-06-04 {
-    description
-      "Add grouping: network-id-config-group.
-       Add container network under container id.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2019-03-07 {
-    description
-      "Added cluster-enrollment attribute to indicate of the enrollment  
-       status of the waveserver in the cluster. 
-       Groupify the module for inclusion into the ciena-waveserver-cluster module.
-       Added cluster-role attribute to define the role of the member node in 
-       cluster.
-       Added typedef: 'dhcp-state-enum'.
-       Added leafs: 'dhcp/interface-type','dhcp/dhcp-state',
-            'dhcp/discovery-interval','dhcp/requested-lease-time',
-            'dhcp/lease-time','dhcp/lease-remaining',
-            'dhcp/renewal-time','dhcp/renewal-remaining',
-            'dhcp/rebinding-time','dhcp/rebinding-remaining',
-            'dhcp/dhcp-server'.
-       Added 'options' sub-container to the 'client-config/dhcp' container.
-       Added leafs for DHCP client options.
-       Added 'waveserver-system-client-config-dhcp-lease-renew' RPC.
-       Added 'url' input parameter leaf in 'waveserver-system-state-dump' RPC.
-       Added 'list multicast-server' to container 'ntp'.
-       Changed 'dns/server/ip-address' type from 'ipv4-address' to 'ip-address'.
-       Added 'environment/diag' container.
-       Added new RPC call (waveserver-system-client-config-ntp-md5auth-import)
-             for NTP MD5 auth key import file.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-10-09 {
-    description
-      "Added typedef: 'ssh-key-type-enum', 'ssh-key-generation-status-enum', 
-            'ssh-public-key-user-status-enum', and
-            'ssh-public-key-user-account-error-status-enum'.
-       Added grouping: 'common-ocsp-group'.
-       Added container: 'ssl'.
-       Added containers: 'server-config/ssh/algorithms', 'server-config/ssh/key'.
-       Added container: 'server-config/https', 'server-config/grpc'.
-       Deprecated leaf: 'server-config/web-server-state, replaced with 'admin-state'
-            in https container.
-       Deprecated leaf: 'server-config/grpc-server-state, replaced with 'admin-state'
-            in grpc container.
-       Added leafs: 'client-config/ntp/autokey-authentication-state',
-            'client-config/ntp/autokey-certificate-present',
-            'client-config/ntp/autokey-type',
-            'client-config/ntp/autokey-signature-algorithm',
-            'client-config/ntp/autokey-valid-from',
-            'client-config/ntp/autokey-valid-to',
-            'client-config/ntp/server/autokey-authentication'.
-       Added RPCs: 'waveserver-system-https-server-rsa-activate-p12-file',
-            'waveserver-system-https-server-rsa-regenerate',
-            'waveserver-system-ssh-server-activate-host-key',
-            'waveserver-system-ssh-server-delete-key',
-            'waveserver-system-ssh-server-generate-key',
-            'waveserver-system-ssh-server-install-key',
-            'waveserver-system-ntp-generate-autokey'.
-       Added several leafs to the 'shell' container.
-       Added container: 'lamp-test'.
-       Updated 'environment/root/secret' to be writable (config true).
-       Added 'encryption-only' read-only leaf to the 'global-provisioning' container.
-       Obsolete leaf: 'global-provisioning/reset-to-factory-defaults',
-            not supported on Waveserver Ai.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-06-04 {
-    description
-      "Added ncx:password statements to password leafs.
-       Added 'dns' sub-container to the 'client-config' container.
-       Added 'waveserver-system-dns-resolve-ip' RPC.
-       Made 'file-name' input parameter mandatory in 'waveserver-system-state-dump' RPC.
-       Added 'reachable', 'authenticated', and 'server-condition' leafs to the ntp server list.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2018-01-04 {
-    description
-      "Changed site 'latitude' and 'longitude' precision from 5 to 6 digits.
-       Updated 'server-config' attribute permissions.
-       Added 'domain-name' container support.
-       Added 'server-config/ssh' container support.
-       Added 'client-config' container support with 'dhcp' and 'ntp' sub-containers.
-       Added 'shell' container for Waveserver CLI shell/session configuration attributes. 
-       Added 'secret' read-only attribute to the environment/root container.
-       Remove 'include-datapath' and 'include-optics' attributes from 'state-dump' command.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-06-30 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Added scp server support (from WS 1.5).
-       Remove bandplan, front-display, fcs-error-forwarding, low-power-mode as not supported 
-       on WS Ai R1.0.
-       Updated xftp-config/tftp 'dhcp-host-name' and 'current-host-name' to be config false.
-       Added 'default-settings' container with leafs to configure 'conditioning-type' 
-       and 'conditioning-holdoff' system defaults.
-       Added 'grpc-server-state' and 'scp-server-state' to server-config container.
-       Combined several boolean leafs in 'server-settings-group' into a single enum.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef cluster-role-enum {
-    type enumeration {
-      enum member {
-        description
-          "Member (which is default).";
-      }
-      enum primary {
-        description
-          "Primary manager.";
-      }
-    }
-    description
-      "Enumeration definition for cluster-role.";
-  }
-
-  typedef dhcp-state-enum {
-    type enumeration {
-      enum disabled {
-        description
-          "Disabled State.";
-      }
-      enum init {
-        description
-          "Initializing.";
-      }
-      enum selecting {
-        description
-          "Got answers. Selecting server to query.";
-      }
-      enum requesting {
-        description
-          "Send DHCPREQUEST. Goto BOUND when DHCPACK is received.";
-      }
-      enum bound {
-        description
-          "Got IP address from server. Waiting for LeaseTime to expire.";
-      }
-      enum renewing {
-        description
-          "Lease time T1 has expired. Trying to extend IP address lease.";
-      }
-      enum rebinding {
-        description
-          "Lease time T2 has expired. Trying to extend IP lease from any server.";
-      }
-      enum inform {
-        description
-          "Interface has an IP address. Inform the server of the IP number.";
-      }
-      enum rebooting {
-        description
-          "Rebooting.";
-      }
-    }
-    description
-      "DHCP state type.";
-  }
-
-  typedef ssh-key-type-enum {
-    type enumeration {
-      enum unknown {
-        description
-          "Unknown key.";
-      }
-      enum rsa2048 {
-        description
-          "RSA key with size of 2048 bits.";
-      }
-      enum rsa3072 {
-        description
-          "RSA key with size of 3072 bits.";
-      }
-      enum rsa4096 {
-        description
-          "RSA key with size of 4096 bits.";
-      }
-      enum ecdsa256 {
-        description
-          "ECDSA key with size of 256 bits.";
-      }
-      enum ecdsa384 {
-        description
-          "ECDSA key with size of 384 bits.";
-      }
-      enum ecdsa521 {
-        description
-          "ECDSA key with size of 521 bits.";
-      }
-    }
-    description
-      "Enum for SSH key type.";
-  }
-
-  typedef ssh-key-generation-status-enum {
-    type enumeration {
-      enum invalid {
-        value 0;
-        description
-          "Invalid result.";
-      }
-      enum generating {
-        value 1;
-        description
-          "The key is being generated.";
-      }
-      enum generated {
-        value 2;
-        description
-          "The key has been generated.";
-      }
-      enum failure {
-        value 3;
-        description
-          "The key generation failed.";
-      }
-    }
-    description
-      "The result of the SSH key generation.";
-  }
-
-  typedef ssh-public-key-user-status-enum {
-    type enumeration {
-      enum installed {
-        description
-          "The public key for the user has been installed.";
-      }
-      enum invalid {
-        description
-          "The public key for the user is invalid.";
-      }
-    }
-    description
-      "The status of the public key authentication for the user.";
-  }
-
-  typedef ssh-public-key-user-account-error-status-enum {
-    type enumeration {
-      enum none {
-        description
-          "No error.";
-      }
-      enum not-created {
-        description
-          "The user account is not created.";
-      }
-      enum no-password {
-        description
-          "The user account has no password.";
-      }
-      enum key-type-not-supported {
-        description
-          "The public key type for the user is not supported.";
-      }
-    }
-    description
-      "The error status for the user account that uses public key authentication.";
-  }
-
-  typedef line-protection-enum {
-    type enumeration {
-      enum unprotected {
-        value 0;
-        description
-          "Line protection is disabled.";
-      }
-      enum trunk-ops {
-        value 1;
-        description
-          "Line protection is enabled.";
-      }
-    }
-    description
-      "Enum for line protection options.";
-  }
-
-  grouping network-id-config-group {
-    description
-      "Grouping for Waveserver system network identification
-       attributes.";
-    leaf id {
-      type uint8 {
-        range "0..254";
-      }
-      description
-        "An integer to uniquely identify the sub-network domain in which this
-         Waveserver chassis is managed.";
-    }
-    leaf name {
-      type string {
-        length "0..32";
-      }
-      description
-        "A name for the sub-network domain.";
-    }
-    leaf description {
-      type string {
-        length "0..64";
-      }
-      description
-        "A description for the sub-network domain.";
-    }
-  }
-
-  grouping site-id-config-group {
-    description
-      "Grouping for Waveserver system site identification attributes.";
-    leaf id {
-      type uint16 {
-        range "0..65535";
-      }
-      description
-        "An integer to uniquely identify the site where this Waveserver is
-         located. This is used to help group Waveservers together with line
-         system equipment. All equipment in a common site should share the
-         same site identifier. ";
-    }
-    leaf name {
-      type string {
-        length "0..32";
-      }
-      description
-        "The name for the site where the Waveserver is located.";
-    }
-    leaf description {
-      type string {
-        length "0..64";
-      }
-      description
-        "The site description";
-    }
-    leaf latitude {
-      type decimal64 {
-        fraction-digits 6;
-        range "-90.0 .. 90.0";
-      }
-      description
-        "Geographic coordinate for the site location in degrees.";
-    }
-    leaf longitude {
-      type decimal64 {
-        fraction-digits 6;
-        range "-180.0 .. 180.0";
-      }
-      description
-        "Geographic coordinate for the site location in degrees.";
-    }
-    leaf address {
-      type string {
-        length "0..128";
-      }
-      description
-        "The street address of the site.";
-    }
-  }
-
-  grouping group-id-config-group {
-    description
-      "Grouping for Waveserver system group (or cluster) identification
-       attributes.";
-    leaf id {
-      type uint8 {
-        range "0..99";
-      }
-      description
-        "An integer to uniquely identify a group of Waveservers within a
-         site.";
-    }
-    leaf name {
-      type string {
-        length "0..32";
-      }
-      description
-        "A name for the group of Waveservers.";
-    }
-    leaf description {
-      type string {
-        length "0..64";
-      }
-      description
-        "A description for the group of Waveservers. ";
-    }
-  }
-
-  grouping xftp-config-group {
-    description
-      "Grouping for Waveserver system XFTP configuration attributes.";
-    leaf mode {
-      type enumeration {
-        enum none {
-          value 0;
-          description
-            "No FTP mode is specified.";
-        }
-        enum tftp {
-          value 1;
-          description
-            "Trivial File Transfer Protocol (TFTP) mode.";
-        }
-        enum ftp {
-          value 2;
-          description
-            "File Transfer Protocol (FTP) mode.";
-        }
-        enum sftp {
-          value 3;
-          description
-            "Secure File Transfer Protocol (SFTP) mode.";
-        }
-        enum scp {
-          value 4;
-          description
-            "Secure Copy Protocol (SCP) mode.";
-        }
-      }
-      description
-        "Identifies which file transfer protocol to user when default-server
-         is specified in a command - FTP, SFTP, TFTP or SCP.";
-    }
-    container tftp {
-      description
-        "Waveserver system TFTP configuration.";
-      leaf config-host-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "TFTP host name configured by user. Format is an IP address (with
-           optional port) or host name.";
-      }
-      leaf dhcp-host-name {
-        type cienawstypes:string-maxl-64;
-        config false;
-        description
-          "TFTP DHCP host name.";
-      }
-      leaf current-host-name {
-        type cienawstypes:string-maxl-64;
-        config false;
-        description
-          "TFTP current host name.";
-      }
-    }
-    container ftp {
-      description
-        "Waveserver system FTP configuration.";
-      leaf host-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "FTP host name. Format is an IP address (with optional port) or
-           host name.";
-      }
-      leaf user-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "FTP user name.";
-      }
-      leaf password {
-        type cienawstypes:string-maxl-128;
-        description
-          "FTP password string.";
-        ncx:password;
-      }
-      leaf secret {
-        type cienawstypes:string-maxl-256;
-        description
-          "FTP secret string.";
-      }
-    }
-    container sftp {
-      description
-        "Waveserver system SFTP configuration.";
-      leaf host-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "SFTP host name. Format is an IP address (with optional port) or
-           host name.";
-      }
-      leaf user-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "SFTP user name.";
-      }
-      leaf password {
-        type cienawstypes:string-maxl-128;
-        description
-          "SFTP password string.";
-        ncx:password;
-      }
-      leaf secret {
-        type cienawstypes:string-maxl-256;
-        description
-          "SFTP secret string.";
-      }
-    }
-    container scp {
-      description
-        "Waveserver system SCP configuration.";
-      leaf host-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "SCP host name. Format is an IP address (with optional port) or
-           host name.";
-      }
-      leaf user-name {
-        type cienawstypes:string-maxl-32;
-        description
-          "SCP user name.";
-      }
-      leaf password {
-        type cienawstypes:string-maxl-128;
-        description
-          "SCP password string.";
-        ncx:password;
-      }
-      leaf secret {
-        type cienawstypes:string-maxl-256;
-        description
-          "SCP secret string.";
-      }
-    }
-  }
-
-  grouping time-config-attributes {
-    description
-      "Grouping definition for Waveserver System time configuration attributes.";
-    leaf date {
-      type string {
-        length "1..11";
-        pattern '\d{4}-\d{2}-\d{2}|\d{2}-\d{2}-\d{2}|\d{2}-\d{2}';
-      }
-      description
-        "Date: must be in format: yyyy-mm-dd, or yy-mm-dd, or mm-dd.";
-    }
-    leaf time {
-      type string {
-        length "1..9";
-        pattern '\d{2}:\d{2}:\d{2}|\d{2}:\d{2}';
-      }
-      description
-        "Time: must be in format: hh:mm:ss";
-    }
-    leaf time-offset {
-      type decimal64 {
-        fraction-digits 2;
-        range "-43200.0 .. 50400.0";
-      }
-      description
-        "System time-offset from UTC in seconds.";
-    }
-    leaf time-stamp {
-      type enumeration {
-        enum utc {
-          description
-            "Timestamp is indicated in Coordinated Universal Time (UTC) format.";
-        }
-        enum local {
-          description
-            "Timestamp is indicated in local time format.";
-        }
-      }
-      description
-        "System time stamp format: local time or UTC time.";
-    }
-    leaf local-date-time {
-      type string {
-        length "1..41";
-      }
-      config false;
-      description
-        "Local date and time Time";
-    }
-    leaf coordinated-universal-time {
-      type string {
-        length "1..41";
-      }
-      config false;
-      description
-        "UTC date and time Time";
-    }
-    leaf system-uptime {
-      type string {
-        length "1..17";
-      }
-      config false;
-      description
-        "Time since last reboot, in format: xxxd xxh xxm xxs";
-    }
-  }
-
-  grouping server-settings-group {
-    description
-      "Grouping for common server settings attributes used in various RPCs.";
-    leaf server-to-use {
-      type enumeration {
-        enum none {
-          description
-            "Don't specify a remote server for the file transfer.";
-        }
-        enum default-server {
-          description
-            "Use the default server for the file transfer.";
-        }
-        enum default-tftp-server {
-          description
-            "Use the default TFTP server for the file transfer.";
-        }
-        enum default-ftp-server {
-          description
-            "Use the default FTP server for the file transfer.";
-        }
-        enum default-sftp-server {
-          description
-            "Use the default SFTP server for the file transfer.";
-        }
-        enum default-scp-server {
-          description
-            "Use the default SCP server for the file transfer.";
-        }
-        enum specified-tftp-server {
-          description
-            "Use the user-specified TFTP server for the file transfer.
-             A tftp-server value must also be specified in the request.";
-        }
-        enum specified-ftp-server {
-          description
-            "Use the user-specified FTP server for the file transfer.
-             An ftp-server value must also be specified in the request.";
-        }
-        enum specified-sftp-server {
-          description
-            "Use the user-specified SFTP server for the file transfer.
-             An sftp-server value must also be specified in the request.";
-        }
-        enum specified-scp-server {
-          description
-            "Use the user-specified SCP server for the file transfer.
-             A scp-server value must also be specified in the request.";
-        }
-      }
-      description
-        "If server-to-use is specified with a value other than 'none; in the
-         RPC request, then the system will use the specified server for the
-         file transfer.";
-    }
-    leaf tftp-server-address {
-      type cienawstypes:string-maxl-64;
-      description
-        "The TFTP server IP address to use for the file transfer if
-         server-to-use is 'specified-tftp-server'. Otherwise this attribute
-         is ignored.";
-    }
-    leaf ftp-server-address {
-      type cienawstypes:string-maxl-64;
-      description
-        "The FTP server IP address to use for the file transfer if
-         server-to-use is 'specified-ftp-server'. Otherwise this attribute
-         is ignored.";
-    }
-    leaf ftp-login-id {
-      type cienawstypes:string-maxl-32;
-      description
-        "The FTP username.";
-    }
-    leaf ftp-password {
-      type cienawstypes:string-maxl-128;
-      description
-        "The FTP password.";
-    }
-    leaf ftp-secret {
-      type cienawstypes:string-maxl-256;
-      description
-        "The FTP secret(pre-encrypted) string.";
-    }
-    leaf sftp-server-address {
-      type cienawstypes:string-maxl-64;
-      description
-        "The SFTP server IP address to use for the file transfer if
-         server-to-use is 'specified-sftp-server'. Otherwise this attribute
-         is ignored.";
-    }
-    leaf sftp-login-id {
-      type cienawstypes:string-maxl-32;
-      description
-        "The SFTP login ID.";
-    }
-    leaf sftp-password {
-      type cienawstypes:string-maxl-128;
-      description
-        "The SFTP password.";
-    }
-    leaf sftp-secret {
-      type cienawstypes:string-maxl-256;
-      description
-        "The SFTP secret(pre-encrypted) string.";
-    }
-    leaf scp-server-address {
-      type cienawstypes:string-maxl-64;
-      description
-        "The SCP server IP address to use for the file transfer if
-         server-to-use is 'specified-scp-server'. Otherwise this attribute
-         is ignored.";
-    }
-    leaf scp-login-id {
-      type cienawstypes:string-maxl-32;
-      description
-        "The SCP login ID.";
-    }
-    leaf scp-password {
-      type cienawstypes:string-maxl-128;
-      description
-        "The SCP password.";
-    }
-    leaf scp-secret {
-      type cienawstypes:string-maxl-256;
-      description
-        "The SCP secret(pre-encrypted) string.";
-    }
-  }
-
-  grouping common-ocsp-group {
-    description
-      "Grouping of common attributes for Online Certificate Status
-       Protocol (OCSP) configuration.";
-    leaf admin-state {
-      type cienawstypes:enabled-disabled-enum;
-      description
-        "Whether OCSP verification is enabled or disabled.";
-    }
-    leaf responder-preference {
-      type enumeration {
-        enum aia {
-          description
-            "Responder in Authority Information Access(AIA) extension is 
-             used first.";
-        }
-        enum default-responder {
-          description
-            "The default responder is used first.";
-        }
-      }
-      description
-        "If 'responder-preference' is set to aia, the OCSP responder 
-         referred in client certificate AIA extension will be used first
-         during OCSP certificate validation. 
-         If it is set to 'default-responder', the configured default 
-         OCSP responder is used first.";
-    }
-    leaf default-responder {
-      type cienawstypes:string-maxl-128;
-      description
-        "Default OCSP responder. It should be in URL format.
-         e.g. https://192.168.20.2:2440. If the 'responder-preference'
-         is not set to 'default-responder', the URL given will be used 
-         only if no responder URL (AIA extension) is specified in the 
-         client certificate being verified.";
-    }
-    leaf nonce {
-      type cienawstypes:on-off-enum;
-      description
-        "Determine whether queries to OCSP responders should contain a 
-         nonce or not. By default nonce option is turned on.";
-    }
-  }
-
-  grouping waveserver-system-group {
-    description
-      "Waveserver System configuration data and operational data.";
-    container id {
-      description
-        "Waveserver system identification attributes.";
-      container network {
-        description
-          "Waveserver system network attributes.";
-        uses network-id-config-group;
-      }
-      container site {
-        description
-          "Waveserver system site attributes.";
-        uses site-id-config-group;
-      }
-      container group {
-        description
-          "Waveserver system group attributes.";
-        uses group-id-config-group;
-      }
-      container member {
-        description
-          "Waveserver system member attributes.";
-        leaf id {
-          type uint8 {
-            range "0..254";
-          }
-          description
-            "An integer to uniquely identify a Waveserver chassis within a
-             group of Waveservers.";
-        }
-        leaf name {
-          type string {
-            length "0..64";
-          }
-          description
-            "A name for the Waveserver chassis. Set to the host name by default.";
-        }
-        leaf description {
-          type string {
-            length "0..64";
-          }
-          description
-            "A description for the Waveserver chassis.";
-        }
-        leaf frame-identification {
-          type string {
-            length "0..128";
-          }
-          description
-            "A description to identify the location of the Waveserver chassis
-             within the data center. For example, the building, floor, aisle,
-             frame number, etc.";
-        }
-        leaf rack-unit-number {
-          type uint8 {
-            range "0..50";
-          }
-          description
-            "A logical identifier for the location of the Waveserver within the
-             frame or rack. For example, the device at the top could be labeled
-             unit 1.";
-        }
-        leaf cluster-role {
-          type cluster-role-enum;
-          config false;
-          description
-            "Attribute indicating the role of this node in the cluster. Default
-             value is member.";
-        }
-        leaf cluster-enrollment {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Attribute indicating if the waveserver member is enrolled into culster.";
-        }
-      }
-    }
-    container host-name {
-      description
-        "Waveserver system host name attributes.";
-      leaf current-host-name {
-        type cienawstypes:string-maxl-64;
-        config false;
-        description
-          "Current host name.";
-      }
-      leaf config-host-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "User configured host name.";
-      }
-      leaf dhcp-host-name {
-        type cienawstypes:string-maxl-64;
-        config false;
-        description
-          "DHCP configured host name.";
-      }
-    }
-    container domain-name {
-      description
-        "Waveserver system domain name attributes.";
-      leaf current-domain-name {
-        type cienawstypes:string-maxl-64;
-        config false;
-        description
-          "Current domain name. This will either be the DHCP-assigned domain
-           name, or the user-configured value, respectively.";
-      }
-      leaf config-domain-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "User configured domain name.";
-      }
-      leaf dhcp-domain-name {
-        type cienawstypes:string-maxl-64;
-        config false;
-        description
-          "DHCP configured domain name, if assigned. DHCP Client must be
-           enabled with Option 15 support in order to obtain a domain name
-           from the server.";
-      }
-    }
-    container time-config {
-      description
-        "Waveserver system time configuration attributes.";
-      uses time-config-attributes;
-    }
-    container server-config {
-      description
-        "Waveserver system server configuration attributes.";
-      leaf sftp-server-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Indicate whether SFTP server is enabled.";
-      }
-      leaf scp-server-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Indicate whether SCP server is enabled.";
-      }
-      leaf web-server-state {
-        type cienawstypes:enabled-disabled-enum;
-        status deprecated;
-        description
-          "Indicate whether web server is enabled, HTTPS only. 
-           This leaf is deprecated, replaced by admin-state in https container.";
-      }
-      leaf netconf-server-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Indicate whether NETCONF server is enabled.";
-      }
-      leaf restconf-server-state {
-        type cienawstypes:enabled-disabled-enum;
-        config false;
-        description
-          "Indicate whether RESTCONF server is enabled, HTTPS only.";
-      }
-      leaf grpc-server-state {
-        type cienawstypes:enabled-disabled-enum;
-        status deprecated;
-        description
-          "Indicate whether gRPC server is enabled.
-           This leaf is deprecated, replaced by admin-state in grpc container.";
-      }
-      container https {
-        description
-          "HTTPS server configuration.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "HTTPS server administrative state.";
-        }
-        leaf web-ui-file-transfer-admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Web Ui File Transfer administrative state.";
-        }
-        leaf inactivity-timeout {
-          type uint16 {
-            range "10|20|30";
-          }
-          units "minutes";
-          description
-            "HTTPS inactivity timeout period, in minutes.";
-        }
-        container certificate-verification {
-          description
-            "The HTTPS server configuration data for client certificate 
-             verification through mutual authentication and Online Certificate 
-             Status Protocol(OCSP).";
-          leaf certificate-name {
-            type cienawstypes:string-maxl-32;
-            description
-              "The certificate name used by the HTTPS server.";
-          }
-          leaf trusted-dns {
-            type string {
-              length "0..255";
-            }
-            description
-              "Trusted DNS name used to check peer's certificate The name
-               should be fully qualified whenever possible, and can accept a
-               leading wildcard period.";
-          }
-          container mutual-authentication {
-            description
-              "HTTPS server mutual authentication configuration data.";
-            leaf admin-state {
-              type cienawstypes:enabled-disabled-enum;
-              description
-                "Whether apache HTTPS server mutual authentication verification 
-                 is enabled or disabled.";
-            }
-          }
-          container ocsp {
-            description
-              "HTTPS server configuration data for OCSP verification.";
-            uses common-ocsp-group;
-          }
-        }
-      }
-      container grpc {
-        description
-          "gRPC server configuration.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "gRPC server administrative state.";
-        }
-        leaf mutual-authentication-state {
-          type enumeration {
-            enum one-way {
-              value 0;
-              description
-                "gRPC mutual authentication is disabled.";
-            }
-            enum mutual {
-              value 1;
-              description
-                "gRPC server mutual authentication is enabled.";
-            }
-          }
-          description
-            "Whether gRPC server mutual authentication verification is 
-             enabled or disabled. Note: Modifying mutual authentication state will 
-             trigger a gRPC server restart";
-        }
-      }
-      container ssh {
-        description
-          "SSH server configuration.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          config false;
-          description
-            "SSH server administrative state. Currently a read-only attribute.
-             SSH server is enabled by default and cannot be explicitly disabled.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "SSH server operational state.";
-        }
-        leaf authentication-retries {
-          type uint8 {
-            range "1..3";
-          }
-          description
-            "Number of authentication retries allowed before the SSH connection
-             is dropped.";
-        }
-        leaf listener-port {
-          type uint16 {
-            range "22..65535";
-          }
-          description
-            "Configured SSH listener port. Default is port 22.";
-        }
-        leaf session-limit {
-          type uint16;
-          config false;
-          description
-            "SSH session limit. Read-only attribute.";
-        }
-        list allowed-clients {
-          key "ip-address";
-          max-elements 100;
-          description
-            "List of allowed client IP addresses.";
-          leaf ip-address {
-            type cienawstypes:string-maxl-64;
-            description
-              "IP address for allowed SSH clients. When the list is not empty, 
-               only the clients in the list can login to the SSH server.";
-          }
-        }
-        container algorithms {
-          description
-            "Waveserver SSH algorithm lists.";
-          list key-exchange {
-            key "algorithm-name";
-            ncx:user-write "update";
-            description
-              "List of SSH key exchange algorithms. 
-               The algorithm names are system assigned.";
-            leaf algorithm-name {
-              type cienawstypes:string-maxl-64;
-              description
-                "The SSH key exchange algorithm name.";
-            }
-            leaf admin-state {
-              type cienawstypes:enabled-disabled-enum;
-              description
-                "SSH key exchange algorithm administrative state.";
-            }
-          }
-          list encryption {
-            key "algorithm-name";
-            ncx:user-write "update";
-            description
-              "List of SSH encryption algorithms. 
-               The algorithm names are system assigned.";
-            leaf algorithm-name {
-              type cienawstypes:string-maxl-64;
-              description
-                "The SSH encryption algorithm name.";
-            }
-            leaf admin-state {
-              type cienawstypes:enabled-disabled-enum;
-              description
-                "SSH encryption algorithm administrative state.";
-            }
-          }
-          list message-authentication-code {
-            key "algorithm-name";
-            ncx:user-write "update";
-            description
-              "List of SSH message authentication code algorithms. 
-               The algorithm names are system assigned.";
-            leaf algorithm-name {
-              type cienawstypes:string-maxl-64;
-              description
-                "The SSH message authentication code algorithm name.";
-            }
-            leaf admin-state {
-              type cienawstypes:enabled-disabled-enum;
-              description
-                "SSH message authentication code algorithm administrative state.";
-            }
-          }
-          list public-key-authentication {
-            key "algorithm-name";
-            ncx:user-write "update";
-            description
-              "List of SSH public key authentication algorithms. 
-               The algorithm names are system assigned.";
-            leaf algorithm-name {
-              type cienawstypes:string-maxl-64;
-              description
-                "The SSH public key authentication algorithm name.";
-            }
-            leaf admin-state {
-              type cienawstypes:enabled-disabled-enum;
-              description
-                "SSH public key authentication algorithm administrative state.";
-            }
-          }
-        }
-        container key {
-          config false;
-          description
-            "SSH key configuration status data. SSH keys serve as a means of 
-             identifying user to an SSH server using public-key cryptography 
-             and challenge-response authentication.";
-          leaf type {
-            type ssh-key-type-enum;
-            description
-              "SSH configured key type.";
-          }
-          leaf status {
-            type ssh-key-generation-status-enum;
-            description
-              "SSH key generation status.";
-          }
-          container fingerprint {
-            description
-              "SSH key fingerprint data.";
-            leaf type {
-              type cienawstypes:string-maxl-16;
-              description
-                "SSH key fingerpint type.";
-            }
-            leaf value {
-              type cienawstypes:string-maxl-64;
-              description
-                "SSH key fingerprint value.";
-            }
-          }
-          list public-key-authentication-users {
-            key "user-name";
-            description
-              "List of users that use SSH public key authentication.";
-            leaf user-name {
-              type cienawstypes:string-maxl-64;
-              description
-                "The user name who uses SSH public key authentication.";
-            }
-            leaf key-type {
-              type ssh-key-type-enum;
-              description
-                "SSH configured key type.";
-            }
-            leaf key-status {
-              type ssh-public-key-user-status-enum;
-              description
-                "SSH public key status for the user.";
-            }
-            leaf user-key-error-status {
-              type ssh-public-key-user-account-error-status-enum;
-              description
-                "SSH public key error status for the user.";
-            }
-          }
-        }
-      }
-    }
-    container client-config {
-      description
-        "Waveserver client configuration attributes.";
-      container dhcp {
-        description
-          "Waveserver DHCP client configuration attributes.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "DHCP client administrative atate";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "DHCP client operational state.";
-        }
-        leaf interface-type {
-          type enumeration {
-            enum remote {
-              value 0;
-              description
-                "Remote.";
-            }
-            enum active {
-              value 1;
-              description
-                "Active.";
-            }
-          }
-          description
-            "DHCP client interface type.";
-        }
-        leaf dhcp-state {
-          type dhcp-state-enum;
-          config false;
-          description
-            "DHCP state.";
-        }
-        leaf discovery-interval {
-          type uint32 {
-            range "1..60";
-          }
-          units "seconds";
-          description
-            "DHCP client discovery interval in seconds.";
-        }
-        leaf requested-lease-time {
-          type uint32 {
-            range "45..max";
-          }
-          units "seconds";
-          description
-            "DHCP client requested lease time in seconds.";
-        }
-        leaf lease-time {
-          type uint32;
-          units "seconds";
-          config false;
-          description
-            "DHCP client lease time in seconds";
-        }
-        leaf lease-remaining {
-          type uint32;
-          units "seconds";
-          config false;
-          description
-            "DHCP client lease time remaning in seconds.";
-        }
-        leaf renewal-time {
-          type uint32;
-          units "seconds";
-          config false;
-          description
-            "DHCP client renewal time (T1) in seconds.";
-        }
-        leaf renewal-remaining {
-          type uint32;
-          units "seconds";
-          config false;
-          description
-            "DHCP client remaining renewal time (T1) in seconds.";
-        }
-        leaf rebinding-time {
-          type uint32;
-          units "seconds";
-          config false;
-          description
-            "DHCP client rebinding time (T2) in seconds.";
-        }
-        leaf rebinding-remaining {
-          type uint32;
-          units "seconds";
-          config false;
-          description
-            "DHCP client remaining rebinding time (T2) in seconds.";
-        }
-        leaf dhcp-server {
-          type cienawstypes:ipv4-address;
-          config false;
-          description
-            "DHCP server ipv4 address.";
-        }
-        container options {
-          description
-            "DHCP Options. A list of the enabled/requested options configured on the DHCP client.";
-          reference "RFC-2132 - DHCP Options and BOOTP Vendor Extensions";
-          leaf subnet-mask {
-            type boolean;
-            description
-              "DHCP Option 1 - Subnet Mask.";
-          }
-          leaf time-offset {
-            type boolean;
-            description
-              "DHCP Option 2 - Time Offset.";
-          }
-          leaf router {
-            type boolean;
-            description
-              "DHCP Option 3 - Router.";
-          }
-          leaf domain-server {
-            type boolean;
-            description
-              "DHCP Option 6 - Domain Name Server.";
-          }
-          leaf log-server {
-            type boolean;
-            description
-              "DHCP Option 7 - Log Server.";
-          }
-          leaf host-name {
-            type boolean;
-            description
-              "DHCP Option 12 - Host Name.";
-          }
-          leaf domain-name {
-            type boolean;
-            description
-              "DHCP Option 15 - Domain Name.";
-          }
-          leaf ntp-servers {
-            type boolean;
-            description
-              "DHCP Option 42 - Network Time Protocol Servers.";
-          }
-          leaf lease-time {
-            type boolean;
-            description
-              "DHCP Option 51 - Lease Time.";
-          }
-          leaf tftp-server-name {
-            type boolean;
-            description
-              "DHCP Option 66 - TFTP Server Name.";
-          }
-          leaf bootfile-name {
-            type boolean;
-            description
-              "DHCP Option 67 - Bootfile Name.";
-          }
-        }
-      }
-      container ntp {
-        description
-          "Waveserver NTP client configuration attributes.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "NTP client administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "NTP client operational state.";
-        }
-        leaf authentication-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "NTP client authentication state. When enabled, only MD5 
-             authenticated packets will be used to synchronize the time.";
-        }
-        leaf autokey-authentication-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "NTP client autokey authentication state. A RSA host key and an X509 
-             certificate (RSA-SHA1) will be created (if not exist) and saved. The 
-             host key and certificate will be loaded to NTP daemon only if the 
-             NTP autokey is enabled on Waveserver";
-        }
-        leaf autokey-certificate-present {
-          type boolean;
-          config false;
-          description
-            "The status of the autokey authentication certificate, indicating
-             whether the certificate is present.";
-        }
-        leaf autokey-type {
-          type cienawstypes:string-maxl-64;
-          config false;
-          description
-            "The NTP autokey type.";
-        }
-        leaf autokey-signature-algorithm {
-          type cienawstypes:string-maxl-64;
-          config false;
-          description
-            "Algorithm used by the CA to sign the NTP autokey certificate.";
-        }
-        leaf autokey-valid-from {
-          type cienawstypes:string-maxl-64;
-          config false;
-          description
-            "The date that the certificate is valid from and the passed validity time.";
-        }
-        leaf autokey-valid-to {
-          type cienawstypes:string-maxl-64;
-          config false;
-          description
-            "The date that the certificate is valid to and the remaining time.";
-        }
-        leaf mode {
-          type enumeration {
-            enum polling {
-              description
-                "NTP client is in polling mode.";
-            }
-            enum broadcast {
-              description
-                "NTP client is in broadcast mode.";
-            }
-            enum multicast {
-              description
-                "NTP client is in multicast mode.";
-            }
-          }
-          description
-            "NTP client mode.";
-        }
-        leaf polling-interval {
-          type uint32 {
-            range "16|32|64|128|256|512|1024|2048|4096|8192|16384|32768|65536";
-          }
-          units "seconds";
-          description
-            "The NTP client polling interval, in seconds. Applicable only when
-             NTP client mode is set to 'polling'. This is a global setting that
-             applies to all configured NTP peer servers.";
-        }
-        leaf delay {
-          type cienawstypes:decimal-3-dig;
-          units "ms";
-          config false;
-          description
-            "Round trip delay to the active NTP peer, in milliseconds.";
-        }
-        leaf offset {
-          type cienawstypes:decimal-3-dig;
-          units "ms";
-          config false;
-          description
-            "The time offset between the NTP client and server, in milliseconds.";
-        }
-        leaf jitter {
-          type cienawstypes:decimal-3-dig;
-          units "ms";
-          config false;
-          description
-            "The mean deviation/dispersion of multiple time samples from the
-             active NTP peer, in milliseconds.";
-        }
-        leaf synchronized {
-          type boolean;
-          config false;
-          description
-            "Specifies whether NTP client has synchronized the system time
-             with a remote peer server.";
-        }
-        list ntp-key {
-          key "key-id";
-          max-elements 32;
-          description
-            "List of NTP authentication keys.";
-          leaf key-id {
-            type uint16;
-            mandatory true;
-            description
-              "Unique index value for the NTP authentication key.";
-          }
-          leaf key-type {
-            type enumeration {
-              enum MD5 {
-                description
-                  "Authentication key uses MD5 encryption.";
-              }
-            }
-            config false;
-            description
-              "Encryption type used for the NTP authentication key.";
-          }
-          leaf key-value {
-            type string {
-              length "2..31";
-            }
-            description
-              "NTP authentication key value.";
-          }
-        }
-        list server {
-          key "address";
-          max-elements 10;
-          description
-            "List of NTP servers to use for time synchronization.";
-          leaf address {
-            type cienawstypes:ipaddr-or-hostname;
-            mandatory true;
-            description
-              "Configured IP address or Domain Name of the remote NTP server.";
-          }
-          leaf ip-address {
-            type cienawstypes:string-maxl-64;
-            config false;
-            description
-              "Operational IP address associated with the remote NTP server, 
-               if configured/available, or 'Unresolved' otherwise.";
-          }
-          leaf autokey-authentication {
-            type cienawstypes:enabled-disabled-enum;
-            description
-              "Whether autokey authentication method is enabled for the server.
-               The 'enabled' state will only be effective when the 
-               'ntp/authentication-state' is 'enabled'.";
-          }
-          leaf admin-state {
-            type cienawstypes:enabled-disabled-enum;
-            description
-              "NTP remote server administrative state.";
-          }
-          leaf operational-state {
-            type cienawstypes:up-down-enum;
-            config false;
-            description
-              "NTP remote server operational state.";
-          }
-          leaf key-id {
-            type leafref {
-              path "../../ntp-key/key-id";
-            }
-            description
-              "Leafref to 'ntp-key' list 'key-id' values.";
-          }
-          leaf reachable {
-            type boolean;
-            config false;
-            description
-              "Indicates whether the NTP remote server is reachable or not.";
-          }
-          leaf authenticated {
-            type boolean;
-            config false;
-            description
-              "Indicates whether the last message received from the peer has
-               been correctly authenticated. If authentication is not enabled,
-               or the server is unreachable, this will be false.";
-          }
-          leaf server-condition {
-            type enumeration {
-              enum rejected {
-                value 0;
-                description
-                  "Peer rejected.";
-              }
-              enum passed-sanity-checks {
-                value 1;
-                description
-                  "Peer passed sanity checks.";
-              }
-              enum passed-correctness-checks {
-                value 2;
-                description
-                  "Peer passed correctness checks.";
-              }
-              enum passed-candidate-checks {
-                value 3;
-                description
-                  "Peer passed candidate checks.";
-              }
-              enum passed-outlyer-checks {
-                value 4;
-                description
-                  "Peer passed outlyer checks.";
-              }
-              enum selected-distance-exceeded {
-                value 5;
-                description
-                  "Current selected synchronization source; max distance exceeded.";
-              }
-              enum selected-distance-okay {
-                value 6;
-                description
-                  "Current selected synchronization source; max distance okay.";
-              }
-              enum pps-peer {
-                value 7;
-                description
-                  "Current selected pulse-per-second (PPS) source.";
-              }
-              enum reaching {
-                value 254;
-                description
-                  "Peer in reaching/syncing state.";
-              }
-              enum error {
-                value 255;
-                description
-                  "An error occurred with this peer.";
-              }
-            }
-            config false;
-            description
-              "NTP remote server peer selection condition.";
-            reference "RFC 1305 - Network Time Protocol.";
-          }
-          leaf offset {
-            type cienawstypes:decimal-3-dig;
-            units "ms";
-            config false;
-            description
-              "Estimated current time offset between the NTP client and server,
-               in milliseconds.";
-          }
-        }
-        list multicast-server {
-          key "ip-address";
-          max-elements 10;
-          description
-            "List of NTP multicast servers to use for time synchronization.";
-          leaf ip-address {
-            type cienawstypes:ipv6-address;
-            description
-              "Configured IPv6 address for NTP Multicast server.";
-          }
-        }
-      }
-      container dns {
-        description
-          "Waveserver DNS client configuration attributes.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "DNS client administrative state.";
-        }
-        leaf operational-state {
-          type cienawstypes:up-down-enum;
-          config false;
-          description
-            "DNS client operational state.";
-        }
-        list server {
-          key "ip-address";
-          max-elements 5;
-          description
-            "List of DNS servers to use for domain name resolution. DNS servers
-             can be manually created by the user, or dynamically created by via
-             DHCP. Waveserver supports up to 3 manually provisioned DNS servers
-             and up to 2 DHCP-assigned servers.";
-          leaf ip-address {
-            type cienawstypes:ip-address;
-            description
-              "IP address associated with the remote DNS server.";
-          }
-          leaf admin-state {
-            type cienawstypes:enabled-disabled-enum;
-            description
-              "DNS remote server administrative state.";
-          }
-          leaf operational-state {
-            type cienawstypes:up-down-enum;
-            config false;
-            description
-              "DNS remote server operational state.";
-          }
-          leaf source {
-            type enumeration {
-              enum user {
-                value 1;
-                description
-                  "The server was manually configured by the user.";
-              }
-              enum dhcp {
-                value 2;
-                description
-                  "The server was automatically configured via DHCP.";
-              }
-              enum both {
-                value 4;
-                description
-                  "The server was configured by both DHCP and user.";
-              }
-            }
-            config false;
-            description
-              "Specifies whether the server configuration data was originated
-               by the user, or auto-created via DHCP, or both.";
-          }
-          leaf user-priority {
-            type uint8 {
-              range "1..3";
-            }
-            description
-              "User-assigned DNS server priority. Only applicable when server
-               source is 'user' or 'both'. Ignored otherwise.";
-          }
-          leaf dhcp-priority {
-            type uint8;
-            config false;
-            description
-              "DHCP-assigned DNS server priority. Only applicable when server
-               source is 'dhcp' or 'both'. Empty/omitted otherwise.";
-          }
-        }
-      }
-    }
-    container xftp-config {
-      description
-        "Waveserver system XFTP configuration attributes.";
-      uses xftp-config-group;
-    }
-    container global-provisioning {
-      description
-        "Waveserver system global provisioning attributes.";
-      leaf reset-to-factory-default-button {
-        type cienawstypes:enabled-disabled-enum;
-        status obsolete;
-        description
-          "Indicate whether the reset button for reset to factory default is
-           enabled. If enabled, the reset button on the faceplate will trigger
-           a reset to factory default settings.";
-      }
-      leaf encryption-only {
-        type boolean;
-        config false;
-        description
-          "A boolean value indicating whether the current chassis configuration
-           requires encryption modules only. If true, a user-initiated request
-           to pre-create clear-text MOTR equipment will be rejected.";
-      }
-      container line-config {
-        description
-          "Waveserver system line configuration.";
-        leaf line-protection {
-          type line-protection-enum;
-          description
-            "Line protection settings. If line protection is enabled, this
-             means that the photonic line the Waveserver is connected to has
-             protection enabled. In the event of a line side fault, the
-             protection card on the line side will select the protection path
-             and the modems will reacquire the signal on the alternate path.
-             While the switch is occuring, link state messaging will be
-             disabled to the clients so that the connected devices do not
-             attempt a switch or a restoration.";
-        }
-      }
-    }
-    container lamp-test {
-      description
-        "Waveserver lamp test attributes.";
-      leaf admin-state {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Enable or disable the system lamp test. The lamp-test admin-state
-           will be automatically disabled once the timeout period has expired.";
-      }
-      leaf mode {
-        type enumeration {
-          enum flash {
-            description
-              "Lamp flash mode.";
-          }
-        }
-        config false;
-        description
-          "Lamp mode selection. The default mode is flash. It is the only mode
-           currently supported";
-      }
-      leaf target-type {
-        type enumeration {
-          enum chassis {
-            description
-              "Chassis target type. This is the default target type. If
-               specified, the target-id field will be reset/empty.";
-          }
-          enum slot {
-            description
-              "Slot target type. The slot number must also be specified in the
-               target-id field.";
-          }
-          enum port {
-            description
-              "Port target type. The port-id(s) must also be specified in the
-               target-id field.";
-          }
-        }
-        description
-          "Lamp testing target type. It can be chassis, slot, or port. The
-           default type is chassis. When the target-type is slot or port, the
-           slot/port identifier should also be set for the selected target(s)
-           to be tested.";
-      }
-      leaf target-id {
-        type cienawstypes:string-maxl-128;
-        description
-          "Lamp testing target ID string. Must be specified when target-type is
-           'slot' or 'port'. When the target-type is 'slot' the target-id should
-           be a slot number (e.g. 1, 2, or 3). When the target-type is 'port'
-           the target-id should be a port-id (e.g. '1-1') or comma-separated
-           list of port-id's (e.g. '1-1,1-2,1-3').";
-      }
-      leaf timeout {
-        type uint32;
-        units "seconds";
-        description
-          "The number of seconds the lamp flash testing will be operating when
-           enabled.";
-      }
-    }
-    container environment {
-      description
-        "Waveserver system linux environment attributes.";
-      container root {
-        description
-          "Waveserver system user root configuration.";
-        leaf password {
-          type cienawstypes:string-maxl-128;
-          description
-            "User root password string.";
-          ncx:password;
-        }
-        leaf secret {
-          type cienawstypes:string-maxl-256;
-          description
-            "The encrypted user password string, supplied as a hashed value.";
-        }
-      }
-      container diag {
-        description
-          "System level default environment configuration for diag level users.";
-        leaf shell {
-          type enumeration {
-            enum cli {
-              description
-                "A Waveserver command-line interface session will be launched
-                 upon diag level user login. This is the default system
-                 behavior.";
-            }
-            enum system {
-              description
-                "A successful authentication of a diag level user account by
-                 the SSH server via local or remote (Radius/TACACS) service
-                 shall put the user in the system shell (e.g. Linux shell).";
-            }
-          }
-          description
-            "The default shell session type for authenticated diag users.";
-        }
-        leaf sudo {
-          type boolean;
-          description
-            "Specifies whether or not diag users will be automatically added to
-             the sudoers list. Default is disabled.";
-        }
-      }
-    }
-    container ssl {
-      description
-        "Waveserver SSL security configuration and operational data.";
-      list tls-cipher-suite-algorithms {
-        key "algorithm-name";
-        ncx:user-write "update";
-        description
-          "List of transport layer security(TLS) cipher suite algorithms. 
-           The algorithm names are system assigned.";
-        leaf algorithm-name {
-          type cienawstypes:string-maxl-64;
-          description
-            "The TLS cipher suite algorithm name.";
-        }
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "TLS cipher suite algorithm administrative state.";
-        }
-      }
-    }
-    container shell {
-      description
-        "Waveserver system CLI shell/session attributes.";
-      leaf inactivity-timer {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Global CLI/shell session inactivity timer state.";
-      }
-      leaf inactivity-timeout {
-        type uint16 {
-          range "1..1500";
-        }
-        units "minutes";
-        description
-          "Global CLI/shell session inactivity timeout period, in minutes.";
-      }
-      leaf more {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Global CLI/shell session pagination (more) behavior.";
-      }
-      leaf more-lines {
-        type uint16 {
-          range "0..999";
-        }
-        description
-          "Global CLI/shell session pagination (more) number of lines per page.";
-      }
-      leaf login-authentication-message {
-        type cienawstypes:enabled-disabled-enum;
-        description
-          "Toggles the authentication message for CLI/shell session logins.";
-      }
-      leaf login-banner-file {
-        type cienawstypes:string-maxl-254;
-        description
-          "Local file name containing the banner text to be displayed prior to
-           CLI/shell session logins.";
-      }
-      leaf welcome-banner-file {
-        type cienawstypes:string-maxl-254;
-        description
-          "Local file name containing the welcome banner text to be displayed upon
-           successful CLI/shell session logins.";
-      }
-    }
-    container default-settings {
-      description
-        "Waveserver system default configuration values.";
-      container conditioning {
-        description
-          "Waveserver system default conditioning values. Ports are created with
-           these values. When the system defaults are set, all existing ports
-           have their values updated.";
-        leaf type {
-          type cienawstypes:conditioning-type;
-          description
-            "Egress UNI port consequent action for an EPL service to be applied
-             on a far-end ingress UNI failure or network failure.";
-        }
-        leaf holdoff {
-          type cienawstypes:conditioning-holdoff;
-          description
-            "Number of milliseconds the failure must be present before applying
-             Egress UNI port consequent action for an EPL service.";
-        }
-      }
-    }
-  }
-
-  container waveserver-system {
-    description
-      "Waveserver System configuration data and operational data.";
-    uses waveserver-system-group;
-  }
-  rpc waveserver-system-state-dump {
-    description
-      "Dump system state information.";
-    input {
-      leaf file-name {
-        type cienawstypes:string-maxl-254;
-        description
-          "The file name to store the system state data.";
-      }
-      leaf include-corefiles {
-        type boolean;
-        description
-          "Indicate whether core files are included (true) or not (false) in
-           the system state dump data.";
-      }
-      uses server-settings-group;
-      leaf url {
-        type cienawstypes:string-maxl-254;
-        description
-          "The URL specifying the remote location and package name to be upload.
-           Example format is 'scp://<uid>:<pwd>@<ip-address>/<path>/<filename>'.
-           If url leaf is not empty, the xftp server group related leafs will be ignored.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-putfile {
-    description
-      "Transfer file to a specified destination.";
-    input {
-      leaf local-file-name {
-        type cienawstypes:string-maxl-254;
-        description
-          "The local file name.";
-      }
-      leaf remote-file-name {
-        type cienawstypes:string-maxl-254;
-        description
-          "The remote file name.";
-      }
-      uses server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-getfile {
-    description
-      "Get file from a specified source.";
-    input {
-      leaf local-file-name {
-        type cienawstypes:string-maxl-254;
-        description
-          "The local file name.";
-      }
-      leaf remote-file-name {
-        type cienawstypes:string-maxl-254;
-        description
-          "The remote file name.";
-      }
-      uses server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-dns-resolve-ip {
-    description
-      "Use DNS protocol to resolve an IP address to an associated domain name,
-       or resolve a host name to its associated IP address.";
-    input {
-      leaf address {
-        type cienawstypes:ipaddr-or-hostname;
-        mandatory true;
-        description
-          "IP address or Host Name to resolve.";
-      }
-    }
-    output {
-      leaf ip-address {
-        type cienawstypes:string-maxl-64;
-        description
-          "The resolved IP address, if known, or 'Unknown' otherwise.";
-      }
-      leaf host-name {
-        type cienawstypes:string-maxl-64;
-        description
-          "The resolved host name, if known, or 'Unknown' otherwise.";
-      }
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-https-server-rsa-activate-p12-file {
-    description
-      "Activate a local p12-file to replace current https server certificate 
-       and private key.";
-    input {
-      leaf path {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "The path and file name of a local p12-file downloaded from outside.";
-      }
-      leaf password {
-        type cienawstypes:string-maxl-128;
-        description
-          "The password for activation.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-https-server-rsa-regenerate {
-    description
-      "Regenerate the https server certificate and private key.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-ssh-server-activate-host-key {
-    description
-      "Activate a SSH host key.";
-    input {
-      leaf host-key {
-        type string {
-          length "1..64";
-        }
-        mandatory true;
-        description
-          "The SSH host key.";
-      }
-      leaf passphrase {
-        type string {
-          length "1..128";
-        }
-        mandatory true;
-        description
-          "The password for the SSH host key.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-ssh-server-delete-key {
-    description
-      "Delete the SSH key for the specified user.";
-    input {
-      leaf user {
-        type string {
-          length "1..32";
-        }
-        mandatory true;
-        description
-          "The user name for whom the key will be deleted.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-ssh-server-generate-key {
-    description
-      "Generate a SSH key.";
-    input {
-      leaf key-type {
-        type ssh-key-type-enum;
-        description
-          "The SSH key type.";
-      }
-      leaf force {
-        type boolean;
-        description
-          "Whether to force the generation of the SSH key.";
-      }
-      uses server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-ssh-server-install-key {
-    description
-      "Install a SSH key for the specified user.";
-    input {
-      leaf user {
-        type string {
-          length "1..32";
-        }
-        mandatory true;
-        description
-          "The user name for whom the key will be generated.";
-      }
-      uses server-settings-group;
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-ntp-generate-autokey {
-    description
-      "Generate the autokey. The certificate created using ntp-keygen tool is 
-       valid for one year and should be updated periodically.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-client-config-dhcp-lease-renew {
-    description
-      "Renew DHCP client lease time.";
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-  rpc waveserver-system-client-config-ntp-md5auth-import {
-    description
-      "To import NTP MD5 keys from a file.";
-    input {
-      leaf filename {
-        type cienawstypes:string-maxl-254;
-        mandatory true;
-        description
-          "NTP MD5 authentication key filename.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-topology.yang b/models/ciena-waveserver-topology.yang
deleted file mode 100644
index e87b56c13529a4b0e1172e3a9af14c43855079d5..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-topology.yang
+++ /dev/null
@@ -1,197 +0,0 @@
-module ciena-waveserver-topology {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-topology";
-  prefix topology;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-interfaces {
-    prefix if;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-              Hanover, Maryland 21076
-              U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's Waveserver Topology representation.";
-
-  revision 2019-06-03 {
-    description
-      "Initial revision introducing basic topology support.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-
-  grouping topology-inventory-attribute-group {
-    description
-      "Common attributes of network inventory.";
-    leaf network-id {
-      type uint8 {
-        range "0..254";
-      }
-      description
-        "An integer to uniquely identify the sub-network domain in which this chassis is managed.";
-    }
-    leaf site-id {
-      type uint8 {
-        range "0..254";
-      }
-      description
-        "An integer to uniquely identify the site where this chassis is located.";
-    }
-    leaf group-id {
-      type uint8 {
-        range "0..254";
-      }
-      description
-        "An integer to uniquely identify a group of chassis within a site.";
-    }
-    leaf chassis-id {
-      type cienawstypes:mac-string;
-      description
-        "MAC address of the chassis.";
-    }
-    leaf member-id {
-      type uint8 {
-        range "0..254";
-      }
-      config false;
-      description
-        "An integer to uniquely identify a chassis within a commonly managed group.";
-    }
-    leaf member-name {
-      type cienawstypes:string-maxl-64;
-      config false;
-      description
-        "A name to uniquely identify a chassis within a commonly managed group.";
-    }
-    leaf chassis-type {
-      type cienawstypes:chassis-type;
-      config false;
-      description
-        "The type of the chassis.";
-    }
-    leaf primary-chassis-id {
-      type cienawstypes:mac-string;
-      config false;
-      description
-        "Chassis MAC address of the primary node within the management domain.";
-    }
-    leaf host-name {
-      type cienawstypes:string-maxl-64;
-      config false;
-      description
-        "Hostname of the chassis.";
-    }
-    leaf enrolled {
-      type boolean;
-      config false;
-      description
-        "Specifies if this chassis is enrolled into the management domain.";
-    }
-    leaf connectivity-state {
-      type cienawstypes:up-down-enum;
-      config false;
-      description
-        "The connectivity state of the cluster member.
-         A reachable member shall have conn state UP, while
-         An unreachable member shall have conn state DOWN.";
-    }
-    leaf network-primary {
-      type boolean;
-      config false;
-      description
-        "Attribute indicating the role of this member in the cluster. 
-         Default value is false (member).";
-    }
-  }
-
-  grouping topology-adjacency-attribute-group {
-    description
-      "Common attributes of topology inventory's adjacency attributes.";
-    leaf interface-id {
-      type leafref {
-        path "/if:waveserver-interfaces/if:physical-interface/if:id/if:name";
-      }
-      config false;
-      description
-        "Interface ID of the local ILAN Port which is connected to the neighbor chassis.";
-    }
-    leaf neighbor-member-id {
-      type uint8 {
-        range "0..254";
-      }
-      config false;
-      description
-        "An integer to uniquely identify the neighbor chassis.";
-    }
-    leaf neighbor-host-name {
-      type cienawstypes:string-maxl-64;
-      config false;
-      description
-        "Hostname of the neighbor chassis.";
-    }
-    leaf neighbor-chassis-id {
-      type leafref {
-        path "../../../network-inventory/chassis-id";
-      }
-      config false;
-      description
-        "MAC address of the neighbor chassis";
-    }
-    leaf neighbor-interface-id {
-      type cienawstypes:string-maxl-16;
-      config false;
-      description
-        "Interface ID of the ILAN Port on the neighbor chassis which is connected to the this chassis.";
-    }
-  }
-
-  container waveserver-topology {
-    description
-      "Waveserver topology attributes and operational data.";
-    list network-inventory {
-      key "chassis-id";
-      config false;
-      description
-        "Summary of the network elements discovered in the network topology, such as NDP discovered chassis on the ILAN.";
-      uses topology-inventory-attribute-group;
-      list adjacency {
-        key "interface-id";
-        config false;
-        description
-          "A list of neighbor node attributes adjacent to this chassis.";
-        uses topology-adjacency-attribute-group;
-      }
-    }
-  }
-  rpc waveserver-topology-delete-network-inventory {
-    description
-      "Delete a network element from network inventory list for the specified instance.";
-    input {
-      leaf chassis-id {
-        type cienawstypes:mac-string;
-        mandatory true;
-        description
-          "MAC address of the chassis.";
-      }
-    }
-    output {
-      leaf return-code {
-        type uint32;
-        description
-          "return code: 0 is success; non-zero is failure";
-      }
-      leaf return-string {
-        type cienawstypes:string-maxl-254;
-        description
-          "Return code description";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-typedefs.yang b/models/ciena-waveserver-typedefs.yang
deleted file mode 100644
index 4a6b1dca071d4f245d3f8b428c89d4dadcede8e1..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-typedefs.yang
+++ /dev/null
@@ -1,1229 +0,0 @@
-module ciena-waveserver-typedefs {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-typedefs";
-  prefix cienawstypes;
-
-  import yuma-ncx {
-    prefix ncx;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's commonly used typedefs";
-
-  revision 2019-06-03 {
-    description
-      "Added 'protocol-specific' enum value to 'condition-type' typedef.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2019-03-29 {
-    description
-      "Added 'xcvr-type' enum values: 'SFP' and 'None'.
-       Added 'xcvr-mode' enum values: '4x10GE', 'OCH', 'OTM', 'OSC', and 'OSC-Add-Drop'.
-       Added typedef for 'chassis-type'.
-       Added 'ipv6-prefix', 'ipv6-opt-prefix', 'ip-opt-prefix' typedefs.
-       Updated 'modem-frequency' range values for expanded C-Band capabilities.
-       Added rpc groupings 'rpc-output', 'rpc-log-upload-group', and 'rpc-oper-status-group'.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-08-23 {
-    description
-      "Added typedef for 'string-maxl-8'.
-       Added typedefs for 'ipv6-address' and 'ip-address'.";
-    reference "Waveserver Ai R1.3 user's guide.";
-  }
-  revision 2018-05-17 {
-    description
-      "Added 'xcvr-mode' enum values.
-       Added 'supported-link-optimization-modes' bits typedef.
-       Added 'squelch-traffic' mode to 'mismatch-fail-mode' enum.
-       Added 'modem-class' and 'link-optimization-mode' types.
-       Added 'ipv4-address', 'ipv4-prefix', 'ipv4-opt-prefix' typedefs.
-       Updated range for 'tx-power-lvl' typedef.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2018-01-04 {
-    description
-      "Updated 'modem-frequency' range values for C-Band and L-Band capabilities.
-       Added 'otn' enum value to 'conditioning-type' typedef.
-       Removed unused OTUCn 'xcvr-mode' enum values and added OTL4.4/OTLC.4 support.
-       Added 'ipaddr-or-hostname' typedef.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-09-05 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Added 'xcvr-mode' enum values.
-       Added 'power-state' typedef.
-       Renamed 'channels-number' typedef to 'lanes-number'.
-       Removed 'xcvr-id', 'ptp-id', 'port-id' types; use string types instead.
-       Added 'conditioning-type' and 'conditioning-holdoff' typedefs.
-       Remove line-module-type-bits typedef.
-       Added 'trace-mismatch-mode' and 'trace-mismatch-fail-mode'.
-       Added 'restart-reason'.
-       Removed several unused typedefs.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef mac-string {
-    type string {
-      length "1..20";
-    }
-    description
-      "MAC address string.";
-  }
-
-  typedef name-string {
-    type string {
-      length "1..32";
-    }
-    description
-      "String type for object names used in Ciena defined modules. It must be a
-       non empty string that is at most 32 characters long.";
-  }
-
-  typedef description-string {
-    type string {
-      length "0..128";
-    }
-    description
-      "String type for description used in Ciena defined modules. Max length of
-       128 characters, plus null.";
-  }
-
-  typedef on-off-enum {
-    type enumeration {
-      enum off {
-        description
-          "Off";
-      }
-      enum on {
-        description
-          "On";
-      }
-    }
-    description
-      "Off and On enum toggle used in Ciena defined modules.";
-  }
-
-  typedef power-state {
-    type enumeration {
-      enum automatic {
-        description
-          "Power state is automatic (on/normal).";
-      }
-      enum shutdown {
-        description
-          "Power state is shutdown (off/low-power-mode).";
-      }
-    }
-    description
-      "Power state automatic (on/normal) or shutdown (off/low-power-mode).";
-  }
-
-  typedef yes-no-enum {
-    type enumeration {
-      enum no {
-        description
-          "No";
-      }
-      enum yes {
-        description
-          "Yes";
-      }
-    }
-    description
-      "No and Yes enum toggle used in Ciena defined modules.";
-  }
-
-  typedef up-down-enum {
-    type enumeration {
-      enum down {
-        description
-          "Object is down/disabled/failed.";
-      }
-      enum up {
-        description
-          "Object is up/operational.";
-      }
-    }
-    description
-      "Down and Up enum toggle used in Ciena defined modules.";
-  }
-
-  typedef enabled-disabled-enum {
-    type enumeration {
-      enum disabled {
-        description
-          "Object or attribute is disabled.";
-      }
-      enum enabled {
-        description
-          "Object or attribute is enabled.";
-      }
-    }
-    description
-      "Enabled and Disabled enum toggle used in Ciena defined modules.";
-  }
-
-  typedef yes-no-na-enum {
-    type enumeration {
-      enum no {
-        description
-          "No";
-      }
-      enum yes {
-        description
-          "Yes";
-      }
-      enum not-applicable {
-        description
-          "Not applicable";
-      }
-    }
-    description
-      "No and Yes enum toggle used in Ciena defined modules.";
-  }
-
-  typedef enabled-disabled-na-enum {
-    type enumeration {
-      enum disabled {
-        description
-          "Disabled";
-      }
-      enum enabled {
-        description
-          "Enabled";
-      }
-      enum not-applicable {
-        description
-          "Not applicable";
-      }
-    }
-    description
-      "Enabled, Disabled, and not-applicable enum used in Ciena defined modules.";
-  }
-
-  typedef wl-spacing {
-    type enumeration {
-      enum 50GHz {
-        description
-          "50GHz wavelength spacing.";
-      }
-      enum 100GHz {
-        description
-          "100GHz wavelength spacing.";
-      }
-      enum 200GHz {
-        description
-          "200GHz wavelength spacing.";
-      }
-      enum flex-grid {
-        description
-          "Flex-grid wavelength spacing.";
-      }
-    }
-    description
-      "Wavelength spacing, 50GHz, 100GHz, 200GHz, or flex-grid. Only 'flex-grid'
-       supported in Waveserver Ai R1.0.";
-  }
-
-  typedef decimal-3-dig {
-    type decimal64 {
-      fraction-digits 3;
-      range "-2147483.0 .. 2147483.0";
-    }
-    description
-      "Decimal value up to 3 digits.";
-  }
-
-  typedef decimal-2-dig-small {
-    type decimal64 {
-      fraction-digits 2;
-      range "-30000.0 .. 30000.0";
-    }
-    description
-      "Decimal value up to 2 digits.";
-  }
-
-  typedef decimal-2-dig {
-    type decimal64 {
-      fraction-digits 2;
-      range "-21474836.0 .. 21474836.0";
-    }
-    description
-      "Decimal value up to 2 digits.";
-  }
-
-  typedef decimal-1-dig {
-    type decimal64 {
-      fraction-digits 1;
-      range "-214748364.0 .. 214748364.0";
-    }
-    description
-      "Decimal value up to 1 digits.";
-  }
-
-  typedef string-sci {
-    type string {
-      length "0..32";
-      pattern '[-+]?[0-9](\.[0-9]+)?([eE][-+]?[0-9]+)?';
-    }
-    description
-      "String in Scientific Notation format with a max length of 32 characters.";
-  }
-
-  typedef string-maxl-8 {
-    type string {
-      length "0..8";
-    }
-    description
-      "Standard string that has a max length of 8 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-15 {
-    type string {
-      length "0..15";
-    }
-    description
-      "Standard string that has a max length of 15 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-16 {
-    type string {
-      length "0..16";
-    }
-    description
-      "Standard string that has a max length of 16 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-32 {
-    type string {
-      length "0..32";
-    }
-    description
-      "Standard string that has a max length of 32 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-44 {
-    type string {
-      length "0..44";
-    }
-    description
-      "Standard string that has a max length of 44 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-50 {
-    type string {
-      length "0..50";
-    }
-    description
-      "Standard string that has a max length of 50 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-64 {
-    type string {
-      length "0..64";
-    }
-    description
-      "Standard string that has a max length of 64 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-128 {
-    type string {
-      length "0..128";
-    }
-    description
-      "Standard string that has a max length of 128 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-254 {
-    type string {
-      length "0..254";
-    }
-    description
-      "Standard string that has a max length of 254 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef string-maxl-256 {
-    type string {
-      length "0..256";
-    }
-    description
-      "Standard string that has a max length of 256 characters. Can be used for
-       various nodes that may require string of this length.";
-  }
-
-  typedef ipaddr-or-hostname {
-    type string {
-      length "1..63";
-    }
-    description
-      "IP address or hostname string.";
-  }
-
-  typedef ip-address {
-    type union {
-      type ipv4-address;
-      type ipv6-address;
-      type string {
-        pattern 'Unresolved';
-      }
-    }
-    description
-      "An IP address type that supports both IPv4 and IPv6 formats.";
-  }
-
-  typedef ip-opt-prefix {
-    type union {
-      type ipv4-opt-prefix;
-      type ipv6-opt-prefix;
-      type string {
-        pattern 'Unresolved';
-      }
-    }
-    description
-      "An IP prefix type that supports both IPv4 and IPv6 formats.";
-  }
-
-  typedef ipv4-address {
-    type string {
-      length "0..16";
-      pattern '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
-    }
-    description
-      "An IPv4 address represented in dotted decimal notation.";
-  }
-
-  typedef ipv4-prefix {
-    type string {
-      length "0..20";
-      pattern '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))';
-    }
-    description
-      "An IPv4 address and prefix represented in dotted decimal notation
-       followed by a slash and a prefix length, e.g. '192.168.1.2/24'.";
-  }
-
-  typedef ipv4-opt-prefix {
-    type string {
-      length "0..20";
-      pattern '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(/(([0-9])|([1-2][0-9])|(3[0-2])))?';
-    }
-    description
-      "A string type matching either the ipv4-address format or the
-       ipv4-prefix format. That is, an IPv4 address in dotted decimal
-       notation with an optional slash and prefix length.";
-  }
-
-  typedef ipv6-address {
-    type string {
-      pattern '[0-9a-fA-F:\.]*';
-    }
-    description
-      "An IPv6 address format.";
-    reference
-      "RFC 4291: IP Version 6 Addressing Architecture
-       RFC 4007: IPv6 Scoped Address Architecture
-       RFC 5952: A Recommendation for IPv6 Address Text
-                 Representation";
-  }
-
-  typedef ipv6-prefix {
-    type string {
-      pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))';
-    }
-    description
-      "The ipv6-prefix type represents an IPv6 address prefix.
-       The prefix length is given by the number following the
-       slash character and must be less than or equal to 128.
-
-       A prefix length value of n corresponds to an IP address
-       mask that has n contiguous 1-bits from the most
-       significant bit (MSB) and all other bits set to 0.
-
-       The IPv6 address should have all bits that do not belong
-       to the prefix set to zero.
-
-       The canonical format of an IPv6 prefix has all bits of
-       the IPv6 address set to zero that are not part of the
-       IPv6 prefix.  Furthermore, the IPv6 address is represented
-       as defined in Section 4 of RFC 5952.";
-    reference
-      "RFC 5952: A Recommendation for IPv6 Address Text
-                 Representation";
-  }
-
-  typedef ipv6-opt-prefix {
-    type string {
-      pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))?';
-    }
-    description
-      "A string type matching either the ipv6-address format or the
-       ipv6-prefix format. That is, an IPv6 address with an optional
-       slash and prefix length.";
-  }
-
-  typedef port-name {
-    type string {
-      length "1..32";
-    }
-    description
-      "A string representing a port interface name. Format is: '<slot>-<port>'
-       or '<slot>-<majorport>.<minorport>'.";
-  }
-
-  typedef service-idx {
-    type uint32 {
-      range "0 .. 1000";
-    }
-    description
-      "Service Index";
-  }
-
-  typedef service-domain-idx {
-    type uint32 {
-      range "0 .. 20";
-    }
-    description
-      "Service Domain Index";
-  }
-
-  typedef chassis-type {
-    type enumeration {
-      enum "unknown chassis" {
-        description
-          "Chassis type is unknown.";
-      }
-      enum "waveserver chassis" {
-        description
-          "Waveserver WL3e Chassis.";
-      }
-      enum "waveserver ai chassis" {
-        description
-          "Waveserver Ai Chassis.";
-      }
-    }
-    description
-      "Type enum value of the chassis.";
-  }
-
-  typedef xcvr-type {
-    type enumeration {
-      enum not-available {
-        value 0;
-        description
-          "XCVR type not available.";
-      }
-      enum unsupported {
-        value 1;
-        description
-          "XCVR type unsupported.";
-      }
-      enum QSFPplus {
-        value 2;
-        description
-          "XCVR type QSFP+; Quad Small Form-factor Pluggable capable of 40 Gb
-           data transmission.";
-      }
-      enum QSFP28 {
-        value 3;
-        description
-          "XCVR type QSFP28; Quad Small Form-factor Pluggable capable of 100 Gb
-           data transmission.";
-      }
-      enum "WaveLogic 3 Extreme" {
-        value 4;
-        description
-          "XCVR type WL3e.";
-      }
-      enum "WaveLogic Ai" {
-        value 5;
-        description
-          "XCVR type WLAi.";
-      }
-      enum SFP {
-        value 6;
-        description
-          "XCVR type SFP; Small Form-Factor Pluggable capable of 1 GbE data
-           transmission.";
-      }
-      enum none {
-        value 7;
-        description
-          "Port has no XCVR type, meaning it represents a passive optical
-           connector only. Applicable to OCH, OTM, and OSC-Add/Drop port types.";
-      }
-    }
-    description
-      "Transceiver type.";
-  }
-
-  typedef xcvr-mode {
-    type enumeration {
-      enum blank {
-        value 0;
-        description
-          "XCVR/slot is blank.";
-      }
-      enum OCH {
-        value 1;
-        description
-          "Optical Channel port mode.";
-      }
-      enum OTM {
-        value 2;
-        description
-          "Optical Multiplex port mode.";
-      }
-      enum OSC {
-        value 3;
-        description
-          "Optical Supervisory Channel port mode.";
-      }
-      enum OSC-Add-Drop {
-        value 4;
-        description
-          "Optical Supervisory Channel Add/Drop port mode.";
-      }
-      enum 10GE {
-        value 10;
-        description
-          "XCVR mode 10 Gigabit Ethernet.";
-      }
-      enum 4x10GE {
-        value 11;
-        description
-          "XCVR mode 4 x 10 Gigabit Ethernet.";
-      }
-      enum 40GE {
-        value 40;
-        description
-          "XCVR mode 40 Gigabit Ethernet.";
-      }
-      enum 100GE {
-        value 100;
-        description
-          "XCVR mode 100 Gigabit Ethernet.";
-      }
-      enum 400GE {
-        value 400;
-        description
-          "XCVR mode 400 Gigabit Ethernet.";
-      }
-      enum OTL4.4 {
-        value 58044;
-        description
-          "XCVR mode OTL4.4.";
-      }
-      enum OTLC.4 {
-        value 58104;
-        description
-          "XCVR mode OTLC.4.";
-      }
-      enum 35-100 {
-        value 350100;
-        description
-          "XCVR mode 35Gbaud, 100Gbps.";
-      }
-      enum 35-150 {
-        value 350150;
-        description
-          "XCVR mode 35Gbaud, 150Gbps.";
-      }
-      enum 35-200 {
-        value 350200;
-        description
-          "XCVR mode 35Gbaud, 200Gbps.";
-      }
-      enum 35-250 {
-        value 350250;
-        description
-          "XCVR mode 35Gbaud, 250Gbps.";
-      }
-      enum 56-100 {
-        value 560100;
-        description
-          "XCVR mode 56Gbaud, 100Gbps.";
-      }
-      enum 56-150 {
-        value 560150;
-        description
-          "XCVR mode 56Gbaud, 150Gbps.";
-      }
-      enum 56-200 {
-        value 560200;
-        description
-          "XCVR mode 56Gbaud, 200Gbps.";
-      }
-      enum 56-250 {
-        value 560250;
-        description
-          "XCVR mode 56Gbaud, 250Gbps.";
-      }
-      enum 56-300 {
-        value 560300;
-        description
-          "XCVR mode 56Gbaud, 300Gbps.";
-      }
-      enum 56-350 {
-        value 560350;
-        description
-          "XCVR mode 56Gbaud, 350Gbps.";
-      }
-      enum 56-400 {
-        value 560400;
-        description
-          "XCVR mode 56Gbaud, 400Gbps.";
-      }
-    }
-    description
-      "Transceiver mode.";
-  }
-
-  typedef line-sys-enum {
-    type enumeration {
-      enum coloured {
-        description
-          "Line system coloured.";
-      }
-      enum colourless {
-        description
-          "Line system colourless.";
-      }
-      enum contentionless {
-        description
-          "Line system contentionless.";
-      }
-      enum cs-coloured {
-        description
-          "Line system cs-coloured.";
-      }
-      enum cs-colourless {
-        description
-          "Line system cs-colourless.";
-      }
-    }
-    description
-      "Line system type.";
-  }
-
-  typedef lanes-number {
-    type uint16 {
-      range "0 .. 4";
-    }
-    description
-      "Lane number common type, lane range is defined from 0 to 4.";
-  }
-
-  typedef connector-type-desc-enum {
-    type enumeration {
-      enum "Unknown or unspecified" {
-        value 0;
-        description
-          "Unknown or unspecified.";
-      }
-      enum "SC - Subscriber Connector" {
-        value 1;
-        description
-          "SC - Subscriber Connector.";
-      }
-      enum "Fibre Channel Style 1 copper connector" {
-        value 2;
-        description
-          "Fibre Channel Style 1 copper connector.";
-      }
-      enum "Fibre Channel Style 2 copper connector" {
-        value 3;
-        description
-          "Fibre Channel Style 2 copper connector.";
-      }
-      enum "BNC/TNC - Bayonet/Threaded Neill-Concelman" {
-        value 4;
-        description
-          "BNC/TNC - Bayonet/Threaded Neill-Concelman.";
-      }
-      enum "Fibre Channel coax headers" {
-        value 5;
-        description
-          "Fibre Channel coax headers.";
-      }
-      enum "Fiber Jack" {
-        value 6;
-        description
-          "Fiber Jack.";
-      }
-      enum "LC - Lucent Connector" {
-        value 7;
-        description
-          "LC - Lucent Connector.";
-      }
-      enum "MT-RJ - Mechanical Transfer - Registered Jack" {
-        value 8;
-        description
-          "MT-RJ - Mechanical Transfer - Registered Jack.";
-      }
-      enum "MU - Multiple Optical" {
-        value 9;
-        description
-          "MU - Multiple Optical.";
-      }
-      enum SG {
-        value 10;
-        description
-          "SG.";
-      }
-      enum "Optical Pigtail" {
-        value 11;
-        description
-          "Optical Pigtail.";
-      }
-      enum "MPO 1x12 - Multifiber Parallel Optic" {
-        value 12;
-        description
-          "MPO 1x12 - Multifiber Parallel Optic.";
-      }
-      enum "MPO 2x16" {
-        value 13;
-        description
-          "MPO 2x16.";
-      }
-      enum "HSSDC II - High Speed Serial Data Connector" {
-        value 32;
-        description
-          "HSSDC II - High Speed Serial Data Connector.";
-      }
-      enum "Copper pigtail" {
-        value 33;
-        description
-          "Copper pigtail.";
-      }
-      enum "RJ45 - Registered Jack" {
-        value 34;
-        description
-          "RJ45 - Registered Jack.";
-      }
-      enum "No separable connector" {
-        value 35;
-        description
-          "No separable connector.";
-      }
-      enum "MXC 2x16" {
-        value 36;
-        description
-          "MXC 2x16.";
-      }
-    }
-    description
-      "Human readable description of Vendor's connector type byte value.";
-    reference "SFF-8024, table 4-3";
-  }
-
-  typedef modem-frequency {
-    type decimal64 {
-      fraction-digits 1;
-      range "0.0 | 186087.5 .. 190956.2 | 191281.0 .. 196119.0";
-    }
-    units "GHz";
-    description
-      "Modem frequency, in GHz. 0.0 indicates unprovisioned (default) value. L-Band
-       range is 186087.5 - 190956.2 GHz, and C-Band range is 191281.0 - 196119.0 GHz.";
-  }
-
-  typedef modem-class {
-    type enumeration {
-      enum terrestrial {
-        description
-          "Terrestrial modem class.";
-      }
-      enum submarine {
-        description
-          "Submarine modem class.";
-      }
-      enum unavailable {
-        description
-          "Modem class is unavailable.";
-      }
-    }
-    description
-      "The modem class type, terrestrial or submarine.";
-  }
-
-  typedef link-optimization-mode {
-    type enumeration {
-      enum standard {
-        description
-          "Standard Mode - Default setting which provides best SNR performance.";
-      }
-      enum snr-tolerant {
-        description
-          "SNR Tolerant Mode - Recommended for applications that want to
-           achieve maximum SNR tolerance while still providing reasonable
-           polarization tracking speed and PDL tolerance.";
-      }
-      enum fast-tracking {
-        description
-          "Fast Tracking Mode - Recommended for applications that want to
-           maximize SOP tracking.";
-      }
-      enum spectral-efficiency {
-        description
-          "Spectral Efficiency Mode - Recommended for applications that want
-           to maximize spectral efficiency by minimizing spectral signal width.";
-      }
-      enum latency {
-        description
-          "Low Latency Mode - Recommended for applications that want to
-           minimize transmission latency.";
-      }
-      enum foreign {
-        description
-          "Foreign Line Mode - Recommended for applications that require the
-           transmitted signal to be be recognized/controlled by a foreign line
-           system.";
-      }
-      enum narrow {
-        description
-          "Narrow Channel Mode - Recommended for applications that want to
-           achieve maximum SNR tolerance over heavily filtered optical link.";
-      }
-      enum non-linear {
-        description
-          "Non-Linear Channel Mode - Recommended for applications that want
-           to achieve maximum SNR tolerance on a non-linear fiber link.";
-      }
-      enum reserved-1 {
-        description
-          "Reserved Mode 1.";
-      }
-      enum reserved-2 {
-        description
-          "Reserved Mode 2.";
-      }
-      enum reserved-3 {
-        description
-          "Reserved Mode 3.";
-      }
-      enum custom {
-        description
-          "Custom Link Optimization Mode.";
-      }
-      enum unavailable {
-        description
-          "Link Optimization Mode is unavailable.";
-      }
-    }
-    description
-      "Link Optimization Modes for the WaveLogic modems.";
-  }
-
-  typedef supported-link-optimization-modes {
-    type bits {
-      bit standard {
-        description
-          "Supports standard link-optimization-mode.";
-      }
-      bit snr-tolerant {
-        description
-          "Supports snr-tolerant link-optimization-mode.";
-      }
-      bit fast-tracking {
-        description
-          "Supports fast-tracking link-optimization-mode.";
-      }
-      bit spectral-efficiency {
-        description
-          "Supports spectral-efficiency link-optimization-mode.";
-      }
-      bit latency {
-        description
-          "Supports latency link-optimization-mode.";
-      }
-      bit foreign {
-        description
-          "Supports foreign link-optimization-mode.";
-      }
-      bit narrow {
-        description
-          "Supports narrow link-optimization-mode.";
-      }
-      bit non-linear {
-        description
-          "Supports non-linear link-optimization-mode.";
-      }
-      bit reserved-1 {
-        description
-          "Supports reserved-1 link-optimization-mode.";
-      }
-      bit reserved-2 {
-        description
-          "Supports reserved-2 link-optimization-mode.";
-      }
-      bit reserved-3 {
-        description
-          "Supports reserved-3 link-optimization-mode.";
-      }
-      bit custom {
-        description
-          "Supports custom link-optimization-mode.";
-      }
-    }
-    description
-      "Type definition for supported link-optimization-mode values for PTPs
-       associated with modem XCVR objects.";
-  }
-
-  typedef tx-power-lvl {
-    type decimal64 {
-      fraction-digits 1;
-      range "-9.0 .. 4.0";
-    }
-    units "dBm";
-    description
-      "Modem Tx Power Level.";
-  }
-
-  typedef module-type-enum {
-    type enumeration {
-      enum unknown {
-        description
-          "Module type unknown.";
-      }
-      enum integrated {
-        description
-          "Module type integrated.";
-      }
-      enum field-replaceable {
-        description
-          "Module type field-replaceable.";
-      }
-    }
-    description
-      "Module type enum.";
-  }
-
-  typedef module-type-bits {
-    type bits {
-      bit integrated {
-        position 0;
-        description
-          "Module type integrated.";
-      }
-      bit field-replaceable {
-        position 1;
-        description
-          "Module type field-replaceable.";
-      }
-    }
-    description
-      "Module type bits.";
-  }
-
-  typedef restart-reason {
-    type enumeration {
-      enum unknown {
-        description
-          "Unknown restart reason.";
-      }
-      enum user-warm {
-        description
-          "User-initiated warm restart.";
-      }
-      enum user-cold {
-        description
-          "User-initiated cold restart.";
-      }
-      enum system-warm {
-        description
-          "System-initiated warm restart.";
-      }
-      enum system-cold {
-        description
-          "System-initiated cold restart.";
-      }
-      enum power-on {
-        description
-          "Device inserted or powered on.";
-      }
-    }
-    description
-      "Chassis/Module last restart reason.";
-  }
-
-  typedef conditioning-type {
-    type enumeration {
-      enum none {
-        value 0;
-        description
-          "No consequent action, if applicable for the specified port.";
-      }
-      enum laser-off {
-        value 1;
-        description
-          "Disable the transmitter consequent action, if applicable for the
-           specified port.";
-      }
-      enum ethernet {
-        value 2;
-        description
-          "Ethernet Local Fault consequent action. Only applicable for Ethernet
-           client ports. For system default-settings, this value maps to the
-           generic 'protocol-specific' enum value.";
-      }
-      enum otn {
-        value 3;
-        description
-          "Standard OTN consequent action as defined in ITU-T G.798. Only
-           applicable for OTN client ports. For system default-settings, this
-           value maps to the generic 'protocol-specific' enum value.";
-      }
-      enum protocol-specific {
-        value 4;
-        description
-          "Protocol-specific default value, based on the port type. For
-           Ethernet client ports, this maps to 'ethernet', and for OTN client
-           ports, this mapes to 'otn'.";
-      }
-    }
-    description
-      "Egress UNI port consequent action for an EPL service to be applied on a
-       far-end ingress UNI failure or network failure.";
-  }
-
-  typedef conditioning-holdoff {
-    type int16 {
-      range "0|10|20|30|40|50|60|70|80|90|100|200|300|400|500|600|700|800|900|1000";
-    }
-    units "ms";
-    description
-      "Number of milliseconds to delay Egress UNI port consequent action for an
-       EPL service.";
-  }
-
-  typedef trace-mismatch-mode {
-    type enumeration {
-      enum operator-only {
-        value 1;
-        description
-          "Trace mismatch detection criteria includes operator-specific trace
-           string only. Other fields are ignored.";
-      }
-      enum sapi {
-        value 2;
-        description
-          "Trace mismatch detection criteria includes source access point
-           identifier (SAPI) trace string only. Other fields are ignored.";
-      }
-      enum dapi {
-        value 3;
-        description
-          "Trace mismatch detection criteria includes destination access point
-           identifier (DAPI) trace string only. Other fields are ignored.";
-      }
-      enum sapi-and-dapi {
-        value 4;
-        description
-          "Trace mismatch detection criteria includes SAPI and DAPI strings. A
-           mismatch of either of these fields will result in TTI mismatch. The
-           operator specific field is ignored.";
-      }
-    }
-    description
-      "The trail trace identifier (TTI) mismatch mode, indicating which fields of
-       the TTI overhead are used for trace mismatch detection.";
-  }
-
-  typedef trace-mismatch-fail-mode {
-    type enumeration {
-      enum none {
-        description
-          "TTI mismatch detection is disable or ignored. Do not raise an alarm on
-           TTI mismatch condition.";
-      }
-      enum alarm-only {
-        description
-          "Raise an alarm when TTI mismatch occurs, but do not squelch traffic.";
-      }
-      enum squelch-traffic {
-        description
-          "Squelch the traffic via signal conditioning when TTI mismatch occurs.";
-      }
-    }
-    description
-      "The trail trace identifier (TTI) mismatch failure mode. When TTI mismatch
-       condition occurs, this indicates the consequent action taken, e.g. whether
-       or not to raise an alarm.";
-  }
-
-  grouping rpc-output {
-    description
-      "RPC output properties.";
-    leaf return-code {
-      type uint32;
-      description
-        "return code: 0 is success; non-zero is failure";
-    }
-    leaf return-string {
-      type cienawstypes:string-maxl-254;
-      description
-        "Return code description";
-    }
-  }
-
-  grouping rpc-log-upload-group {
-    description
-      "Parameters to set when uploading test results.";
-    leaf url {
-      type cienawstypes:string-maxl-254;
-      description
-        "The URL specifying the remote location and filename to upload the logfile.
-         Formats: SCP/TFTP/FTP/SFTP/HTTP/HTTPS
-         Example for node's auto-generated filename:  'scp://<uid>:<pwd>@<ip-address>/<path>/'.
-         Example for user-defined filename: 'scp://<uid>:<pwd>@<ip-address>/<path>/<filename>'.";
-    }
-    leaf login-id {
-      type cienawstypes:string-maxl-32;
-      description
-        "The username to login to the server. Not required if username is given in url.";
-    }
-    leaf password {
-      type cienawstypes:string-maxl-128;
-      ncx:password;
-      description
-        "The password. Not required if password is given in url.";
-    }
-  }
-
-  grouping rpc-oper-status-group {
-    description
-      "Operation Status of a test";
-    leaf oper-status {
-      type uint8;
-      description
-        "Enum value of the Operational status of the test.";
-    }
-    leaf oper-status-string {
-      type cienawstypes:string-maxl-32;
-      description
-        "Description of the operational status of the test.";
-    }
-  }
-}
diff --git a/models/ciena-waveserver-xcvr-modem.yang b/models/ciena-waveserver-xcvr-modem.yang
deleted file mode 100644
index 94364778a54c4019e74297431df2582e16b43100..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-xcvr-modem.yang
+++ /dev/null
@@ -1,240 +0,0 @@
-module ciena-waveserver-xcvr-modem {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-xcvr-modem";
-  prefix xcvr-modem;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-xcvr {
-    prefix xcvr;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's XCVR modem specific data for the NETCONF protocol. It will augment the ciena-waveserver-xcvr module.";
-
-  revision 2018-05-07 {
-    description
-      "Removed 'supported-modes' leaf in vendor-data properties. This is moved to the common xcvr module.
-       Add supported link-optimization-mode attributes to the supported-modes list via augmentation.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-10-24 {
-    description
-      "Changed type for 'frequency-min' and 'frequency-max' leafs from int to decimal.
-       Changed type for 'tx-dispersion-min' and 'tx-dispersion-max' from unsigned to signed int.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-08-28 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Added 'c-band', 'l-band', and 'frequency-resolution' to 'transmitter-technology' container.
-       Removed 'modulation-support' container and added 'supported-modes' to 'vendor-data/properties' container.
-       Added 'temperature-critical' and 'temperature-warning' to 'diagnostics/device' container.
-       Removed 'wavelength-control' and 'wavelength-tolerance' attributes.
-       Removed 'transport-protocols' and 'line-system-support' containers.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:vendor-data/xcvr:properties/xcvr:diagnostic-monitoring" {
-    when "../../../xcvr:type = 'WaveLogic Ai'" {
-      description
-        "XCVR vendor diagnostic-monitoring properties specific to modem XCVRs.";
-    }
-    description
-      "XCVR vendor diagnostic-monitoring properties specific to modem XCVRs.";
-    leaf diagnostic-support {
-      type cienawstypes:yes-no-enum;
-      config false;
-      description
-        "Diagnostic Monitoring, is Diagnostic Support turned on.";
-    }
-    leaf dispersion-measurement {
-      type cienawstypes:yes-no-enum;
-      config false;
-      description
-        "Diagnostic Monitoring, is Dispersion Measurement turned on.";
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:vendor-data/xcvr:properties" {
-    when "../../xcvr:type = 'WaveLogic Ai'" {
-      description
-        "XCVR vendor properties specific to modem XCVRs.";
-    }
-    description
-      "XCVR vendor properties specific to modem XCVRs.";
-    container transmitter-technology {
-      config false;
-      description
-        "Modem Transmitter Technology properties/capabilities.";
-      leaf tunable {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Modem Transmitter Technology, Tunable.";
-      }
-      leaf wavelength-min {
-        type cienawstypes:decimal-2-dig;
-        units "nm";
-        config false;
-        description
-          "Modem Transmitter Technology, Wavelength Min value, in nanometers.";
-      }
-      leaf wavelength-max {
-        type cienawstypes:decimal-2-dig;
-        units "nm";
-        config false;
-        description
-          "Modem Transmitter Technology, Wavelength Max value, in nanometers.";
-      }
-      leaf frequency-min {
-        type cienawstypes:modem-frequency;
-        units "GHz";
-        config false;
-        description
-          "Modem Transmitter Technology, minimum supported frequency, in GHz.";
-      }
-      leaf frequency-max {
-        type cienawstypes:modem-frequency;
-        units "GHz";
-        config false;
-        description
-          "Modem Transmitter Technology, maximum supported frequency, in GHz.";
-      }
-      leaf frequency-resolution {
-        type uint32;
-        units "MHz";
-        config false;
-        description
-          "Modem Transmitter Technology, frequency resolution, in MHz.";
-      }
-      leaf tx-dispersion-min {
-        type int32;
-        units "ps/nm";
-        config false;
-        description
-          "Modem Transmitter Technology, Tx Dispersion Min (ps/nm).";
-      }
-      leaf tx-dispersion-max {
-        type int32;
-        units "ps/nm";
-        config false;
-        description
-          "Modem Transmitter Technology, Tx Dispersion Max (ps/nm).";
-      }
-      leaf edfa {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Whether this modem is an EDFA modem.";
-      }
-      leaf c-band {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Whether this modem supports C-Band frequencies.";
-      }
-      leaf l-band {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Whether this modem supports L-Band frequencies.";
-      }
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:vendor-data/xcvr:properties/xcvr:supported-modes" {
-    when "../../../xcvr:type = 'WaveLogic Ai'" {
-      description
-        "XCVR supported-mode properties specific to modem XCVRs.";
-    }
-    description
-      "XCVR supported-mode properties specific to modem XCVRs.";
-    leaf default-link-optimization-mode {
-      type cienawstypes:link-optimization-mode;
-      description
-        "The default link optimization mode for this XCVR mode.";
-    }
-    leaf supported-link-optimization-modes {
-      type cienawstypes:supported-link-optimization-modes;
-      description
-        "The set of supported link optimization modes for this XCVR mode.";
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:diagnostics/xcvr:device" {
-    when "../../xcvr:type = 'WaveLogic Ai'" {
-      description
-        "XCVR device diagnostic properties specific to modem XCVRs.";
-    }
-    description
-      "XCVR device diagnostic properties specific to modem XCVRs.";
-    container equipment-status {
-      config false;
-      description
-        "XCVR modem equipment status properties.";
-      leaf transmitter-state {
-        type cienawstypes:enabled-disabled-enum;
-        config false;
-        description
-          "Transmitter State of the Modem.";
-      }
-      leaf equipment-out-of-spec {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Is the alarm associated with Equipment Out of Spec raised.";
-      }
-      leaf temperature-critical {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Is there a critical temperature alarm currently raised.";
-      }
-      leaf temperature-warning {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Is there a temperature warning currently raised.";
-      }
-      leaf equipment-failure {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Is the alarm associated with Equipment Failure raised.";
-      }
-      leaf data-link-suspect {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Is the alarm associated with Data Link Suspect raised.";
-      }
-      leaf comms-link-suspect {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Is the alarm associated with Comms Link Suspect raised.";
-      }
-      leaf clock-suspect {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Is the alarm associated with Clock Suspect raised.";
-      }
-      leaf loss-of-synchronization-tick {
-        type cienawstypes:yes-no-enum;
-        config false;
-        description
-          "Is the alarm associated with Loss of Synchronization Tick raised.";
-      }
-    }
-  }
-}
diff --git a/models/ciena-waveserver-xcvr-pluggable.yang b/models/ciena-waveserver-xcvr-pluggable.yang
deleted file mode 100644
index 8cbcecbbfc02a4546a36045f55ffe6d983336afd..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-xcvr-pluggable.yang
+++ /dev/null
@@ -1,711 +0,0 @@
-module ciena-waveserver-xcvr-pluggable {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-xcvr-pluggable";
-  prefix xcvr-pluggable;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-  import ciena-waveserver-xcvr {
-    prefix xcvr;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-             Hanover, Maryland 21076
-             U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This YANG module defines Ciena's XCVR common pluggable specific data for
-     the NETCONF protocol. It will augment the ciena-waveserver-xcvr module.";
-
-  revision 2019-03-13 {
-    description
-      "Added leaf 'revision-compliance-raw'.
-       Added SFP pluggable support.
-       Added power-consumption values for class 5, 6 and 7 module types.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2017-07-27 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Updated description strings, fixed several lint errors/warnings.";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:vendor-data/xcvr:id/xcvr:vendor-id" {
-    when "../../../xcvr:type = 'QSFPplus' or ../../../xcvr:type = 'QSFP28' or ../../../xcvr:type = 'SFP' or ../../../xcvr:type = 'unsupported'" {
-      description
-        "XCVR vendor-id properties specific to pluggable XCVRs.";
-    }
-    description
-      "XCVR vendor-id properties specific to pluggable XCVRs.";
-    leaf revision-compliance {
-      type enumeration {
-        enum not-specified {
-          description
-            "Revision compliance not specified.";
-        }
-        enum RV4.7 {
-          description
-            "Revision compliance RV4.7.";
-        }
-        enum RV4.7-2h {
-          description
-            "Revision compliance RV4.7-2h.";
-        }
-        enum RV1.3 {
-          description
-            "Revision compliance RV1.3.";
-        }
-        enum RV1.4 {
-          description
-            "Revision compliance RV1.4.";
-        }
-        enum RV1.5 {
-          description
-            "Revision compliance RV1.5.";
-        }
-        enum RV2.0 {
-          description
-            "Revision compliance RV2.0.";
-        }
-        enum "RV2.5 and 2.6 and 2.7" {
-          description
-            "Revision compliance RV2.5 and 2.6 and 2.7.";
-        }
-        enum "RV2.8 or later" {
-          description
-            "Revision compliance RV2.8 or later";
-        }
-      }
-      config false;
-      description
-        "Revision Compliance flags, as defined in documentation for Common
-         Management Interface, SFF-8636, table 6-3.";
-    }
-    leaf revision-compliance-raw {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "Revision Compliance raw value. In the format of a HEX string.";
-    }
-    leaf-list vendor-oui {
-      type uint8;
-      config false;
-      max-elements 3;
-      ordered-by system;
-      description
-        "Free side device vendor IEEE company ID. Defined in Common
-         Management Interface, SFF-8636, table 6-15. 3 bytes of data.";
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:vendor-data/xcvr:properties/xcvr:device-id" {
-    when "../../../xcvr:type = 'QSFPplus' or ../../../xcvr:type = 'QSFP28' or ../../../xcvr:type = 'SFP' or ../../../xcvr:type = 'unsupported'" {
-      description
-        "XCVR device-id properties specific to pluggable XCVRs.";
-    }
-    description
-      "XCVR device-id properties specific to pluggable XCVRs.";
-    leaf identifier {
-      type enumeration {
-        enum "Unknown or unspecified" {
-          value 0;
-          description
-            "Identifier value 0x00, Unknown or unspecified.";
-        }
-        enum GBIC {
-          value 1;
-          description
-            "Identifier value 0x01, GBIC.";
-        }
-        enum "Module/connector soldered to motherboard" {
-          value 2;
-          description
-            "Identifier value 0x02, Module/connector soldered to motherboard.";
-        }
-        enum SFP/SFP+/SFP28 {
-          value 3;
-          description
-            "Identifier value 0x03, SFP/SFP+/SFP28.";
-        }
-        enum "300 pin XBI" {
-          value 4;
-          description
-            "Identifier value 0x04, 300 pin XBI.";
-        }
-        enum XENPAK {
-          value 5;
-          description
-            "Identifier value 0x05, XENPAK.";
-        }
-        enum XFP {
-          value 6;
-          description
-            "Identifier value 0x06, XFP.";
-        }
-        enum XFF {
-          value 7;
-          description
-            "Identifier value 0x07, XFF.";
-        }
-        enum XFP-E {
-          value 8;
-          description
-            "Identifier value 0x08, XFP-E.";
-        }
-        enum XPAK {
-          value 9;
-          description
-            "Identifier value 0x09, XPAK.";
-        }
-        enum X2 {
-          value 10;
-          description
-            "Identifier value 0x0A, X2.";
-        }
-        enum DWDM-SFP/SFP+ {
-          value 11;
-          description
-            "Identifier value 0x0B, DWDM-SFP/SFP+.";
-        }
-        enum "QSFP INF-8438" {
-          value 12;
-          description
-            "Identifier value 0x0C, QSFP (INF-8438).";
-        }
-        enum "QSFP+ SFF-8436" {
-          value 13;
-          description
-            "Identifier value 0x0D, QSFP+ (SFF-8436) or later.";
-        }
-        enum CXP {
-          value 14;
-          description
-            "Identifier value 0x0E, CXP or later.";
-        }
-        enum "Shielded Mini Multilane HD 4X" {
-          value 15;
-          description
-            "Identifier value 0x0F, Shielded Mini Multilane HD 4X.";
-        }
-        enum "Shielded Mini Multilane HD 8X" {
-          value 16;
-          description
-            "Identifier value 0x0F, Shielded Mini Multilane HD 8X.";
-        }
-        enum "QSFP28 SFF-8636" {
-          value 17;
-          description
-            "Identifier value 0x11, QSFP28 (SFF-8636) or later.";
-        }
-        enum "CXP2 aka CXP28" {
-          value 18;
-          description
-            "Identifier value 0x12, CXP2 (aka CXP28) or later.";
-        }
-        enum "CDFP Style1/Style2" {
-          value 19;
-          description
-            "Identifier value 0x13, CDFP (Style 1 / Style 2).";
-        }
-        enum "Shielded Mini Multilane HD 4X Fanout" {
-          value 20;
-          description
-            "Identifier value 0x14, Shielded Mini Multilane HD 4X Fanout.";
-        }
-        enum "Shielded Mini Multilane HD 8X Fanout" {
-          value 21;
-          description
-            "Identifier value 0x15, Shielded Mini Multilane HD 8X Fanout.";
-        }
-        enum "CDFP Style 3" {
-          value 22;
-          description
-            "Identifier value 0x16, CDFP (Style 3).";
-        }
-      }
-      config false;
-      description
-        "Human readable description of Vendor's identifier byte value.";
-      reference "SFF-8024, table 4-1";
-    }
-    leaf identifier-raw {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "Vendor's identifier raw byte value. In the format of a HEX string.";
-      reference "SFF-8024, table 4-1";
-    }
-    leaf extended-identifier-raw {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "Vendor's extended identifier raw byte value. In the format of a HEX
-         string.";
-      reference "SFF-8436, table 4-1";
-    }
-    leaf power-consumption {
-      type enumeration {
-        enum "Class 1 Module 1.5W max" {
-          description
-            "Class 1 Module 1.5W max.";
-        }
-        enum "Class 2 Module 2.0W max" {
-          description
-            "Class 2 Module 2.0W max.";
-        }
-        enum "Class 3 Module 2.5W max" {
-          description
-            "Class 3 Module 2.5W max.";
-        }
-        enum "Class 4 Module 3.5W max" {
-          description
-            "Class 4 Module 3.5W max.";
-        }
-        enum "Class 5 Module 4.0W max" {
-          description
-            "Class 5 Module 4.0W max.";
-        }
-        enum "Class 6 Module 4.5W max" {
-          description
-            "Class 6 Module 4.5W max.";
-        }
-        enum "Class 7 Module 5.0W max" {
-          description
-            "Class 7 Module 5.0W max.";
-        }
-      }
-      config false;
-      description
-        "The class of Power Consumption portion of the extended identifier byte,
-         bit 7 to 6.";
-      reference "SFF-8436, section 7.6.2.2";
-    }
-    leaf clei {
-      type cienawstypes:string-maxl-16;
-      config false;
-      description
-        "CLEI code. If bit4 in extended identifier is set to 1, show the CLEI
-         code. If bit4 in extended identifier is set to 0, 'No CLEI code' will
-         be shown.";
-      reference "SFF-8436, section 7.6.2.2 and section 7.6.4";
-    }
-    leaf connector-type-raw {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "Vendor's connector type raw byte value. In the format of a HEX string.";
-      reference "SFF-8024, table 4-3";
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:vendor-data/xcvr:properties/xcvr:transmitter" {
-    when "../../../xcvr:type = 'QSFPplus' or ../../../xcvr:type = 'QSFP28' or ../../../xcvr:type = 'SFP' or ../../../xcvr:type = 'unsupported'" {
-      description
-        "XCVR transmitter properties specific to pluggable XCVRs.";
-    }
-    description
-      "XCVR transmitter properties specific to pluggable XCVRs.";
-    leaf wavelength {
-      type cienawstypes:decimal-2-dig;
-      units "nm";
-      config false;
-      description
-        "Wavelength value, in nanometers.";
-    }
-    leaf wavelength-raw {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "Raw byte value of Wavelength, before any multiplier operation is done.
-         In the format of a HEX string.";
-    }
-    leaf encoding-description {
-      type enumeration {
-        enum Unspecified {
-          value 0;
-          description
-            "Unspecified encoding.";
-        }
-        enum 8B/10B {
-          value 1;
-          description
-            "8B/10B encoding.";
-        }
-        enum 4B/5B {
-          value 2;
-          description
-            "4B/5B encoding.";
-        }
-        enum NRZ {
-          value 3;
-          description
-            "NRZ encoding.";
-        }
-        enum "SONET Scrambled" {
-          value 4;
-          description
-            "SONET Scrambled encoding.";
-        }
-        enum 64B/66B {
-          value 5;
-          description
-            "64B/66B encoding.";
-        }
-        enum Manchester {
-          value 6;
-          description
-            "Manchester encoding.";
-        }
-        enum 256B/257B {
-          value 7;
-          description
-            "256B/257B encoding.";
-        }
-      }
-      config false;
-      description
-        "Human readable description of Device encoding mechanism. Some values
-         may differ depending on if it is 8472 or 8x36.";
-      reference "SFF-8024, TABLE 4-2.";
-    }
-    leaf encoding-raw {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "Raw byte value of Device encoding mechanism. Some values may differ
-         depending on if it is 8472 or 8x36. In the format of a HEX string.";
-      reference "SFF-8024, TABLE 4-2.";
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:vendor-data/xcvr:properties/xcvr:diagnostic-monitoring" {
-    when "../../../xcvr:type = 'QSFPplus' or ../../../xcvr:type = 'QSFP28' or ../../../xcvr:type = 'SFP' or ../../../xcvr:type = 'unsupported'" {
-      description
-        "XCVR diagnostic properties specific to pluggable XCVRs.";
-    }
-    description
-      "XCVR diagnostic properties specific to pluggable XCVRs.";
-    leaf diagnostic-monitoring-type-raw {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "Display the raw byte value of Diagnostic Monitoring Type, in the format
-         of a HEX string.";
-      reference "SFF 8472 section 8.8 and table 9.5";
-    }
-    leaf diagnostic-monitoring-implemented {
-      type boolean;
-      config false;
-      description
-        "If Digital diagnostic monitoring is implemented, determined by bit 6 of
-         diagnostic monitoring type.";
-      reference "SFF 8472 section 8.8 and table 9.5";
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:vendor-data/xcvr:properties" {
-    when "../../xcvr:type = 'QSFPplus' or ../../xcvr:type = 'QSFP28' or ../../../xcvr:type = 'SFP' or ../../xcvr:type = 'unsupported'" {
-      description
-        "XCVR vendor-data properties specific to pluggable XCVRs.";
-    }
-    description
-      "XCVR vendor-data properties specific to pluggable XCVRs.";
-    container transceiver-code {
-      description
-        "XCVR vendor data transceiver code properties.";
-      leaf specification-compliance {
-        type bits {
-          bit Spec-Compliance-40G-Active-Cable-XLPPI {
-            position 0;
-            description
-              "Spec Compliance 40G Active Cable XLPPI";
-          }
-          bit Spec-Compliance-40GBASE-LR4 {
-            position 1;
-            description
-              "Spec Compliance 40GBASE-LR4";
-          }
-          bit Spec-Compliance-40GBASE-SR4 {
-            position 2;
-            description
-              "Spec Compliance 40GBASE-SR4";
-          }
-          bit Spec-Compliance-40GBASE-CR4 {
-            position 3;
-            description
-              "Spec Compliance 40GBASE-CR4";
-          }
-          bit Spec-Compliance-10GBASE-SR {
-            position 4;
-            description
-              "Spec Compliance 10GBASE-SR";
-          }
-          bit Spec-Compliance-10GBASE-LR {
-            position 5;
-            description
-              "Spec Compliance 10GBASE-LR";
-          }
-          bit Spec-Compliance-10GBASE-LRM {
-            position 6;
-            description
-              "Spec Compliance 10GBASE-LRM";
-          }
-          bit Extended-Spec-Compliance-100G-Active-Optical-Cable {
-            position 8;
-            description
-              "Extended Spec Compliance 100G Active Optical Cable";
-          }
-          bit Extended-Spec-Compliance-100GBASE-SR4 {
-            position 9;
-            description
-              "Extended Spec Compliance 100GBASE-SR4";
-          }
-          bit Extended-Spec-Compliance-100GBASE-LR4 {
-            position 10;
-            description
-              "Extended-Spec Compliance 100GBASE-LR4";
-          }
-          bit Extended-Spec-Compliance-100GBASE-ER4 {
-            position 11;
-            description
-              "Extended Spec Compliance 100GBASE-ER4";
-          }
-          bit Extended-Spec-Compliance-100GBASE-SR10 {
-            position 12;
-            description
-              "Extended Spec Compliance 100GBASE-SR10";
-          }
-          bit Extended-Spec-Compliance-100G-CWDM4-MSA-with-FEC {
-            position 13;
-            description
-              "Extended Spec Compliance 100G CWDM4 MSA with FEC";
-          }
-          bit Extended-Spec-Compliance-100G-PSM4-Parallel-SMF {
-            position 14;
-            description
-              "Extended Spec Compliance 100G PSM4 Parallel SMF";
-          }
-          bit Extended-Spec-Compliance-100G-Active-Copper-Cable {
-            position 15;
-            description
-              "Extended Spec Compliance 100G Active Copper Cable";
-          }
-          bit Extended-Spec-Compliance-100G-CWDM-MSA-without-FEC {
-            position 16;
-            description
-              "Extended Spec Compliance 100G CWDM MSA without FEC";
-          }
-          bit Extended-Spec-Compliance-100GBASE-CR4 {
-            position 18;
-            description
-              "Extended Spec Compliance 100GBASE-CR4";
-          }
-          bit Extended-Spec-Compliance-40GBASE-ER4 {
-            position 23;
-            description
-              "Extended Spec Compliance 40GBASE-ER4";
-          }
-          bit Extended-Spec-Compliance-4x10GBASE-SR {
-            position 24;
-            description
-              "Extended Spec Compliance 4x10GBASE-SR";
-          }
-          bit Extended-Spec-Compliance-40G-PSM4-Parallel-SMF {
-            position 25;
-            description
-              "Extended Spec Compliance 40G PSM4 Parallel SMF";
-          }
-          bit Extended-Spec-Compliance-G.959.1-P1I1-2D1 {
-            position 26;
-            description
-              "Extended Spec Compliance G.959.1 P1I1 2D1";
-          }
-          bit Extended-Spec-Compliance-G.959.1-P1S1-2D2 {
-            position 27;
-            description
-              "Extended Spec Compliance G.959.1 P1S1 2D2";
-          }
-          bit Extended-Spec-Compliance-G.959.1-P1L1-2D2 {
-            position 28;
-            description
-              "Extended Spec Compliance G.959.1 P1L1 2D2";
-          }
-          bit ExtSpecCode-10GBASE-T-with-SFI {
-            position 29;
-            description
-              "ExtSpecCode 10GBASE-T with SFI";
-          }
-          bit ExtSpecCode-100G-CLR4 {
-            position 30;
-            description
-              "ExtSpecCode 100G-CLR4";
-          }
-        }
-        description
-          "10 GbE ethernet, 40 GbE ethernet, and 100 GbE extended specification
-           compliance of the transceiver. In the form of a YANG bit field. Note,
-           the bit field in this node is not mapped with the SFF tables.";
-        reference
-          "SFF-8436 table 33 for specification compliance of 10 GbE and 40 GbE.
-           SFF-8024 table 4-4 for extended specification compliance of 100 GbE.";
-      }
-      leaf transceiver-code-raw {
-        type cienawstypes:string-maxl-32;
-        config false;
-        description
-          "Specification Compliance/Transceiver Code raw byte value. In the
-           format of a HEX string.";
-        reference "SFF-8436 table 33";
-      }
-    }
-    container device-technology {
-      description
-        "XCVR vendor data device technology properties.";
-      leaf device-technology-raw {
-        type cienawstypes:string-maxl-32;
-        config false;
-        description
-          "Display the raw byte value of Device Technology, in the format of a
-           HEX string.";
-        reference "SFF 8636 table 6-19.";
-      }
-      leaf transmitter-tunable {
-        type boolean;
-        config false;
-        description
-          "Device Technology Transmitter tuneable value. Reference SFF 8636
-           table 6-19, bit 0.";
-      }
-      leaf max-case-temperature {
-        type uint8;
-        units "C";
-        config false;
-        description
-          "Maximum Case Temperature. In degrees C.";
-      }
-    }
-    container options {
-      description
-        "XCVR device options, as described in reference SFF 8636.";
-      leaf options-raw {
-        type cienawstypes:string-maxl-32;
-        config false;
-        description
-          "Raw byte value of 'options' field. In the format of a HEX string.";
-        reference "SFF 8636 table 6-22.";
-      }
-      leaf tx-input-equalization-auto-adaptive-capable {
-        type boolean;
-        config false;
-        description
-          "A bit flag in 'options'.";
-        reference "SFF 8636 table 6-22.";
-      }
-      leaf tx-input-equalization-fixed-programmable-setting {
-        type boolean;
-        config false;
-        description
-          "A bit flag in 'options'.";
-        reference "SFF 8636 table 6-22.";
-      }
-      leaf rx-output-emphasis-fixed-programmable-setting {
-        type boolean;
-        config false;
-        description
-          "A bit flag in 'options'.";
-        reference "SFF 8636 table 6-22.";
-      }
-      leaf rx-output-amplitude-fixed-programmable-setting {
-        type boolean;
-        config false;
-        description
-          "A bit flag in 'options'.";
-        reference "SFF 8636 table 6-22.";
-      }
-      leaf tx-cdr-loss-of-lock-flag {
-        type boolean;
-        config false;
-        description
-          "A bit flag in 'options'.";
-        reference "SFF 8636 table 6-22.";
-      }
-      leaf rx-cdr-loss-of-lock-flag {
-        type boolean;
-        config false;
-        description
-          "A bit flag in 'options'.";
-        reference "SFF 8636 table 6-22.";
-      }
-      leaf user-eeprom-page-02h-provided {
-        type boolean;
-        config false;
-        description
-          "A bit flag in 'options'.";
-        reference "SFF 8636 table 6-22.";
-      }
-      leaf ast-page-01h-provided {
-        type boolean;
-        config false;
-        description
-          "A bit flag in 'options'.";
-        reference "SFF 8636 table 6-22.";
-      }
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:diagnostics/xcvr:device" {
-    when "../../xcvr:type = 'QSFPplus' or ../../xcvr:type = 'QSFP28' or ../../../xcvr:type = 'SFP'" {
-      description
-        "XCVR diagnostics device properties specific to pluggable XCVRs.";
-    }
-    description
-      "XCVR diagnostics device properties specific to pluggable XCVRs.";
-    container supply-voltage {
-      description
-        "XCVR supply voltage readings and thresholds.";
-      leaf actual {
-        type cienawstypes:decimal-2-dig;
-        units "V";
-        config false;
-        description
-          "Supply voltage, actual supply voltage in volts (V). Range must be
-           between 0 and 6.55V.";
-      }
-      container status {
-        description
-          "Supply voltage status.";
-        uses xcvr:supply-voltage-status-group;
-      }
-      container threshold {
-        description
-          "Supply voltage thresholds.";
-        uses xcvr:supply-voltage-threshold-group;
-      }
-    }
-  }
-  augment "/xcvr:waveserver-xcvrs/xcvr:xcvrs/xcvr:properties/xcvr:diagnostics/xcvr:lane" {
-    when "../../xcvr:type = 'QSFPplus' or ../../xcvr:type = 'QSFP28'" {
-      description
-        "XCVR lane properties specific to pluggable XCVRs.";
-    }
-    description
-      "XCVR lane properties specific to pluggable XCVRs.";
-    leaf transmitter-fault {
-      type boolean;
-      config false;
-      description
-        "If the xcvr channel transmitter has detected a fault.";
-    }
-    leaf tx-adaptive-eq-fault {
-      type boolean;
-      config false;
-      description
-        "If the xcvr channel Tx Adaptive EQ Fault has detected a fault. Only
-         applicable for QSFP28. For QSFP+, default value of FALSE will be
-         returned.";
-    }
-  }
-}
diff --git a/models/ciena-waveserver-xcvr.yang b/models/ciena-waveserver-xcvr.yang
deleted file mode 100644
index 7e205c80a1708649ebafee64161d9118e3c44ab1..0000000000000000000000000000000000000000
--- a/models/ciena-waveserver-xcvr.yang
+++ /dev/null
@@ -1,787 +0,0 @@
-module ciena-waveserver-xcvr {
-  namespace "urn:ciena:params:xml:ns:yang:ciena-ws:ciena-waveserver-xcvr";
-  prefix xcvr;
-
-  import ciena-waveserver-typedefs {
-    prefix cienawstypes;
-  }
-
-  organization
-    "Ciena Corporation";
-  contact
-    "Web URL: http://www.ciena.com/
-     Postal:  7035 Ridge Road
-              Hanover, Maryland 21076
-              U.S.A.
-     Phone:   +1 800-921-1144
-     Fax:     +1 410-694-5750";
-  description
-    "This module defines the common XCVR model. The XCVR is augmented by specific types of transceiver modules if applicable. XCVR objects are permanently available for all ports and reported as empty if the device is not physically present. Attributes read from the device are only available while the device is present.";
-
-  revision 2019-06-24 {
-    description
-      "Added RPC call to create XCVR profile from the existing 3rd party XCVR plug.
-       Added 'XCVR Profile' to define vendor- and part-specific power threshold
-              attributes for the 3rd party XCVR plugs.";
-    reference "Waveserver Ai R1.5 user's guide.";
-  }
-  revision 2019-02-07 {
-    description
-      "Updated 'optical-power-group' to use 2 decimal places for power levels.
-       Updated 'optical-power-threshold-group' to use 2 decimal places for threshold values.";
-    reference "Waveserver Ai R1.4 user's guide.";
-  }
-  revision 2018-05-07 {
-    description
-      "Added 'actual-mode' to the state container.
-       Added 'supported-modes' list to the vendor-data properties container.";
-    reference "Waveserver Ai R1.2 user's guide.";
-  }
-  revision 2017-11-27 {
-    description
-      "Added 'mandatory' statement to 'properties/mode' leaf.";
-    reference "Waveserver Ai R1.1 user's guide.";
-  }
-  revision 2017-08-27 {
-    description
-      "Waveserver Platform Data Model
-       Migrated from Waveserver Classic R1.4 YANG model.
-       Updated namespace to 'ciena-waveserver'.
-       Changed 'xcvrs' list key from 'xcvr-index' (integer type) to 'xcvr-id' (string type) to accommodate '<slot>-<port>' format.
-       Changed 'child-ptp-id' type from integer to string to accommodate '<slot>-<port>' format.
-       Changed 'power-state' enum values to use common typedef.
-       Renamed 'channels' to 'lanes'.
-       Updated description strings, fixed several lint errors/warnings.
-       Updated 'operational-state' enum values.
-       Removed 'description' attribute from 'id' container.
-       Removed 'xcvr-delete' RPC (deletes will be handled via native delete operation instead).";
-    reference "Waveserver Ai R1.0 user's guide.";
-  }
-
-  typedef xcvr-op-enum {
-    type enumeration {
-      enum unknown {
-        description
-          "Unknown operational state.";
-      }
-      enum up {
-        description
-          "XCVR is up/operational.";
-      }
-      enum down {
-        description
-          "XCVR is down/failed.";
-      }
-      enum fault {
-        description
-          "There is an active alarm associated with the XCVR.";
-      }
-      enum shutdown {
-        description
-          "XCVR is shutdown/off.";
-      }
-      enum lower-layer-down {
-        description
-          "The XCVR is enabled, but a parent object is faulted.";
-      }
-      enum unequipped {
-        description
-          "XCVR is unequipped.";
-      }
-      enum uncertified {
-        description
-          "XCVR is uncertified.";
-      }
-    }
-    description
-      "XCVR operational state values.";
-  }
-
-  typedef xcvr-profile-id {
-    type uint32 {
-      range "1 .. 255";
-    }
-    description
-      "XCVR Profile ID";
-  }
-
-  grouping optical-power-group {
-    description
-      "Group of optical power related operational data leafs. Can be used for Rx or Tx";
-    leaf actual {
-      type cienawstypes:decimal-2-dig;
-      units "dBm";
-      config false;
-      description
-        "Actual Tx or Rx optical power in dBm.";
-    }
-    leaf maximum {
-      type cienawstypes:decimal-2-dig;
-      units "dBm";
-      config false;
-      description
-        "Maximum actual recorded Tx or Rx optical power in dBm.";
-    }
-    leaf minimum {
-      type cienawstypes:decimal-2-dig;
-      units "dBm";
-      config false;
-      description
-        "Minimum actual recorded Tx or Rx optical power in dBm.";
-    }
-    leaf maximum-recorded-time {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "The exact date and time when the maximum optical power (Tx or Rx) was recorded. In the format of a date time string.";
-    }
-    leaf minimum-recorded-time {
-      type cienawstypes:string-maxl-32;
-      config false;
-      description
-        "The exact date and time when the minimum optical power (Tx or Rx) was recorded. In the format of a date time string.";
-    }
-  }
-
-  grouping optical-power-threshold-group {
-    description
-      "Group of optical power alarm related operational data leafs. Can be used for Rx or Tx.";
-    leaf high-alarm-threshold {
-      type cienawstypes:decimal-2-dig;
-      units "dBm";
-      description
-        "Optical power high alarm threshold, in dBm. If it is modem Tx-power, the threshold can change based on provisioned tx power. High threshold = target power + 3.";
-    }
-    leaf low-alarm-threshold {
-      type cienawstypes:decimal-2-dig;
-      units "dBm";
-      description
-        "Optical power low alarm threshold, in dBm. If it is modem Tx-power, the threshold can change based on provisioned tx power. Low threshold = target power - 10.";
-    }
-    leaf high-warning-threshold {
-      type cienawstypes:decimal-2-dig;
-      units "dBm";
-      description
-        "Optical power high warning threshold, in dBm.";
-    }
-    leaf low-warning-threshold {
-      type cienawstypes:decimal-2-dig;
-      units "dBm";
-      description
-        "Optical power low warning threshold, in dBm.";
-    }
-  }
-
-  grouping optical-power-status-group {
-    description
-      "Group of optical power status related operational data leafs. Can be used for Rx or Tx";
-    leaf high-alarm-status {
-      type boolean;
-      config false;
-      description
-        "Optical power high alarm status, boolean, true if alarm is raised, false if alarm is not raised.";
-    }
-    leaf low-alarm-status {
-      type boolean;
-      config false;
-      description
-        "Optical power low alarm status, boolean, true if alarm is raised, false if alarm is not raised.";
-    }
-    leaf high-warning-status {
-      type boolean;
-      config false;
-      description
-        "Optical power high warning status, boolean, true if warning is raised, false if warning is not raised.";
-    }
-    leaf low-warning-status {
-      type boolean;
-      config false;
-      description
-        "Optical power low warning status, boolean, true if warning is raised, false if warning is not raised.";
-    }
-  }
-
-  grouping optical-bias-status-group {
-    description
-      "Group of optical bias related operational data leafs.";
-    leaf high-alarm-status {
-      type boolean;
-      config false;
-      description
-        "Optical bias high alarm status, boolean, true if alarm is raised, false if alarm is not raised.";
-    }
-    leaf low-alarm-status {
-      type boolean;
-      config false;
-      description
-        "Optical bias low alarm status, boolean, true if alarm is raised, false if alarm is not raised.";
-    }
-    leaf high-warning-status {
-      type boolean;
-      config false;
-      description
-        "Optical bias high warning status, boolean, true if warning is raised, false if warning is not raised.";
-    }
-    leaf low-warning-status {
-      type boolean;
-      config false;
-      description
-        "Optical bias low warning status, boolean, true if warning is raised, false if warning is not raised.";
-    }
-  }
-
-  grouping temperature-threshold-group {
-    description
-      "Group of XCVR temperature alarm and warning operational data leafs.";
-    leaf high-alarm-threshold {
-      type int16;
-      units "C";
-      config false;
-      description
-        "Temperature high alarm threshold, in degrees Celsius (C).";
-    }
-    leaf low-alarm-threshold {
-      type int16;
-      units "C";
-      config false;
-      description
-        "Temperature low alarm threshold, in degrees Celsius (C)";
-    }
-    leaf high-warning-threshold {
-      type int16;
-      units "C";
-      config false;
-      description
-        "Temperature high warning threshold, in degrees Celsius (C)";
-    }
-    leaf low-warning-threshold {
-      type int16;
-      units "C";
-      config false;
-      description
-        "Temperature low warning threshold, in degrees Celsius (C)";
-    }
-  }
-
-  grouping temperature-status-group {
-    description
-      "Group of XCVR temperature related operational data leafs.";
-    leaf high-alarm-status {
-      type boolean;
-      config false;
-      description
-        "Temperature high alarm status, boolean, true if alarm is raised, false if alarm is not raised.";
-    }
-    leaf low-alarm-status {
-      type boolean;
-      config false;
-      description
-        "Temperature low alarm status, boolean, true if alarm is raised, false if alarm is not raised.";
-    }
-    leaf high-warning-status {
-      type boolean;
-      config false;
-      description
-        "Temperature high warning status, boolean, true if warning is raised, false if warning is not raised.";
-    }
-    leaf low-warning-status {
-      type boolean;
-      config false;
-      description
-        "Temperature low warning status, boolean, true if warning is raised, false if warning is not raised.";
-    }
-  }
-
-  grouping supply-voltage-threshold-group {
-    description
-      "Group of Supply Voltage alarm and warning operational data leafs.";
-    leaf high-alarm-threshold {
-      type cienawstypes:decimal-2-dig;
-      units "V";
-      config false;
-      description
-        "Supply voltage high alarm threshold, in volts (V).";
-    }
-    leaf low-alarm-threshold {
-      type cienawstypes:decimal-2-dig;
-      units "V";
-      config false;
-      description
-        "Supply oltage low alarm threshold, in volts (V).";
-    }
-    leaf high-warning-threshold {
-      type cienawstypes:decimal-2-dig;
-      units "V";
-      config false;
-      description
-        "Supply voltage high warning threshold, in volts (V).";
-    }
-    leaf low-warning-threshold {
-      type cienawstypes:decimal-2-dig;
-      units "V";
-      config false;
-      description
-        "Supply voltage low warning threshold, in volts (V).";
-    }
-  }
-
-  grouping supply-voltage-status-group {
-    description
-      "group of Supply Voltage related operational data leafs. The grouping may be used by various XCVR containers, lists, and augments.";
-    leaf high-alarm-status {
-      type boolean;
-      config false;
-      description
-        "Supply voltage high alarm status, boolean, true if alarm is raised, false if alarm is not raised.";
-    }
-    leaf low-alarm-status {
-      type boolean;
-      config false;
-      description
-        "Supply voltage low alarm status, boolean, true if alarm is raised, false if alarm is not raised.";
-    }
-    leaf high-warning-status {
-      type boolean;
-      config false;
-      description
-        "Supply voltage high warning status, boolean, true if warning is raised, false if warning is not raised.";
-    }
-    leaf low-warning-status {
-      type boolean;
-      config false;
-      description
-        "Supply voltage low warning status, boolean, true if warning is raised, false if warning is not raised.";
-    }
-  }
-
-  container waveserver-xcvrs {
-    description
-      "Waveserver transceivers (XCVR) configuration and operational data.";
-    list xcvrs {
-      key "xcvr-id";
-      description
-        "Waveserver transceiver (XCVR) list.";
-      leaf xcvr-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique, access identifier string of the XCVR (e.g. '1-1'). Key value for the XCVR List.";
-      }
-      container id {
-        config false;
-        description
-          "Identification information of this XCVR instance.";
-        leaf name {
-          type cienawstypes:name-string;
-          config false;
-          description
-            "Name of the XCVR transceiver. Auto generated, and cannot be modified.";
-        }
-      }
-      container state {
-        description
-          "State information of this XCVR instance.";
-        leaf admin-state {
-          type cienawstypes:enabled-disabled-enum;
-          description
-            "Whether Admin State is enabled or disabled for this XCVR's PTP.";
-        }
-        leaf operational-state {
-          type xcvr-op-enum;
-          config false;
-          description
-            "Operational state of this XCVR, for Waveserver, it will be empty by default.";
-        }
-        leaf power-state {
-          type cienawstypes:power-state;
-          config false;
-          description
-            "Power State of the XCVR. If it is in automatic (normal) or shutdown (low power).";
-        }
-        leaf actual-mode {
-          type cienawstypes:xcvr-mode;
-          config false;
-          description
-            "Actual mode of the XCVR.";
-        }
-      }
-      container properties {
-        description
-          "All the Configurable and operational data of this XCVR instance.";
-        leaf type {
-          type cienawstypes:xcvr-type;
-          config false;
-          description
-            "Transceiver type, different transceiver types will have different operational data. Type depends on what is physically plugged in.";
-        }
-        leaf mode {
-          type cienawstypes:xcvr-mode;
-          mandatory true;
-          description
-            "Mode of the XCVR.";
-        }
-        leaf number-of-lanes {
-          type cienawstypes:lanes-number;
-          config false;
-          description
-            "Number of lanes this tranceiver has. Only applicable if a transceiver is plugged in.";
-        }
-        leaf-list child-ptp-id {
-          type cienawstypes:name-string;
-          config false;
-          description
-            "The child ptp this xcvr is associated with.";
-        }
-        container vendor-data {
-          config false;
-          description
-            "vendor-data, the container or its subcontainers may be augmented by pluggable or modem specific yang modules, depending on transceiver type.";
-          container id {
-            description
-              "XCVR Vendor ID";
-            container ciena-id {
-              description
-                "If the plugged transceiver is a Ciena product, display the Ciena product information. The leafs in this container will be blank if the transceiver is not plugged in or if it is not a Ciena product.";
-              leaf ciena-item-number {
-                type cienawstypes:string-maxl-32;
-                config false;
-                description
-                  "If the plugged transceiver is a Ciena product, display the product item number. If it is not a Ciena product or if nothing is plugged in, this field will be blank";
-              }
-              leaf revision {
-                type cienawstypes:string-maxl-32;
-                config false;
-                description
-                  "If the plugged transceiver is a Ciena product, display the Ciena revision in the format of <prefix>.<number>.<suffix>. If it is not a Ciena product or if nothing is plugged in, this field will be blank";
-              }
-              leaf description {
-                type cienawstypes:string-maxl-254;
-                config false;
-                description
-                  "If the plugged transceiver is a Ciena product, display the Ciena description. If it is not a Ciena product or if nothing is plugged in, this field will be blank";
-              }
-            }
-            container vendor-id {
-              description
-                "Display the transceiver vendor identification information.";
-              leaf name {
-                type cienawstypes:string-maxl-32;
-                config false;
-                description
-                  "Name of the Vendor that produced this transceiver. For Ciena transceiver, the value will be Ciena.";
-              }
-              leaf part-number {
-                type cienawstypes:string-maxl-32;
-                config false;
-                description
-                  "Vendor part number of the transceiver.";
-              }
-              leaf revision {
-                type cienawstypes:string-maxl-32;
-                config false;
-                description
-                  "Vendor Revision of the transceiver.";
-              }
-              leaf serial-number {
-                type cienawstypes:string-maxl-32;
-                config false;
-                description
-                  "Vendor serial number of the XCVR transceiver.";
-              }
-              leaf manufactured-date {
-                type cienawstypes:string-maxl-16;
-                config false;
-                description
-                  "Manufactured Date, in the format of mm/dd/yy.";
-              }
-            }
-          }
-          container properties {
-            description
-              "XCVR vendor data properties.";
-            container device-id {
-              description
-                "Vendor Device ID properties.";
-              leaf connector-type {
-                type cienawstypes:connector-type-desc-enum;
-                config false;
-                description
-                  "Human readable description of Vendor's connector type byte value. Reference SFF-8024, table 4-3";
-              }
-            }
-            container transmitter {
-              description
-                "Transmitter properties.";
-              leaf nominal-bit-rate {
-                type cienawstypes:string-maxl-16;
-                units "Gbps";
-                config false;
-                description
-                  "Bit rate, nominal, in Gbps for pluggable XCVRs. For modem XCVR objects, this will be OTUCn.";
-              }
-            }
-            container diagnostic-monitoring {
-              description
-                "XCVR diagnostic monitoring properties.";
-              leaf rx-power-measurement {
-                type enumeration {
-                  enum OMA {
-                    description
-                      "Optical Modulation Amplitude (OMA) Rx measurement type.";
-                  }
-                  enum average-power {
-                    description
-                      "Average Power Rx measurement type.";
-                  }
-                  enum yes {
-                    description
-                      "yes";
-                  }
-                  enum no {
-                    description
-                      "no";
-                  }
-                }
-                config false;
-                description
-                  "Rx power measurement, bit 3 of diagnostic monitoring type. Reference SFF 8472 section 8.8 and table 8-5 for detail.";
-              }
-              leaf tx-power-measurement {
-                type enumeration {
-                  enum yes {
-                    description
-                      "yes";
-                  }
-                  enum no {
-                    description
-                      "no";
-                  }
-                }
-                config false;
-                description
-                  "Tx power measurement, related to diagnostic monitoring type.";
-              }
-            }
-            list supported-modes {
-              key "xcvr-mode";
-              config false;
-              description
-                "A matrix of supported capabilities for each of the supported
-                 XCVR modes for this object. XCVR type specific capabilities
-                 may be augmented into this list.";
-              leaf xcvr-mode {
-                type cienawstypes:xcvr-mode;
-                description
-                  "The XCVR mode to which the capabilities are ascribed. If a
-                   mode is not listed, then it is not supported on this XCVR
-                   object.";
-              }
-            }
-          }
-        }
-        container diagnostics {
-          config false;
-          description
-            "XCVR diagnostic data, the container or its subcontainers may be augmented by pluggable or modem specific yang modules, depending on the transceiver type.";
-          container device {
-            config false;
-            description
-              "container for all common device diagnostic data fields for the XCVR.";
-            container temperature {
-              description
-                "XCVR temperature measurements.";
-              leaf actual {
-                type int16;
-                units "C";
-                config false;
-                description
-                  "Temperature Status, actual temperature in degrees Celsius (C). Range must be between -128 and 128.";
-              }
-              container status {
-                description
-                  "XCVR temperature status.";
-                uses xcvr:temperature-status-group;
-              }
-              container threshold {
-                description
-                  "XCVR temperature threshold.";
-                uses xcvr:temperature-threshold-group;
-              }
-            }
-          }
-          list lane {
-            key "lane-number";
-            config false;
-            max-elements 4;
-            description
-              "List of common xcvr lane diagnostic data fields of the XCVR.";
-            leaf lane-number {
-              type cienawstypes:lanes-number;
-              config false;
-              description
-                "Lane number of XCVR.";
-            }
-            container rx-power {
-              description
-                "Lane Tx power measurements.";
-              leaf actual {
-                type cienawstypes:decimal-1-dig;
-                units "dBm";
-                config false;
-                description
-                  "Actual Rx optical power in dBm.";
-              }
-              container status {
-                description
-                  "Rx power status.";
-                uses xcvr:optical-power-status-group;
-              }
-              container threshold {
-                description
-                  "Default Rx power threshold values stored in the EEPROM.";
-                uses xcvr:optical-power-threshold-group;
-              }
-            }
-            container tx-power {
-              description
-                "Lane Tx power measurements.";
-              leaf actual {
-                type cienawstypes:decimal-1-dig;
-                units "dBm";
-                config false;
-                description
-                  "Actual Tx optical power in dBm.";
-              }
-              container status {
-                description
-                  "Tx power status.";
-                uses xcvr:optical-power-status-group;
-              }
-              container threshold {
-                description
-                  "Default Tx power threshold values stored in the EEPROM.";
-                uses xcvr:optical-power-threshold-group;
-              }
-            }
-          }
-        }
-      }
-    }
-    list xcvr-profiles {
-      key "xcvr-profile-index";
-      description
-        "List of XCVR profiles.";
-      leaf xcvr-profile-index {
-        type xcvr-profile-id;
-        mandatory true;
-        description
-          "XCVR tranceiver profile index, unique, key value for the XCVR Profile List.";
-      }
-      leaf description {
-        type cienawstypes:string-maxl-254;
-        description
-          "The description of the profile to uniquely identify the XCVR and its profile.";
-      }
-      container id {
-        description
-          "Identification information of this XCVR Profile instance.";
-        leaf vendor-name {
-          type cienawstypes:string-maxl-32;
-          description
-            "Name of the XCVR vendor.";
-        }
-        leaf vendor-oui {
-          type string {
-            length "0..8";
-            pattern '[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}';
-          }
-          description
-            "OUI of the XCVR vendor.";
-        }
-        leaf vendor-pn {
-          type cienawstypes:string-maxl-32;
-          description
-            "XCVR vendor part number.";
-        }
-        leaf vendor-rev {
-          type cienawstypes:string-maxl-32;
-          description
-            "XCVR vendor revision.";
-        }
-      }
-      container properties {
-        description
-          "Configurable attributes of the XCVR profile.";
-        leaf tx-optical-power-monitoring-override {
-          type boolean;
-          description
-            "To override the transmit power monitor for plugs even though the  
-             setting of the transmit power monitor capability in EEPROM of the 
-             plug is not to allow monitoring. True means to allow monitoring 
-             irrespective of the EEPROM setting. And, False means no override.";
-        }
-        container tx-thresholds {
-          description
-            "Transmit power thresholds of the XCVR profile. These threshold 
-             attributes will not affect the traffic. Modifying these thresholds
-             to values which are different from the manufacture recommended 
-             values will impact the XCVR optical power alarms/warnings.";
-          uses xcvr:optical-power-threshold-group;
-        }
-        container rx-thresholds {
-          description
-            "Receiver power thresholds of the XCVR profile. These threshold 
-             attributes will not affect the traffic. Modifying these thresholds
-             to values which are different from the manufacture recommended 
-             values will impact the XCVR optical power alarms/warnings.";
-          uses xcvr:optical-power-threshold-group;
-        }
-      }
-    }
-  }
-  rpc waveserver-xcvr-profiles-apply {
-    description
-      "Call to apply a XCVR profile to all XCVRs with matching vendor keys.";
-    input {
-      leaf xcvr-profile-index {
-        type xcvr-profile-id;
-        description
-          "XCVR tranceiver profile index of the profile to be applied.";
-      }
-      leaf all {
-        type boolean;
-        description
-          "Apply all the profiles to respective matching XCVRs. Default is false.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-  rpc waveserver-xcvr-profile-create-from-xcvr {
-    description
-      "Call to create a XCVR profile with vendor parameters matching with one 
-       of the existing XCVR plug. The XCVR profile is created with 
-       tx-optical-power-monitoring-override with default value false. The
-       user can, subsequently, invoke patch operation to update power
-       thresholds and tx-optical-power-monitor-override attributes.";
-    input {
-      leaf xcvr-profile-index {
-        type xcvr-profile-id;
-        mandatory true;
-        description
-          "XCVR tranceiver profile index of the profile to be applied.";
-      }
-      leaf from-xcvr-id {
-        type cienawstypes:name-string;
-        mandatory true;
-        description
-          "Unique, access identifier string of the existing 3rd party XCVR,
-           whose vendor parameters the new XCVR profile will be created with.";
-      }
-    }
-    output {
-      uses cienawstypes:rpc-output;
-    }
-  }
-}
diff --git a/models/ietf-yang-types.yang b/models/tapi/ietf-yang-types.yang
similarity index 100%
rename from models/ietf-yang-types.yang
rename to models/tapi/ietf-yang-types.yang
diff --git a/models/tapi-common@2019-03-31.yang b/models/tapi/tapi-common@2019-03-31.yang
similarity index 100%
rename from models/tapi-common@2019-03-31.yang
rename to models/tapi/tapi-common@2019-03-31.yang
diff --git a/models/tapi-connectivity@2019-03-31.yang b/models/tapi/tapi-connectivity@2019-03-31.yang
similarity index 100%
rename from models/tapi-connectivity@2019-03-31.yang
rename to models/tapi/tapi-connectivity@2019-03-31.yang
diff --git a/models/tapi-dsr@2019-03-31.yang b/models/tapi/tapi-dsr@2019-03-31.yang
similarity index 100%
rename from models/tapi-dsr@2019-03-31.yang
rename to models/tapi/tapi-dsr@2019-03-31.yang
diff --git a/models/tapi-equipment@2019-03-31.yang b/models/tapi/tapi-equipment@2019-03-31.yang
similarity index 100%
rename from models/tapi-equipment@2019-03-31.yang
rename to models/tapi/tapi-equipment@2019-03-31.yang
diff --git a/models/tapi-eth@2019-03-31.yang b/models/tapi/tapi-eth@2019-03-31.yang
similarity index 100%
rename from models/tapi-eth@2019-03-31.yang
rename to models/tapi/tapi-eth@2019-03-31.yang
diff --git a/models/tapi-notification@2019-03-31.yang b/models/tapi/tapi-notification@2019-03-31.yang
similarity index 100%
rename from models/tapi-notification@2019-03-31.yang
rename to models/tapi/tapi-notification@2019-03-31.yang
diff --git a/models/tapi-oam@2019-03-31.yang b/models/tapi/tapi-oam@2019-03-31.yang
similarity index 100%
rename from models/tapi-oam@2019-03-31.yang
rename to models/tapi/tapi-oam@2019-03-31.yang
diff --git a/models/tapi-odu@2019-03-31.yang b/models/tapi/tapi-odu@2019-03-31.yang
similarity index 100%
rename from models/tapi-odu@2019-03-31.yang
rename to models/tapi/tapi-odu@2019-03-31.yang
diff --git a/models/tapi-path-computation@2019-03-31.yang b/models/tapi/tapi-path-computation@2019-03-31.yang
similarity index 100%
rename from models/tapi-path-computation@2019-03-31.yang
rename to models/tapi/tapi-path-computation@2019-03-31.yang
diff --git a/models/tapi-photonic-media@2019-03-31.yang b/models/tapi/tapi-photonic-media@2019-03-31.yang
similarity index 100%
rename from models/tapi-photonic-media@2019-03-31.yang
rename to models/tapi/tapi-photonic-media@2019-03-31.yang
diff --git a/models/tapi-streaming@2017-11-13.yang b/models/tapi/tapi-streaming@2017-11-13.yang
similarity index 100%
rename from models/tapi-streaming@2017-11-13.yang
rename to models/tapi/tapi-streaming@2017-11-13.yang
diff --git a/models/tapi-topology@2019-03-31.yang b/models/tapi/tapi-topology@2019-03-31.yang
similarity index 100%
rename from models/tapi-topology@2019-03-31.yang
rename to models/tapi/tapi-topology@2019-03-31.yang
diff --git a/models/tapi-virtual-network@2019-03-31.yang b/models/tapi/tapi-virtual-network@2019-03-31.yang
similarity index 100%
rename from models/tapi-virtual-network@2019-03-31.yang
rename to models/tapi/tapi-virtual-network@2019-03-31.yang
diff --git a/models/yuma-ncx.yang b/models/tapi/yuma-ncx.yang
similarity index 100%
rename from models/yuma-ncx.yang
rename to models/tapi/yuma-ncx.yang
diff --git a/responses/README.md b/responses/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..71d1b21bfb6d0876eff28b9e43eca19b0febac9d
--- /dev/null
+++ b/responses/README.md
@@ -0,0 +1,38 @@
+# RESTCONF responses
+
+## Ciena MCP Tapi
+
+Used topology UUID: 4e537278-79f8-39ad-804b-f0b553cb2ffb
+
+Used connection UUID: 39337623-6e14-3e63-bd2f-8a23dea1c19f
+
+Used connectivity service UUID: 5f887f79-5ec2-4723-94ad-d3a1e5d623c8
+
+Used node-edge-point UUID: 9b493918-6cca-3372-a0dd-44cae0e82ab6
+
+Used link UUID: 1b3a45c3-dd27-39ff-8921-fed819a622ec
+
+Used node UUID: e0121f0e-d3c6-3845-a769-5be79030c615
+
+**Note:** `Node-edge-point` is a passive property. Listed as `owned-node-edge-point` in the API docs
+
+### Used requests:
+
+```
+https://developer.ciena.com/tapi/data/context/connectivity-context/connection/?page%5Bnumber%5D=0&page%5Bsize%5D=10
+https://developer.ciena.com/tapi/data/context/connectivity-context/connection=39337623-6e14-3e63-bd2f-8a23dea1c19f
+https://developer.ciena.com/tapi/data/context/connectivity-context/connectivity-service/?page%5Bnumber%5D=0&page%5Bsize%5D=10
+https://developer.ciena.com/tapi/data/context/connectivity-context/connectivity-service=5f887f79-5ec2-4723-94ad-d3a1e5d623c8
+https://developer.ciena.com/tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/connection-end-point/?page%5Bnumber%5D=0&page%5Bsize%5D=10
+https://developer.ciena.com/tapi/core/context/topology/mcp-base-topology/link/?limit=100
+https://developer.ciena.com/tapi/core/context/topology/mcp-base-topology/node-edge-point/?limit=100
+https://developer.ciena.com/tapi/core/context/topology/mcp-base-topology/node/?limit=100
+https://developer.ciena.com/tapi/data/context/topology-context/topology/
+https://developer.ciena.com/tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/link/?page%5Bnumber%5D=0&page%5Bsize%5D=10
+https://developer.ciena.com/tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/link=1b3a45c3-dd27-39ff-8921-fed819a622ec
+https://developer.ciena.com/tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node-edge-point/?page%5Bnumber%5D=0&page%5Bsize%5D=10
+https://developer.ciena.com/tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node-edge-point=9b493918-6cca-3372-a0dd-44cae0e82ab6
+https://developer.ciena.com/tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node/?page%5Bnumber%5D=0&page%5Bsize%5D=10
+https://developer.ciena.com/tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=e0121f0e-d3c6-3845-a769-5be79030c615
+https://developer.ciena.com/tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb
+```
diff --git a/responses/ciena/tapi/deeppaging.link.Response.json b/responses/ciena/tapi/deeppaging.link.Response.json
new file mode 100644
index 0000000000000000000000000000000000000000..f2048f93ce658a0727dfdd6a597aaa0edfb1ebcb
--- /dev/null
+++ b/responses/ciena/tapi/deeppaging.link.Response.json
@@ -0,0 +1,2530 @@
+{
+  "data": [
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "72d39ad8-0203-3e91-b778-ab8d15fffb7d",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "72d39ad8-0203-3e91-b778-ab8d15fffb7d",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "98167141-d3ea-3b99-958c-d181a84d0ab0"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "01f6625b-f4a9-3adb-9bb9-b2f6affed4ef"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "OTUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "0c4e351e-aaa0-3a3f-8cfe-55bc71443423",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "0c4e351e-aaa0-3a3f-8cfe-55bc71443423",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "a770e91e-596b-3dea-959d-51fa27e3258b"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "f341c258-84a7-30e4-9485-6852f6e3faf1"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "1b3a45c3-dd27-39ff-8921-fed819a622ec",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "1b3a45c3-dd27-39ff-8921-fed819a622ec",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "9f016279-9a1f-3fee-b1ea-b8a353f0e0af"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "ba1b22ee-2512-3693-9606-9ef75bcc325d"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "3a67b880-2579-3c61-9958-d5eed655faa3",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "3a67b880-2579-3c61-9958-d5eed655faa3",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "2428479b-4216-3d2e-9171-a2884cc63c60"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "d6061908-a684-37de-becd-75d0f8d555e3"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "e4d76f39-c2e8-3c09-8dea-1f7b16ff6ef5",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "e4d76f39-c2e8-3c09-8dea-1f7b16ff6ef5",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "17219a09-985f-377e-a6cb-424bbc6f123b"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "845b0f95-e923-3e6d-bdc2-07974358db71"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "OTUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "a5818a14-6229-3d0d-b7b2-4d1d0c76611f",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "a5818a14-6229-3d0d-b7b2-4d1d0c76611f",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "6135a998-cc1c-3aa4-90f8-a89591c04555"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "041c7fd9-4895-360d-b3ac-86d6c22ca8b7"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "8d51c2e7-a58c-3712-9b69-c4887faec223",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "8d51c2e7-a58c-3712-9b69-c4887faec223",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "015be529-2983-33a3-92d9-42765c2b4f96"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "c106e603-6478-3e2e-b0f6-102ac6d1b28d"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "OTUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "e4e19847-69f0-3470-ba02-5960bd29ac2d",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "e4e19847-69f0-3470-ba02-5960bd29ac2d",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "5bd5ec4b-48d0-3417-9998-20c637f275a3"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "d8316559-2b9c-3370-9a53-5500abea2127"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "b9590abb-4cef-3f31-b3ef-a337375a554f",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "b9590abb-4cef-3f31-b3ef-a337375a554f",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "ecc60310-c5ce-362c-9f9b-4f1c075a1b57"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "806d4a5e-7240-35af-95b9-b22fa3443c44"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "7fa42461-c4e5-3fbb-834a-956bfbdd773d",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "7fa42461-c4e5-3fbb-834a-956bfbdd773d",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "cf368719-7534-338d-b487-e4a5a3f1e959"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "d3863b84-856f-3631-903a-c1325c4fe6cd"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "87cf2c89-a2a1-37eb-b26e-c6386ea51edb",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "87cf2c89-a2a1-37eb-b26e-c6386ea51edb",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "d7390546-0482-3ef2-95b6-7c66a4c68a34"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "a612f441-fa88-3da1-b162-313567ac4dc4"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "c7575c31-8dbb-37bd-b478-1a2ce8eee0bd",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "c7575c31-8dbb-37bd-b478-1a2ce8eee0bd",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "55754d33-a5ca-3835-a31c-e2862e570975"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "67c45d25-f027-3fb2-a74b-be33c980badd"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "OTUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "f064a680-a6cf-3e1f-be6e-4f9c661b979f",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "f064a680-a6cf-3e1f-be6e-4f9c661b979f",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "69e25794-3d3b-3f5d-9e2a-c2bb1c36b8af"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "3bb228fb-c3c7-38a0-8d9c-54e57531f40f"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "f4ef41a4-843c-36ad-b450-edc6229d960a",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "f4ef41a4-843c-36ad-b450-edc6229d960a",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "6cc3db8f-3397-3eda-af65-ff68d46a00b0"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "de83e8c0-7e97-3dbf-950b-915966c5858d"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "b190237a-e425-3112-9a99-5eecedcb6bbe",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "b190237a-e425-3112-9a99-5eecedcb6bbe",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "a4645130-7422-35b0-b992-ed7d49dfd26a"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "fee90194-01b8-3988-8f75-2f3c0317c1cd"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "a6c16b65-d9ad-321e-bec0-2aff7a9cd4c2",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "a6c16b65-d9ad-321e-bec0-2aff7a9cd4c2",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "200bed63-88a6-300a-b65b-0e02f9512d2c"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "5b5e6fd6-82d2-3ce3-965f-93928c9e1025"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "87cf2c89-a2a1-37eb-b26e-c6386ea51edb",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "a5818a14-6229-3d0d-b7b2-4d1d0c76611f",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "7fa42461-c4e5-3fbb-834a-956bfbdd773d",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "72d39ad8-0203-3e91-b778-ab8d15fffb7d",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "0c4e351e-aaa0-3a3f-8cfe-55bc71443423",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "e4e19847-69f0-3470-ba02-5960bd29ac2d",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "3a67b880-2579-3c61-9958-d5eed655faa3",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "a6c16b65-d9ad-321e-bec0-2aff7a9cd4c2",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "f4ef41a4-843c-36ad-b450-edc6229d960a",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "1b3a45c3-dd27-39ff-8921-fed819a622ec",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "b9590abb-4cef-3f31-b3ef-a337375a554f",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "8d51c2e7-a58c-3712-9b69-c4887faec223",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "e4d76f39-c2e8-3c09-8dea-1f7b16ff6ef5",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "c7575c31-8dbb-37bd-b478-1a2ce8eee0bd",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "b190237a-e425-3112-9a99-5eecedcb6bbe",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "f064a680-a6cf-3e1f-be6e-4f9c661b979f",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "b1d1c4be-9c26-334b-add7-c31455fa740c",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "b1d1c4be-9c26-334b-add7-c31455fa740c",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "7da58c12-7776-3fe3-89a9-0c99acd7d70d"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "6f629fe4-b148-3a67-b634-e08de7360cb7",
+              "node-edge-point-uuid": "2ae91481-e14c-3866-8d4c-cf8565e09ae3"
+            }
+          ],
+          "layer-protocol-name": [
+            "ETH"
+          ],
+          "layer-qualifier": "ETHERNET",
+          "direction": "bidirectional",
+          "signal-content-type": "mac_transport"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "589cce94-bf06-3e18-85e1-6895ceba5112",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "589cce94-bf06-3e18-85e1-6895ceba5112",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "6f629fe4-b148-3a67-b634-e08de7360cb7",
+              "node-edge-point-uuid": "195a76f3-6ce0-32dc-970b-1e1de86fe6a7"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "e2b6c9c9-44d6-333c-bba9-ed72cf29a5a3"
+            }
+          ],
+          "layer-protocol-name": [
+            "ETH"
+          ],
+          "layer-qualifier": "ETHERNET",
+          "direction": "bidirectional",
+          "signal-content-type": "mac_transport"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "9392e2e4-0cb0-3a8d-9666-ef98c27e027a",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "9392e2e4-0cb0-3a8d-9666-ef98c27e027a",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "a0ee3940-8fbf-345c-be65-8789efb845cf"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "cd80944c-9ea9-3bc3-854c-edbb8ba5e25c"
+            }
+          ],
+          "layer-protocol-name": [
+            "ETH"
+          ],
+          "layer-qualifier": "ETHERNET",
+          "direction": "bidirectional",
+          "signal-content-type": "mac_transport"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "e37dc6c6-3523-33a9-b559-1f854aa7850a",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "e37dc6c6-3523-33a9-b559-1f854aa7850a",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d95788a8-330f-3fbc-ad62-14456fb8744a",
+              "node-edge-point-uuid": "093dc5bb-80a0-3010-8454-ddf5b59c791a"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+              "node-edge-point-uuid": "ec0cfa23-274e-3484-9582-2ffb9151cd8e"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "OTUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "a90774ba-0a4c-3012-a95a-819508e4b21b",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "a90774ba-0a4c-3012-a95a-819508e4b21b",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d95788a8-330f-3fbc-ad62-14456fb8744a",
+              "node-edge-point-uuid": "ce50cf26-1110-35ef-83dd-2c91a3837735"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+              "node-edge-point-uuid": "4419ebd7-9552-3c6d-b918-e0b7f5c379cd"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "60fa7710-6199-3c9f-9167-29506a7c55ae",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "60fa7710-6199-3c9f-9167-29506a7c55ae",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d95788a8-330f-3fbc-ad62-14456fb8744a",
+              "node-edge-point-uuid": "fb318a44-4471-33cb-bc55-c16fbb5a9ee4"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+              "node-edge-point-uuid": "8effaf21-59aa-37c8-aad1-7cf220f6a7c2"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "277e3c56-254a-3f71-8399-dd911960b776",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "277e3c56-254a-3f71-8399-dd911960b776",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d95788a8-330f-3fbc-ad62-14456fb8744a",
+              "node-edge-point-uuid": "3e47d744-531e-3b1c-8be0-9a684a511b32"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+              "node-edge-point-uuid": "fb94e543-078f-3c40-9c9e-ca47459d55a5"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "b681bfaa-db4b-3948-96a7-79ca8416eb0a",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "b681bfaa-db4b-3948-96a7-79ca8416eb0a",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "f2f53ad1-009f-3652-b1e3-e280abef90d4",
+              "node-edge-point-uuid": "c2c17000-927d-3938-9218-721300928950"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+              "node-edge-point-uuid": "d88bde54-7cb7-3663-a8ea-7e4b4f5929d4"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "OTUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "6e0c483a-fa32-3c05-b8f3-31668f87abaf",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "6e0c483a-fa32-3c05-b8f3-31668f87abaf",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "f2f53ad1-009f-3652-b1e3-e280abef90d4",
+              "node-edge-point-uuid": "1e527dad-8e93-3867-9c0c-8a67ab3199e7"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+              "node-edge-point-uuid": "17da0b55-585b-3f4e-a4c7-b09105448b0a"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODUCN",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "6aa32df0-2cc0-3281-ac58-5e20a5a44cc8",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "6aa32df0-2cc0-3281-ac58-5e20a5a44cc8",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "f2f53ad1-009f-3652-b1e3-e280abef90d4",
+              "node-edge-point-uuid": "c58c7117-1bee-3425-b007-cea9c7c6efbe"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+              "node-edge-point-uuid": "bc87379f-4e0c-3c0b-8a51-3965823fe310"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "dc3292f1-864c-3c46-8edd-48e772089c4d",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "dc3292f1-864c-3c46-8edd-48e772089c4d",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "f2f53ad1-009f-3652-b1e3-e280abef90d4",
+              "node-edge-point-uuid": "378f1388-66aa-3dff-b1f3-f62b75ae0d81"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+              "node-edge-point-uuid": "ba6e48c9-5ba5-3850-b1e8-b389fe399501"
+            }
+          ],
+          "layer-protocol-name": [
+            "ODU"
+          ],
+          "layer-qualifier": "ODU4",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "ab709bac-b91b-3386-8bbc-5d209d10b3ee",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "ab709bac-b91b-3386-8bbc-5d209d10b3ee",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "156b2876-e5e6-309d-9582-5b539cec7f21"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "70e980aa-af9f-325e-91ae-6e9b75ebb8cf"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "161775e9-7296-3850-8eb5-9a7a9bf7c831",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "161775e9-7296-3850-8eb5-9a7a9bf7c831",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "13e8185b-88c1-3470-b38e-3071a430ef69"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "e94099c1-2181-354f-a338-af8f4a970cca"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "63109d07-bfbe-330f-b0fd-21481f1349df",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "63109d07-bfbe-330f-b0fd-21481f1349df",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "b6e558ef-482a-379a-8b8e-81731535ba9e"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "48f7b1bd-49cb-388e-b3c7-9dadc0c41c0c"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "fced414a-066b-30a7-bc93-908e8ca05a97",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "fced414a-066b-30a7-bc93-908e8ca05a97",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "bd750a0a-9cc2-3396-9cec-2b584df22e27"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "6591ac36-f0eb-3a53-944d-c9a20da31a63"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "f251d80b-db98-3b41-877e-aa738465524e",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "f251d80b-db98-3b41-877e-aa738465524e",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "2b078421-274e-3e4b-8d5b-e58ce8ccede2"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "f0d05ab7-2840-3696-b4e1-147088a15588"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "5c4c1086-663e-377f-acdb-6dee362cfc6e",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "5c4c1086-663e-377f-acdb-6dee362cfc6e",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "a938ba62-206a-34f5-8ef0-6b13496708ea"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "db29aab1-7527-31d6-98ad-fe565c69f540"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "0f2f5da2-e8f6-3fb4-b3e3-9cf788d1eab2",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "0f2f5da2-e8f6-3fb4-b3e3-9cf788d1eab2",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "5d598d54-add0-3f42-a616-07dfa09a44db"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "1cfb6518-b603-3283-88e0-271269c37d6f"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "5a1543ed-316c-3f3e-9ff9-a2c6956b19e7",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "5a1543ed-316c-3f3e-9ff9-a2c6956b19e7",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "c2b0a0a9-51a0-39cf-b3a8-b78d97f1c363"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "852565ad-ddee-3ae7-a460-245a7adfd8ba"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "dabe31f1-95e2-31ff-9016-9e8bfc6d3917",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "dabe31f1-95e2-31ff-9016-9e8bfc6d3917",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "8a7e57c1-f5f2-3eed-85ac-6c82f6a357c4"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "0edb2bd5-279d-39a2-90cc-d4ce0c0abb49"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "3e000879-36c0-3380-aa50-dd66e140564f",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "3e000879-36c0-3380-aa50-dd66e140564f",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "9153788e-babd-322a-965b-ce78a3aea2de"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "fb5c5b63-7720-3fca-a3a1-e2523c07f08b"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "95de3609-a78b-382d-afd9-e92cf21b28c4",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "95de3609-a78b-382d-afd9-e92cf21b28c4",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "2ffff253-c982-3e66-98c9-850d7a0819eb"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "39842398-450d-3f51-a649-dfb11469973f"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "6e7fc971-96f1-3c51-a609-5138c988c087",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "6e7fc971-96f1-3c51-a609-5138c988c087",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "39c4f21d-31be-3733-a598-057e412dfa12"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "ec3746da-e375-3ece-ad96-f6f76d118138"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "efb1e892-9ded-3aea-94bb-e89406dd9bf0",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "efb1e892-9ded-3aea-94bb-e89406dd9bf0",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58",
+              "node-edge-point-uuid": "8b71d448-12a6-3275-9246-07d9b5022f41"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9",
+              "node-edge-point-uuid": "57b91e9f-2be4-3028-938c-5aab98c4a4f5"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "9be7484b-85c0-334b-b4ab-0db11d3aa351",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "9be7484b-85c0-334b-b4ab-0db11d3aa351",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58",
+              "node-edge-point-uuid": "e7a5d5eb-c217-381c-a1bf-70b84ae5228a"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9",
+              "node-edge-point-uuid": "11c9fbc9-4a75-3be0-b25f-ca73806b27cc"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTSI",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "40c11f8f-906b-3b8d-8796-ee2f5a1b3722",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "40c11f8f-906b-3b8d-8796-ee2f5a1b3722",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "0303fe8d-ba0d-38fb-998b-686c3da940f2"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "ca624d89-6467-35cf-bff5-5efd653b7c64"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "b42370e3-421c-3980-831b-d42a8b08628e",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "b42370e3-421c-3980-831b-d42a8b08628e",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "8a875d36-52c1-3e7a-b3e2-37e5f5f5ad65"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "aa328490-3754-377b-af4b-e4f69a44c29b"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "a2c05a00-2831-30c8-8c3c-9369e93d7fe2",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "a2c05a00-2831-30c8-8c3c-9369e93d7fe2",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "70c32d1e-4302-3fe4-b37c-8b432f715cab"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "0af6af1b-3848-39c6-b379-dfa9a09427f1",
+              "node-edge-point-uuid": "d2426f72-4fdf-3d5e-b4a4-b13716d64a56"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "bidirectional"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "1e7476b1-e2ae-35d6-8040-8314b17d7c21",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "1e7476b1-e2ae-35d6-8040-8314b17d7c21",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "c305a833-d0b0-3b16-9bbb-a167f9dc7169"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7",
+              "node-edge-point-uuid": "7f88c5b8-0f2e-32d5-9e17-2e12edf606ab"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTSI",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "2b685bf5-4fb4-327e-b6d9-5bf2ee5dc379",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "2b685bf5-4fb4-327e-b6d9-5bf2ee5dc379",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "24e99e8d-e7fb-36ff-9089-302d29831f77"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7",
+              "node-edge-point-uuid": "8ac4ba10-cb8d-377c-bea1-4f6a3c6e8add"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "5d33f26b-5f65-35e9-9366-2091edd171c8",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "5d33f26b-5f65-35e9-9366-2091edd171c8",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "878dc2ca-f436-3ffe-87c3-4353c3179fe5",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "1fed4002-f5a3-36d0-9cc0-ceaf59cdf266",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "d3fdf198-643b-35c7-84dc-fa7eeaf18f26",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "d3fdf198-643b-35c7-84dc-fa7eeaf18f26",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "8708f4ca-0b69-3860-9056-210f56f9aa66"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "c14b17f2-277b-3267-957b-817d5168eaf1"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "8d263ce2-1559-3b7b-bdf1-b011d2581519",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "8d263ce2-1559-3b7b-bdf1-b011d2581519",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "fe89d5bd-454d-3d84-92da-6d47450b1e40"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "a23e39c8-bbe9-3762-8754-59aae6abeaa0"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "371c86eb-ab2a-3d61-b24c-22307ebda6c9",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "371c86eb-ab2a-3d61-b24c-22307ebda6c9",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "2a4ef791-685f-313a-925b-12c9a1747fe6",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "dfe635c6-1389-3bb6-b292-7c6e6dc414d0",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "360a7676-3750-34c5-85cd-ce78ebd3b8be",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "360a7676-3750-34c5-85cd-ce78ebd3b8be",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "3727653b-4de6-3794-91b3-9008d630059f"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "dee4933f-3222-3549-bbf4-67fbd9eb3ed3"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "6ca5fe0c-c1ac-3fd3-bb11-2c77226e0850",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "6ca5fe0c-c1ac-3fd3-bb11-2c77226e0850",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "f85c92c9-30f6-393c-b6d3-ededb4a747ba"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "e7ca1527-fd6f-3cc2-812c-dd7db9d825f2"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "ebab5229-ab72-36e8-bdd8-577d5b37faf9",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "ebab5229-ab72-36e8-bdd8-577d5b37faf9",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "5ebd2a52-6cce-3607-93d1-523811f172be",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "2555d92e-eb0c-39e8-8230-d415c27b1296",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTSI",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "2ce550fa-5e91-37a0-bc94-bb66a6a1c844",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "2ce550fa-5e91-37a0-bc94-bb66a6a1c844",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "2e6b5cdf-4abb-3801-a8b3-85c173dbe9b6",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "e7c615bf-e3fa-3759-8a77-8b1393b0a7f6",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "53aea540-047d-32d3-8dfa-3e5d3995de3b",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "53aea540-047d-32d3-8dfa-3e5d3995de3b",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "b06136df-64da-34ec-9964-c9b3b460c96f",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "9b185438-55ef-3fb4-b00d-db0cda896bc6",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "17af7be0-d566-3739-b968-da2d46819d5d",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "17af7be0-d566-3739-b968-da2d46819d5d",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "986ef1ea-90bd-382c-8c9a-3c9a45216a67",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "79e718ed-70b4-3e65-8057-6970dc177fa9",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "d4a828d0-a51d-3f88-8d57-77b36b63c880",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "d4a828d0-a51d-3f88-8d57-77b36b63c880",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "bb37636d-4ec0-3b7b-b982-accedba89260"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "85beafae-f93d-3eac-9233-be70306d7918"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "7ff5833e-3f41-36e4-abcc-a3271078a951",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "7ff5833e-3f41-36e4-abcc-a3271078a951",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "6ed49263-6c94-39d6-9e65-647fee188668",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "c57f029d-241b-34f7-ac17-390d68b622ac",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "2e0e6173-cce2-30d9-a72e-6fb04ae070f8",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "2e0e6173-cce2-30d9-a72e-6fb04ae070f8",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7",
+              "node-edge-point-uuid": "78c03e52-07e0-3125-8c85-cd271ff1b006"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9",
+              "node-edge-point-uuid": "3badd58e-2e9b-3f2e-83ea-c0227527dfe8"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTSI",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "fa047664-e077-3f40-a1e2-e78e595c2026",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "fa047664-e077-3f40-a1e2-e78e595c2026",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7",
+              "node-edge-point-uuid": "17d72ff2-c91d-328f-9632-d9bf76c1e660"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9",
+              "node-edge-point-uuid": "fb093a0d-9acf-3dbd-a235-7e6691f7bf2f"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "efcc33b0-e33f-367f-984e-250f9e11a475",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "efcc33b0-e33f-367f-984e-250f9e11a475",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "4f8dcd4d-a393-34db-9d7e-db45400d7bfd",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "651d15a8-da2d-397e-a7e7-31ef8d32a4a5",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "2e90e9a1-5c0c-38a7-a4e4-4c372ab915db",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "2e90e9a1-5c0c-38a7-a4e4-4c372ab915db",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "c8ed9856-2b5a-34ab-83de-c194f15037b8",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "a8f04eb8-c5f1-39fc-b548-d7a0bff93469",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTSI",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "04bfb2f1-43b8-3093-a901-5af0bf56d672",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "04bfb2f1-43b8-3093-a901-5af0bf56d672",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "dbe98948-de59-3d31-8bce-b93c7170d507"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "d0e181bc-e08e-3a6b-aa81-c07c1c6fc1a0"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "692718f5-99ab-3c58-9d9e-73ae9e4485d8",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "692718f5-99ab-3c58-9d9e-73ae9e4485d8",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "c26f2c8e-3833-310e-a853-23447f543596"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "94d2a68f-bfa6-31ec-b48e-73d16f4c88d0"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "4baae13f-cea7-3b4f-9e0b-4913439ab71f",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "4baae13f-cea7-3b4f-9e0b-4913439ab71f",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "31490982-de74-3e12-bc8f-e3ed09fa440c"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "7ff8d768-b201-3ee6-b50d-e93b53042c5e"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "4c0c638b-8c64-3c05-9d72-1c02698cfa6c",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "4c0c638b-8c64-3c05-9d72-1c02698cfa6c",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "27825cbf-73b1-3895-ab93-116df09802b3"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "dd6a3565-0294-370b-8a7d-732d3cd342f6"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "0b5a231c-0b66-39fb-95ac-ebe2aa910d4b",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "0b5a231c-0b66-39fb-95ac-ebe2aa910d4b",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58",
+              "node-edge-point-uuid": "f1b539a0-777d-379e-889f-50a877b1e6b3"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "973ecacf-19f6-34f6-ab05-0945f59fa596"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "5ad29136-c0c5-3209-aa1c-cb738ee4beb7",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "5ad29136-c0c5-3209-aa1c-cb738ee4beb7",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58",
+              "node-edge-point-uuid": "c43a42ba-31b3-3954-8923-7a5befc2f29a"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "64e3bc96-7c85-3e69-9a8d-b6cd0422c605"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTSI",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "4af1d95a-0c3a-318d-a8f2-b6f4ae67bde1",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "4af1d95a-0c3a-318d-a8f2-b6f4ae67bde1",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "1d70b5f5-fd86-388f-b084-bbb0796f8c7d",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "bf9f55cf-95b7-31e9-b5be-d669ff0ce74e",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OMS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "b7b2382e-5247-354d-a7cc-2eb80b4454f3",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "b7b2382e-5247-354d-a7cc-2eb80b4454f3",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "99f15f38-e155-3eeb-8bab-b79423bbcd49",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "9a1230e9-ac08-331a-9fbd-12eceb109c7e",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTSI",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "7ddde6bc-116e-3451-b0c1-8f8afdd662b1",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "7ddde6bc-116e-3451-b0c1-8f8afdd662b1",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58",
+              "node-edge-point-uuid": "feede0f2-7bd3-3b81-bdd4-f4c1ac64c9f4"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+              "node-edge-point-uuid": "46e97440-380a-3cf5-94d0-5698d4efb7c6"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "c3561e26-0a9e-3680-9dc0-2ffaf959ef6f",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "c3561e26-0a9e-3680-9dc0-2ffaf959ef6f",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7",
+              "node-edge-point-uuid": "f9cee3c6-cba8-3239-8012-b92e9348a444"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+              "node-edge-point-uuid": "c675946f-8143-3273-b4a5-f55764580e81"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "368c60a8-4929-3ae3-abbe-79085c6a567b",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "368c60a8-4929-3ae3-abbe-79085c6a567b",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58",
+              "node-edge-point-uuid": "db544185-ddf5-3ab7-bf44-8d2d444a1169"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9",
+              "node-edge-point-uuid": "4ca95b41-47d2-3592-88cf-8230bcc6c722"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "b98cff8e-00a6-39d4-a2fe-8bfae0aa33b6",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "b98cff8e-00a6-39d4-a2fe-8bfae0aa33b6",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "4d026b58-5ad8-31c5-924c-635ec50f100f",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "7b860fd7-c646-38f6-8dba-12ffae464635",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "99e44c7f-3475-3732-a91d-291a184953ff",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "99e44c7f-3475-3732-a91d-291a184953ff",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "7f4f6f3b-123a-3eed-92d3-73ff388575b9",
+              "node-uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "701ec4ac-0873-3395-8998-5779e664f139",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "e0315c5a-3c32-31a5-a038-35e6d3101643",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "e0315c5a-3c32-31a5-a038-35e6d3101643",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "848edfe9-1105-32b7-bafa-8cca9f8749f8",
+              "node-uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "b49f7013-aa99-3b29-a6d6-085a937ec6ea",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CLink",
+      "object_id": "a1f0f720-40c5-3218-8aa9-bcaaec435d6b",
+      "object_data": {
+        "tapi-object-class": "link",
+        "tapi-object-data": {
+          "uuid": "a1f0f720-40c5-3218-8aa9-bcaaec435d6b",
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "node-edge-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "1d8d46dd-38d7-3dff-9ca8-2f4a0f9cd2da",
+              "node-uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7"
+            },
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "a01418c7-d806-3fe8-ab13-d7b92a004f22",
+              "node-uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9"
+            }
+          ],
+          "layer-protocol-name": [
+            "PHOTONIC_MEDIA"
+          ],
+          "layer-qualifier": "OTS",
+          "direction": "BIDIRECTIONAL"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "60fa7710-6199-3c9f-9167-29506a7c55ae",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "a90774ba-0a4c-3012-a95a-819508e4b21b",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "277e3c56-254a-3f71-8399-dd911960b776",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "e37dc6c6-3523-33a9-b559-1f854aa7850a",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "b42370e3-421c-3980-831b-d42a8b08628e",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "dc3292f1-864c-3c46-8edd-48e772089c4d",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CLink",
+      "object_id": "6e0c483a-fa32-3c05-b8f3-31668f87abaf",
+      "object_data": null
+    }
+  ],
+  "links": {
+    "next": "/tapi/core/context/topology/mcp-base-topology/link/?token=OtXO:1606143503650_0:-963785102:AAAAAQCBchg=&limit=100",
+    "current": "/tapi/core/context/topology/mcp-base-topology/link/?limit=100"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/deeppaging.node-edge-point.Response.json b/responses/ciena/tapi/deeppaging.node-edge-point.Response.json
new file mode 100644
index 0000000000000000000000000000000000000000..5b67743596d7dbb00b47a122a8124e32c40692ad
--- /dev/null
+++ b/responses/ciena/tapi/deeppaging.node-edge-point.Response.json
@@ -0,0 +1,3944 @@
+{
+  "data": [
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "6135a998-cc1c-3aa4-90f8-a89591c04555",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "6135a998-cc1c-3aa4-90f8-a89591c04555",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-1-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:1-odu4_index:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "6135a998-cc1c-3aa4-90f8-a89591c04555",
+              "connection-end-point-uuid": "c01fe42d-5433-392b-9d4d-70076bdff18d"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "041c7fd9-4895-360d-b3ac-86d6c22ca8b7",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "041c7fd9-4895-360d-b3ac-86d6c22ca8b7",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-1-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:1-odu4_index:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "041c7fd9-4895-360d-b3ac-86d6c22ca8b7",
+              "connection-end-point-uuid": "5aa5afe8-ca58-3a8d-9d97-47082cb5d191"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "5b5e6fd6-82d2-3ce3-965f-93928c9e1025",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "5b5e6fd6-82d2-3ce3-965f-93928c9e1025",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-1-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:1-odu4_index:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "5b5e6fd6-82d2-3ce3-965f-93928c9e1025",
+              "connection-end-point-uuid": "c843618b-4cd5-3c2b-8125-02c3763059fa"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "3bb228fb-c3c7-38a0-8d9c-54e57531f40f",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "3bb228fb-c3c7-38a0-8d9c-54e57531f40f",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-12-CTPServerToClient-2"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:12-odu4_index:4"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "3bb228fb-c3c7-38a0-8d9c-54e57531f40f",
+              "connection-end-point-uuid": "23b81ebc-1744-3f54-83b4-927b52888452"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "5bd5ec4b-48d0-3417-9998-20c637f275a3",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "5bd5ec4b-48d0-3417-9998-20c637f275a3",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-1-CTPServerToClient-2"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:1-odu4_index:2"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "5bd5ec4b-48d0-3417-9998-20c637f275a3",
+              "connection-end-point-uuid": "df6e1768-a447-3597-bed5-7467fe208435"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "d6061908-a684-37de-becd-75d0f8d555e3",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "d6061908-a684-37de-becd-75d0f8d555e3",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-1-CTPServerToClient-2"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:1-odu4_index:2"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "d6061908-a684-37de-becd-75d0f8d555e3",
+              "connection-end-point-uuid": "0ca014aa-ac01-3bea-a109-90e4df114917"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "5be7ba96-37f3-33cb-bc9a-355889878ec6",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "5be7ba96-37f3-33cb-bc9a-355889878ec6",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_8-8-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:8-index:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "5be7ba96-37f3-33cb-bc9a-355889878ec6",
+              "connection-end-point-uuid": "27d543ed-a27b-3900-8fb0-38b6600ce7e1"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "200bed63-88a6-300a-b65b-0e02f9512d2c",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "200bed63-88a6-300a-b65b-0e02f9512d2c",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-1-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:1-odu4_index:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "200bed63-88a6-300a-b65b-0e02f9512d2c",
+              "connection-end-point-uuid": "44b19674-3592-3cd4-afd5-a1dbc76d5b34"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "2428479b-4216-3d2e-9171-a2884cc63c60",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "2428479b-4216-3d2e-9171-a2884cc63c60",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-1-CTPServerToClient-2"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:1-odu4_index:2"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "2428479b-4216-3d2e-9171-a2884cc63c60",
+              "connection-end-point-uuid": "832d5240-b980-341b-9d9c-28e2aaaf90df"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "a4645130-7422-35b0-b992-ed7d49dfd26a",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "a4645130-7422-35b0-b992-ed7d49dfd26a",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-12-CTPServerToClient-2"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:12-odu4_index:4"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "a4645130-7422-35b0-b992-ed7d49dfd26a",
+              "connection-end-point-uuid": "e73a6fd4-0fc0-399e-9fb5-08e520ca4c39"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "4577feb9-91ac-3fc9-adfd-99282a20c246",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "4577feb9-91ac-3fc9-adfd-99282a20c246",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-12-2-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:12-odu4_index:4-index:2"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "4577feb9-91ac-3fc9-adfd-99282a20c246",
+              "connection-end-point-uuid": "e03cfd29-6458-341b-add1-fedf55af1f52"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "d8316559-2b9c-3370-9a53-5500abea2127",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "d8316559-2b9c-3370-9a53-5500abea2127",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-1-CTPServerToClient-2"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:1-odu4_index:2"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "d8316559-2b9c-3370-9a53-5500abea2127",
+              "connection-end-point-uuid": "e9f8532f-d8ed-3964-a5b0-b44afe4ec3e7"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "a612f441-fa88-3da1-b162-313567ac4dc4",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "a612f441-fa88-3da1-b162-313567ac4dc4",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-12-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:12-odu4_index:3"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "a612f441-fa88-3da1-b162-313567ac4dc4",
+              "connection-end-point-uuid": "cac2b2fd-aa7a-318e-9338-a8ec10a32203"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "69e25794-3d3b-3f5d-9e2a-c2bb1c36b8af",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "69e25794-3d3b-3f5d-9e2a-c2bb1c36b8af",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-12-CTPServerToClient-2"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:12-odu4_index:4"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "69e25794-3d3b-3f5d-9e2a-c2bb1c36b8af",
+              "connection-end-point-uuid": "d271332a-aaff-3fb3-9bb6-cc6f92a9c052"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "cd28651c-ba1d-3482-91ce-130b229651b0",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "cd28651c-ba1d-3482-91ce-130b229651b0",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-12-2-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:12-odu4_index:4-index:2"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "cd28651c-ba1d-3482-91ce-130b229651b0",
+              "connection-end-point-uuid": "2e1687b1-9add-3ba7-821f-d6b8b590d05c"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "e05c5578-a052-3134-9100-e3ab90c3756c",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "e05c5578-a052-3134-9100-e3ab90c3756c",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_8-8-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:8-index:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "e05c5578-a052-3134-9100-e3ab90c3756c",
+              "connection-end-point-uuid": "2ef37e05-be0c-3189-a214-6ddeecbe711a"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "76afd807-f878-39a5-8eff-478d51087d80",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "76afd807-f878-39a5-8eff-478d51087d80",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-12-2-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:12-odu4_index:4-index:2"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "76afd807-f878-39a5-8eff-478d51087d80",
+              "connection-end-point-uuid": "edab07ed-02e4-37e9-8e12-41a9c9bb0683"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "db5582a0-53ed-33d7-ab46-b881ee542fad",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "db5582a0-53ed-33d7-ab46-b881ee542fad",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_8-8-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:8-index:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "db5582a0-53ed-33d7-ab46-b881ee542fad",
+              "connection-end-point-uuid": "77b235a9-ac52-3209-945c-ca9e468d9f7c"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "d7390546-0482-3ef2-95b6-7c66a4c68a34",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "d7390546-0482-3ef2-95b6-7c66a4c68a34",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-12-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:12-odu4_index:3"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "d7390546-0482-3ef2-95b6-7c66a4c68a34",
+              "connection-end-point-uuid": "fb7401ad-a6da-30d7-bbd2-d55fcd3f9c6f"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "6cc3db8f-3397-3eda-af65-ff68d46a00b0",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "6cc3db8f-3397-3eda-af65-ff68d46a00b0",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-12-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:12-odu4_index:3"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "6cc3db8f-3397-3eda-af65-ff68d46a00b0",
+              "connection-end-point-uuid": "09e7cb9f-ebad-3370-9f1e-ea1eb305431b"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "cd30d952-80c3-3288-a73d-232d1f27ea67",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "cd30d952-80c3-3288-a73d-232d1f27ea67",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_8-8-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:8"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "c908fa93-3232-3a8f-a319-ec393580229e"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "db528d8a-c7dd-3101-a4ce-2f2199fa5fc3",
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "176e06c9-907e-3348-87fe-b3d9b430f605",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "176e06c9-907e-3348-87fe-b3d9b430f605",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_8-8-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:8"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "563d1289-86f3-35d5-b144-c1c934981b1d"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS304-1-8",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "f68f8859-3532-3d39-8370-ebc91f9ffe8c",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "f68f8859-3532-3d39-8370-ebc91f9ffe8c",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_3-3-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:3"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "cfdab1b2-ed2a-3607-9bfe-8c1ae9c89ef1"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "26a240db-ff75-36b2-94f5-5d8e0ebb7de1",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "26a240db-ff75-36b2-94f5-5d8e0ebb7de1",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_8-8-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:8"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "f6b5ec3c-f3c9-3602-9432-c51623da49f7"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "599716b2-2012-3252-a927-91d39d9d892a",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "599716b2-2012-3252-a927-91d39d9d892a",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_3-3-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:3-index:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "599716b2-2012-3252-a927-91d39d9d892a",
+              "connection-end-point-uuid": "e0c4a15e-91b2-33ed-8c2a-81235fe84440"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "cf368719-7534-338d-b487-e4a5a3f1e959",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "cf368719-7534-338d-b487-e4a5a3f1e959",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "cf368719-7534-338d-b487-e4a5a3f1e959",
+              "connection-end-point-uuid": "ba48d9a0-d62e-3906-a5bb-d5fd97d78fe4"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODUCN"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "13967837-8454-38af-a5b8-08e0f91a4e09",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "13967837-8454-38af-a5b8-08e0f91a4e09",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "13967837-8454-38af-a5b8-08e0f91a4e09",
+              "connection-end-point-uuid": "d4eba1a7-e09f-3031-9805-627d4614886b"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "9f016279-9a1f-3fee-b1ea-b8a353f0e0af",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "9f016279-9a1f-3fee-b1ea-b8a353f0e0af",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "9f016279-9a1f-3fee-b1ea-b8a353f0e0af",
+              "connection-end-point-uuid": "37622987-0362-3806-8d18-e2d6940f84da"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODUCN"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "b9fe640f-84f6-3857-bc42-4856f74b5eec",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "b9fe640f-84f6-3857-bc42-4856f74b5eec",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_8-8-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:8-index:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "b9fe640f-84f6-3857-bc42-4856f74b5eec",
+              "connection-end-point-uuid": "db24d880-754b-30e1-ae12-64496bf8e177"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "f341c258-84a7-30e4-9485-6852f6e3faf1",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "f341c258-84a7-30e4-9485-6852f6e3faf1",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "f341c258-84a7-30e4-9485-6852f6e3faf1",
+              "connection-end-point-uuid": "98a4dbe5-1dfd-3dde-9bee-36896da6bdb8"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODUCN"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "ba1b22ee-2512-3693-9606-9ef75bcc325d",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "ba1b22ee-2512-3693-9606-9ef75bcc325d",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "ba1b22ee-2512-3693-9606-9ef75bcc325d",
+              "connection-end-point-uuid": "b390c341-826f-384a-a049-9d27fb56f069"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODUCN"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "0ae72f89-fb26-3f51-a2b6-e8fa790c7469",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "0ae72f89-fb26-3f51-a2b6-e8fa790c7469",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "0ae72f89-fb26-3f51-a2b6-e8fa790c7469",
+              "connection-end-point-uuid": "843be429-f549-3b5e-927b-ed85567c5651"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "e7efc261-8fa7-3bb7-80b0-3b03a58d213f",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "e7efc261-8fa7-3bb7-80b0-3b03a58d213f",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "e7efc261-8fa7-3bb7-80b0-3b03a58d213f",
+              "connection-end-point-uuid": "4b0f51dc-c7b0-3993-98d2-518bb044687d"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "a110ca64-08ef-3a58-9670-09f6f7bc86c5",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "a110ca64-08ef-3a58-9670-09f6f7bc86c5",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "a110ca64-08ef-3a58-9670-09f6f7bc86c5",
+              "connection-end-point-uuid": "22b01df6-8caa-395e-9aff-63a033358e32"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "9c83f9e7-3f4d-3b77-b24c-a9f97756aa41",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "9c83f9e7-3f4d-3b77-b24c-a9f97756aa41",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-12-2-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:12-odu4_index:4-index:2"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "9c83f9e7-3f4d-3b77-b24c-a9f97756aa41",
+              "connection-end-point-uuid": "70c70cc7-92c1-3f4d-b917-abc92dc54ff7"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "de83e8c0-7e97-3dbf-950b-915966c5858d",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "de83e8c0-7e97-3dbf-950b-915966c5858d",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-12-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:12-odu4_index:3"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "de83e8c0-7e97-3dbf-950b-915966c5858d",
+              "connection-end-point-uuid": "4dc8c2ff-85e0-3cc2-a60a-25ed487f7918"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "272ad1f4-24ac-3769-b773-975360ee4399",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "272ad1f4-24ac-3769-b773-975360ee4399",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_2-2-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:2-index:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "272ad1f4-24ac-3769-b773-975360ee4399",
+              "connection-end-point-uuid": "b54afaf3-840e-31b8-8403-d4fa7ca4c794"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "fee90194-01b8-3988-8f75-2f3c0317c1cd",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "fee90194-01b8-3988-8f75-2f3c0317c1cd",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-12-CTPServerToClient-2"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:12-odu4_index:4"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "fee90194-01b8-3988-8f75-2f3c0317c1cd",
+              "connection-end-point-uuid": "beeaa5fb-04b8-33c2-ac9b-7e13a7f7a973"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "3cd3a346-1dfd-38a8-bfa2-4def77bf0fd2",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "3cd3a346-1dfd-38a8-bfa2-4def77bf0fd2",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_3-3-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:3-index:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "3cd3a346-1dfd-38a8-bfa2-4def77bf0fd2",
+              "connection-end-point-uuid": "0d5195b7-c46e-3f70-ac41-757e0702a260"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "17bfc6a3-6ff5-3f11-8695-61808ac20a94",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "17bfc6a3-6ff5-3f11-8695-61808ac20a94",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_2-2-CTPServerToClient-1"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:2-index:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "17bfc6a3-6ff5-3f11-8695-61808ac20a94",
+              "connection-end-point-uuid": "1cc4b02b-294d-37b3-9653-27cf0669cb65"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "d29b09d2-c7c2-364a-9e57-95fa065647e1",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "d29b09d2-c7c2-364a-9e57-95fa065647e1",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "d29b09d2-c7c2-364a-9e57-95fa065647e1",
+              "connection-end-point-uuid": "66ee8403-8eb5-307d-a27d-c75678741fd1"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "a770e91e-596b-3dea-959d-51fa27e3258b",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "a770e91e-596b-3dea-959d-51fa27e3258b",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+              "node-edge-point-uuid": "a770e91e-596b-3dea-959d-51fa27e3258b",
+              "connection-end-point-uuid": "b05fda15-0f24-39a2-8b20-f11cb3dbeb83"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODUCN"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "eedfc5f9-d610-3cec-bbbe-cc87ee9dfd3a",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "eedfc5f9-d610-3cec-bbbe-cc87ee9dfd3a",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "eedfc5f9-d610-3cec-bbbe-cc87ee9dfd3a",
+              "connection-end-point-uuid": "76f0cbe9-232e-378e-bbb3-f1e65754dfef"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "b6b52d45-b1a7-391f-bf77-dc85f0772e87",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "b6b52d45-b1a7-391f-bf77-dc85f0772e87",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "b6b52d45-b1a7-391f-bf77-dc85f0772e87",
+              "connection-end-point-uuid": "7a03f267-cc3e-3a53-a8ed-4293c2f1273a"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "39d32a92-30f3-3e36-a870-7c983706165b",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "39d32a92-30f3-3e36-a870-7c983706165b",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "39d32a92-30f3-3e36-a870-7c983706165b",
+              "connection-end-point-uuid": "887cc8c9-318b-3703-8843-07ec84b593ab"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODU4"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "d3863b84-856f-3631-903a-c1325c4fe6cd",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "d3863b84-856f-3631-903a-c1325c4fe6cd",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+              "node-edge-point-uuid": "d3863b84-856f-3631-903a-c1325c4fe6cd",
+              "connection-end-point-uuid": "7d2a840a-ef59-3d7a-9617-22fb1a99a103"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODUCN"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "806d4a5e-7240-35af-95b9-b22fa3443c44",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "806d4a5e-7240-35af-95b9-b22fa3443c44",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+              "node-edge-point-uuid": "806d4a5e-7240-35af-95b9-b22fa3443c44",
+              "connection-end-point-uuid": "a847d666-824d-32a9-9828-6a62f2a220bd"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODUCN"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "ecc60310-c5ce-362c-9f9b-4f1c075a1b57",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "ecc60310-c5ce-362c-9f9b-4f1c075a1b57",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+              "node-edge-point-uuid": "ecc60310-c5ce-362c-9f9b-4f1c075a1b57",
+              "connection-end-point-uuid": "1a01e3ff-5744-3cde-b0b1-5d11f3465d52"
+            }
+          ],
+          "layer-protocol-name": "ODU",
+          "supported-cep-layer-protocol-qualifier": [
+            "ODUCN"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "1799c00c-d400-3b26-9c5b-46bd0f85bf12",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "1799c00c-d400-3b26-9c5b-46bd0f85bf12",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "5c283666-fb20-34fd-be98-fc06e291b704"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS303-1-1",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "225bc151-c51a-36e6-8127-d6fc4c2689ae",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "225bc151-c51a-36e6-8127-d6fc4c2689ae",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "101b6ee8-99ca-308d-acca-d01c0b8bf999"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "b9fcf2af-613c-315f-9e0c-0f018c2dd52c",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "b9fcf2af-613c-315f-9e0c-0f018c2dd52c",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "79bf3305-e68b-3982-bdd7-be329d2f4eab"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "064eb201-dfae-3c4d-a93f-a12dce918769",
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "89aa8dcd-704c-3240-852f-596b763db10f",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "89aa8dcd-704c-3240-852f-596b763db10f",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "7a5cb73d-5526-3041-9458-e6f6d9c9b544"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS302-1-1",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "99e210a5-c842-3a70-bbc0-abe7be1997a4",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "99e210a5-c842-3a70-bbc0-abe7be1997a4",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "fd8e334d-8ca7-332b-9e2e-683fbff9e912"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "bf39ebbd-ae09-3b12-bfc5-8ee722d24ab9",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "bf39ebbd-ae09-3b12-bfc5-8ee722d24ab9",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "fc400ad4-2c62-3df6-9c2b-9c29b2b20446"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "d615c16b-ad7b-3330-bc60-4e721c4ddd02",
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "20b2e4b3-705b-3fc5-9b0f-d6498f64ddfb",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "20b2e4b3-705b-3fc5-9b0f-d6498f64ddfb",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "a9eb5d7c-7fb3-344b-9dbf-8cf31050888b"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS304-1-1",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "055e094d-b04c-3a2d-bc14-ff8993c7cdda",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "055e094d-b04c-3a2d-bc14-ff8993c7cdda",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "289be6b4-726f-39f9-a824-b14fb8a19922"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "c6f26f5c-8d6f-3aa2-8367-ae36e607fe54",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "c6f26f5c-8d6f-3aa2-8367-ae36e607fe54",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "1973e829-3ff6-3e9e-8ed9-ea51f1c02972"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "af2b51b0-b28d-32ea-b3bb-2ef411a3e0c6",
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "85ecea4a-83bb-301c-a398-feb8e248fb4e",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "85ecea4a-83bb-301c-a398-feb8e248fb4e",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "6925441d-a83b-3d49-8bee-87d30e0ac252"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS301-1-1",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "514af071-517b-39ff-a979-486b402d1f2c",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "514af071-517b-39ff-a979-486b402d1f2c",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "13a9dc9c-0669-315b-8bf0-0ef3f8be8935"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "81cd6491-225f-3fa9-b16f-84d1efb87cb3",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "81cd6491-225f-3fa9-b16f-84d1efb87cb3",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-1-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:1"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "6eb4b0d0-71c3-3176-92e6-7b4c29623731"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "184d23b8-ff33-3cd8-ab84-b080795bba75",
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "8ddb7f47-3748-3aaa-abc0-9b5ba08ff148",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "8ddb7f47-3748-3aaa-abc0-9b5ba08ff148",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "a14024d9-1158-3302-9d73-446e0c2b9215"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "1d99481d-ec5b-3d2b-a68b-7778778bcd96",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "1d99481d-ec5b-3d2b-a68b-7778778bcd96",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "034f1c11-3b26-33d5-aa04-8fbbd3b271e1"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "bcf9e4c8-e831-3335-9d62-42aaa8bf7f1e",
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "bdbe85a3-d1a9-3e53-8fab-af1667bfbe48",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "bdbe85a3-d1a9-3e53-8fab-af1667bfbe48",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "f438bc5e-465a-3b03-812d-e48a66d3ff80"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "cf0a8aed-7a79-377c-b859-21157da015fe",
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "d909edfc-4260-3ab0-89f6-f95373f4578d",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "d909edfc-4260-3ab0-89f6-f95373f4578d",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "89d35ea2-c840-3b16-a303-27d7f95c4da2"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "a85490d8-91d1-3a81-a848-99e4e534220d",
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "1df3d7a1-b129-371f-b2af-e1158f2f8c50",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "1df3d7a1-b129-371f-b2af-e1158f2f8c50",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "d8508195-c9c4-367c-a524-b5b6dae11d46::TPE_d8508195-c9c4-367c-a524-b5b6dae11d46::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS304-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "44e76e8d-3069-30d7-8171-2202678d1879"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS304-1-12",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "d7424013-bd43-30ec-b287-bb95cc5b89d2",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "d7424013-bd43-30ec-b287-bb95cc5b89d2",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "connection-end-point": [
+            "19cdf599-e73c-3072-a3d8-2429f1411b77"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTSI"
+          ],
+          "mapped-service-interface-point": "98bb3e6e-7d79-3db5-9c89-0a197ceaca21",
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "9f50d1e6-82c0-3b0f-88f4-359463f1bdb0",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "9f50d1e6-82c0-3b0f-88f4-359463f1bdb0",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "db2fc914-3743-32d4-bab2-e982e7a9aa9f"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "613562ae-3351-380b-9f6d-fe0581c2da7b",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "613562ae-3351-380b-9f6d-fe0581c2da7b",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "6fb934b4-c401-3621-bdf4-60f13ab243bb"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS303-1-12",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "48551818-deec-345a-af54-4a9bf0e3090f",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "48551818-deec-345a-af54-4a9bf0e3090f",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "8a798b00-b9a9-36cc-8df7-a407c5c642a3"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS302-1-12",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "1b58cf62-c659-30ae-ace6-585f97a7ff33",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "1b58cf62-c659-30ae-ace6-585f97a7ff33",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "23c0f46e-124b-3aff-8a44-002889904aef::TPE_23c0f46e-124b-3aff-8a44-002889904aef::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS302-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "66eb5cb6-abd1-3334-a614-b96fa95318cc"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "cf046d5f-dd53-3836-a874-ba56dc6ee239",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "cf046d5f-dd53-3836-a874-ba56dc6ee239",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "2417ada3-7a9a-39e0-b4f6-c9b6f0639546::TPE_2417ada3-7a9a-39e0-b4f6-c9b6f0639546::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS303-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "27f8578c-fac7-3542-a276-4e8b9d3611f0"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OMS"
+          ],
+          "containing-node": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "b302049c-a496-3154-b698-fee2b90bfe06",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "b302049c-a496-3154-b698-fee2b90bfe06",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "0408baa1-473d-351d-a92e-7898493636e5::TPE_0408baa1-473d-351d-a92e-7898493636e5::EQPT_CHASSIS-12-PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:WS301-port:12"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            "0fb70901-8508-3f65-ab13-4ed071566df1"
+          ],
+          "layer-protocol-name": "PHOTONIC_MEDIA",
+          "supported-cep-layer-protocol-qualifier": [
+            "OTS"
+          ],
+          "containing-node": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+          "adjacency-package": {
+            "adjacency-type": "TXRX",
+            "local-tag": "WS301-1-12",
+            "topology-source-tag": "DISCOVERED"
+          }
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "79885538-b69c-36ff-b3fb-aed0792a72cc",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "79885538-b69c-36ff-b3fb-aed0792a72cc",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_3_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:3"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "79885538-b69c-36ff-b3fb-aed0792a72cc",
+              "connection-end-point-uuid": "35fbeef0-bdfc-36c4-bc8c-a0bb2acc5dd1"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "f61aba8a-90c9-387e-8f9c-39f40acf6f91",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "f61aba8a-90c9-387e-8f9c-39f40acf6f91",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_2_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:2"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "f61aba8a-90c9-387e-8f9c-39f40acf6f91",
+              "connection-end-point-uuid": "77ff087e-52a1-3719-ac70-895fc9da455d"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "8686f19f-2f1b-37c2-9060-446ca6c86a29",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "8686f19f-2f1b-37c2-9060-446ca6c86a29",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_5_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:5"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "8686f19f-2f1b-37c2-9060-446ca6c86a29",
+              "connection-end-point-uuid": "a262ec01-c2c0-3607-a7a0-2a721debbc77"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "cb8090c1-8682-3cbc-b12a-513ca3392599",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "cb8090c1-8682-3cbc-b12a-513ca3392599",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_6_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:6"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "cb8090c1-8682-3cbc-b12a-513ca3392599",
+              "connection-end-point-uuid": "6a95e3e3-5581-3fa4-b608-c6a80973e0f7"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "fa10320e-d462-33e9-aeea-d69ceee5cad9",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "fa10320e-d462-33e9-aeea-d69ceee5cad9",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_1_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "fa10320e-d462-33e9-aeea-d69ceee5cad9",
+              "connection-end-point-uuid": "e570c0ca-6a18-31f7-8388-b5ac0109b967"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "16540ed1-98eb-3831-8893-9bb3c45c2c1d",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "16540ed1-98eb-3831-8893-9bb3c45c2c1d",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_4_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:4"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "16540ed1-98eb-3831-8893-9bb3c45c2c1d",
+              "connection-end-point-uuid": "05a9d8c9-0258-3f18-8f24-086a992b4ecc"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "e66894a9-9f7f-3603-a33a-13f4d9df9006",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "e66894a9-9f7f-3603-a33a-13f4d9df9006",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_2_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:2"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "e66894a9-9f7f-3603-a33a-13f4d9df9006",
+              "connection-end-point-uuid": "5e1a0e39-4f81-3b15-83f5-87dd2049785a"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "6fb305d3-41c7-3cfa-ba5b-cac04e01a542",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "6fb305d3-41c7-3cfa-ba5b-cac04e01a542",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_3_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:3"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "6fb305d3-41c7-3cfa-ba5b-cac04e01a542",
+              "connection-end-point-uuid": "4dafa421-df56-33aa-a45e-0aae22903d44"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "1729240c-9a6a-3515-9fee-05a6874cbd06",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "1729240c-9a6a-3515-9fee-05a6874cbd06",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_FTP_IPDATA_mpls-110"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:5-vlan:110-interfaceName:mpls-110"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "1729240c-9a6a-3515-9fee-05a6874cbd06",
+              "connection-end-point-uuid": "3b33bb92-379e-37ae-812b-e1ff5350319f"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "f65f8d0a-cb3f-381a-b67c-935c9b006ac0",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "f65f8d0a-cb3f-381a-b67c-935c9b006ac0",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_FTP_IPDATA_mpls-120"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:4-vlan:120-interfaceName:mpls-120"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "f65f8d0a-cb3f-381a-b67c-935c9b006ac0",
+              "connection-end-point-uuid": "6cea75ca-cfe0-327a-a7fa-93a937b1ad9c"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "573aa71f-5e80-3fbb-9984-a46b329bda0a",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "573aa71f-5e80-3fbb-9984-a46b329bda0a",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_5_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:5"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "573aa71f-5e80-3fbb-9984-a46b329bda0a",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "connection-end-point-uuid": "6d0d74a4-bdbf-3ade-ab47-850323002d57"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "e7855a51-883b-3e34-812b-b43edb992523",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "e7855a51-883b-3e34-812b-b43edb992523",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_1_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:1"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "e7855a51-883b-3e34-812b-b43edb992523",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "connection-end-point-uuid": "c59a0112-c58b-35b8-ba03-2839d1a5512e"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "7da58c12-7776-3fe3-89a9-0c99acd7d70d",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "7da58c12-7776-3fe3-89a9-0c99acd7d70d",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_6_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:6"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "7da58c12-7776-3fe3-89a9-0c99acd7d70d",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "connection-end-point-uuid": "a25bbe4c-a1c4-3c83-b051-ccdf02d76036"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "55b089c6-5f00-3f73-aa7d-22d604acbfdb",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "55b089c6-5f00-3f73-aa7d-22d604acbfdb",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_FTP_IPDATA_mpls-130"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:6-vlan:130-interfaceName:mpls-130"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "node-edge-point-uuid": "55b089c6-5f00-3f73-aa7d-22d604acbfdb",
+              "connection-end-point-uuid": "ce0ad4f5-1d6a-3b05-8f97-46f42346096b"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "a0ee3940-8fbf-345c-be65-8789efb845cf",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "a0ee3940-8fbf-345c-be65-8789efb845cf",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_4_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:3916-SiteA-port:4"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-edge-point-uuid": "a0ee3940-8fbf-345c-be65-8789efb845cf",
+              "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+              "connection-end-point-uuid": "f85e3b79-4d0d-3665-83a4-c7d5535a67ef"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "a4082b29-4e31-3d18-9353-a35e490da083"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "a4f9d070-316b-35d4-b43a-e6bdff01b57b",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "a4f9d070-316b-35d4-b43a-e6bdff01b57b",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_43_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:43"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "a4f9d070-316b-35d4-b43a-e6bdff01b57b",
+              "connection-end-point-uuid": "5f3252d3-6e95-3802-b023-3c39706da647"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "9b493918-6cca-3372-a0dd-44cae0e82ab6",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "9b493918-6cca-3372-a0dd-44cae0e82ab6",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_44_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:44"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "9b493918-6cca-3372-a0dd-44cae0e82ab6",
+              "connection-end-point-uuid": "3187dd45-21e6-3db7-a947-64812382ed21"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "f7afb005-b33a-3d9a-9382-04ef792360db",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "f7afb005-b33a-3d9a-9382-04ef792360db",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_24_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:24"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "f7afb005-b33a-3d9a-9382-04ef792360db",
+              "connection-end-point-uuid": "b064d716-27eb-355b-a728-fb97a6be54bb"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "d412b231-ad49-34e1-a5b7-5e7bd24f9414",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "d412b231-ad49-34e1-a5b7-5e7bd24f9414",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_44_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:44"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "d412b231-ad49-34e1-a5b7-5e7bd24f9414",
+              "connection-end-point-uuid": "d6db1202-308d-39a3-a07f-bdfd40b36ae3"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "08a091be-83bb-3d7b-8dbe-57448c48ac50",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "08a091be-83bb-3d7b-8dbe-57448c48ac50",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_46_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:46"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "08a091be-83bb-3d7b-8dbe-57448c48ac50",
+              "connection-end-point-uuid": "d4ed6f56-fbc8-37f8-b1a3-dc67fb1bc466"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "0aadcb01-c951-384b-a5b3-d01fde7518eb",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "0aadcb01-c951-384b-a5b3-d01fde7518eb",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_28_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:28"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "0aadcb01-c951-384b-a5b3-d01fde7518eb",
+              "connection-end-point-uuid": "82080864-79aa-3b92-be0f-6bb2be3a455f"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "0a9a8ebb-70d4-39c8-b5b6-e22f2378e946",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "0a9a8ebb-70d4-39c8-b5b6-e22f2378e946",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_46_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:46"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "0a9a8ebb-70d4-39c8-b5b6-e22f2378e946",
+              "connection-end-point-uuid": "fb041708-0979-3d5b-a885-bda47aacd601"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "7efdc36d-b66e-3855-9380-d94d49f5bfb1",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "7efdc36d-b66e-3855-9380-d94d49f5bfb1",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_47_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:47"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LT_PERMENANTLY_TERMINATED",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "7efdc36d-b66e-3855-9380-d94d49f5bfb1",
+              "connection-end-point-uuid": "a20c66bd-ceb5-39be-b597-fb7cbb6661f2"
+            }
+          ],
+          "layer-protocol-name": "DSR",
+          "supported-cep-layer-protocol-qualifier": [
+            "DSR_ETHERNET"
+          ],
+          "lldp-snoop": {
+            "remote-port-id": "",
+            "remote-chassis-id": "",
+            "tag-version": "",
+            "system-description": "",
+            "remote-ip-address": "",
+            "system-name": ""
+          },
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "e3e39622-f7bd-3d0a-b3b0-6aa498d60293",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "e3e39622-f7bd-3d0a-b3b0-6aa498d60293",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_30_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:30"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "e3e39622-f7bd-3d0a-b3b0-6aa498d60293",
+              "connection-end-point-uuid": "a53d95a1-b2b1-37d8-a4f2-1faa19248517"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "2018c1cb-5604-35d2-ad91-8d285be4d703",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "2018c1cb-5604-35d2-ad91-8d285be4d703",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_47_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:47"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "2018c1cb-5604-35d2-ad91-8d285be4d703",
+              "connection-end-point-uuid": "2eb2b04f-4cae-3799-8f08-8603f3bd80dc"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "aa1b75a9-dee1-3f5c-917c-d2ed4768bab5",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "aa1b75a9-dee1-3f5c-917c-d2ed4768bab5",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_28_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:28"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "aa1b75a9-dee1-3f5c-917c-d2ed4768bab5",
+              "connection-end-point-uuid": "91f7c8f6-e0ba-3939-9a06-4ca519adbbd2"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "e1c106a0-b36b-3bcc-b674-b5e0a7a8ebeb",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "e1c106a0-b36b-3bcc-b674-b5e0a7a8ebeb",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_24_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:24"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "e1c106a0-b36b-3bcc-b674-b5e0a7a8ebeb",
+              "connection-end-point-uuid": "e6ec6950-705f-3bb3-85af-bd129dfcaeef"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNodeEdgePoint",
+      "object_id": "52b39468-47e8-3e81-b2c5-a935708da89f",
+      "object_data": {
+        "tapi-object-class": "node-edge-point",
+        "tapi-object-data": {
+          "uuid": "52b39468-47e8-3e81-b2c5-a935708da89f",
+          "name": [
+            {
+              "value-name": "localId",
+              "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_20_PTP"
+            },
+            {
+              "value-name": "location",
+              "value": "node:5150-SiteD-port:20"
+            }
+          ],
+          "lifecycle-state": "INSTALLED",
+          "termination-direction": "BIDIRECTIONAL",
+          "termination-state": "LP_CAN_NEVER_TERMINATE",
+          "connection-end-point": [
+            {
+              "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+              "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+              "node-edge-point-uuid": "52b39468-47e8-3e81-b2c5-a935708da89f",
+              "connection-end-point-uuid": "d9f3759e-defc-3600-b710-30265da6729b"
+            }
+          ],
+          "layer-protocol-name": "ETH",
+          "supported-cep-layer-protocol-qualifier": [
+            "ETHERNET"
+          ],
+          "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08"
+        }
+      }
+    }
+  ],
+  "links": {
+    "next": "/tapi/core/context/topology/mcp-base-topology/node-edge-point/?token=OtXO:1606143554805_0:-1193189943:AAAAAQCMTVM=&limit=100",
+    "current": "/tapi/core/context/topology/mcp-base-topology/node-edge-point/?limit=100"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/deeppaging.node.Response.json b/responses/ciena/tapi/deeppaging.node.Response.json
new file mode 100644
index 0000000000000000000000000000000000000000..6bd9deb15274f2f2656e5d6a3d73ec76f797abb0
--- /dev/null
+++ b/responses/ciena/tapi/deeppaging.node.Response.json
@@ -0,0 +1,878 @@
+{
+  "data": [
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N3SITEB"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "87b4f957-e76b-351c-8fc7-00b6777dc8db",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "87b4f957-e76b-351c-8fc7-00b6777dc8db",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N3SITEE"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "1e9641ec-a987-30ed-ba59-5d63956ec3a6",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "1e9641ec-a987-30ed-ba59-5d63956ec3a6",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N3SITEC"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CNode",
+      "object_id": "1e9641ec-a987-30ed-ba59-5d63956ec3a6",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "4a760c50-6a15-3e66-b810-0926855e4bcf",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "4a760c50-6a15-3e66-b810-0926855e4bcf",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N3SITED"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "bcb9173f-e4f8-318c-b0b9-2b11d8884502",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "bcb9173f-e4f8-318c-b0b9-2b11d8884502",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N3SITEA"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CNode",
+      "object_id": "4a760c50-6a15-3e66-b810-0926855e4bcf",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CNode",
+      "object_id": "87b4f957-e76b-351c-8fc7-00b6777dc8db",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CNode",
+      "object_id": "bcb9173f-e4f8-318c-b0b9-2b11d8884502",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceDelete",
+      "object_type": "CNode",
+      "object_id": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+      "object_data": null
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "f2f53ad1-009f-3652-b1e3-e280abef90d4",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "f2f53ad1-009f-3652-b1e3-e280abef90d4",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS404"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "f32a6820-9851-31c7-b7fa-aad241770e0c",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "f32a6820-9851-31c7-b7fa-aad241770e0c",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS403"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS401"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "d95788a8-330f-3fbc-ad62-14456fb8744a",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "d95788a8-330f-3fbc-ad62-14456fb8744a",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS402"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "e42f2a99-7193-3369-93da-008c3e9f3b52",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "e42f2a99-7193-3369-93da-008c3e9f3b52",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS603"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "220ea870-e305-3a63-8a8e-f46854a16efd",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "220ea870-e305-3a63-8a8e-f46854a16efd",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS602"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "288ce3e5-c238-3c4a-b891-4480b759d137",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "288ce3e5-c238-3c4a-b891-4480b759d137",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS601"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "e0121f0e-d3c6-3845-a769-5be79030c615",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "e0121f0e-d3c6-3845-a769-5be79030c615",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS604"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "DISABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "DELETING"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS304"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS301"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS302"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "WS303"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M8333346"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "1.6.0"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "6f629fe4-b148-3a67-b634-e08de7360cb7",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "6f629fe4-b148-3a67-b634-e08de7360cb7",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "3916-SiteC"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "3916 Service Delivery Switch"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "3916-057"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "saos-06-17-01-0178"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "a4082b29-4e31-3d18-9353-a35e490da083",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "3916-SiteA"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "3916 Service Delivery Switch"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "3916-147"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "saos-06-17-01-0178"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "5150-SiteD"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "5150 Service Aggregation Switch"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "M6254624"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "saos-06-17-00-0195"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED"
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "017432e1-a92c-34bb-b95f-7e6e4ef7d8e9",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N2SITED"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "a13a4b31-d3fd-3733-ae24-75e24d940814",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N2SITEE"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "370a75ea-545c-3557-8a7e-7dbdbfb2e2a7",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N2SITEB"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "34970137-92ef-3d03-b3ed-59dbbd519e58",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "34970137-92ef-3d03-b3ed-59dbbd519e58",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N2SITEC"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED",
+          "osrp-enabled": true
+        }
+      }
+    },
+    {
+      "version": "TAPI/2.2",
+      "event_type": "ResourceSnapshot",
+      "object_type": "CNode",
+      "object_id": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+      "object_data": {
+        "tapi-object-class": "node",
+        "tapi-object-data": {
+          "uuid": "76e40538-0ecc-3826-ba0d-a16a03523fa6",
+          "name": [
+            {
+              "value-name": "nativeName",
+              "value": "C5N2SITEA"
+            },
+            {
+              "value-name": "deviceType",
+              "value": "6500 32-Slot Packet-Optical Shelf Assembly"
+            },
+            {
+              "value-name": "serialNumber",
+              "value": "NNTMSIMSIDDD"
+            },
+            {
+              "value-name": "softwareVersion",
+              "value": "12.72"
+            }
+          ],
+          "operational-state": "ENABLED",
+          "lifecycle-state": "INSTALLED",
+          "sync-state": "SYNCHRONIZED",
+          "osrp-enabled": true
+        }
+      }
+    }
+  ],
+  "links": {
+    "next": "/tapi/core/context/topology/mcp-base-topology/node/?token=OtXO:1606143634768_0:-961769110:AAAAAQAAnyY=&limit=100",
+    "current": "/tapi/core/context/topology/mcp-base-topology/node/?limit=100"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.connectivity.Connection-filtered.json b/responses/ciena/tapi/tapi.connectivity.Connection-filtered.json
new file mode 100644
index 0000000000000000000000000000000000000000..7315503679375157e1f42166f2d676988f09d798
--- /dev/null
+++ b/responses/ciena/tapi/tapi.connectivity.Connection-filtered.json
@@ -0,0 +1,39 @@
+{
+  "data": {
+    "lower-connection": [
+      {
+        "connection-uuid": "1e6def9a-b4d9-30d6-9724-760d0e413ddd"
+      }
+    ],
+    "operational-state": "ENABLED",
+    "layer-qualifier": "MPLS_PROTECTION",
+    "lifecycle-state": "PLANNED",
+    "name": [
+      {
+        "value-name": "userLabel",
+        "value": "T20200922_21-51-03-355"
+      }
+    ],
+    "layer-protocol-name": "ETH",
+    "connection-end-point": [
+      {
+        "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+        "node-edge-point-uuid": "0ce28ef0-a786-3517-b25d-e0bb9959b94d",
+        "node-uuid": "6f629fe4-b148-3a67-b634-e08de7360cb7",
+        "connection-end-point-uuid": "48a4c31b-1b73-36ea-985f-b8436a4a0016"
+      },
+      {
+        "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+        "node-edge-point-uuid": "12c3ee3d-4537-3a63-8c80-555ea38c7a92",
+        "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+        "connection-end-point-uuid": "207ce525-84a3-343c-a389-9d1b1221ac3a"
+      }
+    ],
+    "uuid": "39337623-6e14-3e63-bd2f-8a23dea1c19f",
+    "service-class": "Tunnel",
+    "direction": "bidirectional"
+  },
+  "links": {
+    "self": "tapi/data/context/connectivity-context/connection/39337623-6e14-3e63-bd2f-8a23dea1c19f"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.connectivity.Connection.json b/responses/ciena/tapi/tapi.connectivity.Connection.json
new file mode 100644
index 0000000000000000000000000000000000000000..4446d6e0599f24e63f8574ed526ca4de0fc6cc10
--- /dev/null
+++ b/responses/ciena/tapi/tapi.connectivity.Connection.json
@@ -0,0 +1,333 @@
+{
+  "meta": {
+    "totalMatchingResources": 99,
+    "totalResources": 99
+  },
+  "data": [
+    {
+      "lower-connection": [
+        {
+          "connection-uuid": "1e6def9a-b4d9-30d6-9724-760d0e413ddd"
+        }
+      ],
+      "operational-state": "ENABLED",
+      "layer-qualifier": "MPLS_PROTECTION",
+      "lifecycle-state": "PLANNED",
+      "name": [
+        {
+          "value-name": "userLabel",
+          "value": "T20200922_21-51-03-355"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "0ce28ef0-a786-3517-b25d-e0bb9959b94d",
+          "node-uuid": "6f629fe4-b148-3a67-b634-e08de7360cb7",
+          "connection-end-point-uuid": "48a4c31b-1b73-36ea-985f-b8436a4a0016"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "12c3ee3d-4537-3a63-8c80-555ea38c7a92",
+          "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+          "connection-end-point-uuid": "207ce525-84a3-343c-a389-9d1b1221ac3a"
+        }
+      ],
+      "uuid": "39337623-6e14-3e63-bd2f-8a23dea1c19f",
+      "service-class": "Tunnel",
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "lower-connection": [],
+      "layer-qualifier": "ETHERNET",
+      "lifecycle-state": "INSTALLED",
+      "signal-content-type": "mac_transport",
+      "layer-protocol-name": "ETH",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "7da58c12-7776-3fe3-89a9-0c99acd7d70d",
+          "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+          "connection-end-point-uuid": "979e4b06-3970-34b7-b60b-5be1a1861f96"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "2ae91481-e14c-3866-8d4c-cf8565e09ae3",
+          "node-uuid": "6f629fe4-b148-3a67-b634-e08de7360cb7",
+          "connection-end-point-uuid": "f6ae7498-40db-361b-bb3b-0149cd33df05"
+        }
+      ],
+      "uuid": "8bd45fa5-d13d-3a4b-a6b0-9512ad69c040",
+      "service-class": "LLDP",
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "lower-connection": [],
+      "layer-qualifier": "ETHERNET",
+      "lifecycle-state": "INSTALLED",
+      "signal-content-type": "mac_transport",
+      "layer-protocol-name": "ETH",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "195a76f3-6ce0-32dc-970b-1e1de86fe6a7",
+          "node-uuid": "6f629fe4-b148-3a67-b634-e08de7360cb7",
+          "connection-end-point-uuid": "98e8d9ae-8e08-3c4a-a069-bb8c85411410"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "e2b6c9c9-44d6-333c-bba9-ed72cf29a5a3",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "b84652ea-0a68-3d22-816f-a980e049c69f"
+        }
+      ],
+      "uuid": "469d3d83-97f5-31f8-869d-8082ca77fea0",
+      "service-class": "LLDP",
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "lower-connection": [],
+      "layer-qualifier": "ETHERNET",
+      "lifecycle-state": "INSTALLED",
+      "signal-content-type": "mac_transport",
+      "layer-protocol-name": "ETH",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "a0ee3940-8fbf-345c-be65-8789efb845cf",
+          "node-uuid": "a4082b29-4e31-3d18-9353-a35e490da083",
+          "connection-end-point-uuid": "980c374c-19a0-3c34-8cc6-1b8ab03830c5"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "cd80944c-9ea9-3bc3-854c-edbb8ba5e25c",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "91944384-3ba9-377e-8e09-9d3f14d5d3ba"
+        }
+      ],
+      "uuid": "54920ba7-2e2a-3ce5-8f64-24b78c1c3718",
+      "service-class": "LLDP",
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "lower-connection": [
+        {
+          "connection-uuid": "3eb9f488-fad3-3053-8c0e-5eb445e49d9c"
+        },
+        {
+          "connection-uuid": "c3bceca9-b47a-3bbf-af97-7ad6c3c3ba2a"
+        },
+        {
+          "connection-uuid": "845c77fb-3509-340c-b796-34870c0642d1"
+        }
+      ],
+      "layer-qualifier": "DSR_ETHERNET",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "userLabel",
+          "value": "AUTOGEN-SERVICE-400"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "631ca88c-303c-3189-be70-e99ebc9fdc5e",
+          "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+          "connection-end-point-uuid": "2ef37e05-be0c-3189-a214-6ddeecbe711a"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "fe635093-0ab8-32f9-883b-10e00ce8324a",
+          "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+          "connection-end-point-uuid": "db24d880-754b-30e1-ae12-64496bf8e177"
+        }
+      ],
+      "uuid": "66baddd7-e50c-3fcb-8ce6-bee0f4ca48da",
+      "direction": "bidirectional"
+    },
+    {
+      "lower-connection": [
+        {
+          "connection-uuid": "8622773b-a15e-39a1-92c0-6cbfa80a1ed0"
+        }
+      ],
+      "layer-qualifier": "MEDIA",
+      "lifecycle-state": "PLANNED",
+      "name": [
+        {
+          "value-name": "userLabel",
+          "value": "TEST_SVC"
+        }
+      ],
+      "layer-protocol-name": "PHOTONIC_MEDIA",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "8b3cf0fe-c941-384a-816e-65b2233419ca",
+          "node-uuid": "87b4f957-e76b-351c-8fc7-00b6777dc8db",
+          "connection-end-point-uuid": "141096e7-d51f-3aa5-bdf9-994f9ed7e1b6"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "01a8258f-f813-36d7-9160-8790de475ca3",
+          "node-uuid": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+          "connection-end-point-uuid": "842385c8-0756-3977-b04b-86b61092409e"
+        }
+      ],
+      "uuid": "4ed7cfde-1dff-3773-b98e-3efd1e389b35",
+      "direction": "BIDIRECTIONAL"
+    },
+    {
+      "lower-connection": [
+        {
+          "connection-uuid": "71939a55-51a0-38f7-8d96-48f1f9ac57ee"
+        }
+      ],
+      "layer-qualifier": "MEDIA",
+      "lifecycle-state": "PLANNED",
+      "name": [
+        {
+          "value-name": "ossLabel",
+          "value": "CIOLFI_002"
+        },
+        {
+          "value-name": "userLabel",
+          "value": "CIOLFI_002"
+        }
+      ],
+      "layer-protocol-name": "PHOTONIC_MEDIA",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "931d65b8-4840-39a4-b288-cfae08f06383",
+          "node-uuid": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+          "connection-end-point-uuid": "3365a44d-0c18-3f2f-834c-6b3607306de5"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "39d1ea44-0810-3d0a-8c27-b55e579cffd4",
+          "node-uuid": "bcb9173f-e4f8-318c-b0b9-2b11d8884502",
+          "connection-end-point-uuid": "e6d80c39-7450-3993-8a70-8685a3ee4bd3"
+        }
+      ],
+      "uuid": "e8886e1c-a99a-3a2c-861a-5117b7fdf44e",
+      "direction": "BIDIRECTIONAL"
+    },
+    {
+      "lower-connection": [
+        {
+          "connection-uuid": "8622773b-a15e-39a1-92c0-6cbfa80a1ed0"
+        }
+      ],
+      "layer-qualifier": "MEDIA",
+      "lifecycle-state": "PLANNED",
+      "name": [
+        {
+          "value-name": "ossLabel",
+          "value": "CIOLFI_002"
+        },
+        {
+          "value-name": "userLabel",
+          "value": "CIOLFI_002"
+        }
+      ],
+      "layer-protocol-name": "PHOTONIC_MEDIA",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "8b3cf0fe-c941-384a-816e-65b2233419ca",
+          "node-uuid": "87b4f957-e76b-351c-8fc7-00b6777dc8db",
+          "connection-end-point-uuid": "a5da6b38-45ea-3b84-b2f7-b57e13ff58ef"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "01a8258f-f813-36d7-9160-8790de475ca3",
+          "node-uuid": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+          "connection-end-point-uuid": "3754d05d-471e-3f19-965f-d1a5976f11a3"
+        }
+      ],
+      "uuid": "48d2e506-f3d4-3f68-aa21-3a8bd91ff477",
+      "direction": "BIDIRECTIONAL"
+    },
+    {
+      "lower-connection": [
+        {
+          "connection-uuid": "8622773b-a15e-39a1-92c0-6cbfa80a1ed0"
+        }
+      ],
+      "layer-qualifier": "MEDIA",
+      "lifecycle-state": "PLANNED",
+      "name": [
+        {
+          "value-name": "userLabel",
+          "value": "CIOLFI_001"
+        }
+      ],
+      "layer-protocol-name": "PHOTONIC_MEDIA",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "01a8258f-f813-36d7-9160-8790de475ca3",
+          "node-uuid": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+          "connection-end-point-uuid": "c9f523fd-3127-3230-b95b-c8c413dd2e41"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "8b3cf0fe-c941-384a-816e-65b2233419ca",
+          "node-uuid": "87b4f957-e76b-351c-8fc7-00b6777dc8db",
+          "connection-end-point-uuid": "bdfb2fe5-e988-30f1-8334-831f6bee2702"
+        }
+      ],
+      "uuid": "f56713ff-2bdc-336f-a402-b2c0bff78018",
+      "direction": "BIDIRECTIONAL"
+    },
+    {
+      "operational-state": "DISABLED",
+      "layer-qualifier": "OTSI",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "ossLabel",
+          "value": "CIOLFI_002"
+        },
+        {
+          "value-name": "nativeName",
+          "value": "1-2-8-193.687500,1-22-5-193.687500"
+        },
+        {
+          "value-name": "userLabel",
+          "value": "CIOLFI_002"
+        }
+      ],
+      "layer-protocol-name": "PHOTONIC_MEDIA",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "ca6b3a6a-034d-3a08-b348-05aa7f836fea",
+          "node-uuid": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+          "connection-end-point-uuid": "07123d3c-ec1e-34c1-b02d-4967500cac5d"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "a02d3a50-a23d-3f8e-abbf-69e29a7b43ba",
+          "node-uuid": "8b048398-5706-389b-9ba9-6cf3ef0a2dad",
+          "connection-end-point-uuid": "10e69674-60e0-38a8-bdb5-eef463685a3f"
+        }
+      ],
+      "uuid": "ebd40bcc-fb42-379b-974e-2dad7ecce9d1",
+      "direction": "BIDIRECTIONAL"
+    }
+  ],
+  "links": {
+    "self": "tapi/data/context/connectivity-context/connection/?page[number]=0&page[size]=10",
+    "last": "tapi/data/context/connectivity-context/connection/?page[number]=9&page[size]=10",
+    "next": "tapi/data/context/connectivity-context/connection/?page[number]=1&page[size]=10"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.connectivity.connectivitycontext.ConnectivityService-filtered.json b/responses/ciena/tapi/tapi.connectivity.connectivitycontext.ConnectivityService-filtered.json
new file mode 100644
index 0000000000000000000000000000000000000000..17a7bf33d803abfe9252062c8443093d23a860a6
--- /dev/null
+++ b/responses/ciena/tapi/tapi.connectivity.connectivitycontext.ConnectivityService-filtered.json
@@ -0,0 +1,20 @@
+{
+  "data": {
+    "last-error-msg": "",
+    "name": [
+      {
+        "value-name": "name",
+        "value": "CIOLFI_003"
+      }
+    ],
+    "resilience-type": {
+      "protection-type": "DYNAMIC_RESTORATION"
+    },
+    "uuid": "5f887f79-5ec2-4723-94ad-d3a1e5d623c8",
+    "deployment-state": "DEFINED_AND_VIABLE",
+    "maximize-capacity": true
+  },
+  "links": {
+    "self": "tapi/data/context/connectivity-context/connectivity-service/5f887f79-5ec2-4723-94ad-d3a1e5d623c8"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.connectivity.connectivitycontext.ConnectivityService.json b/responses/ciena/tapi/tapi.connectivity.connectivitycontext.ConnectivityService.json
new file mode 100644
index 0000000000000000000000000000000000000000..1a839d35ebd86586ef671a82f84b783cb8dc8263
--- /dev/null
+++ b/responses/ciena/tapi/tapi.connectivity.connectivitycontext.ConnectivityService.json
@@ -0,0 +1,26 @@
+{
+  "meta": {
+    "totalMatchingResources": 1,
+    "totalResources": 1
+  },
+  "data": [
+    {
+      "last-error-msg": "",
+      "name": [
+        {
+          "value-name": "name",
+          "value": "CIOLFI_003"
+        }
+      ],
+      "resilience-type": {
+        "protection-type": "DYNAMIC_RESTORATION"
+      },
+      "uuid": "5f887f79-5ec2-4723-94ad-d3a1e5d623c8",
+      "deployment-state": "DEFINED_AND_VIABLE",
+      "maximize-capacity": true
+    }
+  ],
+  "links": {
+    "self": "tapi/data/context/connectivity-context/connectivity-service/?page[number]=0&page[size]=10"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList.json b/responses/ciena/tapi/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList.json
new file mode 100644
index 0000000000000000000000000000000000000000..2514f88b95b38e2e9c34ffd8ad2df6090d082d1b
--- /dev/null
+++ b/responses/ciena/tapi/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList.json
@@ -0,0 +1,257 @@
+{
+  "meta": {
+    "totalMatchingResources": 2016,
+    "totalResources": 2016
+  },
+  "data": [
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "signal-content-type": "VLAN",
+      "interface-type": "INNI",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_2_CTPServerToClient_VLAN_120"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:2-vlan:120"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "additional-attributes": {
+        "ingress-cos-policy": "L2PcpCos",
+        "ingress-cos-map-name": "DefaultFcosRcos"
+      },
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "layer-protocol-qualifier": "ETHERNET",
+      "uuid": "d0ca4289-13e4-3b43-b05b-d404ecd752d9"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "signal-content-type": "IP",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_FTP_IPDATA_mpls-120"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:2-vlan:120-interfaceName:mpls-120"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "additional-attributes": {
+        "te-qos-mode": "diffServ",
+        "link-cost": "1",
+        "interface-ip": "10.1.2.2",
+        "subnet-mask": "255.255.255.252",
+        "interface-l-3-mac": "00:03:18:bb:d8:01",
+        "routing-protocol-enabled": "false",
+        "mtu": "1500"
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "layer-protocol-qualifier": "ETHERNET",
+      "uuid": "1f6a3fa0-fee8-383d-937c-1ff07919dc06"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "signal-content-type": "IP",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_FTP_IPDATA_mpls-150"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:1-vlan:150-interfaceName:mpls-150"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "additional-attributes": {
+        "te-qos-mode": "diffServ",
+        "link-cost": "1",
+        "interface-ip": "10.1.5.1",
+        "subnet-mask": "255.255.255.252",
+        "interface-l-3-mac": "00:03:18:bb:d8:01",
+        "routing-protocol-enabled": "false",
+        "mtu": "1500"
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "layer-protocol-qualifier": "ETHERNET",
+      "uuid": "bb687765-89a2-3c90-b8f8-a2d54e03d669"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "signal-content-type": "VLAN",
+      "interface-type": "ENNI",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_3_CTPServerToClient_VLAN_140"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:3-vlan:140"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "additional-attributes": {
+        "ingress-cos-policy": "L2PcpCos",
+        "ingress-cos-map-name": "DefaultFcosRcos"
+      },
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "layer-protocol-qualifier": "ETHERNET",
+      "uuid": "869c1757-bd6a-36ef-b013-04b2483df635"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "signal-content-type": "IP",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_FTP_IPDATA_mpls-140"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:3-vlan:140-interfaceName:mpls-140"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "additional-attributes": {
+        "te-qos-mode": "diffServ",
+        "link-cost": "1",
+        "interface-ip": "10.1.4.2",
+        "subnet-mask": "255.255.255.252",
+        "interface-l-3-mac": "00:03:18:bb:d8:01",
+        "routing-protocol-enabled": "false",
+        "mtu": "1500"
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "layer-protocol-qualifier": "ETHERNET",
+      "uuid": "02c3d86b-6e37-3d9f-a26d-1d1dbb88e9bd"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "signal-content-type": "VLAN",
+      "interface-type": "INNI",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_1_CTPServerToClient_VLAN_150"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:1-vlan:150"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "additional-attributes": {
+        "ingress-cos-policy": "L2PcpCos",
+        "ingress-cos-map-name": "DefaultFcosRcos"
+      },
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "layer-protocol-qualifier": "ETHERNET",
+      "uuid": "97432801-e779-3939-8f27-2eeab32d3ef7"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "signal-content-type": "VLAN",
+      "interface-type": "INNI",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "36c6312c-3032-318e-ba12-62a0694c1699::TPE_4_CTPServerToClient_VLAN_120"
+        },
+        {
+          "value-name": "location",
+          "value": "node:3916-SiteA-port:4-vlan:120"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "additional-attributes": {
+        "ingress-cos-policy": "L2PcpCos",
+        "ingress-cos-map-name": "DefaultFcosRcos"
+      },
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "layer-protocol-qualifier": "ETHERNET",
+      "uuid": "f85e3b79-4d0d-3665-83a4-c7d5535a67ef"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "signal-content-type": "VLAN",
+      "interface-type": "INNI",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "553c9136-e7c8-39d4-9837-de89cfa3bd40::TPE_6_CTPServerToClient_VLAN_150"
+        },
+        {
+          "value-name": "location",
+          "value": "node:3916-SiteC-port:6-vlan:150"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "additional-attributes": {
+        "ingress-cos-policy": "L2PcpCos",
+        "ingress-cos-map-name": "DefaultFcosRcos"
+      },
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "layer-protocol-qualifier": "ETHERNET",
+      "uuid": "afd8265b-7b81-3b62-a5e8-de3750f37bff"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_19_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:19"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "layer-protocol-qualifier": [
+        "DSR_ETHERNET"
+      ],
+      "uuid": "aaecb1af-102a-3b84-bea5-13aa90d9567a"
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_18_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:18"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "layer-protocol-qualifier": [
+        "DSR_ETHERNET"
+      ],
+      "uuid": "4d17d4a1-43b4-3366-a777-551328f603bf"
+    }
+  ],
+  "links": {
+    "self": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/connection-end-point/?page[number]=0&page[size]=10",
+    "last": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/connection-end-point/?page[number]=201&page[size]=10",
+    "next": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/connection-end-point/?page[number]=1&page[size]=10"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.topology.Link-filtered.json b/responses/ciena/tapi/tapi.topology.Link-filtered.json
new file mode 100644
index 0000000000000000000000000000000000000000..26f217c1dea55ee6b22a330ce8497615ec4367cd
--- /dev/null
+++ b/responses/ciena/tapi/tapi.topology.Link-filtered.json
@@ -0,0 +1,27 @@
+{
+  "data": {
+    "operational-state": "ENABLED",
+    "layer-qualifier": "ODUCN",
+    "lifecycle-state": "INSTALLED",
+    "layer-protocol-name": [
+      "ODU"
+    ],
+    "uuid": "1b3a45c3-dd27-39ff-8921-fed819a622ec",
+    "node-edge-point": [
+      {
+        "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+        "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa",
+        "node-edge-point-uuid": "9f016279-9a1f-3fee-b1ea-b8a353f0e0af"
+      },
+      {
+        "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+        "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a",
+        "node-edge-point-uuid": "ba1b22ee-2512-3693-9606-9ef75bcc325d"
+      }
+    ],
+    "direction": "bidirectional"
+  },
+  "links": {
+    "self": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/link/1b3a45c3-dd27-39ff-8921-fed819a622ec"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.topology.Link.json b/responses/ciena/tapi/tapi.topology.Link.json
new file mode 100644
index 0000000000000000000000000000000000000000..f17927aec24f94f5c38887059f21a1a2566a2e34
--- /dev/null
+++ b/responses/ciena/tapi/tapi.topology.Link.json
@@ -0,0 +1,233 @@
+{
+  "meta": {
+    "totalMatchingResources": 69,
+    "totalResources": 69
+  },
+  "data": [
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "OTUCN",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "c7575c31-8dbb-37bd-b478-1a2ce8eee0bd",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "55754d33-a5ca-3835-a31c-e2862e570975",
+          "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "67c45d25-f027-3fb2-a74b-be33c980badd",
+          "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "ODU4",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "87cf2c89-a2a1-37eb-b26e-c6386ea51edb",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "d7390546-0482-3ef2-95b6-7c66a4c68a34",
+          "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "a612f441-fa88-3da1-b162-313567ac4dc4",
+          "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "ODUCN",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "7fa42461-c4e5-3fbb-834a-956bfbdd773d",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "cf368719-7534-338d-b487-e4a5a3f1e959",
+          "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "d3863b84-856f-3631-903a-c1325c4fe6cd",
+          "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "ODU4",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "f064a680-a6cf-3e1f-be6e-4f9c661b979f",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "69e25794-3d3b-3f5d-9e2a-c2bb1c36b8af",
+          "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "3bb228fb-c3c7-38a0-8d9c-54e57531f40f",
+          "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "ODUCN",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "0c4e351e-aaa0-3a3f-8cfe-55bc71443423",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "a770e91e-596b-3dea-959d-51fa27e3258b",
+          "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "f341c258-84a7-30e4-9485-6852f6e3faf1",
+          "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "OTUCN",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "72d39ad8-0203-3e91-b778-ab8d15fffb7d",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "98167141-d3ea-3b99-958c-d181a84d0ab0",
+          "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "01f6625b-f4a9-3adb-9bb9-b2f6affed4ef",
+          "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "ODU4",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "3a67b880-2579-3c61-9958-d5eed655faa3",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "2428479b-4216-3d2e-9171-a2884cc63c60",
+          "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "d6061908-a684-37de-becd-75d0f8d555e3",
+          "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "ODU4",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "a5818a14-6229-3d0d-b7b2-4d1d0c76611f",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "6135a998-cc1c-3aa4-90f8-a89591c04555",
+          "node-uuid": "585474ea-e12e-3d7d-a61b-13b84b51f5dd"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "041c7fd9-4895-360d-b3ac-86d6c22ca8b7",
+          "node-uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "OTUCN",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "e4d76f39-c2e8-3c09-8dea-1f7b16ff6ef5",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "17219a09-985f-377e-a6cb-424bbc6f123b",
+          "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "845b0f95-e923-3e6d-bdc2-07974358db71",
+          "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      ],
+      "direction": "bidirectional"
+    },
+    {
+      "operational-state": "ENABLED",
+      "layer-qualifier": "ODUCN",
+      "lifecycle-state": "INSTALLED",
+      "layer-protocol-name": [
+        "ODU"
+      ],
+      "uuid": "1b3a45c3-dd27-39ff-8921-fed819a622ec",
+      "node-edge-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "9f016279-9a1f-3fee-b1ea-b8a353f0e0af",
+          "node-uuid": "cd0346a3-b37f-35e1-97a9-04964de6defa"
+        },
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "ba1b22ee-2512-3693-9606-9ef75bcc325d",
+          "node-uuid": "54f3901b-f77e-344e-a8c0-4fec1d78913a"
+        }
+      ],
+      "direction": "bidirectional"
+    }
+  ],
+  "links": {
+    "self": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/link/?page[number]=0&page[size]=10",
+    "last": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/link/?page[number]=6&page[size]=10",
+    "next": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/link/?page[number]=1&page[size]=10"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.topology.TopologyInfo.json b/responses/ciena/tapi/tapi.topology.TopologyInfo.json
new file mode 100644
index 0000000000000000000000000000000000000000..e4ac0bead825a22134bd59bdd0b794d9e4068c0e
--- /dev/null
+++ b/responses/ciena/tapi/tapi.topology.TopologyInfo.json
@@ -0,0 +1,26 @@
+{
+  "meta": {
+    "totalMatchingResources": 1,
+    "totalResources": 1
+  },
+  "data": [
+    {
+      "name": [
+        {
+          "value-name": "name",
+          "value": "mcp-base-topology"
+        }
+      ],
+      "layer-protocol-name": [
+        "PHOTONIC_MEDIA",
+        "DSR",
+        "ODU",
+        "ETH"
+      ],
+      "uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb"
+    }
+  ],
+  "links": {
+    "self": "tapi/data/context/topology-context/topology/?page[number]=0&page[size]=10"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.topology.node.OwnedNodeEdgePoint-filtered.json b/responses/ciena/tapi/tapi.topology.node.OwnedNodeEdgePoint-filtered.json
new file mode 100644
index 0000000000000000000000000000000000000000..1c7c95195f37fd08bb7c0f68bbf2571ef169dda2
--- /dev/null
+++ b/responses/ciena/tapi/tapi.topology.node.OwnedNodeEdgePoint-filtered.json
@@ -0,0 +1,42 @@
+{
+  "data": {
+    "lifecycle-state": "INSTALLED",
+    "termination-direction": "BIDIRECTIONAL",
+    "name": [
+      {
+        "value-name": "localId",
+        "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_44_PTP"
+      },
+      {
+        "value-name": "location",
+        "value": "node:5150-SiteD-port:44"
+      }
+    ],
+    "layer-protocol-name": "DSR",
+    "lldp-snoop": {
+      "remote-port-id": "",
+      "remote-chassis-id": "",
+      "tag-version": "",
+      "system-description": "",
+      "remote-ip-address": "",
+      "system-name": ""
+    },
+    "termination-state": "LT_PERMENANTLY_TERMINATED",
+    "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+    "connection-end-point": [
+      {
+        "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+        "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+        "node-edge-point-uuid": "9b493918-6cca-3372-a0dd-44cae0e82ab6",
+        "connection-end-point-uuid": "3187dd45-21e6-3db7-a947-64812382ed21"
+      }
+    ],
+    "uuid": "9b493918-6cca-3372-a0dd-44cae0e82ab6",
+    "supported-cep-layer-protocol-qualifier": [
+      "DSR_ETHERNET"
+    ]
+  },
+  "links": {
+    "self": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node-edge-point/9b493918-6cca-3372-a0dd-44cae0e82ab6"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.topology.node.OwnedNodeEdgePoint.json b/responses/ciena/tapi/tapi.topology.node.OwnedNodeEdgePoint.json
new file mode 100644
index 0000000000000000000000000000000000000000..0805616fd0a994561668f94dfb96af2df6eff65f
--- /dev/null
+++ b/responses/ciena/tapi/tapi.topology.node.OwnedNodeEdgePoint.json
@@ -0,0 +1,351 @@
+{
+  "meta": {
+    "totalMatchingResources": 501,
+    "totalResources": 501
+  },
+  "data": [
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_44_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:44"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "lldp-snoop": {
+        "system-description": "",
+        "tag-version": "",
+        "remote-chassis-id": "",
+        "system-name": "",
+        "remote-ip-address": "",
+        "remote-port-id": ""
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "9b493918-6cca-3372-a0dd-44cae0e82ab6",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "3187dd45-21e6-3db7-a947-64812382ed21"
+        }
+      ],
+      "uuid": "9b493918-6cca-3372-a0dd-44cae0e82ab6",
+      "supported-cep-layer-protocol-qualifier": [
+        "DSR_ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_44_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:44"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "d412b231-ad49-34e1-a5b7-5e7bd24f9414",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "d6db1202-308d-39a3-a07f-bdfd40b36ae3"
+        }
+      ],
+      "uuid": "d412b231-ad49-34e1-a5b7-5e7bd24f9414",
+      "supported-cep-layer-protocol-qualifier": [
+        "ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_1_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:1"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "lldp-snoop": {
+        "system-description": "",
+        "tag-version": "",
+        "remote-chassis-id": "",
+        "system-name": "",
+        "remote-ip-address": "",
+        "remote-port-id": ""
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "6782f920-427b-3b42-a76c-9b06168c6030",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "9f1f0115-b39d-3cb5-a2b5-1e299621bf7f"
+        }
+      ],
+      "uuid": "6782f920-427b-3b42-a76c-9b06168c6030",
+      "supported-cep-layer-protocol-qualifier": [
+        "DSR_ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_24_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:24"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "lldp-snoop": {
+        "system-description": "",
+        "tag-version": "",
+        "remote-chassis-id": "",
+        "system-name": "",
+        "remote-ip-address": "",
+        "remote-port-id": ""
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "f7afb005-b33a-3d9a-9382-04ef792360db",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "b064d716-27eb-355b-a728-fb97a6be54bb"
+        }
+      ],
+      "uuid": "f7afb005-b33a-3d9a-9382-04ef792360db",
+      "supported-cep-layer-protocol-qualifier": [
+        "DSR_ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_24_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:24"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "e1c106a0-b36b-3bcc-b674-b5e0a7a8ebeb",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "e6ec6950-705f-3bb3-85af-bd129dfcaeef"
+        }
+      ],
+      "uuid": "e1c106a0-b36b-3bcc-b674-b5e0a7a8ebeb",
+      "supported-cep-layer-protocol-qualifier": [
+        "ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_46_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:46"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "lldp-snoop": {
+        "system-description": "",
+        "tag-version": "",
+        "remote-chassis-id": "",
+        "system-name": "",
+        "remote-ip-address": "",
+        "remote-port-id": ""
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "08a091be-83bb-3d7b-8dbe-57448c48ac50",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "d4ed6f56-fbc8-37f8-b1a3-dc67fb1bc466"
+        }
+      ],
+      "uuid": "08a091be-83bb-3d7b-8dbe-57448c48ac50",
+      "supported-cep-layer-protocol-qualifier": [
+        "DSR_ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_46_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:46"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "0a9a8ebb-70d4-39c8-b5b6-e22f2378e946",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "fb041708-0979-3d5b-a885-bda47aacd601"
+        }
+      ],
+      "uuid": "0a9a8ebb-70d4-39c8-b5b6-e22f2378e946",
+      "supported-cep-layer-protocol-qualifier": [
+        "ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_28_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:28"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "lldp-snoop": {
+        "system-description": "",
+        "tag-version": "",
+        "remote-chassis-id": "",
+        "system-name": "",
+        "remote-ip-address": "",
+        "remote-port-id": ""
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "0aadcb01-c951-384b-a5b3-d01fde7518eb",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "82080864-79aa-3b92-be0f-6bb2be3a455f"
+        }
+      ],
+      "uuid": "0aadcb01-c951-384b-a5b3-d01fde7518eb",
+      "supported-cep-layer-protocol-qualifier": [
+        "DSR_ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_28_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:28"
+        }
+      ],
+      "layer-protocol-name": "ETH",
+      "termination-state": "LP_CAN_NEVER_TERMINATE",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "aa1b75a9-dee1-3f5c-917c-d2ed4768bab5",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "91f7c8f6-e0ba-3939-9a06-4ca519adbbd2"
+        }
+      ],
+      "uuid": "aa1b75a9-dee1-3f5c-917c-d2ed4768bab5",
+      "supported-cep-layer-protocol-qualifier": [
+        "ETHERNET"
+      ]
+    },
+    {
+      "lifecycle-state": "INSTALLED",
+      "termination-direction": "BIDIRECTIONAL",
+      "name": [
+        {
+          "value-name": "localId",
+          "value": "874480ab-6625-3cfa-ac06-07a7d6df640c::TPE_47_PTP"
+        },
+        {
+          "value-name": "location",
+          "value": "node:5150-SiteD-port:47"
+        }
+      ],
+      "layer-protocol-name": "DSR",
+      "lldp-snoop": {
+        "system-description": "",
+        "tag-version": "",
+        "remote-chassis-id": "",
+        "system-name": "",
+        "remote-ip-address": "",
+        "remote-port-id": ""
+      },
+      "termination-state": "LT_PERMENANTLY_TERMINATED",
+      "containing-node": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "connection-end-point": [
+        {
+          "topology-uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb",
+          "node-edge-point-uuid": "7efdc36d-b66e-3855-9380-d94d49f5bfb1",
+          "node-uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+          "connection-end-point-uuid": "a20c66bd-ceb5-39be-b597-fb7cbb6661f2"
+        }
+      ],
+      "uuid": "7efdc36d-b66e-3855-9380-d94d49f5bfb1",
+      "supported-cep-layer-protocol-qualifier": [
+        "DSR_ETHERNET"
+      ]
+    }
+  ],
+  "links": {
+    "self": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node-edge-point/?page[number]=0&page[size]=10",
+    "last": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node-edge-point/?page[number]=50&page[size]=10",
+    "next": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node-edge-point/?page[number]=1&page[size]=10"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.topology.topology.Node-filtered.json b/responses/ciena/tapi/tapi.topology.topology.Node-filtered.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d3b9d87b21f6881a55965a1d1e8a96b30adf6ee
--- /dev/null
+++ b/responses/ciena/tapi/tapi.topology.topology.Node-filtered.json
@@ -0,0 +1,30 @@
+{
+  "data": {
+    "operational-state": "DISABLED",
+    "lifecycle-state": "INSTALLED",
+    "name": [
+      {
+        "value-name": "nativeName",
+        "value": "WS604"
+      },
+      {
+        "value-name": "deviceType",
+        "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+      },
+      {
+        "value-name": "serialNumber",
+        "value": "M8333346"
+      },
+      {
+        "value-name": "softwareVersion",
+        "value": "1.6.0"
+      }
+    ],
+    "sync-state": "DELETING",
+    "uuid": "e0121f0e-d3c6-3845-a769-5be79030c615",
+    "ownedNodeEdgePoint": []
+  },
+  "links": {
+    "self": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node/e0121f0e-d3c6-3845-a769-5be79030c615"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.topology.topology.Node.json b/responses/ciena/tapi/tapi.topology.topology.Node.json
new file mode 100644
index 0000000000000000000000000000000000000000..a8624dcd7692700c26455425a7101289738aebda
--- /dev/null
+++ b/responses/ciena/tapi/tapi.topology.topology.Node.json
@@ -0,0 +1,393 @@
+{
+  "meta": {
+    "totalMatchingResources": 20,
+    "totalResources": 20
+  },
+  "data": [
+    {
+      "operational-state": "DISABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS601"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "DELETING",
+      "uuid": "288ce3e5-c238-3c4a-b891-4480b759d137",
+      "ownedNodeEdgePoint": []
+    },
+    {
+      "operational-state": "DISABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS602"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "DELETING",
+      "uuid": "220ea870-e305-3a63-8a8e-f46854a16efd",
+      "ownedNodeEdgePoint": []
+    },
+    {
+      "operational-state": "DISABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS402"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "DELETING",
+      "uuid": "d95788a8-330f-3fbc-ad62-14456fb8744a",
+      "ownedNodeEdgePoint": []
+    },
+    {
+      "operational-state": "DISABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS404"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "DELETING",
+      "uuid": "f2f53ad1-009f-3652-b1e3-e280abef90d4",
+      "ownedNodeEdgePoint": []
+    },
+    {
+      "operational-state": "DISABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS403"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "DELETING",
+      "uuid": "f32a6820-9851-31c7-b7fa-aad241770e0c",
+      "ownedNodeEdgePoint": []
+    },
+    {
+      "operational-state": "DISABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS401"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "DELETING",
+      "uuid": "4447c0cb-a28b-3e37-84c7-287e6045584f",
+      "ownedNodeEdgePoint": []
+    },
+    {
+      "operational-state": "DISABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS603"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "DELETING",
+      "uuid": "e42f2a99-7193-3369-93da-008c3e9f3b52",
+      "ownedNodeEdgePoint": []
+    },
+    {
+      "operational-state": "DISABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS604"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "DELETING",
+      "uuid": "e0121f0e-d3c6-3845-a769-5be79030c615",
+      "ownedNodeEdgePoint": []
+    },
+    {
+      "operational-state": "ENABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "5150-SiteD"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "5150 Service Aggregation Switch"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M6254624"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "saos-06-17-00-0195"
+        }
+      ],
+      "sync-state": "SYNCHRONIZED",
+      "uuid": "d219b4bf-dc6a-38e8-89d7-d363823fca08",
+      "ownedNodeEdgePoint": [
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=9b493918-6cca-3372-a0dd-44cae0e82ab6",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=d412b231-ad49-34e1-a5b7-5e7bd24f9414",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=6782f920-427b-3b42-a76c-9b06168c6030",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=f7afb005-b33a-3d9a-9382-04ef792360db",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=e1c106a0-b36b-3bcc-b674-b5e0a7a8ebeb",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=08a091be-83bb-3d7b-8dbe-57448c48ac50",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=0a9a8ebb-70d4-39c8-b5b6-e22f2378e946",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=0aadcb01-c951-384b-a5b3-d01fde7518eb",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=aa1b75a9-dee1-3f5c-917c-d2ed4768bab5",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=7efdc36d-b66e-3855-9380-d94d49f5bfb1",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=2018c1cb-5604-35d2-ad91-8d285be4d703",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=a4fee99f-fd6a-300a-bf30-f7bedf970864",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=a4f9d070-316b-35d4-b43a-e6bdff01b57b",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=25d23cc9-32bb-3b9f-b35f-b4f478eabf41",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=fae70ed7-9761-3ba9-86f9-80448a04957a",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=ac797ebb-d0ed-3121-ba61-e65881a47311",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=e3e39622-f7bd-3d0a-b3b0-6aa498d60293",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=5a06b2e3-117e-3227-a3e5-fc5a336a3dd3",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=07d49861-67e7-3341-8f71-ae5a54a3438d",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=7edd6124-0702-346b-9d6c-962758f24a8d",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=c1c29e72-27d4-358d-9d35-3c63726c45bf",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=3062c143-673e-3286-b3de-cec9e20abafe",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=b571b3bd-4195-307a-9998-001a20f1b442",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=980628de-222e-3110-bf81-142ab725de04",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=18d98d9d-9874-3466-90d3-8f0230dab4b3",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=52b39468-47e8-3e81-b2c5-a935708da89f",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=0910de20-a5e0-3182-9f53-4f7f338a4631",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=8736039d-0a21-392d-99cf-7e8e08e1ffb8",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=9812e008-3ee2-3de6-b960-fc1651937e78",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=79f184b1-d12b-3a53-a33e-2e4c9af8fca8",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=e68f5aca-567b-3ba7-af3b-6001b59c3b17",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=9ebb3603-61a6-3012-97c5-e341d7f55cf8",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=cfb35738-9be2-3e70-939e-aba4391ceff8",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=ad01186a-2e55-3026-9dcd-ebbcda72c4f7",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=38506b99-d949-302e-908f-788272c0e773",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=343f8282-7006-3d6b-af94-229dc8a3edda",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=9257eb17-5625-30df-8e42-e4f1b19162cf",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=a5f7af3d-3340-35b2-bbf8-4cd432475caf",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=b77ecdf2-7c9b-3f92-8e1d-efed773400a9",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=5ed41e6b-b5b6-35e1-9334-1b743fdc47fb",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=44fe5a0e-c29a-364d-b53f-edc2a7bdb13b",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=6786641b-15f8-3a0c-a6cf-5df51c90e296",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=1c39c222-f6a8-343b-b99e-fbd9f2a885f9",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=9b4411dc-3135-3568-b1c9-905d1825dc6e",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=910aff4d-f454-31a1-95dc-ef162a7c0127",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=5ce45933-fae8-3ba1-9feb-b9159cc10136",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=76b9eab7-4851-3e68-8908-1ece88507fe1",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=2e5d7f5c-2821-39d4-96a9-85c207a713c6",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=932d5318-081f-3c93-afc3-7216c629f82c",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=d196ef8b-aa72-3f5a-858f-8feda9a148c2",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=fe3cc3ad-a53d-3a99-8237-d1bcc6617ef7",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=516998f3-a00f-3143-9c8c-97b13f7209ac",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=14346d75-d7a9-30c4-b243-33542817f335",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=ffca39d6-0b59-3eca-9bc9-82077b134e84",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=1e1c25be-41de-3e3c-a1f9-14453438d2e8",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=337dfbb8-6f08-35e1-a949-216752e756e8",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=96b75e02-c5b3-3880-98bd-2a39db5a6d04",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=4dd3a043-b1bb-308d-b412-eb10dfc95d7e",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=60978bbc-a24c-31b8-bf9d-d48811aa18a2",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=68a5c30b-20dd-38db-96e5-36f7590b6883",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=5b6fa1f1-296a-3aa6-9329-a1944ec20a55",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=e5745450-8432-3fb2-94bc-dbb041f3ffe0",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=1da70eef-d725-3c88-9956-a3372508b71a",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=167a9010-30d5-3384-a9d7-f42968f0f4ff",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=3dc8abb0-a9f6-3568-91ae-1e18165f6f81",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=6828a2d0-e5e1-3a3a-b85b-00ab6f77cd1c",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=635f6002-b61c-3df7-9e51-ffa5d6a3e9c7",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=a30d78c0-e9a2-327b-ad8e-a69a366cc1f6",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=b0b05dea-73fc-3620-9740-fef3f2739aee",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=0bb76892-fb50-345c-bc11-5c01cad1ce11",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=95c73058-e50f-3b52-a175-ae1e1a89224c",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=3310828a-c3a7-3417-a029-5d5614583339",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=62b96c1e-2eb7-3d5a-873f-c6fd26ae7de2",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=60c9f698-5e99-3c73-a224-ab0be15652c4",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=c3bb21af-26fd-3624-80f3-ba49cec1f9bd",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=2639c978-a301-3367-bb27-23b9431bac50",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=3afd7dff-70eb-306b-a999-801e46797dfd",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=22d00470-6b74-3a90-97fb-e5eaaabbb0da",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=345b7c3f-ec7e-357f-ab59-fe9aab02115c",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=08df10b3-ca7a-3330-bc18-4014b7b26c05",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=4b885cb1-4f81-35b4-bfeb-9ba4e67ae152",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=2311e37c-dbaa-38ac-9ce0-2cb7a6dac672",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=8031e5e1-5f79-3498-ae16-054c7e90e842",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=0fe3a519-8ca2-3f99-aece-7e4fecaf1cd2",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=7a767ec5-b05e-3f9d-b3f1-eb8c0f3e7c7d",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=8ae84b1c-b7e7-3909-8cc5-7f742ab09eff",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=9f133013-a951-350e-8a5e-ec561407091f",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=f164dcaf-40a8-372b-86a0-6e4b6964feaf",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=0b2874b7-2165-3ebe-8e42-2e82f11be749",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=21978ee3-1182-3e0f-ab75-6997c5480728",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=23997733-2304-3450-af2f-0b99176aba15",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=f2251fe8-2981-3834-9680-a13c4ae92ec0",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=e7e2f12a-a56d-304e-87f5-0a37632beac9",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=c0485120-55ea-38da-8006-f0098e90dae7",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=032ff81e-47b4-3d7c-8e34-f594aa0911e1",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=6e2b334a-17a5-36ac-80e9-2a5a5d4c8bc0",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=5c2a227e-0fb6-3e22-a4ef-88d443734d8d",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=c326435d-c7b2-39c8-803b-2b837bb5e398",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=4143fcfd-66ac-367f-b7aa-a7901b5a9ced",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=bd0c679f-91ec-3bf4-99c1-23f0917ae44a",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=ecb1b738-cc5f-30d7-b77e-82cda3f5a5ad",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=e2b6c9c9-44d6-333c-bba9-ed72cf29a5a3",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=c85c060d-bfa5-35c8-ae1a-83523f1fa22a",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=cd80944c-9ea9-3bc3-854c-edbb8ba5e25c",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=5fec0290-0744-3d75-964f-dbd5983eea4d",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=2fc165ae-3a9e-3e1d-9542-4ddc22692aa9",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=d219b4bf-dc6a-38e8-89d7-d363823fca08/owned-node-edge-point=0bfc7195-95bb-3621-8584-da8a05f09dda"
+      ]
+    },
+    {
+      "operational-state": "ENABLED",
+      "lifecycle-state": "INSTALLED",
+      "name": [
+        {
+          "value-name": "nativeName",
+          "value": "WS302"
+        },
+        {
+          "value-name": "deviceType",
+          "value": "Optics: Waveserver, Power: AC, Encryption capable: no"
+        },
+        {
+          "value-name": "serialNumber",
+          "value": "M8333346"
+        },
+        {
+          "value-name": "softwareVersion",
+          "value": "1.6.0"
+        }
+      ],
+      "sync-state": "SYNCHRONIZED",
+      "uuid": "eb7c6770-afa4-311c-bbbc-6422e59e9e7a",
+      "ownedNodeEdgePoint": [
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=f341c258-84a7-30e4-9485-6852f6e3faf1",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=e7efc261-8fa7-3bb7-80b0-3b03a58d213f",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=041c7fd9-4895-360d-b3ac-86d6c22ca8b7",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=d6061908-a684-37de-becd-75d0f8d555e3",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=ecc60310-c5ce-362c-9f9b-4f1c075a1b57",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=39d32a92-30f3-3e36-a870-7c983706165b",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=6cc3db8f-3397-3eda-af65-ff68d46a00b0",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=f9b9b25b-f90f-32c8-8dcd-26b74bb092fc",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=f5873c8e-fc1c-3781-ae92-de504992d16c",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=82a43d9b-337d-3908-9ca2-a03ad6e0f00b",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=a4645130-7422-35b0-b992-ed7d49dfd26a",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=272ad1f4-24ac-3769-b773-975360ee4399",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=e05c5578-a052-3134-9100-e3ab90c3756c",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=cd28651c-ba1d-3482-91ce-130b229651b0",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=48551818-deec-345a-af54-4a9bf0e3090f",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=1b58cf62-c659-30ae-ace6-585f97a7ff33",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=bdbe85a3-d1a9-3e53-8fab-af1667bfbe48",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=89aa8dcd-704c-3240-852f-596b763db10f",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=99e210a5-c842-3a70-bbc0-abe7be1997a4",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=bf39ebbd-ae09-3b12-bfc5-8ee722d24ab9",
+        "/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node=eb7c6770-afa4-311c-bbbc-6422e59e9e7a/owned-node-edge-point=33ab0757-cec9-3891-818d-0f6dd489e6f3"
+      ]
+    }
+  ],
+  "links": {
+    "self": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node/?page[number]=0&page[size]=10",
+    "last": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node/?page[number]=1&page[size]=10",
+    "next": "tapi/data/context/topology-context/topology=4e537278-79f8-39ad-804b-f0b553cb2ffb/node/?page[number]=1&page[size]=10"
+  }
+}
\ No newline at end of file
diff --git a/responses/ciena/tapi/tapi.topology.topologycontext.Topology.json b/responses/ciena/tapi/tapi.topology.topologycontext.Topology.json
new file mode 100644
index 0000000000000000000000000000000000000000..cbbedee25411860ab01effcac04376747c98203e
--- /dev/null
+++ b/responses/ciena/tapi/tapi.topology.topologycontext.Topology.json
@@ -0,0 +1,20 @@
+{
+  "data": {
+    "name": [
+      {
+        "value-name": "name",
+        "value": "mcp-base-topology"
+      }
+    ],
+    "layer-protocol-name": [
+      "PHOTONIC_MEDIA",
+      "DSR",
+      "ODU",
+      "ETH"
+    ],
+    "uuid": "4e537278-79f8-39ad-804b-f0b553cb2ffb"
+  },
+  "links": {
+    "self": "tapi/data/context/topology-context/topology/4e537278-79f8-39ad-804b-f0b553cb2ffb"
+  }
+}
\ No newline at end of file