rewrite portmapping functional test 46/73546/5
authorGilles Thouenon <gilles.thouenon@orange.com>
Thu, 8 Feb 2018 09:32:52 +0000 (10:32 +0100)
committerguillaume.lambert <guillaume.lambert@orange.com>
Wed, 18 Jul 2018 12:19:24 +0000 (14:19 +0200)
- add support for xpdr devices
- add some tests to check the devices are correctly (dis)connected
- remove useless tests
- add a folder and a subfolder for ordm 1.2.1 sample configuration files
- update the sample ROADM configuration file for tests purpose
  Add new data to create a SRG3 but no SRG2. This is to ensure that
  portmapping parses correctly config with unordered SRGs.
  The related test is "test_07_rdm_portmapping_SRG3_PP1_TXRX".
- add a specific tox profile to allow running portmapping tests only
- add a folder with ordm 1.2.1 models needed by testtool
- update schemas location in build.sh
  New 2.x schemas previously pushed in ordmodels generate errors in
  testool with current ordm 1.2.1 sample configs.
  Although, tests must show that an ODL instance compiled with 2.x
  models can manage ordm 1.2.1 devices.

Change-Id: I67ed29d00cf5cd75e7a9ff854ab598522fc1b83f
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
43 files changed:
tests/build.sh
tests/ordmodels_1.2.1/org-openroadm-alarm.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-common-service-types.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-common-types.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-database.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-de-operations.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-device-resource-types.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-device.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-equipment-states-types.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-ethernet-interfaces.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-file-transfer.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-fwdl.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-interfaces.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-layerRate.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-lldp.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-maintenance-loopback.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-maintenance-testsignal.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-maintenance.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-optical-channel-interfaces.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-optical-multiplex-interfaces.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-optical-transport-interfaces.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-otn-odu-interfaces.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-otn-otu-interfaces.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-physical-types.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-pm-types.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-pm.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-port-types.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-probable-cause.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-resource-types.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-resource.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-routing-constraints.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-rstp.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-service.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-swdl.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-syslog.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-tca.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-topology.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-user-mgmt.yang [new file with mode: 0644]
tests/ordmodels_1.2.1/org-openroadm-wavelength-map.yang [new file with mode: 0644]
tests/sample_configs/ord_1.2.1/sample-config-ROADM.xml [moved from tests/sample-config-ROADM.xml with 69% similarity]
tests/sample_configs/ord_1.2.1/sample-config-XPDR.xml [moved from tests/sample-config-XPDR.xml with 100% similarity]
tests/tox.ini
tests/transportpce_tests/test_portmapping.py

index 85c67fe7b8a561893ec973e619c5ffb4acb704e3..d765ebfd8fc483ace8166565935846cabb75b4ee 100755 (executable)
@@ -16,7 +16,13 @@ rm -rf netconf mdsal && git submodule update --init
 (cd netconf && patch -p1 < ../netconf.patch && patch -p1 < ../get_connection_port_trail.patch)
 
 (cp testtool_pom.xml netconf/netconf/tools/netconf-testtool/pom.xml  && cd netconf/netconf/tools/netconf-testtool &&  mvn clean install -DskipTests)
-rm -rf schemas; mkdir -p schemas && cp -r ../ordmodels/src/main/yang/org-openroadm-* schemas
+rm -rf schemas && mkdir -p schemas
+#sample config for ordm 2.x are not yet ready
+#cp -r ../ordmodels/common/src/main/yang/org-openroadm-* schemas
+#cp -r ../ordmodels/device/src/main/yang/org-openroadm-* schemas
+#rm schemas/org-openroadm-otn-common-types@2016-10-14.yang
+#we expect that the ODL instance compiled with ordm 2.x models will be compatible with ordm 1.2.1 devices
+cp ordmodels_1.2.1/org-openroadm-* schemas
 cp ${yang} schemas
 
 exit $?
diff --git a/tests/ordmodels_1.2.1/org-openroadm-alarm.yang b/tests/ordmodels_1.2.1/org-openroadm-alarm.yang
new file mode 100644 (file)
index 0000000..5ed8792
--- /dev/null
@@ -0,0 +1,127 @@
+module org-openroadm-alarm {
+  namespace "http://org/openroadm/alarm";
+  prefix org-openroadm-alarm;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+  import org-openroadm-resource {
+    prefix org-openroadm-resource;
+  }
+  import org-openroadm-probable-cause {
+    prefix org-openroadm-probable-cause;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of an alarm.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping alarm {
+    leaf id {
+      description
+        "Uniquely id for this alarm, within the given management domain";
+      type string;
+      mandatory true;
+    }
+    container resource {
+      description
+        "Resource under alarm";
+      uses org-openroadm-resource:resource;
+    }
+    container probableCause {
+      description
+        "Probable cause of alarm";
+      uses org-openroadm-probable-cause:probable-cause;
+    }
+    leaf type {
+      description
+        "Type of alarm. Based on X.733 event Type.";
+      mandatory false;
+      type enumeration {
+        enum "communication" {
+          value 1;
+        }
+        enum "qualityOfService" {
+          value 2;
+        }
+        enum "processingError" {
+          value 3;
+        }
+        enum "equipment" {
+          value 4;
+        }
+        enum "environmental" {
+          value 5;
+        }
+      }
+    }
+    leaf raiseTime {
+      description
+        "Time alarm was raised";
+      type yang:date-and-time;
+      mandatory true;
+    }
+    leaf severity {
+      description
+        "Severity of alarm. Based on X.733 perceived severity.";
+      mandatory true;
+      type org-openroadm-common-types:severity;
+    }
+    leaf circuit-id {
+      description
+        "Circuit-id for alarm correlation.";
+      type string;
+    }
+  }
+
+  container active-alarm-list {
+    description
+      "List of currently active alarms. An alarm is removed from this table when the state transitions to clear.";
+    list activeAlarms {
+      key "id";
+      uses alarm;
+    }
+    config false;
+  }
+  notification alarm-notification {
+    description
+      "Notification sent on initial alarm creation, as well as any time the alarm changes state, including clear";
+    uses alarm;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-common-service-types.yang b/tests/ordmodels_1.2.1/org-openroadm-common-service-types.yang
new file mode 100644 (file)
index 0000000..7d5978c
--- /dev/null
@@ -0,0 +1,508 @@
+module org-openroadm-common-service-types {
+  namespace "http://org/openroadm/common/service/types";
+  prefix org-openroadm-common-service-types;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import ietf-inet-types {
+    prefix inet;
+  }
+  import org-openroadm-routing-constraints {
+    prefix org-openroadm-routing-constraints;
+  }
+  import org-openroadm-topology {
+    prefix org-openroadm-topology;
+  }
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+  import org-openroadm-resource-types {
+    prefix org-openroadm-resource-types;
+  }
+
+  organization
+    "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of common service types.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping configuration-response-common {
+    container configuration-response-common {
+      leaf request-id {
+        type string;
+        mandatory true;
+      }
+      leaf response-code {
+        type string;
+        mandatory true;
+      }
+      leaf response-message {
+        type string;
+      }
+      leaf ack-final-indicator {
+        type string;
+        mandatory true;
+      }
+    }
+  }
+
+  grouping response-parameters {
+    container response-parameters {
+      uses org-openroadm-routing-constraints:routing-constraints;
+    }
+  }
+
+  grouping service-endpoint {
+    leaf service-format {
+      type service-format;
+      mandatory true;
+      description
+        "Format of the requested service: Ethernet, OTU, etc.";
+    }
+    leaf service-rate {
+      when "../service-format!='OMS'"{
+        description "service rate not applicable when service
+        format is roadmline";
+      }
+      type uint32;
+      mandatory true;
+      description
+        "Rate of the requested service in GBps";
+    }
+    leaf clli {
+      type string;
+      mandatory true;
+      description
+        "CLLI";
+    }
+    uses org-openroadm-resource-types:device-id;
+    container site;
+    container tx-direction {
+      uses service-port;
+      uses service-lgx;
+      uses service-tail;
+    }
+    container rx-direction {
+      uses service-port;
+      uses service-lgx;
+      uses service-tail;
+    }
+    leaf optic-type {
+      type org-openroadm-common-types:optic-types;
+    }
+    container router {
+      description
+        "Needed for communication with DWDM pluggable";
+      leaf node-id {
+        type string;
+        description
+          "Node id. This is reported against the service, but may not get reflected in the service in the network.";
+      }
+      leaf ip-address {
+        type inet:ip-address;
+        description
+          "Router IP Address. This is reported against the service, but may not get reflected in the service in the network.";
+      }
+      leaf url {
+        type string;
+        description
+          "URL needed for communication with DWDM pluggable. This is reported against the service, but may not get reflected in the service in the network.";
+      }
+    }
+    leaf user-label {
+      type string;
+      mandatory false;
+      description
+        "Label for service endpoint, defined by the user";
+    }
+  }
+
+  typedef rpc-actions {
+    description "rpc-actions include all the rpc methods";
+    type enumeration {
+      enum service-create {
+        value "1";
+      }
+      enum service-feasibility-check {
+        value "2";
+      }
+      enum service-delete {
+        value "3";
+      }
+      enum equipment-notification {
+        value "4";
+      }
+      enum temp-service-create {
+        value "5";
+      }
+      enum temp-service-delete {
+        value "6";
+      }
+      enum service-roll {
+        value "7";
+      }
+      enum service-reconfigure {
+        value "8";
+      }
+      enum service-restoration {
+        value "9";
+      }
+      enum service-reversion {
+        value "10";
+      }
+      enum service-reroute {
+        value "11";
+      }
+      enum service-reroute-confirm {
+        value "12";
+      }
+      enum network-re-optimization {
+        value "13";
+      }
+    }
+  }
+
+  grouping sdnc-request-header {
+    container sdnc-request-header {
+      leaf request-id {
+        type string;
+      }
+      leaf rpc-action {
+        type rpc-actions;
+      }
+      leaf notification-url {
+        type string;
+      }
+      leaf request-system-id{
+        type string;
+      }
+    }
+  }
+
+  grouping service-port {
+    container port {
+      leaf port-device-name {
+        type string;
+      }
+      leaf port-type {
+        type string;
+      }
+      leaf port-name {
+        type string;
+      }
+      leaf port-rack {
+        type string;
+      }
+      leaf port-shelf {
+        type string;
+      }
+      leaf port-slot {
+        type string;
+      }
+      leaf port-sub-slot {
+        type string;
+      }
+    }
+  }
+
+  grouping service-lgx {
+    container lgx {
+      leaf lgx-device-name {
+        type string;
+      }
+      leaf lgx-port-name {
+        type string;
+      }
+      leaf lgx-port-rack {
+        type string;
+      }
+      leaf lgx-port-shelf {
+        type string;
+      }
+    }
+  }
+
+  grouping service-tail {
+    container tail {
+      container tail-roadm {
+        description
+          "ROADM on which the transponder is connected to (TID, IP Address,
+           or FQDN)";
+        uses org-openroadm-resource-types:device-id;
+      }
+      container xponder-port {
+        description
+          "Muxponder port used in tail, that will get used as a service endpoint.";
+        leaf circuit-pack-name {
+          type string;
+        }
+        leaf port-name {
+          type string;
+        }
+      }
+      leaf tail-roadm-port-aid {
+        type string;
+        description
+          "This will provide the transponder port needed to inter-city ROADM
+           connection";
+      }
+      leaf tail-roadm-port-rack-location {
+        type string;
+        description
+          "Transponder's location";
+      }
+    }
+  }
+
+  grouping service-information {
+    leaf due-date {
+      type yang:date-and-time;
+      description
+        "Date and time service to be turn up. If time is not specified for a given date, default to  midnight. Service turned up immediately if no due date is specified";
+    }
+    leaf end-date {
+      type yang:date-and-time;
+      description
+        "Date and time service to be removed";
+      mandatory false;
+    }
+    leaf nc-code {
+      type string;
+      description
+        "NC code applied to wavelength service only.This is reported against the service, but may not get reflected in the service in the network.";
+    }
+    leaf nci-code {
+      type string;
+      description
+        "NCI code applied to wavelength service only.This is reported against the service, but may not get reflected in the service in the network.";
+    }
+    leaf secondary-nci-code {
+      type string;
+      description
+        "NC code applied to wavelength service only.This is reported against the service, but may not get reflected in the service in the network.";
+    }
+    leaf customer {
+      type string;
+      description
+        "To be included in ticket information.This is reported against the service, but may not get reflected in the service in the network.";
+    }
+    leaf customer-contact {
+      type string;
+      description
+        "Customer contact information To be included in ticket information. This is reported against the service, but may not get reflected in the service in the network.";
+    }
+    leaf operator-contact {
+      type string;
+      description
+        "Operator contact information to be included in ticket information. This is reported against the service, but may not get reflected in the service in the network.";
+    }
+  }
+
+  grouping service {
+    leaf service-name {
+      type string;
+      description
+        "Identifier for the service to be created in
+         the ROADM network, e.g., CLFI, CLCI, etc.";
+      mandatory true;
+    }
+    leaf common-id {
+      type string;
+      description
+        "To be used by the ROADM controller to identify the routing
+         constraints received from planning application (PED).";
+    }
+    uses sdnc-request-header;
+    leaf connection-type {
+      type connection-type;
+      mandatory true;
+      description
+        "Connection type";
+    }
+    leaf lifecycle-state {
+      type org-openroadm-common-types:lifecycle-state;
+      description
+        "Lifecycle State of service. Whether it is planned, deployed, in maintenance, etc.";
+    }
+    leaf administrative-state {
+      type org-openroadm-common-types:state;
+      description
+        "Administrative State: Intended state of service";
+    }
+    leaf operational-state {
+      type org-openroadm-common-types:state;
+      config false;
+      description
+        "Operational State: Actual state of service";
+    }
+    leaf condition {
+      type service-condition;
+      description
+        "Service Condition: Additional information about the state of the service. Only sent when applicable.";
+    }
+    container service-a-end {
+      uses service-endpoint;
+    }
+    container service-z-end {
+      uses service-endpoint;
+    }
+    uses org-openroadm-routing-constraints:routing-constraints;
+    uses service-information;
+    leaf latency {
+      type uint32;
+      description
+        "Latency on service";
+    }
+    leaf-list fiber-span-srlgs {
+      type string;
+      description
+        "Shared risk link group identifiers";
+    }
+    list equipment-srgs {
+      key "srg-number";
+      uses org-openroadm-resource-types:srg-number;
+    }
+    leaf-list supporting-service-name {
+      description
+        "The service name that this runs over top. If connection-type is service, then this is the related
+         connection-type = infrastructure service, for example.";
+      type string;
+    }
+    container topology {
+      uses org-openroadm-topology:topology;
+    }
+  }
+
+  grouping service-notification-result {
+    leaf service-name {
+      type string;
+      description
+        "Identifier for the service e.g., CLFI, CLCI, etc.";
+      mandatory true;
+    }
+    leaf actual-date {
+      type yang:date-and-time;
+      description
+        "Actual date and time (if successful)";
+    }
+  }
+
+  typedef service-format {
+    type enumeration {
+      enum "Ethernet" {
+        value 1;
+      }
+      enum "OTU" {
+        value 2;
+      }
+      enum "OC" {
+        value 3;
+      }
+      enum "STM" {
+        value 4;
+      }
+      enum "OMS" {
+        value 5;
+      }
+      enum "ODU" {
+        value 6;
+      }
+      enum "OTM" {
+        value 7;
+      }
+    }
+  }
+
+  typedef service-notification-types {
+    type enumeration {
+      enum "service-create-result" {
+        value 1;
+      }
+      enum "service-reconfigure-result" {
+        value 2;
+      }
+      enum "service-delete-result" {
+        value 3;
+      }
+      enum "service-roll-result" {
+        value 4;
+      }
+      enum "service-revert-result" {
+        value 5;
+      }
+      enum "service-reroute-result" {
+        value 6;
+      }
+      enum "service-restoration-result" {
+        value 7;
+      }
+    }
+  }
+
+  typedef connection-type {
+    type enumeration {
+      enum "service" {
+        value 1;
+      }
+      enum "infrastructure" {
+        value 2;
+      }
+      enum "roadm-line" {
+        value 3;
+      }
+    }
+  }
+
+  typedef service-condition {
+    type enumeration {
+      enum "restored-temporarily" {
+        value 1;
+      }
+      enum "re-routed-temporarily" {
+        value 2;
+      }
+      enum "activated-for-service" {
+        value 3;
+      }
+      enum "activated-for-further-check" {
+        value 4;
+      }
+      enum "activated-for-troubleshooting-failure" {
+        value 5;
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-common-types.yang b/tests/ordmodels_1.2.1/org-openroadm-common-types.yang
new file mode 100644 (file)
index 0000000..e52b12b
--- /dev/null
@@ -0,0 +1,282 @@
+module org-openroadm-common-types {
+  namespace "http://org/openroadm/common-types";
+  prefix org-openroadm-common-types;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of common types.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping physical-location {
+    leaf rack {
+      type string;
+      mandatory false;
+    }
+    leaf shelf {
+      type string;
+      mandatory false;
+    }
+    leaf slot {
+      type string;
+      mandatory false;
+    }
+    leaf subSlot {
+      type string;
+      mandatory false;
+    }
+  }
+
+  typedef node-types {
+    type enumeration {
+      enum "rdm" {
+        value 1;
+      }
+      enum "xpdr" {
+        value 2;
+      }
+    }
+    description
+      "3 digit identifier for node type
+       1. rdm for ROADM
+       2. xpdr for Transponder, Regen";
+  }
+
+  typedef power-dBm {
+    description
+      "Power value in dBm.";
+    type decimal64 {
+      fraction-digits 2;
+    }
+    units "dBm";
+  }
+
+  typedef ratio-dB {
+    description
+      "Power ratio in dB.";
+    type decimal64 {
+      fraction-digits 3;
+    }
+    units "dB";
+  }
+
+  typedef severity {
+    description
+      "Severity, based on X.733 perceived severity";
+    type enumeration {
+      enum "critical" {
+        value 1;
+      }
+      enum "major" {
+        value 2;
+      }
+      enum "minor" {
+        value 3;
+      }
+      enum "warning" {
+        value 4;
+      }
+      enum "clear" {
+        value 5;
+      }
+      enum "indeterminate" {
+        value 6;
+      }
+    }
+  }
+
+  typedef rpc-status {
+    description
+      "status of RPC ";
+    type enumeration {
+      enum "Successful" {
+        value 1;
+      }
+      enum "Failed" {
+        value 2;
+      }
+    }
+  }
+
+  grouping rpc-response-status {
+    leaf status {
+      type rpc-status;
+      mandatory true;
+      description
+        "Successful or Failed";
+    }
+    leaf status-message {
+      type string;
+      description
+        "Gives a more detailed reason for failure";
+    }
+  }
+
+  typedef lifecycle-state {
+    description
+      "Lifecycle state.";
+    type enumeration {
+      enum "deployed" {
+        value 1;
+      }
+      enum "planned" {
+        value 2;
+      }
+      enum "maintenance" {
+        value 3;
+      }
+      enum "deploying" {
+        value 4;
+      }
+      enum "undeploying" {
+        value 5;
+      }
+    }
+  }
+
+  typedef state {
+    description
+      "State that indicates whether the resource is able to provide fullfill its role - carry traffic, etc.";
+    type enumeration {
+      enum "inService" {
+        value 1;
+      }
+      enum "outOfService" {
+        value 2;
+      }
+      enum "degraded" {
+        value 3;
+      }
+    }
+  }
+
+  typedef optic-types {
+    type enumeration {
+      enum "gray" {
+        value 1;
+      }
+      enum "dwdm" {
+        value 2;
+      }
+    }
+  }
+  grouping equipment-type {
+    leaf type {
+      type equipment-type-enum;
+      mandatory true;
+      config false;
+    }
+    leaf extension {
+      description
+        "Populated with equipment type when enum value is set to vendorExtension";
+      type string;
+      mandatory false;
+      config false;
+    }
+  }
+
+  typedef equipment-type-enum {
+    type enumeration {
+      enum "other" {
+        value 1;
+      }
+      enum "powerSupply" {
+        value 2;
+      }
+      enum "shelfProcessor" {
+        value 3;
+      }
+      enum "crossConnect" {
+        value 4;
+      }
+      enum "fan" {
+        value 5;
+      }
+      enum "accessPanel" {
+        value 6;
+      }
+      enum "circuitPack" {
+        value 7;
+      }
+    }
+  }
+
+  typedef optical-control-mode {
+    description
+      "Optical Control Mode: identifies specific algorithm related to power management and general optical control.";
+    type enumeration {
+      enum "power" {
+        value 1;
+      }
+      enum "gainLoss" {
+        value 2;
+      }
+      enum "off" {
+        value 3;
+      }
+    }
+    reference "openroadm.org: Open ROADM MSA Specification.";
+  }
+
+  typedef direction {
+    type enumeration {
+      enum "tx" {
+        value 1;
+      }
+      enum "rx" {
+        value 2;
+      }
+      enum "bidirectional" {
+        value 3;
+      }
+    }
+  }
+
+  typedef pm-direction {
+    type enumeration {
+      enum "tx" {
+        value 1;
+      }
+      enum "rx" {
+        value 2;
+      }
+      enum "bidirectional" {
+        value 3;
+      }
+      enum "notApplicable" {
+        value 4;
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-database.yang b/tests/ordmodels_1.2.1/org-openroadm-database.yang
new file mode 100644 (file)
index 0000000..991e1cb
--- /dev/null
@@ -0,0 +1,119 @@
+module org-openroadm-database {
+  namespace "http://org/openroadm/database";
+  prefix org-openroadm-database;
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "This module contains definitions for System Management.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  rpc db-backup {
+    description
+      "copy  running DB to user provided file to a given path";
+    input {
+      leaf filename {
+        type string {
+          length "10..255";
+        }
+        description
+          "Path and file name is used with back-up.(xxx.DBS)";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc db-restore {
+    description
+      "Restore database ";
+    input {
+      leaf filename {
+        type string {
+          length "10..255";
+        }
+        description
+          "PATH/file name use file name.(xxx.DBS)";
+      }
+      leaf nodeIDCheck {
+        type boolean;
+        default "true";
+        description
+          "Flag to indicate if sysNameCheck is required";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc db-activate {
+    description
+      "activate the database";
+    input {
+      leaf rollBackTimer {
+        type string;
+        description
+          "rollbackTimer ";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc cancel-rollback-timer {
+    description
+      "Cancel roll back timer which user provisioned as part of activate command";
+    input {
+      leaf accept {
+        type boolean;
+        description
+          " TRUE means rollback timer is cancelled and new load is accepted";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc database-init {
+    description
+      "Initialize the database to default DB";
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    } //output
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-de-operations.yang b/tests/ordmodels_1.2.1/org-openroadm-de-operations.yang
new file mode 100644 (file)
index 0000000..26c3673
--- /dev/null
@@ -0,0 +1,77 @@
+module org-openroadm-de-operations {
+  namespace "http://org/openroadm/de/operations";
+  prefix org-openroadm-de-operations;
+
+  import org-openroadm-resource {
+    prefix org-openroadm-resource;
+  }
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of operations.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  rpc restart {
+    description
+      "Restart a resource with warm/cold option. If no resource is provided or only the device name is provded, then the device itself will be restarted.
+       Note that resources on the device will not be restartable";
+    input {
+      uses org-openroadm-resource:resource;
+      leaf option{
+        type enumeration{
+          enum "warm"{
+            value 1;
+          }
+          enum "cold"{
+            value 2;
+          }
+        }
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  notification restart-notification {
+    description
+      "This Notification is sent when a resource on a device has completed a restart. This is sent as a result of restarts triggered via the
+       restart RPC and other means.  The resource identified is the from the RPC request or the equivalment if the restart was triggered another way.";
+    uses org-openroadm-resource:resource;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-device-resource-types.yang b/tests/ordmodels_1.2.1/org-openroadm-device-resource-types.yang
new file mode 100644 (file)
index 0000000..eb2d9a2
--- /dev/null
@@ -0,0 +1,217 @@
+module org-openroadm-device-resource-types {
+  namespace "http://org/openroadm/de/device-resource-types";
+  prefix org-openroadm-device-resource-types;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of resource types.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping device-id {
+    description
+      "Device identifier. Unique within the Controller.";
+    leaf node-id {
+      description
+        "Node Id. Globally unique identifier for a device.";
+      type leafref {
+        path "/org-openroadm-device/info/node-id";
+      }
+      mandatory true;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping shelf-name {
+    leaf shelf-name {
+      description
+        "Shelf identifier. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/shelves/shelf-name";
+      }
+      mandatory true;
+      config false;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping physical-link-name {
+    leaf physical-link-name {
+      description
+        "Physical Link identifier. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/physical-link/physical-link-name";
+      }
+      mandatory true;
+      config false;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping internal-link-name {
+    uses org-openroadm-device:circuit-pack-name;
+    leaf internal-link-name {
+      description
+        "Internal Link identifier. Unique within the context of a circuit pack.";
+      type leafref {
+        path "/org-openroadm-device/internal-link/internal-link-name";
+      }
+      mandatory true;
+      config false;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping connection-number {
+    leaf connection-number {
+      description
+        "Connection identifier. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/connections/connection-number";
+      }
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping this-will-test-ids {
+    uses device-id;
+    container shelf {
+      uses shelf-name;
+    }
+    container circuit-pack {
+      uses org-openroadm-device:circuit-pack-name;
+    }
+    container port {
+      uses org-openroadm-device:port-name;
+    }
+    uses internal-link-name;
+    uses physical-link-name;
+    uses connection-number;
+    uses org-openroadm-device:srg-number;
+    uses org-openroadm-device:degree-number;
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping xponder-device-id {
+    description
+      "Xponder identifier. Unique within the Controller.";
+    leaf node-id {
+      description
+        "Xponder Id. Globally unique identifier for the device";
+      type leafref {
+        path "/org-openroadm-device/info/node-id";
+      }
+      mandatory true;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping xponder-number {
+    leaf xponder-number {
+      description
+        "Xponder identifier. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/xponders/xponder-number";
+      }
+      config false;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping xponder-shelf-name {
+    uses xponder-number;
+    leaf shelf-name {
+      description
+        "Shelf identifier. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/xponders[xponder-number=current()/../xponder-number]/shelves/shelf-name";
+      }
+      mandatory true;
+      config false;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping xponder-circuit-pack-name {
+    uses xponder-number;
+    leaf circuit-pack-name {
+      description
+        "Circuit Pack identifier. Unique within the context of a xponder.";
+      type leafref {
+        path "/org-openroadm-device/circuit-packs/circuit-pack-name";
+      }
+      config false;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping xponder-port-name {
+    uses xponder-circuit-pack-name;
+    leaf port-name {
+      description
+        "Port identifier. Unique within the context of a circuit-pack.";
+      type leafref {
+        path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../circuit-pack-name]/ports/port-name";
+      }
+      config false;
+    }
+  }
+*/
+
+/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved.
+  grouping this-will-test-xponder-ids {
+    uses xponder-device-id;
+    container shelf {
+      uses xponder-shelf-name;
+    }
+    container circuit-pack {
+      uses xponder-circuit-pack-name;
+    }
+    container port {
+      uses xponder-port-name;
+    }
+  }
+*/
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-device.yang b/tests/ordmodels_1.2.1/org-openroadm-device.yang
new file mode 100644 (file)
index 0000000..e17d0ec
--- /dev/null
@@ -0,0 +1,1213 @@
+module org-openroadm-device {
+  namespace "http://org/openroadm/device";
+  prefix org-openroadm-device;
+
+  import ietf-yang-types {
+    prefix ietf-yang-types;
+  }
+  import ietf-inet-types {
+    prefix ietf-inet-types;
+  }
+  import ietf-netconf {
+    prefix ietf-nc;
+  }
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+  import org-openroadm-resource-types {
+    prefix org-openroadm-resource-types;
+  }
+  import org-openroadm-wavelength-map {
+    prefix org-openroadm-wavelength-map;
+  }
+  import org-openroadm-physical-types {
+    prefix org-openroadm-physical-types;
+  }
+  import org-openroadm-user-mgmt {
+    prefix org-openroadm-user-mgmt;
+  }
+  import org-openroadm-port-types {
+    prefix org-openroadm-port-types;
+  }
+  import org-openroadm-interfaces {
+    prefix org-openroadm-interfaces;
+  }
+  import org-openroadm-swdl {
+    prefix org-openroadm-swdl;
+  }
+  import org-openroadm-equipment-states-types {
+    prefix org-openroadm-equipment-states-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of ROADM device
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF netconf.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+
+  revision 2017-02-06 {
+    description
+      "Version 1.2.1 - removed pattern for current-datetime in info tree and rpc";
+  }
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  rpc get-connection-port-trail {
+    input {
+      leaf connection-number {
+        type string;
+        mandatory true;
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+      list ports {
+        uses org-openroadm-common-types:physical-location;
+        uses port-name {
+          refine "circuit-pack-name" {
+            mandatory true;
+          }
+          refine "port-name" {
+            mandatory true;
+          }
+        }
+      }
+    }
+  }
+  rpc disable-automatic-shutoff {
+    input {
+      leaf amp {
+        type leafref {
+          path "/org-openroadm-device/shelves/shelf-name";
+        }
+        mandatory true;
+        description
+          "The shelf where amp is located";
+      }
+      leaf degree-number {
+        type uint16;
+        mandatory true;
+      }
+      leaf support-timer {
+        type uint16 {
+          range "1..600";
+        }
+        default "20";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc start-scan {
+    input {
+      leaf degree-number {
+        type uint16;
+        mandatory true;
+      }
+      leaf port-direction {
+        type org-openroadm-common-types:direction;
+      }
+      leaf distance {
+        type uint32;
+      }
+      leaf resolution {
+        type uint32;
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+
+  notification otdr-scan-result {
+    leaf status {
+      type enumeration {
+        enum "Completed" {
+          value 1;
+        }
+        enum "Failed" {
+          value 2;
+        }
+      }
+      mandatory true;
+      description
+        "Completed or Failed for the scan's final status";
+    }
+    leaf result-file {
+      type string;
+    }
+  }
+
+  rpc set-current-datetime {
+    description
+      "Set the info/current-datetime leaf to the specified value.";
+    input {
+     leaf current-datetime {
+        type ietf-yang-types:date-and-time;
+        mandatory true;
+        description
+          "The current system date and time in UTC. Format: YYYY-MM-DDTHH:MM:SS";
+      }
+    }
+
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+
+  grouping device-common {
+    leaf node-id {
+      type string;
+      description
+        "Globally unique identifer for a device.";
+      default "openroadm";
+    }
+    leaf node-number {
+      type uint32;
+      description
+        "Number assigned to a ROADM node at a
+         given office";
+    }
+    leaf node-type {
+      type org-openroadm-common-types:node-types;
+      description
+        "Identifier for node-type e.g Roadm, xponder";
+      config false;
+      mandatory true;
+    }
+    leaf clli {
+      type string;
+      description
+        "Common Language Location Identifier.";
+    }
+    uses org-openroadm-physical-types:node-info;
+    leaf ipAddress {
+      type ietf-inet-types:ip-address;
+      description
+        "IP Address of device";
+    }
+    leaf prefix-length {
+      type uint8 {
+        range "0..128";
+      }
+      description
+        "The length of the subnet prefix";
+    }
+    leaf defaultGateway {
+      type ietf-inet-types:ip-address;
+      description
+        "Default Gateway";
+    }
+    leaf source {
+      type enumeration {
+        enum "static" {
+          value 1;
+        }
+        enum "dhcp" {
+          value 2;
+        }
+      }
+      config false;
+    }
+    leaf current-ipAddress {
+      type ietf-inet-types:ip-address;
+      config false;
+      description
+        "Current IP Address of device";
+    }
+    leaf current-prefix-length {
+      type uint8 {
+        range "0..128";
+      }
+      config false;
+      description
+        "The current length of the subnet prefix";
+    }
+    leaf current-defaultGateway {
+      type ietf-inet-types:ip-address;
+      config false;
+      description
+        "Current Default Gateway";
+    }
+    leaf macAddress {
+      type ietf-yang-types:mac-address;
+      description
+        "MAC Address of device";
+      config false;
+    }
+    leaf softwareVersion {
+      type string;
+      config false;
+      description
+        "Software version";
+    }
+    leaf template {
+      type string;
+      description
+        "Template information used in the deployment.";
+    }
+    leaf current-datetime {
+      type ietf-yang-types:date-and-time;
+      config false;
+      description
+        "The current system date and time in UTC. Format: YYYY-MM-DDTHH:MM:SS.mm+ ";
+    }
+    container geoLocation {
+      description
+        "GPS location";
+      leaf latitude {
+        type decimal64 {
+          fraction-digits 16;
+          range "-90 .. 90";
+        }
+        description
+          "[From wikipedia] Latitude is an angle (defined below)
+           which ranges from 0° at the Equator to 90° (North or
+           South) at the poles";
+      }
+      leaf longitude {
+        type decimal64 {
+          fraction-digits 16;
+          range "-180 .. 180";
+        }
+        description
+          "[From wikipedia] The longitude is measured as the
+           angle east or west from the Prime Meridian, ranging
+           from 0° at the Prime Meridian to +180° eastward and
+           âˆ’180° westward.";
+      }
+    }
+  }
+
+  grouping slot-info {
+    description
+      "slots information. To be populated by NE during retrieval.";
+    leaf slot-name {
+      type string;
+      description
+        "The name of this slot.";
+    }
+    leaf label {
+      type string;
+      description
+        "Faceplate label";
+    }
+    leaf provisioned-circuit-pack {
+      type leafref {
+        path "/org-openroadm-device/circuit-packs/circuit-pack-name";
+      }
+      description
+        "The supported circuit-pack. It will be empty if no provision on this slot.";
+    }
+  }
+  grouping shelves {
+    list shelves {
+      key "shelf-name";
+      uses shelf;
+    }
+  }
+  grouping shelf {
+    leaf shelf-name {
+      description
+        "Unique identifier for this shelf within a device";
+      type string;
+    }
+    leaf shelf-type {
+      description
+        "The shelf type: describe the shelf with a unique string.";
+      type string;
+      mandatory true;
+    }
+    leaf rack {
+      description
+        "Reflect the shelf physical location data including floor, aisle, bay values.";
+      type string;
+    }
+    leaf shelf-position {
+      description
+        "Reflect the shelf vertical position within an equipment bay.";
+      type string;
+    }
+    leaf administrative-state {
+      description
+        "Admin State of the shelf";
+      type org-openroadm-equipment-states-types:admin-states;
+    }
+    uses org-openroadm-physical-types:common-info;
+    leaf equipment-state {
+      type org-openroadm-equipment-states-types:states;
+      description
+        "equipment state for the shelf, used to track the lifecycle state.";
+    }
+    leaf due-date {
+      type ietf-yang-types:date-and-time;
+      description
+        "due date for the shelf.";
+    }
+    list slots {
+      description
+          "List of slots on this shelf. To be populated by NE during retrieval.";
+      key "slot-name";
+      config false;
+      uses slot-info;
+    }
+  }
+
+  grouping circuit-packs {
+    list circuit-packs {
+      description
+        "List of circuit packs. This includes common equipment, like fans, power supplies, etc.";
+      key "circuit-pack-name";
+      leaf circuit-pack-type {
+        description
+          "Type of circuit-pack";
+        type string;
+        mandatory true;
+      }
+      leaf circuit-pack-product-code {
+        description
+          "Product Code for the circuit-pack";
+        type string;
+      }
+      uses circuit-pack;
+    }
+  }
+
+  grouping circuit-pack {
+    leaf circuit-pack-name {
+      description
+        "Unique identifier for this circuit-pack within a device";
+      type string;
+    }
+    leaf administrative-state {
+      description
+        "Administrative state of circuit-pack";
+      type org-openroadm-equipment-states-types:admin-states;
+    }
+    uses org-openroadm-physical-types:common-info;
+    container circuit-pack-category {
+      description
+        "General type of circuit-pack";
+      uses org-openroadm-common-types:equipment-type;
+      config false;
+    }
+    leaf equipment-state {
+      description
+        "Equipment state, which complements operational state.";
+      type org-openroadm-equipment-states-types:states;
+    }
+    leaf circuit-pack-mode {
+      description
+        "Circuit-pack mode allowed. e.g. NORMAL or REGEN";
+      type string;
+      default "NORMAL";
+    }
+    leaf shelf {
+      type leafref {
+        path "/org-openroadm-device/shelves/shelf-name";
+      }
+      mandatory true;
+    }
+    leaf slot {
+      type string;
+      mandatory true;
+    }
+    leaf subSlot {
+      type string;
+      mandatory false;
+    }
+    leaf due-date {
+      type ietf-yang-types:date-and-time;
+      description
+        "due date for this circuit-pack.";
+    }
+    container parent-circuit-pack {
+      description
+        "In the case of circuit packs that contain other equipment (modules or pluggables), this captures the hierarchy of that equipment.  It is a vendor specific design decision if the ports for single-port pluggables are modeled as children of the parent circuit-pack, or as children of the pluggable circuit-pack contained in the parent circuit-pack.  For modules with multiple ports, it is recommended that ports be children of the module and not the carrier, to help in fault correlation and isolation in the case of a module failure.";
+      uses circuit-pack-name;
+      leaf cp-slot-name {
+        type string;
+        description
+          "Slot name on parent-circuit-pack.";
+      }
+    }
+    list cp-slots {
+      description
+          "List of circuit-pack slots on this circuit-pack. To be populated by NE during retrieval.";
+      key "slot-name";
+      config false;
+      uses slot-info;
+    }
+    list ports {
+      key "port-name";
+      description
+        "List of ports on this circuit-pack.  For single port pluggables, the port may be modeled against the pluggable itself, or against the parent-circuit-pack.  For mulit-port pluggables, it is recommended that ports be modeled against the module itself.  Modeling ports as close to the equipment hierarchy as possible will help in fault correlation and isolation since common failures associated with supporting equipment can be used to help identify symptomatic failures on the contained ports.";
+      uses port;
+      container roadm-port {
+        when "../port-qual='roadm-external'";
+        uses org-openroadm-port-types:roadm-port;
+      }
+      container transponder-port {
+        when "../port-qual='xpdr-network' or ../port-qual='xpdr-client'";
+        uses org-openroadm-port-types:common-port;
+      }
+      container otdr-port {
+        when "../port-qual='otdr'";
+        description
+          "Settings for otdr port.";
+        leaf launch-cable-length {
+          type uint32;
+          default "30";
+          units "m";
+        }
+        leaf port-direction {
+          type org-openroadm-common-types:direction;
+        }
+      }
+    }
+  }
+
+  grouping connection {
+    description
+      "Grouping used to define connections.";
+    leaf connection-number {
+      type string;
+    }
+    leaf wavelength-number {
+      type uint32;
+      mandatory true;
+      description
+        "wavelength-number, can be used to access wavelength-map
+         to get wavelength value in nm.";
+    }
+    leaf opticalControlMode {
+      description
+        "Whether connection is currently in power or gain/loss mode";
+      type org-openroadm-common-types:optical-control-mode;
+      reference "openroadm.org: Open ROADM MSA Specification.";
+      default "off";
+    }
+    leaf target-output-power {
+      type org-openroadm-common-types:power-dBm;
+      description
+        "The output target power for this connection. When set, the ROADM will work to ensure that current-output-power reaches this level.";
+    }
+    container source {
+      leaf src-if {
+        type leafref {
+          path "/org-openroadm-device/interface/name";
+        }
+        mandatory true;
+      }
+    }
+    container destination {
+      leaf dst-if {
+        type leafref {
+          path "/org-openroadm-device/interface/name";
+        }
+        mandatory true;
+      }
+    }
+  }
+
+  grouping degree {
+    leaf degree-number {
+      type uint16;
+      must "not( current() > /org-openroadm-device/info/max-degrees) and current() > 0" {
+        error-message "Degree not supported by device ";
+        description
+          "Validating if the degree is supported by device";
+      }
+    }
+    leaf max-wavelengths {
+      type uint16;
+      description
+        "maximum number of wavelengths";
+      config false;
+      mandatory true;
+    }
+    list circuit-packs {
+      key "index";
+      description
+        "list for Cards associated with a degree";
+      leaf index {
+        type uint32;
+      }
+      uses circuit-pack-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+      }
+    }
+    list connection-ports {
+      description
+        "Port associated with degree: One if bi-directional; two if uni-directional";
+      key "index";
+      leaf index {
+        type uint32;
+      }
+      uses port-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+        refine "port-name" {
+          mandatory true;
+        }
+      }
+    }
+    container otdr-port {
+      description
+        "otdr port associated with degree.";
+      uses port-name;
+    }
+  }
+
+  grouping external-links {
+    description
+      "YANG definitions for external links..
+       - physical links between ROADMs and between the ROADMs and XPonders, which can be added and removed maually.";
+    list external-link {
+      key "external-link-name";
+      uses external-link;
+    }
+  }
+
+  grouping external-link {
+    leaf external-link-name {
+      type string;
+    }
+    container source {
+      uses org-openroadm-resource-types:device-id {
+        refine "node-id" {
+          mandatory true;
+        }
+      }
+      uses org-openroadm-resource-types:port-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+        refine "port-name" {
+          mandatory true;
+        }
+      }
+    }
+    container destination {
+      uses org-openroadm-resource-types:device-id {
+        refine "node-id" {
+          mandatory true;
+        }
+      }
+      uses org-openroadm-resource-types:port-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+        refine "port-name" {
+          mandatory true;
+        }
+      }
+    }
+  }
+
+  grouping internal-links {
+    list internal-link {
+      key "internal-link-name";
+      config false;
+      uses internal-link;
+    }
+  }
+
+  grouping internal-link {
+    leaf internal-link-name {
+      type string;
+    }
+    container source {
+      uses port-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+        refine "port-name" {
+          mandatory true;
+        }
+      }
+    }
+    container destination {
+      uses port-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+        refine "port-name" {
+          mandatory true;
+        }
+      }
+    }
+  }
+
+  grouping physical-links {
+    description
+      "YANG definitions for physical links.
+       - phyical links between cards within a ROADM, which are populated by the ROADM and cannot be added or removed manually. ";
+    list physical-link {
+      key "physical-link-name";
+      uses physical-link;
+    }
+  }
+
+  grouping physical-link {
+    leaf physical-link-name {
+      type string;
+    }
+    container source {
+      uses port-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+        refine "port-name" {
+          mandatory true;
+        }
+      }
+    }
+    container destination {
+      uses port-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+        refine "port-name" {
+          mandatory true;
+        }
+      }
+    }
+  }
+
+  grouping srg {
+    leaf max-add-drop-ports {
+      type uint16;
+      config false;
+      mandatory true;
+    }
+    leaf srg-number {
+      type uint16;
+      must "not(current()>/org-openroadm-device/info/max-srgs) and current()>0" {
+        error-message "invalid SRG";
+        description
+          "Validating if the srg is supported by add/drop group";
+      }
+    }
+    leaf wavelengthDuplication {
+      description
+        "Whether the SRG can handle duplicate wavelengths and if so to what extent.";
+      config false;
+      mandatory true;
+      type enumeration {
+        enum "onePerSRG" {
+          description
+            "The SRG cannot handle wavelength duplication. Attempting to provision a connection on this SRG that uses the same wavelength as an existing service will result in failure.";
+          value 1;
+        }
+        enum "onePerDegree" {
+          description
+            "The SRG can handle wavelength duplication, but only one per degree. Attempting to provision a connection on this SRG that uses the same wavelength as an existing service will succeed, so long as the connections are not using the same degree.";
+          value 2;
+        }
+      }
+    }
+    list circuit-packs {
+      key "index";
+      description
+        "list for Cards associated with an add/drop group and srg";
+      leaf index {
+        type uint32;
+      }
+      uses circuit-pack-name {
+        refine "circuit-pack-name" {
+          mandatory true;
+        }
+      }
+    }
+  }
+
+  grouping degree-number {
+    leaf degree-number {
+      description
+        "Degree identifier. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/degree/degree-number";
+      }
+    }
+  }
+
+  grouping circuit-pack-name {
+    leaf circuit-pack-name {
+      description
+        "Circuit-Pack identifier. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/circuit-packs/circuit-pack-name";
+      }
+    }
+  }
+
+  grouping port-name {
+    uses circuit-pack-name;
+    leaf port-name {
+      description
+        "Port identifier. Unique within the context of a circuit-pack.";
+      type leafref {
+        path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../circuit-pack-name]/ports/port-name";
+      }
+    }
+  }
+
+  grouping srg-number {
+    leaf srg-number {
+      description
+        "Shared Risk Group identifier. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/shared-risk-group/srg-number";
+      }
+    }
+  }
+
+  grouping supporting-port-name {
+    leaf supporting-circuit-pack-name {
+      description
+        "Identifier of the supporting circuit-pack.";
+      type leafref {
+        path "/org-openroadm-device/circuit-packs/circuit-pack-name";
+      }
+      mandatory true;
+    }
+    leaf supporting-port {
+      description
+        "Identifier of the supporting port.";
+      mandatory true;
+      type leafref {
+        path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../supporting-circuit-pack-name]/ports/port-name";
+      }
+    }
+  }
+
+  grouping interface-name {
+    leaf interface-name {
+      description
+        "Name of an interface. Unique within the context of a device.";
+      type leafref {
+        path "/org-openroadm-device/interface/name";
+      }
+      config false;
+    }
+  }
+
+  grouping interfaces-grp {
+    description
+      "OpenROADM Interface configuration parameters.";
+    list interface {
+      key "name";
+      description
+        "The list of configured interfaces on the device.";
+      leaf name {
+        type string;
+        description
+          "The name of the interface.";
+      }
+      leaf description {
+        type string;
+        description
+          "A textual description of the interface.";
+      }
+      leaf type {
+        type identityref {
+          base org-openroadm-interfaces:interface-type;
+        }
+        mandatory true;
+        description
+          "The type of the interface.";
+      }
+      leaf administrative-state {
+        type org-openroadm-equipment-states-types:admin-states;
+      }
+      leaf operational-state {
+        type org-openroadm-common-types:state;
+        config false;
+      }
+      leaf circuit-id {
+        type string {
+          length "0..45";
+        }
+        description
+          "circuit identifier/user label,
+           can be used in alarm correlation and/or connection management ";
+      }
+      leaf supporting-interface {
+        type leafref {
+          path "/org-openroadm-device/interface/name";
+        }
+      }
+      uses supporting-port-name;
+    }
+  }
+
+  grouping port {
+    description
+      "Grouping of attributes related to a port object.";
+    leaf port-name {
+      type string;
+      mandatory true;
+      description
+        "Identifier for a port, unique within a circuit pack";
+    }
+    leaf port-type {
+      type string;
+      description
+        "Type of the pluggable or fixed port.";
+    }
+    leaf port-qual {
+      type enumeration {
+        enum "roadm-internal" {
+          value 1;
+        }
+        enum "roadm-external" {
+          value 2;
+        }
+        enum "xpdr-network" {
+          value 3;
+        }
+        enum "xpdr-client" {
+          value 4;
+        }
+        enum "otdr" {
+          value 5;
+        }
+      }
+    }
+    leaf port-wavelength-type {
+      type org-openroadm-port-types:port-wavelength-types;
+      config false;
+      description
+        "Type of port - single, multiple-wavelength, etc.";
+    }
+    leaf port-direction {
+      type org-openroadm-common-types:direction;
+      config false;
+      mandatory true;
+      description
+        "Whether port is uni (tx/rx) or bi-directional and";
+    }
+    leaf label {
+      type string;
+      config false;
+      description
+        "Faceplate label";
+    }
+    leaf circuit-id{
+      type string{
+        length "0..45";
+      }
+      description
+          "circuit identifier/user label,
+           can be used in alarm correlation and/or connection management ";
+
+    }
+    leaf administrative-state {
+      type org-openroadm-equipment-states-types:admin-states;
+      description
+        "Administrative state of port. The value of this field independant of the state of its contained and containing resources.  Setting this a port to administratively down will impact both its operational state, as well the operational state of its contained resources.  If this port is an endpoint to a connection, internal-link, physical-link, etc, then administratevely disabling this port will impact the operational state of those items unless they are using some form of port-protection schema.";
+      default "outOfService";
+    }
+    leaf operational-state {
+      type org-openroadm-common-types:state;
+      config false;
+      mandatory true;
+      description
+        "Operational state of a port";
+    }
+    leaf-list supported-interface-capability {
+      description
+        "Interface types supported on this port";
+      config false;
+      type identityref {
+        base org-openroadm-port-types:supported-if-capability;
+      }
+    }
+    leaf logical-connection-point {
+      type string;
+      description
+        "delete or replace with list logical-ports or connections?";
+    }
+    container partner-port {
+      config false;
+      description
+        "For ports which are not identified as having a direction of bidirectional, this field is used to identify the port which corresponds to the reverse direction. A port pair should include a port for each direction (tx, rx) and report their mate as partner-port.";
+      uses port-name;
+    }
+    container parent-port {
+      config false;
+      description
+        "In the case of port hierarchy, this is the parent port, which is also modeled as port within this circuit-pack. This is used in the case of a port that supports a parallel connector that contains subports.  The parent-port of the subport will be the port that contains this subport.  This can be used to help isolate faults when a single fault on a parallel connector introduces symptomatic failures on the contained subports.";
+      uses port-name;
+    }
+    list interfaces {
+      config false;
+      description
+        "List of the interfaces this port supports.  This is a list of names of instances in the flat instance list";
+      uses interface-name;
+    }
+  }
+
+  uses org-openroadm-device-container;
+
+  grouping org-openroadm-device-container {
+    container org-openroadm-device {
+      container info {
+        uses device-common;
+        leaf max-degrees {
+          type uint16;
+          description
+            "Max. number of degrees supported by device";
+          config false;
+        }
+        leaf max-srgs {
+          type uint16;
+          description
+            "Max. number of SRGs in an add/drop group";
+          config false;
+        }
+      }
+      container users {
+        description
+          "Stores a list of users";
+        uses org-openroadm-user-mgmt:user-profile;
+      }
+      container pending-sw {
+        config false;
+        uses org-openroadm-swdl:sw-bank;
+      }
+      uses shelves;
+      uses circuit-packs;
+      uses interfaces-grp;
+      container protocols {
+        description
+          "Contains the supported protocols";
+      }
+      container wavelength-map {
+        description
+          "The wavelength-number and center frequency, wavelength mapping";
+        config false;
+        uses org-openroadm-wavelength-map:wavelength-map-g;
+      }
+      uses internal-links;
+      uses physical-links;
+      uses external-links;
+      list degree {
+        when "/org-openroadm-device/info/node-type='rdm'";
+        key "degree-number";
+        uses degree;
+      }
+      list shared-risk-group {
+        when "/org-openroadm-device/info/node-type='rdm'";
+        key "srg-number";
+        uses srg;
+      }
+      list roadm-connections {
+        when "/org-openroadm-device/info/node-type='rdm'";
+        key "connection-number";
+        uses connection;
+      }
+      list connection-map {
+        key "connection-map-number";
+        config false;
+        leaf connection-map-number {
+          description
+            "Unique identifier for this connection-map entry";
+          type uint32;
+        }
+        container source {
+          leaf circuit-pack-name {
+            type leafref {
+              path "/org-openroadm-device/circuit-packs/circuit-pack-name";
+            }
+            mandatory true;
+          }
+          leaf port-name {
+            description
+              "Port identifier. Unique within the context of a circuit-pack.";
+            type leafref {
+              path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../circuit-pack-name]/ports/port-name";
+            }
+            mandatory true;
+          }
+        }
+        list destination {
+          key "circuit-pack-name port-name";
+          min-elements 1;
+          leaf circuit-pack-name {
+            type leafref {
+              path "/org-openroadm-device/circuit-packs/circuit-pack-name";
+            }
+            mandatory true;
+          }
+          leaf port-name {
+            description
+              "Port identifier. Unique within the context of a circuit-pack.";
+            type leafref {
+              path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../circuit-pack-name]/ports/port-name";
+            }
+            mandatory true;
+          }
+        }
+      }
+    }
+  }
+
+  grouping common-session-parms {
+    description
+      "Common session parameters to identify a
+       management session.";
+
+    leaf username {
+      type string;
+      mandatory true;
+      description
+        "Name of the user for the session.";
+    }
+
+    leaf session-id {
+      type ietf-nc:session-id-or-zero-type;
+      mandatory true;
+      description
+        "Identifier of the session.
+         A NETCONF session MUST be identified by a non-zero value.
+         A non-NETCONF session MAY be identified by the value zero.";
+    }
+
+    leaf source-host {
+      type ietf-inet-types:ip-address;
+      description
+        "Address of the remote host for the session.";
+    }
+  }
+  grouping changed-by-parms {
+    description
+      "Common parameters to identify the source
+       of a change event, such as a configuration
+       or capability change.";
+
+     container changed-by {
+       description
+         "Indicates the source of the change.
+          If caused by internal action, then the
+          empty leaf 'server' will be present.
+          If caused by a management session, then
+          the name, remote host address, and session ID
+          of the session that made the change will be reported.";
+       choice server-or-user {
+         leaf server {
+           type empty;
+           description
+             "If present, the change was caused
+              by the server.";
+         }
+
+         case by-user {
+           uses common-session-parms;
+         }
+       } // choice server-or-user
+     } // container changed-by-parms
+  }
+  notification change-notification {
+    description
+      "The Notification that a resource has been added, modified or removed.
+       This notification can be triggered by changes in configuration and operational data.
+       It shall contain the changed field pointed by the xpath.
+       Typically it is not intended for frequently changing volatile data e.g. PM, power levels";
+
+    leaf change-time {
+      description "The time the change occurs.";
+      type ietf-yang-types:date-and-time;
+    }
+    uses changed-by-parms;
+
+    leaf datastore {
+      type enumeration {
+        enum running {
+          description "The <running> datastore has changed.";
+        }
+        enum startup {
+          description "The <startup> datastore has changed";
+        }
+      }
+      default "running";
+      description
+        "Indicates which configuration datastore has changed.";
+    }
+    list edit {
+      description
+        "An edit (change) record SHOULD be present for each distinct
+         edit operation that the server has detected on
+         the target datastore.  This list MAY be omitted
+         if the detailed edit operations are not known.
+         The server MAY report entries in this list for
+         changes not made by a NETCONF session.";
+
+      leaf target {
+        type instance-identifier;
+        description
+            "Topmost node associated with the configuration or operationa change.
+             A server SHOULD set this object to the node within
+             the datastore that is being altered.  A server MAY
+             set this object to one of the ancestors of the actual
+             node that was changed, or omit this object, if the
+             exact node is not known.";
+      }
+      leaf operation {
+        type ietf-nc:edit-operation-type;
+        description
+          "Type of edit operation performed.
+         A server MUST set this object to the NETCONF edit
+         operation performed on the target datastore.";
+      }
+    } // list edit
+  } // notification change-notification
+}
\ No newline at end of file
diff --git a/tests/ordmodels_1.2.1/org-openroadm-equipment-states-types.yang b/tests/ordmodels_1.2.1/org-openroadm-equipment-states-types.yang
new file mode 100644 (file)
index 0000000..11ce8f5
--- /dev/null
@@ -0,0 +1,130 @@
+module org-openroadm-equipment-states-types {
+  namespace "http://org/openroadm/equipment/states/types";
+  prefix org-openroadm-equipment-states-types;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for types of states of equipment (slot/subslot).
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  typedef admin-states {
+    type enumeration {
+      enum "inService" {
+        value 1;
+      }
+      enum "outOfService" {
+        value 2;
+      }
+      enum "maintenance" {
+        value 3;
+      }
+    }
+  }
+
+  typedef states {
+    type enumeration {
+      enum "reserved-for-facility-planned" {
+        value 1;
+        description
+          "equipment is planned for use by a service";
+      }
+      enum "not-reserved-planned" {
+        value 2;
+        description
+          "equipment is planned by not reserved for any purpose";
+      }
+      enum "reserved-for-maintenance-planned" {
+        value 3;
+        description
+          "equipment is planned for use as a maintenance spare";
+      }
+      enum "reserved-for-facility-unvalidated" {
+        value 4;
+        description
+          "equipment is reserved for use by a service but not
+           validated against planned equipment";
+      }
+      enum "not-reserved-unvalidated" {
+        value 5;
+        description
+          "equipment is not reserved for any purpose and
+           not validated against planned equipment";
+      }
+      enum "unknown-unvalidated" {
+        value 6;
+        description
+          "unknown equipment not validated against planned equipment";
+      }
+      enum "reserved-for-maintenance-unvalidated" {
+        value 7;
+        description
+          "equipment is to be used for use as a maintenance spare
+           but not validated against planned equipment";
+      }
+      enum "reserved-for-facility-available" {
+        value 8;
+        description
+          "reserved for use by a service and available";
+      }
+      enum "not-reserved-available" {
+        value 9;
+        description
+          "not reserved for use by a service and available";
+      }
+      enum "reserved-for-maintenance-available" {
+        value 10;
+        description
+          "reserved as a maintenance spare and available";
+      }
+      enum "reserved-for-reversion-inuse" {
+        value 11;
+        description
+          "equipiment that is reserved as part of a home path
+           for a service that has been temporarily re-routed";
+      }
+      enum "not-reserved-inuse" {
+        value 12;
+        description
+          "equipment in use for a service";
+      }
+      enum "reserved-for-maintenance-inuse" {
+        value 13;
+        description
+          "maintenance spare equipment that is in use as a
+           maintenance spare";
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-ethernet-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-ethernet-interfaces.yang
new file mode 100644 (file)
index 0000000..869a2c9
--- /dev/null
@@ -0,0 +1,145 @@
+module org-openroadm-ethernet-interfaces {
+  namespace "http://org/openroadm/ethernet-interfaces";
+  prefix org-openroadm-eth-interfaces;
+
+  import org-openroadm-device {
+    prefix org-openroadm-device;
+  }
+  import org-openroadm-interfaces {
+    prefix openROADM-if;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for device facility ethernet interfaces.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF Interfaces.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping eth-attributes {
+    leaf speed {
+      type uint32;
+      description
+        "Set speed of the interface, unit mbps.
+         This is for ETH facility. ";
+    }
+    leaf fec {
+      type enumeration {
+        enum off;
+        enum rsfec;
+      }
+      description "Forward Error Correction Choices. ";
+    }
+    leaf duplex {
+      type enumeration {
+        enum "half" {
+          value 0;
+          description
+            "half duplex";
+        }
+        enum "full" {
+          value 1;
+          description
+            "full duplex";
+        }
+      }
+      default "full";
+      description
+        "Set duplex selections.";
+    }
+    leaf mtu {
+      type uint32 {
+        range "1518..9000";
+      }
+      default "1522";
+      description
+        "Set Maximum Frame Size.";
+    }
+    leaf auto-negotiation {
+      type enumeration {
+        enum "enabled" {
+          value 1;
+          description
+            "Auto Negotiation enabled";
+        }
+        enum "disabled" {
+          value 0;
+          description
+            "Auto Negotiation disabled";
+        }
+      }
+      default "enabled";
+      description
+        "Set Auto Negotiation: Enabled/Disabled.";
+    }
+    leaf curr-speed {
+      config false;
+      type string;
+      description
+        "speed (UNKNOWN/AUTO/10/100/1000/10000) corresponding to the interface";
+    }
+    leaf curr-duplex {
+      config false;
+      type string;
+      description
+        "duplex (HALF/FULL) corresponding to the interface";
+    }
+  }
+
+  grouping ethernet-container {
+    container ethernet {
+      description
+        "Ethernet Interfaces";
+      uses eth-attributes;
+    }
+  }
+
+  augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" {
+    when "org-openroadm-device:type = 'openROADM-if:ethernetCsmacd'";
+    uses ethernet-container;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-file-transfer.yang b/tests/ordmodels_1.2.1/org-openroadm-file-transfer.yang
new file mode 100644 (file)
index 0000000..1e1c8ff
--- /dev/null
@@ -0,0 +1,145 @@
+module org-openroadm-file-transfer {
+  namespace "http://org/openroadm/file-transfer";
+  prefix org-openroadm-file-txr;
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for file management related rpcs.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  rpc transfer {
+    description
+      "File transfer using FTP/SFTP";
+    input {
+      leaf action {
+        mandatory true;
+        description
+          "Type of action - download/upload.";
+        type enumeration {
+          enum "upload" {
+            description
+              "Specify the upload action. The server sends
+               the file identified by the local-file-path
+               to the remote-file-path.";
+          }
+          enum "download" {
+            description
+              "Specify the download action. The server retrieves
+               the file identified by the remote-file-path
+               to the local-file-path.";
+          }
+        }
+      }
+      leaf local-file-path {
+        type string;
+        mandatory true;
+        description
+          "Local file path.
+           Ex: /var/shared/example.txt";
+      }
+      leaf remote-file-path {
+        type inet:uri;
+        mandatory true;
+        description
+          "Remote file path.
+           A URI for the remote file path.
+
+           Format:sftp://user[:password]@host[:port]/path.
+           Ex: sftp://test:verify@[2001:db8:0:1::10]:22/home/user/sample";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc show-file {
+    description
+      "Show one or more files in the specified directory.";
+    input {
+      leaf filename {
+        type string {
+          length "1..255";
+        }
+        description
+          "Specify file(s) to be listed (* is allowed as wild-card). ";
+      }
+    }
+    output {
+      leaf status {
+        type enumeration {
+          enum "Successful" {
+            value 1;
+          }
+          enum "Failed" {
+            value 2;
+          }
+        }
+        mandatory true;
+        description
+          "Successful or Failed";
+      }
+      leaf-list status-message {
+        type string;
+        description
+          "Gives a more detailed reason for success / failure";
+      }
+    }
+  }
+  rpc delete-file {
+    description
+      "Delete one or more files in the specified directory.";
+    input {
+      leaf filename {
+        type string {
+          length "1..255";
+        }
+        mandatory true;
+        description
+          "Specify file(s) to be deleted (* is allowed as wild-card).";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-fwdl.yang b/tests/ordmodels_1.2.1/org-openroadm-fwdl.yang
new file mode 100644 (file)
index 0000000..95225f3
--- /dev/null
@@ -0,0 +1,59 @@
+module org-openroadm-fwdl {
+  namespace "http://org/openroadm/fwdl";
+  prefix org-openroadm-fwdl;
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "This module contains definitions for System Management.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  rpc fw-update {
+    description
+      "Fpga data update";
+    input {
+      leaf circuit-pack-name {
+        type string;
+        description
+          "Name of the circuit pack";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-interfaces.yang
new file mode 100644 (file)
index 0000000..acd74fe
--- /dev/null
@@ -0,0 +1,108 @@
+module org-openroadm-interfaces {
+  namespace "http://org/openroadm/interfaces";
+  prefix openROADM-if;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for device facility interfaces.
+     Reused ietf-interfaces and some interface-type defined in iana-if-type.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF Interfaces.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  identity interface-type {
+    description
+      "Base identity from which specific interface types are
+       derived.";
+  }
+
+  identity ethernetCsmacd {
+    base interface-type;
+    description
+      "For all Ethernet-like interfaces, regardless of speed,
+       as per RFC 3635.";
+    reference
+      "RFC 3635 - Definitions of Managed Objects for the
+                  Ethernet-like Interface Types";
+  }
+
+  identity ip {
+    base interface-type;
+    description
+      "IP (for APPN HPR in IP networks).";
+  }
+
+  identity opticalChannel {
+    base interface-type;
+    description
+      "Optical Channel.";
+  }
+
+  identity opticalTransport {
+    base interface-type;
+    description
+      "Optical Transport.";
+  }
+
+  identity otnOdu {
+    base interface-type;
+    description
+      "OTN Optical Data Unit.";
+  }
+
+  identity otnOtu {
+    base interface-type;
+    description
+      "OTN Optical channel Transport Unit.";
+  }
+
+  identity openROADMOpticalMultiplex {
+    base interface-type;
+    description
+      "Optical Transport Multiplex type for openROADM";
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-layerRate.yang b/tests/ordmodels_1.2.1/org-openroadm-layerRate.yang
new file mode 100644 (file)
index 0000000..e9c7eb0
--- /dev/null
@@ -0,0 +1,89 @@
+module org-openroadm-layerRate {
+  namespace "http://org/openroadm/layerRate";
+  prefix org-openroadm-layerRate;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of layer rates.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping layer-rate {
+    description
+      "Set list of layer rates, plus the ability to report layer rates not yet in set list.";
+    leaf type {
+      type layer-rate-enum;
+      mandatory true;
+    }
+    leaf extension {
+      type string;
+      mandatory false;
+    }
+  }
+
+  typedef layer-rate-enum {
+    type enumeration {
+      enum "vendorExtension" {
+        value 1;
+        description
+          "vendor extension";
+      }
+      enum "layer2" {
+        value 2;
+        description
+          "2";
+      }
+      enum "layer3" {
+        value 3;
+        description
+          "3";
+      }
+      enum "layer4" {
+        value 4;
+        description
+          "4";
+      }
+      enum "layer5" {
+        value 5;
+        description
+          "5";
+      }
+      enum "layer6" {
+        value 6;
+        description
+          "6";
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-lldp.yang b/tests/ordmodels_1.2.1/org-openroadm-lldp.yang
new file mode 100644 (file)
index 0000000..d781330
--- /dev/null
@@ -0,0 +1,302 @@
+module org-openroadm-lldp {
+  namespace "http://org/openroadm/lldp";
+  prefix org-openroadm-lldp;
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+  import org-openroadm-device {
+    prefix org-openroadm-device;
+  }
+  import iana-afn-safi {
+    prefix ianaaf;
+  }
+  import org-openroadm-resource-types {
+    prefix org-openroadm-resource-types;
+  }
+  import ietf-yang-types {
+    prefix yang;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for lldp protocol.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+  grouping nbr-info-grp {
+    description
+      "Display LLDP Neighbour ";
+
+    leaf remoteSysName {
+      type string;
+      description
+        "remote neighbour system name";
+    }
+    leaf remoteMgmtAddressSubType {
+      type ianaaf:address-family;
+      description
+        "remote neighbour Management Address Subtype Enumeration";
+    }
+    leaf remoteMgmtAddress {
+      type inet:ip-address;
+      description
+        "remote neighbour management address";
+    }
+    leaf remotePortIdSubType {
+      type enumeration {
+        enum "other" {
+          value 0;
+          description
+            "reserved";
+        }
+        enum "ifalias" {
+          value 1;
+          description
+            "Interface Alias (IfAlias - IETF RFC 2863) ";
+        }
+        enum "portcomponent" {
+          value 2;
+          description
+            "Port component (EntPhysicalAlias IETF RFC 4133)";
+        }
+        enum "macaddress" {
+          value 3;
+          description
+            "MAC address (IEEE Std 802) ";
+        }
+        enum "networkaddress" {
+          value 4;
+          description
+            "Network Address";
+        }
+        enum "ifname" {
+          value 5;
+          description
+            "Interface Name (ifName - IETF RFC 2863)";
+        }
+        enum "agentcircuitid" {
+          value 6;
+          description
+            "Agent Circuit Id (IETF RFC 3046)";
+        }
+        enum "local" {
+          value 7;
+          description
+            "Locally assigned";
+        }
+      }
+      description
+        "remote neighbour Port ID Subtype Enumeration";
+    }
+    leaf remotePortId {
+      type string;
+      description
+        "remote neighbour port Id";
+    }
+    leaf remoteChassisIdSubType {
+      type enumeration {
+        enum "reserved" {
+          value 0;
+          description
+            "reserved";
+        }
+        enum "chassiscomponent" {
+          value 1;
+          description
+            "Chassis component (EntPhysicalAlias IETF RFC 4133)";
+        }
+        enum "ifalias" {
+          value 2;
+          description
+            "Interface Alias (IfAlias - IETF RFC 2863) ";
+        }
+        enum "portcomponent" {
+          value 3;
+          description
+            "Port component (EntPhysicalAlias IETF RFC 4133)";
+        }
+        enum "macaddress" {
+          value 4;
+          description
+            "MAC address (IEEE Std 802) ";
+        }
+        enum "networkaddress" {
+          value 5;
+          description
+            "Network Address";
+        }
+        enum "ifname" {
+          value 6;
+          description
+            "Interface Name (ifName - IETF RFC 2863)";
+        }
+        enum "local" {
+          value 7;
+          description
+            "Locally assigned";
+        }
+      }
+      description
+        "Chassis ID Subtype Enumeration";
+    }
+    leaf remoteChassisId {
+      type string;
+      description
+        "remote neighbour Chassis Id";
+    }
+  }
+
+  grouping lldp-container {
+    container lldp {
+      description
+        "LLDP configurable and retrievable";
+      container global-config {
+        description
+          "LLDP global configurations";
+        leaf adminStatus {
+          type enumeration {
+            enum "disable" {
+              value 0;
+              description
+                "Disable the LLDP feature per NE";
+            }
+            enum "enable" {
+              value 1;
+              description
+                "Enable the LLDP feature per NE";
+            }
+          }
+          description
+            "LLDP feature Enable/Disable per NE";
+          default "enable";
+        }
+        leaf msgTxInterval {
+          type uint16 {
+            range "5..32768";
+          }
+          description
+            "LLDP frame Retransmit Interval in seconds";
+          default "30";
+        }
+        leaf msgTxHoldMultiplier {
+          type uint8 {
+            range "2..10";
+          }
+          description
+            "TTL value for the TLVs transmitter over wire in seconds";
+          default "4";
+        }
+      }
+      list port-config {
+        description
+          "LLDP port configurations";
+        key "ifName";
+        leaf ifName {
+          type leafref {
+            path "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface/org-openroadm-device:name";
+          }
+          description
+            "Ethernet interface name where LLDP runs";
+        }
+        leaf adminStatus {
+          type enumeration {
+            enum "disable" {
+              value 0;
+              description
+                "Disables the LLDP frames transmit and receive on specific interface";
+            }
+            enum "txandrx" {
+              value 1;
+              description
+                "Enable Transmit and Receive LLDP frames on specific interface";
+            }
+          }
+          description
+            "LLDP enable per port basis";
+          default "txandrx";
+        }
+      }
+      container nbr-list {
+        description
+          "LLDP Oper data - Neighbour List information";
+        config false;
+        list if-name {
+          key "ifName";
+          leaf ifName {
+            type string;
+            description
+              "Ethernet interface name where LLDP runs";
+          }
+          uses nbr-info-grp;
+        }
+      }
+    }
+  }
+
+  augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:protocols" {
+    when "/org-openroadm-device:org-openroadm-device/org-openroadm-device:info/org-openroadm-device:node-type='rdm'";
+    uses lldp-container;
+  }
+
+  notification lldp-nbr-info-change {
+    description "LLDP: Neighbor Information Changed
+            remoteSysName
+            remoteSysMgmtAddressSubType
+            remoteSysMgmtAddress
+            remotePortIdSubType
+            remotePortId
+            remoteChassisIdSubType
+            remoteChassisId
+            All of the above attributes are sent in event";
+    leaf notification-type {
+      type org-openroadm-resource-types:resource-notification-type;
+    }
+    leaf resource-type {
+      type org-openroadm-resource-types:resource-type-enum;
+      description
+        "resource-type for this notification is interface";
+    }
+    leaf resource {
+      type string;
+      description
+        "resource interface-name";
+    }
+    container nbr-info {
+      uses nbr-info-grp;
+    }
+    leaf event-time {
+      type yang:date-and-time;
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-maintenance-loopback.yang b/tests/ordmodels_1.2.1/org-openroadm-maintenance-loopback.yang
new file mode 100644 (file)
index 0000000..4f50786
--- /dev/null
@@ -0,0 +1,75 @@
+module org-openroadm-maintenance-loopback {
+  namespace "http://org/openroadm/maintenance-loopback";
+  prefix org-openroadm-maint-loopback;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for maintenance loopback.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping maint-loopback {
+    container maint-loopback {
+      leaf enabled {
+        type boolean;
+        default "false";
+        description
+          "loopback operation enable flag";
+      }
+      leaf type {
+        when "../enabled = 'true'";
+        type enumeration {
+          enum "fac" {
+            value 0;
+            description
+              "pre-FEC Loopback in the facility direction";
+          }
+          enum "term" {
+            value 1;
+            description
+              "Loopback in the terminal direction";
+          }
+          enum "fac2" {
+            value 2;
+            description
+              "post-FEC Loopback in the facility direction";
+          }
+        }
+        default "fac";
+        description
+          "Set Loopback type (or direction).";
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-maintenance-testsignal.yang b/tests/ordmodels_1.2.1/org-openroadm-maintenance-testsignal.yang
new file mode 100644 (file)
index 0000000..67d980b
--- /dev/null
@@ -0,0 +1,134 @@
+module org-openroadm-maintenance-testsignal {
+  namespace "http://org/openroadm/maintenance-testsignal";
+  prefix org-openroadm-maint-testsignal;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for maintenance testsignal.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping maint-testsignal {
+    container maint-testsignal {
+      leaf enabled {
+        type boolean;
+        default "false";
+        description
+          "testsignal enabled flag";
+      }
+      leaf testPattern {
+        when "../enabled = 'true'";
+        type enumeration {
+          enum "PRBS" {
+            value 0;
+            description
+              "Unframed, inverted PN-31 pattern or PRBS31 pattern per IEEE 802.3 clause 50.3.8.2 (inverted PN-31at line rate)";
+          }
+          enum "PRBS31" {
+            value 1;
+            description
+              "PRBS31 with standard mapping per G.709";
+          }
+          enum "PRBS23" {
+            value 2;
+            description
+              "SONET/SDH Framed,inverted PN-23 pattern.";
+          }
+          enum "PRZEROS" {
+            value 3;
+            description
+              "pseudo-random with zeros data pattern per IEEE 802.3 clause 49.2.8";
+          }
+          enum "IDLE" {
+            value 4;
+            description
+              "Scrambled IDLE test-pattern per IEEE 802.3ba";
+          }
+        }
+        description
+          "Set test signal pattern";
+      }
+      leaf type {
+        when "../enabled = 'true'";
+        type enumeration {
+          enum "fac" {
+            value 0;
+            description
+              "test signal in the facility direction";
+          }
+          enum "term" {
+            value 1;
+            description
+              "test signal in the terminal direction";
+          }
+        }
+        default "fac";
+        description
+          "Set test signal type (or direction).";
+      }
+      leaf bitErrors {
+        when "../enabled = 'true' and ../type = 'fac'";
+        type uint32 {
+          range "0..4294967295";
+        }
+        config false;
+        description
+          "bit errors for test signal in facility direction.";
+      }
+      leaf bitErrorsTerminal {
+        when "../enabled = 'true' and ../type = 'term'";
+        type uint32 {
+          range "0..4294967295";
+        }
+        config false;
+        description
+          "bit errors for test signal in terminal direction.";
+      }
+      leaf syncSeconds {
+        when "../enabled = 'true' and ../type = 'fac'";
+        type string;
+        config false;
+        description
+          "number of seconds the received facility test signal is in sync.";
+      }
+      leaf syncSecondsTerminal {
+        when "../enabled = 'true' and ../type = 'term'";
+        type string;
+        config false;
+        description
+          "number of seconds the received terminal test signal is in sync.";
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-maintenance.yang b/tests/ordmodels_1.2.1/org-openroadm-maintenance.yang
new file mode 100644 (file)
index 0000000..5c6e1ff
--- /dev/null
@@ -0,0 +1,87 @@
+module org-openroadm-maintenance {
+  namespace "http://org/openroadm/maintenance";
+  prefix org-openroadm-mainteance;
+
+  import org-openroadm-resource {
+    prefix org-openroadm-resource;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of maintenace operations.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping maintenance {
+    leaf id {
+      description
+        "Uniquely identify maintenance activity";
+      type string;
+      mandatory true;
+    }
+    container resource {
+      description
+        "Resource under maintenance";
+      uses org-openroadm-resource:resource;
+    }
+    leaf operation {
+      type maintenance-operation;
+    }
+  }
+
+  container maintenance-list {
+    description
+      "A list of active maintenance operations. Adding an entry to this list creates an active maintenance operation.  Removing an entry from this terminates a maintenance activity";
+    list maintenance {
+      key "id";
+      uses maintenance;
+    }
+  }
+
+  typedef maintenance-operation {
+    description
+      "Maintenance Operation.";
+    type enumeration {
+      enum "terminalLoopback" {
+        value 1;
+      }
+      enum "facilityLoopback" {
+        value 2;
+      }
+      enum "testSignal" {
+        value 3;
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-optical-channel-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-optical-channel-interfaces.yang
new file mode 100644 (file)
index 0000000..563596b
--- /dev/null
@@ -0,0 +1,184 @@
+module org-openroadm-optical-channel-interfaces {
+  namespace "http://org/openroadm/optical-channel-interfaces";
+  prefix org-openroadm-optical-channel-interfaces;
+
+  import org-openroadm-device {
+    prefix org-openroadm-device;
+  }
+  import org-openroadm-interfaces {
+    prefix openROADM-if;
+  }
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for device facility och interfaces.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF Interfaces.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  identity rate-identity {
+    description
+      "A unique rate identification";
+  }
+
+  identity R200G {
+    base rate-identity;
+    description
+      "Identity for 200G Rate";
+  }
+
+  identity R100G {
+    base rate-identity;
+    description
+      "Identity for 100G Rate";
+  }
+
+  identity R10.7G {
+    base rate-identity;
+    description
+      "Identity for 10.7G Rate";
+  }
+
+  identity R11.1G {
+    base rate-identity;
+    description
+      "Identity for 11.1G Rate";
+  }
+
+  grouping och-attributes {
+    description
+      "Optical Channel attributes";
+    leaf rate {
+      type identityref {
+        base rate-identity;
+      }
+      description
+        "rate";
+    }
+    leaf wavelength-number {
+      type uint32;
+    }
+    leaf modulation-format {
+      type enumeration {
+        enum "bpsk" {
+          value 0;
+          description
+            "binary phase-shift keying";
+        }
+        enum "dc-dp-bpsk" {
+          value 1;
+          description
+            "DC dual-polarization binary phase-shift keying";
+        }
+        enum "qpsk" {
+          value 2;
+          description
+            "quadrature phase-shift keying";
+        }
+        enum "dp-qpsk" {
+          value 3;
+          description
+            "dual-polarization binary phase-shift keying";
+        }
+        enum "qam16" {
+          value 4;
+          description
+            "quadrature amplitude modulation 16";
+        }
+        enum "dp-qam16" {
+          value 5;
+          description
+            "dual-polarization quadrature amplitude modulation 16";
+        }
+        enum "dc-dp-qam16" {
+          value 6;
+          description
+            "DC dual-polarization quadrature amplitude modulation 16";
+        }
+        enum "qam8" {
+          value 7;
+          description
+            "quadrature amplitude modulation 8";
+        }
+        enum "dp-qam8" {
+          value 8;
+          description
+            "dual-polarization quadrature amplitude modulation 8";
+        }
+        enum "dc-dp-qam8" {
+          value 9;
+          description
+            "DC dual-polarization quadrature amplitude modulation 8";
+        }
+      }
+      description
+        "modulation format";
+    }
+    leaf transmit-power {
+      type org-openroadm-common-types:power-dBm;
+      description
+        "The target transmit power for this channel. When set, the xponder will work to ensure that port-current-power reaches this level. Applicable only to channel on top of xpdr-network port";
+    }
+  }
+
+  grouping och-container {
+    container och {
+      description
+        "Optical Channel (OCh):
+         Models the optical channel interfaces for an Optical White Box.";
+      uses och-attributes;
+    }
+  }
+
+  augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" {
+    when "org-openroadm-device:type = 'openROADM-if:opticalChannel'";
+    uses och-container;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-optical-multiplex-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-optical-multiplex-interfaces.yang
new file mode 100644 (file)
index 0000000..5503241
--- /dev/null
@@ -0,0 +1,66 @@
+module org-openroadm-optical-multiplex-interfaces {
+  namespace "http://org/openroadm/optical-multiplex-interfaces";
+  prefix org-openroadm-optical-multiplex-interfaces;
+
+  import org-openroadm-device {
+    prefix org-openroadm-device;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "This module contains YANG definitions
+     for the Optical multiplex Interfaces (OMS).
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF Interfaces.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" {
+    description
+      "Optical Multiplex Section (OMS)
+       allow setting of OMS in the openROADM interfaces tree.";
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-optical-transport-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-optical-transport-interfaces.yang
new file mode 100644 (file)
index 0000000..060e4d7
--- /dev/null
@@ -0,0 +1,144 @@
+module org-openroadm-optical-transport-interfaces {
+  namespace "http://org/openroadm/optical-transport-interfaces";
+  prefix org-openroadm-optical-transport-interfaces;
+
+  import org-openroadm-device {
+    prefix org-openroadm-device;
+  }
+  import org-openroadm-interfaces {
+    prefix openROADM-if;
+  }
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "This module contains YANG definitions
+     for the Optical Transport Interfaces.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF Interfaces.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping ots-attributes {
+    description
+      "Optical Transport Section (OTS) attributes";
+    leaf fiber-type {
+      type enumeration {
+        enum "smf" {
+          value 0;
+          description
+            "Single Mode Fiber";
+        }
+        enum "eleaf" {
+          value 1;
+          description
+            "ELEAF";
+        }
+        enum "oleaf" {
+          value 2;
+          description
+            "OLEAF";
+        }
+        enum "dsf" {
+          value 3;
+          description
+            "DSF";
+        }
+        enum "truewave" {
+          value 4;
+          description
+            "TRUEWAVE Reduced Slope";
+        }
+        enum "truewavec" {
+          value 5;
+          description
+            "TRUEWAVE Classic";
+        }
+        enum "nz-dsf" {
+          value 6;
+          description
+            "NZ-DSF";
+        }
+        enum "ull" {
+          value 7;
+          description
+            "Ultra Low Loss (ULL)";
+        }
+      }
+      default "smf";
+      description
+        "fiber type
+         Default    : SMF ";
+    }
+    leaf span-loss-receive {
+      description
+        "Span loss on the receiver side. Set by the controller and used by device to set AMP gain.";
+      type org-openroadm-common-types:ratio-dB;
+    }
+    leaf span-loss-transmit {
+      description
+        "Span loss on the transmitter side. Set by the controller and used by device to configure MSA compliant channel launch power";
+      type org-openroadm-common-types:ratio-dB;
+    }
+  }
+
+  grouping ots-container {
+    container ots {
+      description
+        "Optical Transport Section (OTS):
+          Models the optical interfaces for an Optical White Box.
+          The network side is represented by the OTS/OMS.";
+      uses ots-attributes;
+    }
+  }
+
+  augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" {
+    when "org-openroadm-device:type = 'openROADM-if:opticalTransport'";
+    uses ots-container;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-otn-odu-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-otn-odu-interfaces.yang
new file mode 100644 (file)
index 0000000..3b49eff
--- /dev/null
@@ -0,0 +1,387 @@
+module org-openroadm-otn-odu-interfaces {
+  namespace "http://org/openroadm/otn-odu-interfaces";
+  prefix org-openroadm-otn-odu-interfaces;
+
+  import org-openroadm-device {
+    prefix org-openroadm-device;
+  }
+  import org-openroadm-interfaces {
+    prefix openROADM-if;
+  }
+  import org-openroadm-maintenance-testsignal {
+    prefix org-openroadm-maint-testsignal;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for device facility otnodu interfaces.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF Interfaces.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  identity odu-rate-identity {
+    description
+      "A unique rate identification of the ODUk.";
+  }
+
+  identity ODU4 {
+    base odu-rate-identity;
+    description
+      "Identity for an ODU4";
+  }
+
+  identity ODU3 {
+    base odu-rate-identity;
+    description
+      "Identity for an ODU3";
+  }
+
+  identity ODU2 {
+    base odu-rate-identity;
+    description
+      "Identity for an ODU2";
+  }
+
+  identity ODU2e {
+    base odu-rate-identity;
+    description
+      "Identity for an ODU2e";
+  }
+
+  identity ODU1 {
+    base odu-rate-identity;
+    description
+      "Identity for an ODU1";
+  }
+
+  identity ODU0 {
+    base odu-rate-identity;
+    description
+      "Identity for an ODU0";
+  }
+
+  identity ODUflex {
+    base odu-rate-identity;
+    description
+      "Identity for an ODUflex";
+  }
+
+  identity odtu-type-identity {
+    description
+      "A unique identification for the MSI odtu type.";
+  }
+
+  identity ODTU4.ts-Allocated {
+    base odtu-type-identity;
+    description
+      "OPU4 MSI - ODTU4.ts, TS is occupied/allocated";
+  }
+
+  identity ODTU4.1 {
+    base odtu-type-identity;
+    description
+      "ODTU4.1 MSI type";
+  }
+
+  identity ODTU4.2 {
+    base odtu-type-identity;
+    description
+      "ODTU4.2 MSI type";
+  }
+
+  identity ODTU4.8 {
+    base odtu-type-identity;
+    description
+      "ODTU4.8 MSI type";
+  }
+
+  identity ODTU4.31 {
+    base odtu-type-identity;
+    description
+      "ODTU4.31 MSI type";
+  }
+
+  identity ODTU01 {
+    base odtu-type-identity;
+    description
+      "ODTU01 MSI type";
+  }
+
+  identity ODTU12 {
+    base odtu-type-identity;
+    description
+      "ODTU12 MSI type";
+  }
+
+  identity ODTU13 {
+    base odtu-type-identity;
+    description
+      "ODTU13 MSI type";
+  }
+
+  identity ODTU23 {
+    base odtu-type-identity;
+    description
+      "ODTU23 MSI type";
+  }
+
+  identity ODTU2.ts {
+    base odtu-type-identity;
+    description
+      "ODTU2.ts MSI type";
+  }
+
+  identity ODTU3.ts {
+    base odtu-type-identity;
+    description
+      "ODTU3.ts MSI type";
+  }
+
+  identity unallocated {
+    base odtu-type-identity;
+    description
+      "Unallocated MSI type";
+  }
+
+  grouping msi-entry {
+    leaf trib-slot {
+      type uint16;
+      description
+        "tributary slot (TS)";
+    }
+    leaf odtu-type {
+      type identityref {
+        base odtu-type-identity;
+      }
+      description
+        "ODTU type, part of the MSI (Multiplex Structure Identifier)";
+    }
+    leaf trib-port {
+      type uint8;
+      description
+        "Tributray Port Number (0-based), part of the MSI";
+    }
+    leaf trib-port-payload {
+      type string;
+      description
+        "interface name being mapped to trib-port";
+    }
+  }
+
+  grouping odu-attributes {
+    description
+      "ODU attributes";
+    leaf rate {
+      type identityref {
+        base odu-rate-identity;
+      }
+      description
+        "rate identity of the ODU. 'identityref' is used
+         to allow to extend for future higher rates";
+    }
+    leaf monitoring-mode {
+      type enumeration {
+        enum "not-terminated" {
+          description
+            "Not Terminated: no detection or generation.
+             Overhead is passed through the interface transparently in receive direction";
+        }
+        enum "terminated" {
+          description
+            "Terminated: detection and generation enabled.
+             Overhead is erased (replaced with all zeros) in receive direction";
+        }
+        enum "monitored" {
+          description
+            "Monitored: detection enabled.
+             Overhead is passed through the interface transparently in receive direction";
+        }
+      }
+      description
+        "Monitoring mode of the ODU Overhead";
+    }
+    leaf proactive-delay-measurement-enabled {
+      type boolean;
+      description
+        "enable/disable proactive Delay Measurement";
+    }
+    list tcm {
+      key "layer";
+      uses tcm-attributes;
+      max-elements "6";
+      description
+        "Tandem Connection Management";
+    }
+    uses opu;
+  }
+
+  grouping opu {
+    container opu {
+      when "../monitoring-mode = 'terminated' or ../monitoring-mode = 'monitored'";
+      description
+        "Optical Channel Payload Unit (OPU)";
+      leaf payload-type {
+        type string {
+          length "2";
+          pattern "[0-9a-fA-F]*";
+        }
+        description
+          "Payload Type";
+      }
+      leaf rx-payload-type {
+        type string {
+          length "2";
+          pattern "[0-9a-fA-F]*";
+        }
+        description
+          "Received Payload Type";
+      }
+      leaf exp-payload-type {
+        type string {
+          length "2";
+          pattern "[0-9a-fA-F]*";
+        }
+        description
+          "Expected Payload Type";
+      }
+      leaf payload-interface {
+        type string;
+        description
+          "Expected Payload of OPU. It designates client interface name";
+      }
+      container msi {
+        when "../payload-type = '20' or ../payload-type = '21'";
+        list tx-msi {
+          key "trib-slot";
+          uses msi-entry;
+          description
+            "Transmit MSI";
+        }
+        list rx-msi {
+          key "trib-slot";
+          uses msi-entry;
+          description
+            "Receive MSI";
+        }
+        list exp-msi {
+          key "trib-slot";
+          uses msi-entry;
+          description
+            "Expected MSI";
+        }
+      }
+    }
+  }
+
+  grouping tcm-attributes {
+    description
+      "Tandem Connection Monitoring (TCM) attributes";
+    leaf layer {
+      type uint8 {
+        range "1..6";
+      }
+      description
+        "TCM layer";
+    }
+    leaf monitoring-mode {
+      type enumeration {
+        enum "not-terminated" {
+          description
+            "Not Terminated: no detection or generation.
+             Overhead is passed through the interface transparently in receive direction
+             unless extension is set for erase";
+        }
+        enum "terminated" {
+          description
+            "Terminated: detection and generation enabled.
+             Overhead is erased (replaced with all zeros) in receive direction, unless
+             extension is set to passthrough";
+        }
+        enum "monitored" {
+          description
+            "Monitored: detection enabled.
+             Overhead is passed through the interface transparently in receive direction
+             unless extension is set for erase";
+        }
+      }
+      description
+        "Monitoring mode of the TCM layer";
+    }
+    leaf ltc-act-enabled {
+      type boolean;
+      description
+        "enable/disable alarm transfer on detection of Loss of Tandem Connection (LTC)";
+    }
+    leaf proactive-delay-measurement-enabled {
+      type boolean;
+      description
+        "enable/disable proactive Delay Measurement";
+    }
+  }
+
+  grouping odu-container {
+    container odu {
+      presence "Attribute Nodes for Optical Data Unit (ODU)";
+      description
+        "Optical Channel Data Unit (ODU)";
+      uses odu-attributes {
+        refine "opu/rx-payload-type" {
+          config false;
+        }
+        refine "opu/msi" {
+          config false;
+        }
+      }
+      uses org-openroadm-maint-testsignal:maint-testsignal;
+    }
+  }
+
+  augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" {
+    when "org-openroadm-device:type = 'openROADM-if:otnOdu'";
+    uses odu-container;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-otn-otu-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-otn-otu-interfaces.yang
new file mode 100644 (file)
index 0000000..4fe3bb3
--- /dev/null
@@ -0,0 +1,185 @@
+module org-openroadm-otn-otu-interfaces {
+  namespace "http://org/openroadm/otn-otu-interfaces";
+  prefix org-openroadm-otn-otu-interfaces;
+
+  import org-openroadm-device {
+    prefix org-openroadm-device;
+  }
+  import org-openroadm-interfaces {
+    prefix openROADM-if;
+  }
+  import org-openroadm-maintenance-loopback {
+    prefix org-openroadm-maint-loopback;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for device facility otnotu interfaces.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF Interfaces.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  identity otu-rate-identity {
+    description
+      "A unique rate identification of the OTU.";
+  }
+
+  identity OTU4 {
+    base otu-rate-identity;
+    description
+      "Identity for an OTU4";
+  }
+
+  identity OTU3 {
+    base otu-rate-identity;
+    description
+      "Identity for an OTU3";
+  }
+
+  identity OTU2 {
+    base otu-rate-identity;
+    description
+      "Identity for an OTU2";
+  }
+
+  identity OTU2e {
+    base otu-rate-identity;
+    description
+      "Identity for an OTU2e";
+  }
+
+  identity OTU1 {
+    base otu-rate-identity;
+    description
+      "Identity for an OTU1";
+  }
+
+  identity OTU0 {
+    base otu-rate-identity;
+    description
+      "Identity for an OTU0";
+  }
+
+  identity OTUflex {
+    base otu-rate-identity;
+    description
+      "Identity for an OTUflex";
+  }
+
+  grouping otu-attributes {
+    description
+      "OTU attributes";
+    leaf rate {
+      type identityref {
+        base otu-rate-identity;
+      }
+      description
+        "rate identity of the OTU. 'identityref' is used
+         to allow to extend for future higher rates";
+    }
+    leaf fec {
+      type enumeration {
+        enum "off" {
+          value 0;
+          description
+            "fec off";
+        }
+        enum "rsfec" {
+          value 1;
+          description
+            "rsfec";
+        }
+        enum "sdfeca1" {
+          value 2;
+          description
+            "Clariphy SDFEC";
+        }
+        enum "efec" {
+          value 3;
+          description
+            "G.975.1 I.4";
+        }
+        enum "ufec" {
+          value 4;
+          description
+            "G.975.1 I.7";
+        }
+        enum "sdfec" {
+          value 5;
+          description
+            "Soft decision FEC";
+        }
+        enum "sdfecb1" {
+          value 6;
+          description
+            "SDFEC with SCFEC";
+        }
+        enum "scfec" {
+          value 7;
+          description
+            "Stair case FEC";
+        }
+      }
+      description
+        "Forward Error Correction";
+    }
+  }
+
+  grouping otu-container {
+    container otu {
+      description
+        "Optical Channel Transport Unit (OTU)";
+      uses otu-attributes;
+      uses org-openroadm-maint-loopback:maint-loopback;
+    }
+  }
+
+  augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" {
+    when "org-openroadm-device:type = 'openROADM-if:otnOtu'";
+    uses otu-container;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-physical-types.yang b/tests/ordmodels_1.2.1/org-openroadm-physical-types.yang
new file mode 100644 (file)
index 0000000..4251018
--- /dev/null
@@ -0,0 +1,117 @@
+module org-openroadm-physical-types {
+  namespace "http://org/openroadm/physical/types";
+  prefix org-openroadm-physical-types;
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+  import ietf-yang-types {
+    prefix yang;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of physical types.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping node-info {
+    description
+      "Physical inventory data used by the node";
+    leaf vendor {
+      description
+        "Vendor of the equipment";
+      type string;
+      config false;
+      mandatory true;
+    }
+    leaf model {
+      type string;
+      description
+        "Physical resource model information.";
+      config false;
+      mandatory true;
+    }
+    leaf serial-id {
+      description
+        "Product Code for this physical resource";
+      type string;
+      config false;
+      mandatory true;
+    }
+  }
+
+  grouping common-info {
+    description
+      "Physical inventory data used by all other entities";
+    uses node-info;
+    leaf type {
+      description
+        "The specific type of this physical resource - ie the type of
+         shelf, type of circuit-pack, etc.";
+      type string;
+      config false;
+    }
+    leaf product-code {
+      description
+        "Product Code for this physical resource";
+      type string;
+      config false;
+    }
+    leaf manufacture-date {
+      description
+        "Manufactor date of physical resource";
+      type yang:date-and-time;
+      config false;
+    }
+    leaf clei {
+      description
+        "CLEI for this physical resource";
+      type string;
+      config false;
+    }
+    leaf hardware-version {
+      description
+        "The version of the hardware.";
+      type string;
+      config false;
+    }
+    leaf operational-state {
+      description
+        "Operational state of the physical resource";
+      type org-openroadm-common-types:state;
+      config false;
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-pm-types.yang b/tests/ordmodels_1.2.1/org-openroadm-pm-types.yang
new file mode 100644 (file)
index 0000000..d2820d3
--- /dev/null
@@ -0,0 +1,278 @@
+module org-openroadm-pm-types {
+  namespace "http://org/openroadm/pm-types";
+  prefix org-openroadm-pm-types;
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of performance management types.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  typedef pm-granularity {
+    description
+      "Granularity of PM bin";
+    type enumeration {
+      enum "notApplicable" {
+        description
+          "This is for total statistic counters on devices that support
+              them.";
+        value 1;
+      }
+      enum "15min" {
+        value 2;
+      }
+      enum "24Hour" {
+        value 3;
+      }
+    }
+  }
+
+  typedef pm-data-type {
+    type union {
+      type uint64;
+      type decimal64 {
+        fraction-digits 2;
+      }
+      type decimal64 {
+        fraction-digits 17;
+      }
+    }
+  }
+
+  grouping pm-measurement {
+    description
+      "Set of parameters related to a PM Measurement";
+    container pmParameterName {
+      uses pm-names;
+    }
+    leaf pmParameterValue {
+      type pm-data-type;
+      mandatory true;
+      config false;
+    }
+    leaf pmParameterUnit {
+      description
+        "Unit PM parameter has been measured - frames, packets, u, etc";
+      type string;
+      mandatory false;
+    }
+    leaf location {
+      description
+        "Location PM parameter measurement";
+      type enumeration {
+        enum "notApplicable" {
+          value 1;
+        }
+        enum "nearEnd" {
+          value 2;
+        }
+        enum "farEnd" {
+          value 3;
+        }
+      }
+      mandatory false;
+    }
+    leaf direction {
+      description
+        "Direction PM parameter measurement";
+      type org-openroadm-common-types:pm-direction;
+      mandatory false;
+    }
+    leaf validity {
+      description
+        "Validity of data";
+      type enumeration {
+        enum "complete" {
+          value 1;
+        }
+        enum "partial" {
+          value 2;
+        }
+        enum "suspect" {
+          value 3;
+        }
+      }
+      mandatory false;
+      config false;
+    }
+  }
+
+  grouping pm-names {
+    description
+      "Name of PM parameter. Consisists of a set list of parameters,
+       plus an extension field to support addition parameters.";
+    leaf type {
+      type pm-names-enum;
+      mandatory true;
+    }
+    leaf extension {
+      description
+        "name of parameter, when enum value set to vendorExtension because
+         name not found in pm-names-enum";
+      type string;
+      mandatory false;
+    }
+  }
+
+  typedef pm-names-enum {
+    type enumeration {
+      enum "vendorExtension" {
+        value 1;
+        description
+          "vendor extension";
+      }
+      enum "bitErrorRate" {
+        value 2;
+        description
+          "Bit error rate (BER)";
+      }
+      enum "opticalPowerOutput" {
+        value 3;
+        description
+          "Optical Power Output (OPOUT-OTS). Total optical power includes Variable Optical Attenuator (VOA) attenuation";
+      }
+      enum "opticalReturnLoss" {
+        value 4;
+        description
+          "Optical Return Loss (ORL-OTS) - at MW port(s) B";
+      }
+      enum "opticalPowerInput" {
+        value 5;
+        description
+          "Optical Power Input (OPIN-OTS). Total optical power";
+      }
+      enum "opticalPower" {
+        value 6;
+        description
+          "Optical Power Receive (OPR-OTS); Optical Power Transmit (OPT-OSC)";
+      }
+      enum "opticalChannelPowerTransmit" {
+        value 7;
+        description
+          "Optical Channel Power Transmit (OPT-OCH). Individual channel power includes Variable Optical Attenuator (VOA) attenuation";
+      }
+      enum "codeViolations" {
+        value 8;
+        description
+          "Code Violations (CV-PCS). 8B/10B errors";
+        reference "IEEE 802.3ah, Section 45.2.1.44";
+      }
+      enum "erroredSecondsSection" {
+        value 9;
+        description
+          "Errored Seconds Section (ES-PCS)";
+        reference "IEEE 802.3ah, Section 45.2.1.46";
+      }
+      enum "severlyErrorSeconds" {
+        value 10;
+        description
+          "Severely Errored Seconds (SES-PCS)";
+        reference "IEEE 802.3ah, Section 45.2.1.48";
+      }
+      enum "unavailableSecondsPCS" {
+        value 11;
+        description
+          "Unavailable Seconds PCS (UAS-PCS)";
+        reference "IEEE 802.3ah, Section 45.2.1.52";
+      }
+      enum "inFrames" {
+        value 12;
+        description
+          "In frames (INFRAMES-E)";
+      }
+      enum "inFramesErrored" {
+        value 13;
+        description
+          "In frames errored (INFRAMESERR-E)";
+      }
+      enum "outFrames" {
+        value 14;
+        description
+          "Out frames (OUTFRAMES-E)";
+      }
+      enum "erroredSecondsEthernet" {
+        value 15;
+        description
+          "Errored Seconds Ethernet (ES-E)";
+        reference "IEEE 802.3ah, Section 45.2.1.46";
+      }
+      enum "severelyErroredSecondsEthernet" {
+        value 16;
+        description
+          "Severly Errored Seconds, Ethernet (SES-E)";
+        reference "IEEE 802.3ah, Section 45.2.1.48";
+      }
+      enum "unavailableSecondsEthernet" {
+        value 17;
+        description
+          "Unavailable Seconds, Ethernet (UAS-E)";
+        reference "IEEE 802.3ah, Section 45.2.1.52";
+      }
+      enum "erroredBlockCount" {
+        value 18;
+        description
+          "Errored block count";
+        reference "G.798 : 6.5.1.1";
+      }
+      enum "delay" {
+        value 19;
+        description
+          "Number of frames between a DMValue toggle event and the received DMp signal value toggle event";
+        reference "G.798";
+      }
+      enum "defectSeconds" {
+        value 20;
+        description
+          "Defect Seconds (DS)";
+        reference "";
+      }
+      enum "backwardIncomingAlignmentError" {
+        value 21;
+        description
+          "Backward Incoming Alignment Error (BIAE)";
+        reference "Ref: G.798: 14.5.1.1.2";
+      }
+      enum "incomingAlignmentError" {
+        value 22;
+        description
+          "Incoming Alignment Error (IAE)";
+        reference "Ref: G.798: 14.5.1.1.2";
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-pm.yang b/tests/ordmodels_1.2.1/org-openroadm-pm.yang
new file mode 100644 (file)
index 0000000..8a75c58
--- /dev/null
@@ -0,0 +1,189 @@
+module org-openroadm-pm {
+  namespace "http://org/openroadm/pm";
+  prefix org-openroadm-pm;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import org-openroadm-resource {
+    prefix org-openroadm-resource;
+  }
+  import org-openroadm-layerRate {
+    prefix org-openroadm-layerRate;
+  }
+  import org-openroadm-pm-types {
+    prefix org-openroadm-pm-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of performance management.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping current-pm {
+    description
+      "PM Data with current values - both realtime (granularity=notApplicable) and binned (granularity=15 minute, 24h))";
+    leaf id {
+      type string;
+      mandatory true;
+      config false;
+    }
+    container resource {
+      uses org-openroadm-resource:resource;
+    }
+    container layerRate {
+      uses org-openroadm-layerRate:layer-rate;
+    }
+    list measurements {
+      container measurement {
+        uses org-openroadm-pm-types:pm-measurement;
+      }
+    }
+    leaf retrievalTime {
+      type yang:date-and-time;
+      mandatory true;
+      config false;
+    }
+    leaf granularity {
+      type org-openroadm-pm-types:pm-granularity;
+    }
+  }
+
+  container currentPmlist {
+    description
+      "List of current PMs.";
+    list currentPm {
+      key "id";
+      uses current-pm;
+    }
+    config false;
+  }
+
+  grouping historical-pm {
+    description
+      "PM Data with historical values - binned (granularity=15 minute, 24h))";
+    leaf id {
+      type string;
+      mandatory true;
+      config false;
+    }
+    container resource {
+      uses org-openroadm-resource:resource;
+    }
+    container layerRate {
+      uses org-openroadm-layerRate:layer-rate;
+    }
+    list binned-pm {
+      key "bin-number";
+      uses bin-pm;
+    }
+    leaf granularity {
+      type org-openroadm-pm-types:pm-granularity;
+    }
+  }
+
+  grouping bin-pm {
+    description
+      "PM Data with historical values";
+    leaf bin-number {
+      type uint16 {
+        range "1..max";
+      }
+      mandatory true;
+      config false;
+    }
+    list measurements {
+      container measurement {
+        uses org-openroadm-pm-types:pm-measurement;
+      }
+    }
+    leaf completionTime {
+      type yang:date-and-time;
+      mandatory true;
+      config false;
+    }
+  }
+
+  container historicalPmlist {
+    description
+      "List of historical PM";
+    list historicalPm {
+      key "id";
+      uses historical-pm;
+    }
+    config false;
+  }
+  rpc clear-pm {
+    description "Command to initialize PM data";
+    input {
+      uses org-openroadm-resource:resource;
+      leaf pm-type {
+        default "current";
+        type enumeration {
+          enum "current" {
+            value 1;
+          }
+          enum "all" {
+            value 2;
+          }
+        }
+      }
+      leaf granularity {
+        default "15min";
+        type org-openroadm-pm-types:pm-granularity;
+      }
+    }
+    output {
+      leaf status {
+        type enumeration {
+          enum "Successful" {
+            value 1;
+          }
+          enum "Failed" {
+            value 2;
+          }
+        }
+        mandatory true;
+        description
+          "Successful or Failed";
+      }
+      leaf status-message {
+        type string;
+        description
+          "Gives a more detailed reason for success / failure";
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-port-types.yang b/tests/ordmodels_1.2.1/org-openroadm-port-types.yang
new file mode 100644 (file)
index 0000000..e4c6478
--- /dev/null
@@ -0,0 +1,150 @@
+module org-openroadm-port-types {
+  namespace "http://org/openroadm/port/types";
+  prefix org-openroadm-port-types;
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for port types.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  identity supported-if-capability {
+    description
+      "Base identity from which specific supported interfaces are derived";
+  }
+
+  identity if-100GE {
+    base supported-if-capability;
+  }
+
+  identity if-OMS {
+    base supported-if-capability;
+  }
+
+  identity if-OTS {
+    base supported-if-capability;
+  }
+
+  identity if-OCH {
+    base supported-if-capability;
+  }
+
+  identity supported-xpdr-capability {
+    description
+      "Base identity from which specific supported xponder are derived";
+  }
+
+  identity Transponder {
+    base supported-xpdr-capability;
+  }
+
+  identity Regen {
+    base supported-xpdr-capability;
+  }
+
+  typedef port-wavelength-types {
+    type enumeration {
+      enum "wavelength" {
+        value 1;
+        description
+          "Port on a transponder.";
+      }
+      enum "multi-wavelegnth" {
+        value 2;
+        description
+          "Port on a ROADM.";
+      }
+    }
+    description
+      "Port types.";
+  }
+
+  grouping common-port {
+    leaf port-power-capability-min-rx {
+      type org-openroadm-common-types:power-dBm;
+      config false;
+      description
+        "Based on port capabilities, the minimum power in the system spec for this port to
+         provide optimum function in rx direction";
+    }
+    leaf port-power-capability-min-tx {
+      type org-openroadm-common-types:power-dBm;
+      config false;
+      description
+        "Based on port capabilities, the minimum power in the system spec for this port to
+         provide optimum function in tx direction.";
+    }
+    leaf port-power-capability-max-rx {
+      type org-openroadm-common-types:power-dBm;
+      config false;
+      description
+        "Based on port capabilities, the maximum power in the system spec for this port to
+         provide optimum function in rx direction.";
+    }
+    leaf port-power-capability-max-tx {
+      type org-openroadm-common-types:power-dBm;
+      config false;
+      description
+        "Based on port capabilities, the maximum power in the system spec for this port to
+         provide optimum function in tx direction.";
+    }
+    leaf-list capable-wavelengths {
+      type uint32;
+      config false;
+      description
+        "List of wavelengths this port is capable of supporting.
+         can be used to access wavelength-map to get the wavelength value in nm";
+    }
+  }
+  grouping roadm-port {
+    uses common-port;
+    leaf-list available-wavelengths {
+      type uint32;
+      config false;
+      description
+        "List of available (capable and unused) wavelengths on this port.
+         can be used to access wavelength-map to get the wavelength value in nm";
+    }
+    leaf-list used-wavelengths {
+      type uint32;
+      config false;
+      description
+        "List of used available wavelength-numbers on this port.";
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-probable-cause.yang b/tests/ordmodels_1.2.1/org-openroadm-probable-cause.yang
new file mode 100644 (file)
index 0000000..eaa0d2a
--- /dev/null
@@ -0,0 +1,522 @@
+module org-openroadm-probable-cause {
+  namespace "http://org/openroadm/probableCause";
+  prefix org-openroadm-probable-cause;
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of Probable Causes.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping probable-cause {
+    leaf cause {
+      type probable-cause-enum;
+      mandatory true;
+    }
+    leaf extension {
+      type string;
+      mandatory false;
+    }
+    leaf direction {
+      description
+        "Direction indication of the alarm.";
+      type org-openroadm-common-types:direction;
+    }
+    leaf location {
+      description
+        "location indication of the alarm.";
+      type enumeration {
+        enum "NEND" {
+          value 1;
+          description
+            "Near End location";
+        }
+        enum "FEND" {
+          value 2;
+          description
+            "Far End location";
+        }
+      }
+    }
+  }
+
+  typedef probable-cause-enum {
+    type enumeration {
+      enum "vendorExtension" {
+        value 1;
+        description
+          "vendorExtension";
+      }
+      enum "openConnectionIndication" {
+        value 2;
+        description
+          "Open connection indication (OCI)";
+        reference "G.798";
+      }
+      enum "alarmIndicationSignal" {
+        value 3;
+        description
+          "Alarm indication signal";
+        reference "G.798";
+      }
+      enum "lossOfSignal" {
+        value 4;
+        description
+          "Loss of Signal";
+      }
+      enum "opticalLineFail" {
+        value 5;
+        description
+          "Optical Line Fail";
+      }
+      enum "opticalPowerDegraded" {
+        value 6;
+        description
+          "Optical Line Fail";
+      }
+      enum "automaticLaserShutdown" {
+        value 7;
+        description
+          "Optical Line Fail";
+      }
+      enum "serverSignalFail" {
+        value 8;
+        description
+          "Server Signal Fail (SSF)";
+        reference "G.798";
+      }
+      enum "lossofTandemConnection" {
+        value 9;
+        description
+          "Loss of Tandem Connection (LTC)";
+        reference "G.798";
+      }
+      enum "lockedDefect" {
+        value 10;
+        description
+          "Locked defect (LCK)";
+        reference "G.798";
+      }
+      enum "trailTraceIdentifierMismatch" {
+        value 11;
+        description
+          "Trail trace Identifier Mismatch (TIM)";
+        reference "G.798";
+      }
+      enum "degradedEffect" {
+        value 12;
+        description
+          "Degraded defect (DEG)";
+        reference "G.798";
+      }
+      enum "backwardsDefectIndication" {
+        value 13;
+        description
+          "Backward Defect Indication (BDI)";
+        reference "G.798";
+      }
+      enum "otsSpanlossPowerOutOfSpecificationHigh" {
+        value 14;
+      }
+      enum "automaticShutoffDisabled" {
+        value 15;
+      }
+      enum "postBlockManualLaserShutdown" {
+        value 16;
+      }
+      enum "portLossOfLight" {
+        value 17;
+      }
+      enum "reflectionTooHigh" {
+        value 18;
+      }
+      enum "shutoffThresholdCrossed" {
+        value 19;
+      }
+      enum "preBlockSpanAdjustmentInProgress" {
+        value 20;
+      }
+      enum "postBlockSpanAdjustmentInProgress" {
+        value 21;
+      }
+      enum "payloadMissingIndication" {
+        value 22;
+        description
+          "Will be applicable to ROADM when OSC signaling supported in future (G.709 2016-06 Figure 15-1A, 1B)";
+      }
+      enum "forwardDefectIndication" {
+        value 23;
+        description
+          "Will be applicable to ROADM when OSC signaling supported in future (G.709 2016-06 Figure 15-1A, 1B)";
+      }
+      enum "oscPowerOutOfSpecificationHigh" {
+        value 24;
+      }
+      enum "oscPowerOutOfSpecificationLow" {
+        value 25;
+      }
+      enum "powerOutOfSpecificationHigh" {
+        value 26;
+      }
+      enum "lossOfSynchronization" {
+        value 27;
+      }
+      enum "linkDown" {
+        value 28;
+      }
+      enum "equipmentFault" {
+        value 29;
+      }
+      enum "equipmentRemoved" {
+        value 30;
+      }
+      enum "equipmentMismatch" {
+        value 31;
+      }
+      enum "equipmentWarmup" {
+        value 32;
+      }
+      enum "equipmentLedOn" {
+        value 33;
+      }
+      enum "equipmentInterConnectFailure" {
+        value 34;
+      }
+      enum "equipmentMiscabledConnection" {
+        value 35;
+      }
+      enum "softwareVersionMismatch" {
+        value 36;
+      }
+      enum "softwareStageInProgress" {
+        value 37;
+      }
+      enum "databaseCorruption" {
+        value 38;
+      }
+      enum "databaseLockedSoftwareUpgradeInProgress" {
+        value 39;
+      }
+      enum "databaseLockedDbRestoreInProgress" {
+        value 40;
+      }
+      enum "databaseLockedSysInitInProgress" {
+        value 41;
+      }
+      enum "databaseLockedDbAlarmPresent" {
+        value 42;
+      }
+      enum "databaseLockedIlfViolation" {
+        value 43;
+      }
+      enum "databaseVersionMismatch" {
+        value 44;
+      }
+      enum "databaseLockedShelfProvModePresent" {
+        value 45;
+      }
+      enum "firmwareVersionMismatch" {
+        value 46;
+      }
+      enum "firmwareBackwardCompatibleLimited" {
+        value 47;
+      }
+      enum "firmwareBackwardCompatibleAll" {
+        value 48;
+      }
+      enum "incompatibleFirmware" {
+        value 49;
+      }
+      enum "firmwareDownloadOrActivationFailure" {
+        value 50;
+      }
+      enum "firmwareInitInProgress" {
+        value 51;
+      }
+      enum "softwareReset" {
+        value 52;
+      }
+      enum "fanCoolingFail" {
+        value 53;
+      }
+      enum "administrativeDown" {
+        value 54;
+      }
+      enum "lampTest" {
+        value 55;
+      }
+      enum "powerProblemA" {
+        value 56;
+      }
+      enum "powerProblemB" {
+        value 57;
+      }
+      enum "shelfProvisioningMode" {
+        value 58;
+      }
+      enum "sysNameChanged" {
+        value 59;
+      }
+      enum "sysNtpNotSynchronized" {
+        value 60;
+      }
+      enum "ilfViolationMajor" {
+        value 61;
+      }
+      enum "ilfViolationCritical" {
+        value 62;
+      }
+      enum "lossOfFrame" {
+        value 63;
+      }
+      enum "lossOfMultiframe" {
+        value 64;
+      }
+      enum "backwardIncomingAlignmentError" {
+        value 65;
+      }
+      enum "incomingAlignmentError" {
+        value 66;
+      }
+      enum "payloadMismatch" {
+        value 67;
+      }
+      enum "clientSignalFailDefect" {
+        value 68;
+      }
+      enum "backwardIncomingAlignmentErrorTCM1" {
+        value 69;
+      }
+      enum "backwardIncomingAlignmentErrorTCM2" {
+        value 70;
+      }
+      enum "backwardIncomingAlignmentErrorTCM3" {
+        value 71;
+      }
+      enum "backwardIncomingAlignmentErrorTCM4" {
+        value 72;
+      }
+      enum "backwardIncomingAlignmentErrorTCM5" {
+        value 73;
+      }
+      enum "backwardIncomingAlignmentErrorTCM6" {
+        value 74;
+      }
+      enum "incomingAlignmentErrorTCM1" {
+        value 75;
+      }
+      enum "incomingAlignmentErrorTCM2" {
+        value 76;
+      }
+      enum "incomingAlignmentErrorTCM3" {
+        value 77;
+      }
+      enum "incomingAlignmentErrorTCM4" {
+        value 78;
+      }
+      enum "incomingAlignmentErrorTCM5" {
+        value 79;
+      }
+      enum "incomingAlignmentErrorTCM6" {
+        value 80;
+      }
+      enum "backwardsDefectIndicationTCM1" {
+        value 81;
+      }
+      enum "backwardsDefectIndicationTCM2" {
+        value 82;
+      }
+      enum "backwardsDefectIndicationTCM3" {
+        value 83;
+      }
+      enum "backwardsDefectIndicationTCM4" {
+        value 84;
+      }
+      enum "backwardsDefectIndicationTCM5" {
+        value 85;
+      }
+      enum "backwardsDefectIndicationTCM6" {
+        value 86;
+      }
+      enum "degradedDefectTCM1" {
+        value 87;
+      }
+      enum "degradedDefectTCM2" {
+        value 88;
+      }
+      enum "degradedDefectTCM3" {
+        value 89;
+      }
+      enum "degradedDefectTCM4" {
+        value 90;
+      }
+      enum "degradedDefectTCM5" {
+        value 91;
+      }
+      enum "degradedDefectTCM6" {
+        value 92;
+      }
+      enum "trailTraceIdentifierMisMatchTCM1" {
+        value 93;
+      }
+      enum "trailTraceIdentifierMisMatchTCM2" {
+        value 94;
+      }
+      enum "trailTraceIdentifierMisMatchTCM3" {
+        value 95;
+      }
+      enum "trailTraceIdentifierMisMatchTCM4" {
+        value 96;
+      }
+      enum "trailTraceIdentifierMisMatchTCM5" {
+        value 97;
+      }
+      enum "trailTraceIdentifierMisMatchTCM6" {
+        value 98;
+      }
+      enum "alarmIndicationSignalTCM1" {
+        value 99;
+      }
+      enum "alarmIndicationSignalTCM2" {
+        value 100;
+      }
+      enum "alarmIndicationSignalTCM3" {
+        value 101;
+      }
+      enum "alarmIndicationSignalTCM4" {
+        value 102;
+      }
+      enum "alarmIndicationSignalTCM5" {
+        value 103;
+      }
+      enum "alarmIndicationSignalTCM6" {
+        value 104;
+      }
+      enum "openConnectionIndicationTCM1" {
+        value 105;
+      }
+      enum "openConnectionIndicationTCM2" {
+        value 106;
+      }
+      enum "openConnectionIndicationTCM3" {
+        value 107;
+      }
+      enum "openConnectionIndicationTCM4" {
+        value 108;
+      }
+      enum "openConnectionIndicationTCM5" {
+        value 109;
+      }
+      enum "openConnectionIndicationTCM6" {
+        value 110;
+      }
+      enum "lockedDefectTCM1" {
+        value 111;
+      }
+      enum "lockedDefectTCM2" {
+        value 112;
+      }
+      enum "lockedDefectTCM3" {
+        value 113;
+      }
+      enum "lockedDefectTCM4" {
+        value 114;
+      }
+      enum "lockedDefectTCM5" {
+        value 115;
+      }
+      enum "lockedDefectTCM6" {
+        value 116;
+      }
+      enum "lossofTandemConnectionTCM1" {
+        value 117;
+      }
+      enum "lossofTandemConnectionTCM2" {
+        value 118;
+      }
+      enum "lossofTandemConnectionTCM3" {
+        value 119;
+      }
+      enum "lossofTandemConnectionTCM4" {
+        value 120;
+      }
+      enum "lossofTandemConnectionTCM5" {
+        value 121;
+      }
+      enum "lossofTandemConnectionTCM6" {
+        value 122;
+      }
+      enum "highBER" {
+        value 123;
+      }
+      enum "localFault" {
+        value 124;
+      }
+      enum "remoteFault" {
+        value 125;
+      }
+      enum "lossOfAlignment" {
+        value 126;
+      }
+      enum "lossOfFECAlignment" {
+        value 127;
+      }
+      enum "facilityLoopbackActive" {
+        value 128;
+      }
+      enum "facilityLoopback2Active" {
+        value 129;
+      }
+      enum "terminalLoopbackActive" {
+        value 130;
+      }
+      enum "facilityTestsignalActive" {
+        value 131;
+      }
+      enum "terminalTestsignalActive" {
+        value 132;
+      }
+      enum "automaticLaserShutdownDisabled" {
+        value 133;
+      }
+      enum "certificateNotInstalled" {
+        value 134;
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-resource-types.yang b/tests/ordmodels_1.2.1/org-openroadm-resource-types.yang
new file mode 100644 (file)
index 0000000..bb6a80a
--- /dev/null
@@ -0,0 +1,252 @@
+module org-openroadm-resource-types {
+  namespace "http://org/openroadm/resource/types";
+  prefix org-openroadm-resource-types;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of common resource types.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping resource-type {
+    leaf type {
+      type resource-type-enum;
+      mandatory true;
+    }
+    leaf extension {
+      type string;
+      mandatory false;
+    }
+  }
+
+  typedef resource-type-enum {
+    type enumeration {
+      enum "other" {
+        value 1;
+        description
+          "Resource of type not found in list.";
+      }
+      enum "device" {
+        value 2;
+        description
+          "device - ROAMD, Xponder, etc";
+      }
+      enum "degree" {
+        value 3;
+        description
+          "degree";
+      }
+      enum "shared-risk-group" {
+        value 4;
+        description
+          "shared-risk-group";
+      }
+      enum "connection" {
+        value 5;
+        description
+          "connection";
+      }
+      enum "connection-map" {
+        value 6;
+        description
+          "connection-map";
+      }
+      enum "port" {
+        value 7;
+        description
+          "port";
+      }
+      enum "circuit-pack" {
+        value 8;
+        description
+          "circuit pack";
+      }
+      enum "internal-link" {
+        value 9;
+        description
+          "internal-link";
+      }
+      enum "physical-link" {
+        value 10;
+        description
+          "physical-link";
+      }
+      enum "interface" {
+        value 11;
+        description
+          "interface";
+      }
+      enum "shelf" {
+        value 12;
+        description
+          "shelf";
+      }
+      enum "service" {
+        value 13;
+        description
+          "service";
+      }
+    }
+  }
+
+  grouping device-id {
+    description
+      "Device identifier. Unique within the Controller.";
+    leaf node-id {
+      description
+        "Node Id is a globally unique identifier for a device.
+         Same as leafref value in model, if applicable.";
+      type string;
+    }
+  }
+
+  grouping circuit-pack-name {
+    leaf circuit-pack-name {
+      description
+        "Circuit-Pack identifier. Unique within the context of a device.
+         Same as leafref value in model, if applicable.";
+      type string;
+      mandatory true;
+    }
+  }
+
+  grouping port-name {
+    uses circuit-pack-name;
+    leaf port-name {
+      description
+        "Port identifier. Unique within the context of a circuit-pack.
+         Same as leafref value in model, if applicable.";
+      type string;
+    }
+  }
+
+  grouping physical-link-name {
+    leaf physical-link-name {
+      description
+        "Physical Link identifier. Unique within the context of a device.
+         Same as leafref value in model, if applicable.";
+      type string;
+      mandatory true;
+    }
+  }
+
+  grouping internal-link-name {
+    leaf internal-link-name {
+      description
+        "Internal Link identifier. Unique within the context of a device.
+         Same as leafref value in model, if applicable.";
+      type string;
+      mandatory true;
+    }
+  }
+
+  grouping connection-number {
+    leaf connection-number {
+      description
+        "Connection identifier. Unique within the context of a device.
+         Same as leafref value in model, if applicable.";
+      type string;
+    }
+  }
+
+  grouping degree-number {
+    leaf degree-number {
+      description
+        "Degree identifier. Unique within the context of a device.
+         Same as leafref value in model, if applicable.";
+      type uint16;
+    }
+  }
+
+  grouping srg-number {
+    leaf srg-number {
+      description
+        "Shared Risk Group identifier. Unique within the context of a device.
+         Same as leafref value in model, if applicable.";
+      type uint16;
+    }
+  }
+
+  grouping shelf-name {
+    leaf shelf-name {
+      description
+        "Shelf-id identifier. Unique within the context of a device.
+         Same as leafref value in model, if applicable.";
+      type string;
+      mandatory true;
+    }
+  }
+
+  grouping service-name {
+    leaf service-name {
+      description
+        "Service identifier. Unique within the context of a network.
+         Same as leafref value in model, if applicable.";
+      type string;
+      mandatory true;
+    }
+  }
+
+  grouping interface-name {
+    leaf interface-name {
+      description
+        "Interface identifier.";
+      type string;
+      mandatory true;
+    }
+  }
+
+  typedef resource-notification-type {
+    description
+      "Type of notification about a resource";
+    type enumeration {
+      enum "resourceCreation" {
+        value 1;
+        description
+          "A new instance of a resource has been created.";
+      }
+      enum "resourceModification" {
+        value 2;
+        description
+          "An exhisting instance of a resource has been modified. This shall be triggered by changes in configuration, state, status etc.
+           It shall not be triggered by changes in performance measurements, power and temperature readings or any other data that is highlyvolatile. ";
+      }
+      enum "resourceDeletion" {
+        value 3;
+        description
+          "An exhisting instance of a resource has been removed.";
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-resource.yang b/tests/ordmodels_1.2.1/org-openroadm-resource.yang
new file mode 100644 (file)
index 0000000..25cb9f1
--- /dev/null
@@ -0,0 +1,109 @@
+module org-openroadm-resource {
+  namespace "http://org/openroadm/resource";
+  prefix org-openroadm-resource;
+
+  import org-openroadm-resource-types {
+    prefix org-openroadm-resource-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of resources.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping resource {
+    description
+      "This resource identifier is intended to provide a generic identifer
+       for any resource that can be used without specific knowledge of
+       the resource.";
+    container device {
+      description
+        "Device of the resource, used only when the system using this
+         model report on more than one device. ";
+      uses org-openroadm-resource-types:device-id;
+    }
+    container resource {
+      choice resource {
+        case circuit-pack {
+          uses org-openroadm-resource-types:circuit-pack-name;
+        }
+        case port {
+          container port {
+            uses org-openroadm-resource-types:port-name;
+          }
+        }
+        case connection {
+          uses org-openroadm-resource-types:connection-number {
+            refine connection-number {
+              mandatory true;
+            }
+          }
+        }
+        case physical-link {
+          uses org-openroadm-resource-types:physical-link-name;
+        }
+        case internal-link {
+          uses org-openroadm-resource-types:internal-link-name;
+        }
+        case shelf {
+          uses org-openroadm-resource-types:shelf-name;
+        }
+        case srg {
+          uses org-openroadm-resource-types:srg-number {
+            refine srg-number {
+              mandatory true;
+            }
+          }
+        }
+        case degree {
+          uses org-openroadm-resource-types:degree-number {
+            refine degree-number {
+              mandatory true;
+            }
+          }
+        }
+        case service {
+          uses org-openroadm-resource-types:service-name;
+        }
+        case interface {
+          uses org-openroadm-resource-types:interface-name;
+        }
+      }
+    }
+    container resourceType {
+      uses org-openroadm-resource-types:resource-type;
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-routing-constraints.yang b/tests/ordmodels_1.2.1/org-openroadm-routing-constraints.yang
new file mode 100644 (file)
index 0000000..e8f5a1e
--- /dev/null
@@ -0,0 +1,128 @@
+module org-openroadm-routing-constraints {
+  namespace "http://org/openroadm/routing/constrains";
+  prefix org-openroadm-routing-constraints;
+
+  organization
+    "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of routing constraints.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping routing-constraints {
+    container hard-constraints {
+      uses constraints;
+    }
+    container soft-constraints {
+      uses constraints;
+    }
+  }
+
+  grouping constraints {
+    leaf-list customer-code {
+      type string;
+    }
+    choice co-routing-or-general {
+      case general {
+        container diversity {
+          uses diversity-existing-service-contraints;
+        }
+        container exclude {
+          uses common-constraints;
+          leaf-list supporting-service-name {
+            description
+              "Supporting service(s) to exclude from this route.";
+            type string;
+          }
+        }
+        container include {
+          uses common-constraints;
+          leaf-list supporting-service-name {
+            description
+              "Supporting service(s) to include in this route.";
+            type string;
+          }
+        }
+        container latency {
+          description
+            "Maximum latency allowed";
+          leaf max-latency {
+            type uint32;
+            units "ms";
+          }
+        }
+      }
+      case co-routing {
+        container co-routing {
+          leaf-list existing-service {
+            type string;
+            description
+              "Diverse from existing services identified by facility CLFI";
+          }
+        }
+      }
+    }
+  }
+
+  grouping common-constraints {
+    leaf-list fiber-bundle {
+      type string;
+    }
+    leaf-list site {
+      type string;
+    }
+    leaf-list node-id {
+      type string;
+    }
+  }
+
+  grouping diversity-existing-service-contraints {
+    leaf-list existing-service {
+      type string;
+      description
+        "Diverse from existing services identified by facility CLFI";
+    }
+    container existing-service-applicability {
+      leaf site {
+        type boolean;
+      }
+      leaf node {
+        type boolean;
+      }
+      leaf srlg {
+        type boolean;
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-rstp.yang b/tests/ordmodels_1.2.1/org-openroadm-rstp.yang
new file mode 100644 (file)
index 0000000..0bec3d9
--- /dev/null
@@ -0,0 +1,310 @@
+module org-openroadm-rstp {
+  namespace "http://org/openroadm/rstp";
+  prefix org-openroadm-rstp;
+
+  import org-openroadm-device {
+    prefix org-openroadm-device;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for rstp protocol.
+
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  typedef bridge-id-type {
+    type string;
+    description
+      "Unique Bridge Identifier";
+  }
+
+  grouping rstp-common-bridge-config {
+    leaf bridge-priority {
+      description
+        "Bridge Priority Value";
+      type uint32 {
+        range "0..61440";
+      }
+      default "32768";
+    }
+    leaf shutdown {
+      description
+        "Bridge admin state";
+      type empty;
+    }
+    leaf hold-time {
+      description
+        "The time interval during which no more than two
+            BPDUs transmitted by this node in seconds - not used in rstp mode (in seconds)";
+      type uint32 {
+        range "1..10";
+      }
+      default "2";
+    }
+    leaf hello-time {
+      description
+        "The time between the transmission of BPDU's by this node on any
+            port, when role is rooti (in seconds)";
+      type uint32 {
+        range "1..10";
+      }
+      default "2";
+    }
+    leaf max-age {
+      description
+        "The value that all bridges use for MaxAge when this bridge
+            is acting as the root";
+      type uint32 {
+        range "6..40";
+      }
+      default "20";
+    }
+    leaf forward-delay {
+      description
+        "The port on the Switch spends this time in the listening
+            state while moving from the blocking state to the forwarding state (in seconds)";
+      type uint32 {
+        range "4..30";
+      }
+      default "15";
+    }
+    leaf transmit-hold-count {
+      description
+        "Maximum BPDU transmission rate";
+      type uint32 {
+        range "1..10";
+      }
+      default "2";
+    }
+  }
+
+  grouping rstp-root-bridge-attr {
+    leaf root-bridge-port {
+      description
+        "Port id of the root port";
+      type uint32;
+    }
+    leaf root-path-cost {
+      description
+        "The cost of the path to the root as
+               seen from this bridge";
+      type uint32;
+    }
+    leaf root-bridge-priority {
+      description
+        "Root Bridge Priority Value";
+      type uint32;
+    }
+    leaf root-bridge-id {
+      description
+        "Root Bridge identifier";
+      type bridge-id-type;
+    }
+    leaf root-hold-time {
+      description
+        "The time interval during which no more than two
+               BPDUs transmitted by this node in seconds at root node (in seconds)";
+      type uint32;
+    }
+    leaf root-hello-time {
+      description
+        "The time between the transmission of BPDU's used at root node (in seconds)";
+      type uint32;
+    }
+    leaf root-max-age {
+      description
+        "The value that all bridges use for MaxAge used at root node";
+      type uint32;
+    }
+    leaf root-forward-delay {
+      description
+        "The time in seconds spent on the listening state used at root node (in seconds)";
+      type uint32;
+    }
+  }
+
+  grouping rstp-bridge-port-state-attr {
+    list rstp-bridge-port-table {
+      max-elements "15";
+      description
+        "This table contains port-specific information for rstp state attributes";
+      key "ifname";
+      leaf ifname {
+        description
+          "Interface name of the port";
+        type string {
+          length "1..255";
+        }
+      }
+      leaf bridge-port-state {
+        description
+          "The port's current state";
+        type enumeration {
+          enum "discarding";
+          enum "blocked";
+          enum "learning";
+          enum "forwarding";
+          enum "unknown";
+        }
+      }
+      leaf bridge-port-role {
+        description
+          "The role payed by this port in the bridge";
+        type enumeration {
+          enum "designated";
+          enum "root";
+          enum "alternate";
+          enum "disabled";
+          enum "backup";
+          enum "unknown";
+        }
+      }
+      leaf bridge-port-id {
+        description
+          "Unique port id of this port";
+        type uint32;
+      }
+      leaf oper-edge-bridge-port {
+        description
+          "The operational value of the Edge Port parameter";
+        type empty;
+      }
+      leaf designated-bridge-port {
+        description
+          "Port id of the designated port";
+        type uint32;
+      }
+      leaf designated-bridgeid {
+        description
+          "The Bridge Identifier of the bridge that this port considers
+           to be the Designated Bridge for this port's segment";
+        type bridge-id-type;
+      }
+    }
+  }
+
+  grouping rstp-bridge-port-attr {
+    list rstp-bridge-port-table {
+      max-elements "15";
+      description
+        "Table contains port-specific information for rstp config";
+      key "ifname";
+      leaf ifname {
+        description
+          "Interface name of the port";
+        type leafref {
+          path "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface/org-openroadm-device:name";
+        }
+      }
+      leaf cost {
+        description
+          "The contribution of this port to the path cost of
+                 paths towards the spanning tree root which include this port also";
+        type uint32 {
+          range "2000..200000";
+        }
+        default "20000";
+      }
+      leaf priority {
+        description
+          "The value of the priority field";
+        type uint32 {
+          range "0..240";
+        }
+      }
+    }
+  }
+
+  grouping rstp-container {
+    container rstp {
+      description
+        "Open ROADM RSTP top level";
+      list rstp-bridge-instance {
+        max-elements "1";
+        description
+          "rstp bridge instance, max instance = 1";
+        key "bridge-name";
+        leaf bridge-name {
+          description
+            "unique name of the bridge";
+          type string {
+            length "1..255";
+          }
+        }
+        container rstp-config {
+          description
+            "Collection of rstp configuration attributes";
+          uses rstp-common-bridge-config;
+          uses rstp-bridge-port-attr;
+        }
+        container rstp-state {
+          description
+            "Collection of rstp operational attributes";
+          config false;
+          container rstp-bridge-attr {
+            description
+              "Collection of operational rstp bridge attributes";
+            uses rstp-root-bridge-attr;
+            leaf bridge-id {
+              description
+                "Bridge identifier of the bridge";
+              type bridge-id-type;
+            }
+            leaf topo-change-count {
+              description
+                "The total number of topology changes";
+              type uint32;
+            }
+            leaf time-since-topo-change {
+              description
+                "Time since last topology changes occured (in seconds)";
+              type uint32;
+            }
+          }
+          container rstp-bridge-port-attr {
+            description
+              "Collection of operational rstp port related attributes";
+            uses rstp-bridge-port-state-attr;
+          }
+        }
+      }
+    }
+  }
+
+  augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:protocols" {
+    when "/org-openroadm-device:org-openroadm-device/org-openroadm-device:info/org-openroadm-device:node-type='rdm'";
+    uses rstp-container;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-service.yang b/tests/ordmodels_1.2.1/org-openroadm-service.yang
new file mode 100644 (file)
index 0000000..5be86fa
--- /dev/null
@@ -0,0 +1,547 @@
+module org-openroadm-service {
+  namespace "http://org/openroadm/service";
+  prefix org-openroadm-service;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import org-openroadm-routing-constraints {
+    prefix org-openroadm-routing-constraints;
+  }
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+  import org-openroadm-resource-types {
+    prefix org-openroadm-resource-types;
+  }
+  import org-openroadm-common-service-types {
+    prefix org-openroadm-common-service-types;
+  }
+
+  organization
+    "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of services.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  rpc service-create {
+    input {
+      leaf service-name {
+        type string;
+        description
+          "Identifier for the service to be created in
+           the ROADM network, e.g., CLFI, CLCI, etc. This is reported against the service, but may not get reflected in the service in the network.";
+        mandatory true;
+      }
+      leaf common-id {
+        type string;
+        description
+          "To be used by the ROADM controller to identify the routing constraints received from planning application (PED).";
+      }
+      uses org-openroadm-common-service-types:sdnc-request-header;
+      leaf connection-type {
+        type org-openroadm-common-service-types:connection-type;
+        mandatory true;
+      }
+      container service-a-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+      }
+      container service-z-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+      }
+      uses org-openroadm-routing-constraints:routing-constraints;
+      uses org-openroadm-common-service-types:service-information;
+    }
+    output {
+      uses org-openroadm-common-service-types:configuration-response-common;
+      uses org-openroadm-common-service-types:response-parameters;
+    }
+    description
+      "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a
+       service-rpc-result Notification shall be sent.";
+  }
+  rpc service-feasibility-check {
+    input {
+      leaf common-id {
+        type string;
+        mandatory true;
+        description
+          "To be used by the ROADM controller to identify the routing
+           constraints received from planning application (PED).";
+      }
+      uses org-openroadm-common-service-types:sdnc-request-header;
+      leaf connection-type {
+        type org-openroadm-common-service-types:connection-type;
+      }
+      container service-a-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+      }
+      container service-z-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+      }
+      uses org-openroadm-routing-constraints:routing-constraints;
+      uses org-openroadm-common-service-types:service-information;
+    }
+    output {
+      uses org-openroadm-common-service-types:configuration-response-common;
+      uses org-openroadm-common-service-types:response-parameters;
+      container service-a-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+        list equipment-required {
+          description
+            "List of required equipment, including equipment type and quantity";
+          key "eqipment-identifier";
+          leaf eqipment-identifier {
+            type string;
+          }
+          leaf equipment-type {
+            type string;
+          }
+          leaf equipment-quantity {
+            type uint32;
+          }
+        }
+      }
+      container service-z-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+        list equipment-required {
+          description
+            "List of required equipment, including equipment type and quantity";
+          key "eqipment-identifier";
+          leaf eqipment-identifier {
+            type string;
+          }
+          leaf equipment-type {
+            type string;
+          }
+          leaf equipment-quantity {
+            type uint32;
+          }
+        }
+      }
+      list intermediate-sites {
+        key "clli";
+        uses org-openroadm-common-service-types:service-endpoint;
+        list equipment-required {
+          description
+            "List of required equipment, including equipment type and quantity";
+          key "eqipment-identifier";
+          leaf eqipment-identifier {
+            type string;
+          }
+          leaf equipment-type {
+            type string;
+          }
+          leaf equipment-quantity {
+            type uint32;
+          }
+        }
+      }
+    }
+    description
+      "Whether a service was possible to be created, and if so
+       the routing constraints match and the a and z end connection that have
+       to match";
+  }
+  rpc service-delete {
+    input {
+      uses org-openroadm-common-service-types:sdnc-request-header;
+      container service-delete-req-info {
+        leaf service-name {
+          type string;
+          description
+            "Identifier for the service to be deleted in
+             the ROADM network, e.g., CLFI, CLCI, etc.";
+          mandatory true;
+        }
+        leaf due-date {
+          type yang:date-and-time;
+          description
+            "date and time service to be turned down. If missing, now.";
+        }
+        leaf tail-retention {
+          type enumeration {
+            enum "yes" {
+              value 1;
+              description
+                "tails are left intact ";
+            }
+            enum "no" {
+              value 2;
+              description
+                "tails are deleted";
+            }
+          }
+          mandatory true;
+        }
+      }
+    }
+    output {
+      uses org-openroadm-common-service-types:configuration-response-common;
+    }
+    description
+      "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a
+       service-rpc-result Notification shall be sent. Once the service has been deleted, it no longer will appear in the service list";
+  }
+  rpc equipment-notification {
+    input {
+      uses org-openroadm-common-service-types:sdnc-request-header;
+      leaf equiptment-id {
+        type string;
+        mandatory true;
+      }
+      leaf equipment-name {
+        type string;
+      }
+      leaf equipemt-type {
+        type string;
+        mandatory true;
+      }
+      leaf equipment-vendor {
+        type string;
+        mandatory true;
+      }
+      leaf equipment-customer {
+        type string;
+      }
+      leaf equipment-clli {
+        type string;
+        mandatory true;
+      }
+      leaf equipment-ip {
+        type string;
+      }
+      leaf controller-id {
+        type string;
+        mandatory true;
+      }
+    }
+    output {
+      uses org-openroadm-common-service-types:configuration-response-common;
+    }
+  }
+  rpc temp-service-create {
+    input {
+      leaf common-id {
+        type string;
+        description
+          "To be used by the ROADM controller to identify the routing constraints received from planning application (PED).";
+        mandatory true;
+      }
+      uses org-openroadm-common-service-types:sdnc-request-header;
+      leaf connection-type {
+        type org-openroadm-common-service-types:connection-type;
+        mandatory true;
+      }
+      container service-a-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+      }
+      container service-z-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+      }
+      uses org-openroadm-routing-constraints:routing-constraints;
+      uses org-openroadm-common-service-types:service-information;
+    }
+    output {
+      uses org-openroadm-common-service-types:configuration-response-common;
+      uses org-openroadm-common-service-types:response-parameters;
+    }
+  }
+  rpc temp-service-delete {
+    input {
+      leaf common-id {
+        type string;
+        mandatory true;
+      }
+    }
+    output {
+      uses org-openroadm-common-service-types:configuration-response-common;
+    }
+  }
+  rpc service-roll {
+    input {
+      leaf service-name {
+        type string;
+        mandatory true;
+        description
+          "Identifier for the service to be rolled in
+           the ROADM network, e.g., CLFI, CLCI, etc.";
+      }
+      leaf due-date {
+        type yang:date-and-time;
+        description
+          "date and time service to be rolled";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc service-reconfigure {
+    input {
+      leaf service-name {
+        type string;
+        mandatory true;
+        description
+          "Existing identifier for the service to be
+           reconfigured in the ROADM network, e.g., CLFI, CLCI, etc.";
+      }
+      leaf new-service-name {
+        type string;
+        description
+          "New identifier for the service to be
+           reconfigured in the ROADM network, e.g., CLFI, CLCI, etc.";
+      }
+      leaf common-id {
+        type string;
+        description
+          "To be used by the ROADM controller to identify the routing
+           constraints received from planning application (PED).";
+      }
+      leaf connection-type {
+        type org-openroadm-common-service-types:connection-type;
+      }
+      container service-a-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+      }
+      container service-z-end {
+        uses org-openroadm-common-service-types:service-endpoint;
+      }
+      uses org-openroadm-routing-constraints:routing-constraints;
+      uses org-openroadm-common-service-types:service-information;
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+    description
+      "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a
+       service-rpc-result Notification shall be sent.";
+  }
+  rpc service-restoration {
+    input {
+      leaf service-name {
+        type string;
+        mandatory true;
+        description
+          "Identifier for the service to be restored in
+           the ROADM network, e.g., CLFI, CLCI, etc.";
+      }
+      leaf option {
+        type enumeration {
+          enum "permanent" {
+            value 1;
+            description
+              "A spare regen can be used to restore the
+               service permanently without reverting back to the
+               original regen";
+          }
+          enum "temporary" {
+            value 2;
+            description
+              "a spare regen can be used to restore the
+               service temporarily.   The service needs to be reverted
+               back to the original regen transponder";
+          }
+        }
+        mandatory true;
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+    description
+      "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a
+       service-rpc-result Notification shall be sent.";
+  }
+  rpc service-reversion {
+    input {
+      leaf service-name {
+        type string;
+        mandatory true;
+        description
+          "Identifier for the service to be reverted
+           in the ROADM network, e.g., CLFI, CLCI, etc. ";
+      }
+      leaf due-date {
+        type yang:date-and-time;
+        description
+          "date and time service to be reverted";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+    description
+      "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a
+       service-rpc-result Notification shall be sent.";
+  }
+  rpc service-reroute {
+    input {
+      leaf service-name {
+        type string;
+        mandatory true;
+        description
+          "Identifier for the service to be re-routed in
+           the ROADM network, e.g., CLFI, CLCI, etc.";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+      uses org-openroadm-routing-constraints:routing-constraints;
+    }
+    description
+      "Whether this request was validated and processed correct. If sucessful, it return the proposed new route.
+       If acceptable, this request should be followed by a service-reroute-confirm to complete the reroute operation.";
+  }
+  rpc service-reroute-confirm {
+    input {
+      leaf service-name {
+        type string;
+        mandatory true;
+        description
+          "Identifier for the service to be re-routed in
+           the ROADM network, e.g., CLFI, CLCI, etc.";
+      }
+      uses org-openroadm-routing-constraints:routing-constraints;
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+    description
+      "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a
+       service-rpc-result Notification shall be sent.";
+  }
+  rpc network-re-optimization {
+    input {
+      leaf service-name {
+        type string;
+        description
+          "Identifier for the service in the ROADM network,
+           e.g., CLFI, CLCI, etc. whose path is to be checked by the RNC
+           for re-optimization";
+      }
+      leaf a-end {
+        type string;
+        description
+          "Services whose A-ends are terminated at the
+           specified office location are to be checked by the RNC for
+           re-optimization";
+      }
+      leaf z-end {
+        type string;
+        description
+          "Services whose Z-ends are terminated at the
+           specified office location are to be checked by the RNC for
+           re-optimization ";
+      }
+      leaf pass-through {
+        type string;
+        description
+          "Services that are pass-through (either via
+           regen or express) at the specified office location are to
+           be checked by the RNC for re-optimization";
+      }
+      leaf customer-code {
+        type string;
+        description
+          "Services that belong to the specified customer
+           are to be checked by the RNC for re-optimization ";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+      leaf optimization-candidate {
+        type string;
+      }
+    }
+  }
+  container service-list {
+    description
+      "List of service. Can only be created, deleted, modified, etc. using special RPCs.";
+    list services {
+      key "service-name";
+      uses org-openroadm-common-service-types:service;
+    }
+  }
+  container temp-service-list {
+    description
+      "List of temporary services Can only be created, deleted, modified, etc. using special RPCs.";
+    list services {
+      key "common-id";
+      uses org-openroadm-common-service-types:service {
+        refine "service-name" {
+          mandatory false;
+        }
+      }
+    }
+  }
+  notification service-rpc-result {
+    description
+      "This Notification indicates result of  service RPC";
+    leaf notification-type {
+      type org-openroadm-common-service-types:service-notification-types;
+    }
+    uses org-openroadm-common-types:rpc-response-status;
+    uses org-openroadm-common-service-types:service-notification-result;
+  }
+  notification service-traffic-flow {
+    description
+      "This Notification indicates that traffic is flowing again on the service after an administrative action has completed";
+    leaf service-name {
+      type string;
+      description
+        "Identifier for the service being reported on";
+      mandatory true;
+    }
+    leaf actual-date {
+      type yang:date-and-time;
+      description
+        "Actual date and time traffic started flowing";
+    }
+  }
+  notification service-notification {
+    description
+      "This Notification that a service has been added, modified or removed.
+       A resourceCreation notification shall contain the created service in its entirety.
+       A resourceMofified notification shall contain just the modified field, plus the service identifier
+       A resourceDeleted notification shall just contain the service identifier";
+    leaf notificationType {
+      type org-openroadm-resource-types:resource-notification-type;
+      description
+        "Whether this notification indicates a service creation, service modification or service deletion.";
+    }
+    uses org-openroadm-common-service-types:service;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-swdl.yang b/tests/ordmodels_1.2.1/org-openroadm-swdl.yang
new file mode 100644 (file)
index 0000000..0fdcdb6
--- /dev/null
@@ -0,0 +1,120 @@
+module org-openroadm-swdl {
+  namespace "http://org/openroadm/de/swdl";
+  prefix org-openroadm-swdl;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "Yang definitions for System Management.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping sw-bank {
+    leaf sw-version {
+      type string;
+      description
+        "Gissue of the SW in this bank";
+    }
+    leaf sw-validation-timer {
+      type string {
+        pattern "(([0-1][0-9]|2[0-3])-([0-5][0-9])-([0-5][0-9]))";
+      }
+      description
+        "value of validation timer in hh-mm-ss";
+    }
+    leaf activation-date-time {
+      type yang:date-and-time;
+      description
+        "activation date and time: The date load was activated";
+    }
+  }
+
+  rpc sw-stage {
+    description
+      "SW stage - copies the SW from repo to staging bank";
+    input {
+      leaf filename {
+        type string {
+          length "10..255";
+        }
+        description
+          "file name which has the load";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc sw-activate {
+    description
+      "Activate new load";
+    input {
+      leaf version {
+        type string;
+        description
+          " software version of the new load which is being activated";
+      }
+      leaf validationTimer {
+        type string;
+        description
+          "validation timer hh-mm-ss";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+  rpc cancel-validation-timer {
+    description
+      "Cancel validation timer which user provisioned as part of activate command";
+    input {
+      leaf accept {
+        type boolean;
+        default "true";
+        description
+          " TRUE means  validation timer is cancelled and new load is accepted";
+      }
+    }
+    output {
+      uses org-openroadm-common-types:rpc-response-status;
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-syslog.yang b/tests/ordmodels_1.2.1/org-openroadm-syslog.yang
new file mode 100644 (file)
index 0000000..cdac3e8
--- /dev/null
@@ -0,0 +1,334 @@
+module org-openroadm-syslog {
+  namespace "http://org/openroadm/syslog";
+  prefix org-openroadm-syslog;
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "This module contains a collection of YANG definitions
+     for Syslog configuration.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Also contains code components extracted from IETF Interfaces.  These code components
+     are copyrighted and licensed as follows:
+
+     Copyright (c) 2016 IETF Trust and the persons identified as the document authors.
+     All rights reserved.
+
+     This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating
+     to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of
+     publication of this document. Please review these documents carefully, as they
+     describe your rights and restrictions with respect to this document. Code Components
+     extracted from this document must include Simplified BSD License text as described in
+     Section 4.e of the Trust Legal Provisions and are provided without warranty as
+     described in the Simplified BSD License.";
+  reference "RFC 5424: The Syslog Protocol";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  feature selector-sevop-config {
+    description
+      "This feature represents the ability to select messages
+       using the additional operators equal to, or not equal to
+       when comparing the Syslog message severity.";
+  }
+
+  feature selector-match-config {
+    description
+      "This feature represents the ability to select messages based
+       on a Posix 1003.2 regular expression pattern match.";
+  }
+
+  // copied from draft of ietf-ietf-syslog-types.yang
+  identity syslog-facility {
+    description
+      "The base identity to represent syslog facilities";
+  }
+
+  // copied from draft of ietf-ietf-syslog-types.yang;
+  // extended the enum set to include all and none
+  typedef severity {
+    type enumeration {
+      enum "emergency" {
+        value 0;
+        description
+          "Emergency Level Msg";
+      }
+      enum "alert" {
+        value 1;
+        description
+          "Alert Level Msg";
+      }
+      enum "critical" {
+        value 2;
+        description
+          "Critical Level Msg";
+      }
+      enum "error" {
+        value 3;
+        description
+          "Error Level Msg";
+      }
+      enum "warning" {
+        value 4;
+        description
+          "Warning Level Msg";
+      }
+      enum "notice" {
+        value 5;
+        description
+          "Notification Level Msg";
+      }
+      enum "info" {
+        value 6;
+        description
+          "Informational Level Msg";
+      }
+      enum "debug" {
+        value 7;
+        description
+          "Debugging Level Msg";
+      }
+      enum "all" {
+        value 8;
+        description
+          "This enum describes the case where all severities
+           are selected.";
+      }
+      enum "none" {
+        value 9;
+        description
+          "This enum describes the case where no severities
+           are selected.";
+      }
+    }
+    description
+      "The definitions for Syslog message severity as per RFC 5424.
+       Extended the RFC definition with enums for all and none";
+  }
+
+  grouping syslog-severity {
+    description
+      "This grouping defines the Syslog severity which is used to
+       select log messages.";
+    leaf severity {
+      type severity;
+      mandatory true;
+      description
+        "This leaf specifies the Syslog message severity. When
+         severity is specified, the default severity comparison
+         is all messages of the specified severity and greater are
+         selected. 'all' is a special case which means all severities
+         are selected. 'none' is a special case which means that
+         no selection should occur or disable this filter.";
+    }
+    leaf severity-operator {
+      when
+        "../severity != 'all' and
+                    ../severity != 'none'" {
+        description
+          "The severity-operator is not applicable for severity 'all' or
+           severity 'none'";
+      }
+      if-feature selector-sevop-config;
+      type enumeration {
+        enum "equals-or-higher" {
+          description
+            "This enum specifies all messages of the specified
+             severity and higher are logged according to the
+             given log-action";
+        }
+        enum "equals" {
+          description
+            "This enum specifies all messages that are for
+             the specified severity are logged according to the
+             given log-action";
+        }
+        enum "not-equals" {
+          description
+            "This enum specifies all messages that are not for
+             the specified severity are logged according to the
+             given log-action";
+        }
+      }
+      default "equals-or-higher";
+      description
+        "This leaf describes the option to specify how the
+         severity comparison is performed.";
+    }
+  }
+
+  grouping syslog-selector {
+    description
+      "This grouping defines a Syslog selector which is used to
+       select log messages for the log-action (buffer, file,
+       etc). Choose one of the following:
+         no-log-facility
+         log-facility [<facility> <severity>...]";
+    container log-selector {
+      description
+        "This container describes the log selector parameters
+         for Syslog.";
+      choice selector-facility {
+        mandatory true;
+        description
+          "This choice describes the option to specify no
+           facilities, or a specific facility which can be
+           all for all facilities.";
+        case no-log-facility {
+          description
+            "This case specifies no facilities will match when
+             comparing the Syslog message facility. This is a
+             method that can be used to effectively disable a
+             particular log-action (buffer, file, etc).";
+          leaf no-facilities {
+            type empty;
+            description
+              "This leaf specifies that no facilities are selected
+               for this log-action.";
+          }
+        }
+        case log-facility {
+          description
+            "This case specifies one or more specified facilities
+             will match when comparing the Syslog message facility.";
+          list log-facility {
+            key "facility";
+            description
+              "This list describes a collection of Syslog
+               facilities and severities.";
+            leaf facility {
+              type union {
+                type identityref {
+                  base syslog-facility;
+                }
+                type enumeration {
+                  enum "all" {
+                    description
+                      "This enum describes the case where all
+                       facilities are requested.";
+                  }
+                }
+              }
+              description
+                "The leaf uniquely identifies a Syslog facility.";
+            }
+            uses syslog-severity;
+          }
+        }
+      }
+    }
+  }
+
+  container syslog {
+    description
+      "This container describes the configuration parameters for
+       Syslog.";
+    container log-actions {
+      description
+        "This container describes the log-action parameters
+         for Syslog.";
+      container remote {
+        description
+          "This container describes the configuration parameters for
+           remote logging.";
+        list destination {
+          key "name";
+          description
+            "This list describes a collection of remote logging
+             destinations.";
+          leaf name {
+            type string;
+            description
+              "An arbitrary name for the endpoint to connect to.";
+          }
+          choice transport {
+            mandatory true;
+            description
+              "This choice describes the transport option.";
+            case tcp {
+              container tcp {
+                description
+                  "This container describes the TCP transport
+                   options.";
+                reference "RFC 6587: Transmission of Syslog Messages over TCP";
+                leaf address {
+                  type inet:host;
+                  description
+                    "The leaf uniquely specifies the address of
+                     the remote host. One of the following must
+                     be specified: an ipv4 address, an ipv6
+                     address, or a host name.";
+                }
+                leaf port {
+                  type inet:port-number;
+                  default "514";
+                  description
+                    "This leaf specifies the port number used to
+                     deliver messages to the remote server.";
+                }
+              }
+            }
+            case udp {
+              container udp {
+                description
+                  "This container describes the UDP transport
+                   options.";
+                reference "RFC 5426: Transmission of Syslog Messages over UDP";
+                leaf address {
+                  type inet:host;
+                  description
+                    "The leaf uniquely specifies the address of
+                     the remote host. One of the following must be
+                     specified: an ipv4 address, an ipv6 address,
+                     or a host name.";
+                }
+                leaf port {
+                  type inet:port-number;
+                  default "514";
+                  description
+                    "This leaf specifies the port number used to
+                     deliver messages to the remote server.";
+                }
+              }
+            }
+          }
+          uses syslog-selector;
+        }
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-tca.yang b/tests/ordmodels_1.2.1/org-openroadm-tca.yang
new file mode 100644 (file)
index 0000000..4949508
--- /dev/null
@@ -0,0 +1,122 @@
+module org-openroadm-tca {
+  namespace "http://org/openroadm/tca";
+  prefix org-openroadm-tca;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import org-openroadm-common-types {
+    prefix org-openroadm-common-types;
+  }
+  import org-openroadm-pm-types {
+    prefix org-openroadm-pm-types;
+  }
+  import org-openroadm-resource {
+    prefix org-openroadm-resource;
+  }
+  import org-openroadm-layerRate {
+    prefix org-openroadm-layerRate;
+  }
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of Threshold Crossing Alert types.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping tca {
+    leaf id {
+      type string;
+      mandatory true;
+    }
+    container resource {
+      uses org-openroadm-resource:resource;
+    }
+    leaf granularity {
+      type org-openroadm-pm-types:pm-granularity;
+    }
+    leaf raiseTime {
+      type yang:date-and-time;
+      mandatory true;
+      config false;
+    }
+    container layerRate {
+      uses org-openroadm-layerRate:layer-rate;
+    }
+    leaf severity {
+      mandatory true;
+      type org-openroadm-common-types:severity;
+      description
+        "Severity of alarm. Based on X.733 perceived severity.";
+    }
+    leaf thresholdType {
+      mandatory false;
+      type enumeration {
+        enum "high" {
+          value 1;
+        }
+        enum "low" {
+          value 2;
+        }
+      }
+      description
+        "Threshold Crossed";
+    }
+    container thresholdMeasurement {
+      uses org-openroadm-pm-types:pm-measurement;
+    }
+  }
+
+  grouping potential-tca {
+    leaf lowThresholdValue {
+      mandatory false;
+      type uint64;
+    }
+    leaf highThresholdValue {
+      mandatory false;
+      type uint64;
+    }
+    uses tca;
+  }
+
+  container potential-tca-list {
+    list tca {
+      key "id";
+      uses potential-tca;
+    }
+  }
+  notification tca-notification {
+    uses tca;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-topology.yang b/tests/ordmodels_1.2.1/org-openroadm-topology.yang
new file mode 100644 (file)
index 0000000..f616c6a
--- /dev/null
@@ -0,0 +1,91 @@
+module org-openroadm-topology {
+  namespace "http://org/openroadm/topology";
+  prefix org-openroadm-topology;
+
+  import org-openroadm-resource {
+    prefix org-openroadm-resource;
+  }
+
+  organization
+    "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of topology.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping topology {
+    description
+      "Topology reports the individual hops along the service in the A to Z direction and Z to A directions.  This includes both ports internal to a device and those
+       at its edge that are available for externally connections. It includes both physical and logical ports.
+       Physical ports are ordered with the logical ports that run over them as follows:
+       a.\tOn ingress to a node/card, physical then logical
+       b.\tOn egress to a node/card, logical then physical";
+    list aToZ {
+      key "id";
+      leaf id {
+        description
+          "Unigue identifier for this topology component within this service";
+        type string;
+      }
+      uses hop;
+    }
+    list zToA {
+      key "id";
+      leaf id {
+        description
+          "Unigue identifier for this topology component within this service";
+        type string;
+      }
+      uses hop;
+    }
+  }
+
+  grouping hop {
+    leaf hop-type {
+      type enumeration {
+        enum "node-external" {
+          description
+            "The given resource is on the edge of the node, and used in relationships to resources outside of the node.";
+          value 1;
+        }
+        enum "node-internal" {
+          description
+            "The given resource is internally to the node";
+          value 2;
+        }
+      }
+    }
+    uses org-openroadm-resource:resource;
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-user-mgmt.yang b/tests/ordmodels_1.2.1/org-openroadm-user-mgmt.yang
new file mode 100644 (file)
index 0000000..fb5fa6d
--- /dev/null
@@ -0,0 +1,109 @@
+module org-openroadm-user-mgmt {
+  namespace "http://org/openroadm/user-mgmt";
+  prefix org-openroadm-user-mgmt;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions of user managements.
+
+      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+      AT&T Intellectual Property.  All other rights reserved.
+
+      Redistribution and use in source and binary forms, with or without modification,
+      are permitted provided that the following conditions are met:
+
+      * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.
+      * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+        contributors may be used to endorse or promote products derived from this software
+        without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+      IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+      INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+      NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+      OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping user-profile {
+    list user {
+      key "name";
+      description
+        "The list of local users configured on this device.";
+      leaf name {
+        type string;
+        description
+          "The user name string identifying this entry.";
+      }
+      leaf password {
+        type string;
+        description
+          "The password for this entry. This shouldn't be in clear text";
+      }
+      leaf group {
+        type enumeration {
+          enum "sudo";
+        }
+        description
+          "The group to which the user is associated to.";
+      }
+    }
+  }
+
+  rpc chg-password {
+    input {
+      leaf currentPassword {
+        type string;
+        description
+          "provide the current password";
+        mandatory true;
+      }
+      leaf newPassword {
+        type string;
+        description
+          "provide a new password";
+        mandatory true;
+      }
+      leaf newPasswordConfirm {
+        type string;
+        description
+          "re-enter the new password ";
+        mandatory true;
+      }
+    }
+    output {
+      leaf status {
+        type enumeration {
+          enum "Successful" {
+            value 1;
+          }
+          enum "Failed" {
+            value 2;
+          }
+        }
+        mandatory true;
+        description
+          "Successful or Failed";
+      }
+      leaf status-message {
+        type string;
+        description
+          "Gives a more detailed reason for success / failure";
+      }
+    }
+  }
+}
diff --git a/tests/ordmodels_1.2.1/org-openroadm-wavelength-map.yang b/tests/ordmodels_1.2.1/org-openroadm-wavelength-map.yang
new file mode 100644 (file)
index 0000000..451cae6
--- /dev/null
@@ -0,0 +1,71 @@
+module org-openroadm-wavelength-map {
+  namespace "http://org/openroadm/wavelength-map";
+  prefix org-openroadm-wavelength-map;
+
+  organization "Open ROADM MSA";
+  contact
+    "OpenROADM.org";
+  description
+    "YANG definitions for mapping wavelength-number to center frequency and wavelength value.
+
+     Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
+     AT&T Intellectual Property.  All other rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modification,
+     are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+     * Neither the Members of the Open ROADM MSA Agreement nor the names of its
+       contributors may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT ''AS IS''
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+     IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA  AGREEMENT BE LIABLE FOR ANY DIRECT,
+     INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+     OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.";
+
+  revision 2016-10-14 {
+    description
+      "Version 1.2";
+  }
+
+  grouping wavelength-map-g {
+    list wavelengths {
+      key "wavelength-number";
+      leaf wavelength-number {
+        type uint32;
+      }
+      config false;
+      leaf center-frequency {
+        type decimal64 {
+          fraction-digits 3;
+          range "191.350..196.100";
+        }
+        units "THz";
+        description
+          "Frequency of the transmit optical channel
+           Domain range:  191.350THz .. 196.100THz ";
+      }
+      leaf wavelength {
+        type decimal64 {
+          fraction-digits 2;
+          range "1528.77..1566.72";
+        }
+        units "nm";
+        description
+          "Lambda corresponding to transmit frequency
+           Domain range:  1528.72nm .. 1566.72nm ";
+      }
+    }
+  }
+}
similarity index 69%
rename from tests/sample-config-ROADM.xml
rename to tests/sample_configs/ord_1.2.1/sample-config-ROADM.xml
index 5b6be41e271dd35bbfef33488da39e59ebbeaf95..2dd3c3f241ae1131bcb0b612d68df3a73b2bae03 100644 (file)
         <logical-connection-point>SRG1-CP-TXRX</logical-connection-point>
       </ports>
     </circuit-packs>
+    <circuit-packs>
+      <circuit-pack-name>5/0</circuit-pack-name>
+      <circuit-pack-type>ADDDROP</circuit-pack-type>
+      <administrative-state>inService</administrative-state>
+      <vendor>vendorA</vendor>
+      <model>16CX4D</model>
+      <clei>cccccccc</clei>
+      <operational-state>inService</operational-state>
+      <equipment-state>not-reserved-available</equipment-state>
+      <circuit-pack-mode>NORMAL</circuit-pack-mode>
+      <shelf>4</shelf>
+      <slot>0</slot>
+      <subSlot>0</subSlot>
+      <ports>
+        <port-name>C1</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP1</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C10</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP10</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C11</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP11</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C12</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP12</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C13</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP13</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C14</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP14</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C15</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP15</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C16</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP16</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C2</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP2</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C3</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP3</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C4</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP4</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C5</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG5-PP5</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C6</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP6</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C7</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP7</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C8</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP8</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>C9</port-name>
+        <port-type>Client</port-type>
+        <port-qual>roadm-external</port-qual>
+        <port-wavelength-type>wavelength</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-PP9</logical-connection-point>
+        <roadm-port>
+          <port-power-capability-min-rx>-15.0</port-power-capability-min-rx>
+          <port-power-capability-min-tx>-28.0</port-power-capability-min-tx>
+          <port-power-capability-max-rx>10.0</port-power-capability-max-rx>
+          <port-power-capability-max-tx>15.0</port-power-capability-max-tx>
+          <capable-wavelengths>1</capable-wavelengths>
+          <capable-wavelengths>2</capable-wavelengths>
+          <capable-wavelengths>3</capable-wavelengths>
+          <capable-wavelengths>4</capable-wavelengths>
+          <capable-wavelengths>5</capable-wavelengths>
+          <capable-wavelengths>6</capable-wavelengths>
+          <capable-wavelengths>7</capable-wavelengths>
+          <capable-wavelengths>8</capable-wavelengths>
+          <capable-wavelengths>9</capable-wavelengths>
+          <capable-wavelengths>10</capable-wavelengths>
+          <capable-wavelengths>11</capable-wavelengths>
+          <capable-wavelengths>12</capable-wavelengths>
+          <capable-wavelengths>13</capable-wavelengths>
+          <capable-wavelengths>14</capable-wavelengths>
+          <capable-wavelengths>15</capable-wavelengths>
+          <capable-wavelengths>16</capable-wavelengths>
+          <capable-wavelengths>17</capable-wavelengths>
+          <capable-wavelengths>18</capable-wavelengths>
+          <capable-wavelengths>19</capable-wavelengths>
+          <capable-wavelengths>20</capable-wavelengths>
+          <capable-wavelengths>21</capable-wavelengths>
+          <capable-wavelengths>22</capable-wavelengths>
+          <capable-wavelengths>23</capable-wavelengths>
+          <capable-wavelengths>24</capable-wavelengths>
+          <capable-wavelengths>25</capable-wavelengths>
+          <capable-wavelengths>26</capable-wavelengths>
+          <capable-wavelengths>27</capable-wavelengths>
+          <capable-wavelengths>28</capable-wavelengths>
+          <capable-wavelengths>29</capable-wavelengths>
+          <capable-wavelengths>30</capable-wavelengths>
+          <capable-wavelengths>31</capable-wavelengths>
+          <capable-wavelengths>32</capable-wavelengths>
+          <capable-wavelengths>33</capable-wavelengths>
+          <capable-wavelengths>34</capable-wavelengths>
+          <capable-wavelengths>35</capable-wavelengths>
+          <capable-wavelengths>36</capable-wavelengths>
+          <capable-wavelengths>37</capable-wavelengths>
+          <capable-wavelengths>38</capable-wavelengths>
+          <capable-wavelengths>39</capable-wavelengths>
+          <capable-wavelengths>40</capable-wavelengths>
+          <capable-wavelengths>41</capable-wavelengths>
+          <capable-wavelengths>42</capable-wavelengths>
+          <capable-wavelengths>43</capable-wavelengths>
+          <capable-wavelengths>44</capable-wavelengths>
+          <capable-wavelengths>45</capable-wavelengths>
+          <capable-wavelengths>46</capable-wavelengths>
+          <capable-wavelengths>47</capable-wavelengths>
+          <capable-wavelengths>48</capable-wavelengths>
+          <capable-wavelengths>49</capable-wavelengths>
+          <capable-wavelengths>50</capable-wavelengths>
+          <capable-wavelengths>51</capable-wavelengths>
+          <capable-wavelengths>52</capable-wavelengths>
+          <capable-wavelengths>53</capable-wavelengths>
+          <capable-wavelengths>54</capable-wavelengths>
+          <capable-wavelengths>55</capable-wavelengths>
+          <capable-wavelengths>56</capable-wavelengths>
+          <capable-wavelengths>57</capable-wavelengths>
+          <capable-wavelengths>58</capable-wavelengths>
+          <capable-wavelengths>59</capable-wavelengths>
+          <capable-wavelengths>60</capable-wavelengths>
+          <capable-wavelengths>61</capable-wavelengths>
+          <capable-wavelengths>62</capable-wavelengths>
+          <capable-wavelengths>63</capable-wavelengths>
+          <capable-wavelengths>64</capable-wavelengths>
+          <capable-wavelengths>65</capable-wavelengths>
+          <capable-wavelengths>66</capable-wavelengths>
+          <capable-wavelengths>67</capable-wavelengths>
+          <capable-wavelengths>68</capable-wavelengths>
+          <capable-wavelengths>69</capable-wavelengths>
+          <capable-wavelengths>70</capable-wavelengths>
+          <capable-wavelengths>71</capable-wavelengths>
+          <capable-wavelengths>72</capable-wavelengths>
+          <capable-wavelengths>73</capable-wavelengths>
+          <capable-wavelengths>74</capable-wavelengths>
+          <capable-wavelengths>75</capable-wavelengths>
+          <capable-wavelengths>76</capable-wavelengths>
+          <capable-wavelengths>77</capable-wavelengths>
+          <capable-wavelengths>78</capable-wavelengths>
+          <capable-wavelengths>79</capable-wavelengths>
+          <capable-wavelengths>80</capable-wavelengths>
+          <capable-wavelengths>81</capable-wavelengths>
+          <capable-wavelengths>82</capable-wavelengths>
+          <capable-wavelengths>83</capable-wavelengths>
+          <capable-wavelengths>84</capable-wavelengths>
+          <capable-wavelengths>85</capable-wavelengths>
+          <capable-wavelengths>86</capable-wavelengths>
+          <capable-wavelengths>87</capable-wavelengths>
+          <capable-wavelengths>88</capable-wavelengths>
+          <capable-wavelengths>89</capable-wavelengths>
+          <capable-wavelengths>90</capable-wavelengths>
+          <capable-wavelengths>91</capable-wavelengths>
+          <capable-wavelengths>92</capable-wavelengths>
+          <capable-wavelengths>93</capable-wavelengths>
+          <capable-wavelengths>94</capable-wavelengths>
+          <capable-wavelengths>95</capable-wavelengths>
+          <capable-wavelengths>96</capable-wavelengths>
+        </roadm-port>
+      </ports>
+      <ports>
+        <port-name>AD-DEG1</port-name>
+        <port-type>Edge</port-type>
+        <port-qual>roadm-internal</port-qual>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-CP-TXRX</logical-connection-point>
+      </ports>
+      <ports>
+        <port-name>AD-DEG2</port-name>
+        <port-type>Edge</port-type>
+        <port-qual>roadm-internal</port-qual>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-CP-TXRX</logical-connection-point>
+      </ports>
+      <ports>
+        <port-name>AD-DEG3</port-name>
+        <port-type>Edge</port-type>
+        <port-qual>roadm-internal</port-qual>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-CP-TXRX</logical-connection-point>
+      </ports>
+      <ports>
+        <port-name>AD-DEG4</port-name>
+        <port-type>Edge</port-type>
+        <port-qual>roadm-internal</port-qual>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
+        <port-direction>bidirectional</port-direction>
+        <administrative-state>inService</administrative-state>
+        <operational-state>inService</operational-state>
+        <logical-connection-point>SRG3-CP-TXRX</logical-connection-point>
+      </ports>
+    </circuit-packs>
     <interface>
       <name>oms-2/0/0/L1</name>
       <type xmlns:openROADM-if="http://org/openroadm/interfaces">openROADM-if:openROADMOpticalMultiplex</type>
         <circuit-pack-name>4/0</circuit-pack-name>
       </circuit-packs>
     </shared-risk-group>
+    <shared-risk-group>
+      <srg-number>3</srg-number>
+      <max-add-drop-ports>16</max-add-drop-ports>
+      <wavelengthDuplication>onePerSRG</wavelengthDuplication>
+      <circuit-packs>
+        <index>1</index>
+        <circuit-pack-name>5/0</circuit-pack-name>
+      </circuit-packs>
+    </shared-risk-group>
     <connection-map>
       <connection-map-number>1</connection-map-number>
       <source>
index 368ca4b90d4d06b855a838678ad449fa19d05ece..36bec9de0fc88d42f9a1885c4173a9043a5583a0 100644 (file)
@@ -3,21 +3,14 @@ envlist = py27
 
 [testenv]
 usedevelop = True
+basepython = python2.7
 deps =
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 whitelist_externals = bash
 commands =
   bash -c "(cd .. && mvn clean install -DskipTests -Dmaven.javadoc.skip=true)"
-  ./build.sh
-  nosetests --with-xunit transportpce_tests
-
-[testenv:servicehandler]
-usedevelop = True
-deps =
-  -r{toxinidir}/requirements.txt
-  -r{toxinidir}/test-requirements.txt
-whitelist_externals = bash
-commands =
-  bash -c "(cd .. && mvn clean install -DskipTests -Dmaven.javadoc.skip=true)"
-  nosetests --with-xunit transportpce_tests/test_servicehandler.py
+  {py27,portmapping}: ./build.sh
+  py27: nosetests --with-xunit transportpce_tests/
+  portmapping: nosetests --with-xunit transportpce_tests/test_portmapping.py
+  servicehandler: nosetests --with-xunit transportpce_tests/test_servicehandler.py
index 5b03a5f1b5f483371e8c9efaac43068f1232ae41..a880ea80dca42a086ee450c178d99d50179843ca 100644 (file)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##############################################################################
-#Copyright (c) 2017 Orange, Inc. and others.  All rights reserved.
+# Copyright (c) 2017 Orange, Inc. and others.  All rights reserved.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -20,9 +20,10 @@ import time
 import unittest
 
 
-class TransportPCEtesting(unittest.TestCase):
+class TransportPCEPortMappingTesting(unittest.TestCase):
 
-    testtools_process = None
+    testtools_process1 = None
+    testtools_process2 = None
     odl_process = None
     restconf_baseurl = "http://127.0.0.1:8181/restconf"
 
@@ -31,10 +32,17 @@ class TransportPCEtesting(unittest.TestCase):
         executable = ("./netconf/netconf/tools/netconf-testtool/target/"
                       "netconf-testtool-1.3.1-executable.jar")
         if os.path.isfile(executable):
-            with open('testtools.log', 'w') as outfile:
-                cls.testtools_process = subprocess.Popen(
+            with open('testtools1.log', 'w') as outfile:
+                cls.testtools_process1 = subprocess.Popen(
                     ["java", "-jar", executable, "--schemas-dir", "schemas",
-                     "--initial-config-xml", "sample-config-ROADM.xml"],
+                     "--initial-config-xml", "sample_configs/ord_1.2.1/sample-config-ROADM.xml",
+                     "--starting-port","17830"],
+                    stdout=outfile)
+            with open('testtools2.log', 'w') as outfile:
+                cls.testtools_process2 = subprocess.Popen(
+                    ["java", "-jar", executable, "--schemas-dir", "schemas",
+                     "--initial-config-xml", "sample_configs/ord_1.2.1/sample-config-XPDR.xml",
+                     "--starting-port","17831"],
                     stdout=outfile)
 
     @classmethod
@@ -53,8 +61,10 @@ class TransportPCEtesting(unittest.TestCase):
 
     @classmethod
     def tearDownClass(cls):
-        cls.testtools_process.send_signal(signal.SIGINT)
-        cls.testtools_process.wait()
+        cls.testtools_process1.send_signal(signal.SIGINT)
+        cls.testtools_process1.wait()
+        cls.testtools_process2.send_signal(signal.SIGINT)
+        cls.testtools_process2.wait()
         for child in psutil.Process(cls.odl_process.pid).children():
             child.send_signal(signal.SIGINT)
             child.wait()
@@ -62,9 +72,33 @@ class TransportPCEtesting(unittest.TestCase):
         cls.odl_process.wait()
 
     def setUp(self):
-        time.sleep(1)
+        print ("execution of {}".format(self.id().split(".")[-1]))
+        time.sleep(10)
+
+    def test_01_restconfAPI(self):
+        url = ("{}/operational/network-topology:network-topology/topology/"
+        "topology-netconf/node/controller-config".format(self.restconf_baseurl))
+        headers = {'content-type': 'application/json'}
+        response = requests.request("GET", url, headers=headers, auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(res['node'] [0] ['netconf-node-topology:connection-status'],
+                         'connected')
+
+    def test_02_restconfAPI(self):
+        url = ("{}/config/portmapping:network/nodes/controller-config"
+               .format(self.restconf_baseurl))
+        headers = {'content-type': 'application/json'}
+        response = requests.request(
+            "GET", url, headers=headers, auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.not_found)
+        res = response.json()
+        self.assertIn(
+            {"error-type":"application","error-tag":"data-missing",
+             "error-message":"Request could not be completed because the relevant data model content does not exist "},
+            res['errors']['error'])
 
-    def test_01_connect_device(self):
+    def test_03_rdm_device_connected(self):
         url = ("{}/config/network-topology:"
                "network-topology/topology/topology-netconf/node/ROADMA"
               .format(self.restconf_baseurl))
@@ -83,7 +117,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created)
         time.sleep(20)
 
-    def test_02_device_connected(self):
+    def test_04_rdm_device_connected(self):
         url = ("{}/operational/network-topology:"
                "network-topology/topology/topology-netconf/node/ROADMA"
                .format(self.restconf_baseurl))
@@ -97,35 +131,7 @@ class TransportPCEtesting(unittest.TestCase):
             'connected')
         time.sleep(10)
 
-    def test_03_portmapping_SRG1_PP3_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP3-TXRX"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C3', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP3-TXRX'},
-            res['mapping'])
-
-    def test_04_portmapping_SRG1_PP6_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP6-TXRX"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C6', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP6-TXRX'},
-            res['mapping'])
-
-    def test_05_portmapping_DEG1_TTP_TXRX(self):
+    def test_05_rdm_portmapping_DEG1_TTP_TXRX(self):
         url = ("{}/config/portmapping:network/"
                "nodes/ROADMA/mapping/DEG1-TTP-TXRX"
                .format(self.restconf_baseurl))
@@ -139,37 +145,9 @@ class TransportPCEtesting(unittest.TestCase):
              'logical-connection-point': 'DEG1-TTP-TXRX'},
             res['mapping'])
 
-    def test_06_portmapping_SRG1_PP9_TXRX(self):
+    def test_06_rdm_portmapping_SRG1_PP7_TXRX(self):
         url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP9-TXRX"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C9', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP9-TXRX'},
-            res['mapping'])
-
-    def test_07_portmapping_SRG1_PP16_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP16-TXRX"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C16', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP16-TXRX'},
-            res['mapping'])
-
-    def test_08_portmapping_SRG1_PP4_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP4-TXRX"
+               "nodes/ROADMA/mapping/SRG1-PP7-TXRX"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -177,13 +155,13 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-            {'supporting-port': 'C4', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP4-TXRX'},
+            {'supporting-port': 'C7', 'supporting-circuit-pack-name': '4/0',
+             'logical-connection-point': 'SRG1-PP7-TXRX'},
             res['mapping'])
 
-    def test_09_portmapping_SRG1_PP2_TXRX(self):
+    def test_07_rdm_portmapping_SRG3_PP1_TXRX(self):
         url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP2-TXRX"
+               "nodes/ROADMA/mapping/SRG3-PP1-TXRX"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -191,55 +169,46 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-            {'supporting-port': 'C2', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP2-TXRX'},
+            {'supporting-port': 'C1', 'supporting-circuit-pack-name': '5/0',
+             'logical-connection-point': 'SRG3-PP1-TXRX'},
             res['mapping'])
 
-    def test_10_portmapping_SRG1_PP14_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP14-TXRX"
+    def test_08_xpdr_device_connected(self):
+        url = ("{}/config/network-topology:"
+               "network-topology/topology/topology-netconf/node/XPDRA"
               .format(self.restconf_baseurl))
+        data = {"node": [{
+            "node-id": "XPDRA",
+            "netconf-node-topology:username": "admin",
+            "netconf-node-topology:password": "admin",
+            "netconf-node-topology:host": "127.0.0.1",
+            "netconf-node-topology:port": "17831",
+            "netconf-node-topology:tcp-only": "false",
+            "netconf-node-topology:pass-through": {}}]}
         headers = {'content-type': 'application/json'}
         response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C14', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP14-TXRX'},
-            res['mapping'])
-
-    def test_11_portmapping_SRG1_PP11_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP11-TXRX"
-               .format(self.restconf_baseurl))
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C11', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP11-TXRX'},
-            res['mapping'])
+            "PUT", url, data=json.dumps(data), headers=headers,
+            auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.created)
+        time.sleep(20)
 
-    def test_12_portmapping_SRG1_PP7_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP7-TXRX"
+    def test_09_xpdr_device_connected(self):
+        url = ("{}/operational/network-topology:"
+               "network-topology/topology/topology-netconf/node/XPDRA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
             "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C7', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP7-TXRX'},
-            res['mapping'])
+        self.assertEqual(
+            res['node'][0]['netconf-node-topology:connection-status'],
+            'connected')
+        time.sleep(10)
 
-    def test_13_portmapping_DEG2_TTP_TXRX(self):
+    def test_10_xpdr_portmapping_NETWORK1(self):
         url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/DEG2-TTP-TXRX"
+               "nodes/XPDRA/mapping/XPDR-LINE1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -247,13 +216,13 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-            {'supporting-port': 'L1', 'supporting-circuit-pack-name': '3/0',
-             'logical-connection-point': 'DEG2-TTP-TXRX'},
+            {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+             'logical-connection-point': 'XPDR-LINE1'},
             res['mapping'])
 
-    def test_14_portmapping_DEG2_TTP_TXRX(self):
+    def test_11_xpdr_portmapping_CLIENT1(self):
         url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/DEG2-TTP-TXRX"
+               "nodes/XPDRA/mapping/XPDR-CLNT1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -261,169 +230,85 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-            {'supporting-port': 'L1', 'supporting-circuit-pack-name': '3/0',
-             'logical-connection-point': 'DEG2-TTP-TXRX'},
+            {'supporting-port': '1',
+             'supporting-circuit-pack-name': '1/0/2-PLUG-CLIENT',
+             'logical-connection-point': 'XPDR-CLNT1'},
             res['mapping'])
 
-    def test_15_portmapping_SRG1_PP12_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP12-TXRX"
+    def test_12_xpdr_device_disconnected(self):
+        url = ("{}/config/network-topology:"
+                "network-topology/topology/topology-netconf/node/XPDRA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
+             "DELETE", url, headers=headers,
+             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C12', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP12-TXRX'},
-            res['mapping'])
+        time.sleep(20)
 
-    def test_16_portmapping_SRG1_PP8_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP8-TXRX"
-               .format(self.restconf_baseurl))
+    def test_13_xpdr_device_disconnected(self):
+        url = ("{}/operational/network-topology:network-topology/topology/"
+               "topology-netconf/node/XPDRA".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
             "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
+        self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-            {'supporting-port': 'C8', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP8-TXRX'},
-            res['mapping'])
+            {"error-type":"application","error-tag":"data-missing",
+             "error-message":"Request could not be completed because the relevant data model content does not exist "},
+            res['errors']['error'])
 
-    def test_17_portmapping_SRG1_PP5_TXRX(self):
+    def test_14_xpdr_device_disconnected(self):
         url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP5-TXRX"
+               "nodes/XPDRA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
             "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
+        self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-            {'supporting-port': 'C5', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP5-TXRX'},
-            res['mapping'])
+            {"error-type":"application","error-tag":"data-missing",
+             "error-message":"Request could not be completed because the relevant data model content does not exist "},
+            res['errors']['error'])
 
-    def test_18_portmapping_SRG1_PP13_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP13-TXRX"
+    def test_15_rdm_device_disconnected(self):
+        url = ("{}/config/network-topology:"
+                "network-topology/topology/topology-netconf/node/ROADMA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-            "GET", url, headers=headers, auth=('admin', 'admin'))
+             "DELETE", url, headers=headers,
+             auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn(
-            {'supporting-port': 'C13', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP13-TXRX'},
-            res['mapping'])
+        time.sleep(20)
 
-    def test_19_portmapping_SRG1_PP15_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP15-TXRX"
-               .format(self.restconf_baseurl))
+    def test_16_rdm_device_disconnected(self):
+        url = ("{}/operational/network-topology:network-topology/topology/"
+               "topology-netconf/node/ROADMA".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
             "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
+        self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-            {'supporting-port': 'C15', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP15-TXRX'},
-            res['mapping'])
+            {"error-type":"application","error-tag":"data-missing",
+             "error-message":"Request could not be completed because the relevant data model content does not exist "},
+            res['errors']['error'])
 
-    def test_20_portmapping_SRG1_PP10_TXRX(self):
-        url = ("{}/config/portmapping:network/"
-               "nodes/ROADMA/mapping/SRG1-PP10-TXRX"
+    def test_17_rdm_device_disconnected(self):
+        url = ("{}/config/portmapping:network/nodes/ROADMA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
             "GET", url, headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
+        self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-            {'supporting-port': 'C10', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP10-TXRX'},
-            res['mapping'])
-
-    def test_21_cross_connection_DEG1_TTP_TXRX_SRG1_PP3_TXRX(self):
-        url = "{}/operations/renderer:service-path".format(self.restconf_baseurl)
-        data = {"renderer:input": {
-            "renderer:service-name": "service_32",
-            "renderer:wave-number": "32",
-            "renderer:operation": "create",
-            "renderer:nodes": [
-                {"renderer:node-id": "ROADMA",
-                 "renderer:src-tp": "DEG1-TTP-TXRX",
-                 "renderer:dest-tp": "SRG1-PP3-TXRX"}]}}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "POST", url, data=json.dumps(data),
-            headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertEqual(response.json(), {
-            'output': {
-                'result':
-                'Roadm-connection successfully created for nodes [ROADMA]'}})
-
-    def test_22_cross_connection_SRG1_PP3_TXRX_DEG1_TTP_TXRX(self):
-        url = "{}/operations/renderer:service-path".format(self.restconf_baseurl)
-        data = {"renderer:input": {
-            "renderer:service-name": "service_32",
-            "renderer:wave-number": "32",
-            "renderer:operation": "create",
-            "renderer:nodes": [
-                {"renderer:node-id": "ROADMA",
-                 "renderer:src-tp": "SRG1-PP3-TXRX",
-                 "renderer:dest-tp": "DEG1-TTP-TXRX"}]}}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "POST", url, data=json.dumps(data),
-            headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertEqual(response.json(), {
-            'output': {
-                'result':
-                'Roadm-connection successfully created for nodes [ROADMA]'}})
-
-    def test_23_delete_DEG1_TTP_TXRX_SRG1_PP3_TXRX(self):
-        url = "{}/operations/renderer:service-path".format(self.restconf_baseurl)
-        data = {"renderer:input": {
-            "renderer:service-name": "service_32",
-            "renderer:wave-number": "32",
-            "renderer:operation": "delete",
-            "renderer:nodes": [
-                {"renderer:node-id": "ROADMA",
-                 "renderer:src-tp": "DEG1-TTP-TXRX",
-                 "renderer:dest-tp": "SRG1-PP3-TXRX"}]}}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "POST", url, data=json.dumps(data),
-            headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertEqual(response.json(), {
-            'output': {'result': 'Request processed'}})
-
-    def test_24_delete_SRG1_PP3_TXRX_DEG1_TTP_TXRX(self):
-        url = "{}/operations/renderer:service-path".format(self.restconf_baseurl)
-        data = {"renderer:input": {
-            "renderer:service-name": "service_32",
-            "renderer:wave-number": "32",
-            "renderer:operation": "delete",
-            "renderer:nodes": [
-                {"renderer:node-id": "ROADMA",
-                 "renderer:src-tp": "SRG1-PP3-TXRX",
-                 "renderer:dest-tp": "DEG1-TTP-TXRX"}]}}
-        headers = {'content-type': 'application/json'}
-        response = requests.request(
-            "POST", url, data=json.dumps(data),
-            headers=headers, auth=('admin', 'admin'))
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertEqual(response.json(), {
-            'output': {'result': 'Request processed'}})
+            {"error-type":"application","error-tag":"data-missing",
+             "error-message":"Request could not be completed because the relevant data model content does not exist "},
+            res['errors']['error'])
 
 
 if __name__ == "__main__":