From f721ce11d119f9a34b66cfc5c0b69b6d5324c3ba Mon Sep 17 00:00:00 2001 From: Shweta V Date: Wed, 20 Dec 2017 11:18:00 +0100 Subject: [PATCH] Openroadm models update Co-authored-by: Martial COULIBALY Change-Id: I8550bf98c95a59bb3ecde89ad14aaddf98c1bcd1 Signed-off-by: Shweta Signed-off-by: Martial COULIBALY --- api/pom.xml | 14 +- features/odl-transportpce-api/pom.xml | 19 +- features/odl-transportpce-ordmodels/pom.xml | 19 +- olm/pom.xml | 19 +- ordmodels/common/pom.xml | 42 ++ .../pm/types/rev161014/PmDataTypeBuilder.java | 18 + .../yang/org-openroadm-alarm@2016-10-14.yang} | 40 +- ...rg-openroadm-common-types@2016-10-14.yang} | 42 +- ...org-openroadm-common-types@2017-06-26.yang | 582 ++++++++++++++++ ...org-openroadm-common-types@2017-09-29.yang | 629 ++++++++++++++++++ ...dm-equipment-states-types@2016-10-14.yang} | 40 +- .../org-openroadm-layerRate@2016-10-14.yang} | 40 +- ...org-openroadm-maintenance@2016-10-14.yang} | 40 +- ...openroadm-otn-common-types@2016-10-14.yang | 257 +++++++ .../org-openroadm-pm-types@2016-10-14.yang} | 41 +- .../yang/org-openroadm-pm@2016-10-14.yang} | 40 +- .../org-openroadm-port-types@2017-09-29.yang} | 121 ++-- ...-openroadm-probable-cause@2016-10-14.yang} | 40 +- ...-openroadm-resource-types@2016-10-14.yang} | 58 +- .../org-openroadm-resource@2016-10-14.yang} | 40 +- .../yang/org-openroadm-tca@2016-10-14.yang} | 41 +- .../org-openroadm-user-mgmt@2016-10-14.yang} | 40 +- ordmodels/device/pom.xml | 69 ++ .../facility/LogFacilityFacilityBuilder.java | 19 + .../org-openroadm-database@2016-10-14.yang} | 56 +- ...g-openroadm-de-operations@2016-10-14.yang} | 44 +- ...adm-device-resource-types@2016-10-14.yang} | 40 +- .../org-openroadm-device@2017-02-06.yang} | 119 ++-- ...roadm-ethernet-interfaces@2016-10-14.yang} | 66 +- ...g-openroadm-file-transfer@2016-10-14.yang} | 48 +- .../yang/org-openroadm-fwdl@2016-10-14.yang} | 42 +- .../org-openroadm-interfaces@2016-10-14.yang} | 64 +- .../yang/org-openroadm-lldp@2016-10-14.yang} | 66 +- ...oadm-maintenance-loopback@2016-10-14.yang} | 40 +- ...dm-maintenance-testsignal@2016-10-14.yang} | 40 +- ...ptical-channel-interfaces@2016-10-14.yang} | 51 +- ...ical-multiplex-interfaces@2016-10-14.yang} | 46 +- ...ical-transport-interfaces@2016-10-14.yang} | 51 +- ...nroadm-otn-odu-interfaces@2016-10-14.yang} | 60 +- ...nroadm-otn-otu-interfaces@2016-10-14.yang} | 46 +- ...-openroadm-physical-types@2016-10-14.yang} | 40 +- .../yang/org-openroadm-rstp@2016-10-14.yang} | 46 +- .../yang/org-openroadm-swdl@2016-10-14.yang} | 40 +- .../org-openroadm-syslog@2016-10-14.yang} | 126 ++-- ...-openroadm-wavelength-map@2016-10-14.yang} | 40 +- ordmodels/network/pom.xml | 58 ++ .../org-openroadm-amplifier@2017-09-29.yang | 132 ++++ ...org-openroadm-clli-network@2017-06-26.yang | 68 ++ .../yang/org-openroadm-degree@2017-09-29.yang | 109 +++ ...enroadm-external-pluggable@2017-09-29.yang | 106 +++ .../yang/org-openroadm-link@2017-09-29.yang | 200 ++++++ ...openroadm-network-topology@2017-09-29.yang | 291 ++++++++ ...rg-openroadm-network-types@2017-09-29.yang | 334 ++++++++++ .../org-openroadm-network@2017-09-29.yang | 166 +++++ ...g-openroadm-opposite-links@2017-09-29.yang | 31 + ...roadm-otn-network-topology@2017-09-29.yang | 174 +++++ .../yang/org-openroadm-roadm@2017-09-29.yang | 73 ++ .../yang/org-openroadm-srg@2017-09-29.yang | 90 +++ .../org-openroadm-xponder@2017-09-29.yang | 185 ++++++ ordmodels/pom.xml | 24 +- ordmodels/service/pom.xml | 54 ++ ...oadm-common-service-types@2016-10-14.yang} | 56 +- ...roadm-routing-constraints@2016-10-14.yang} | 40 +- .../org-openroadm-service@2016-10-14.yang} | 45 +- .../org-openroadm-topology@2016-10-14.yang} | 40 +- renderer/pom.xml | 19 +- servicehandler/pom.xml | 19 +- tests/stubmodels/pom.xml | 19 +- tests/stubpce/pom.xml | 19 +- tests/stubrenderer/pom.xml | 19 +- 70 files changed, 4866 insertions(+), 986 deletions(-) create mode 100644 ordmodels/common/pom.xml create mode 100644 ordmodels/common/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java rename ordmodels/{src/main/yang/org-openroadm-alarm.yang => common/src/main/yang/org-openroadm-alarm@2016-10-14.yang} (90%) rename ordmodels/{src/main/yang/org-openroadm-common-types.yang => common/src/main/yang/org-openroadm-common-types@2016-10-14.yang} (93%) create mode 100644 ordmodels/common/src/main/yang/org-openroadm-common-types@2017-06-26.yang create mode 100644 ordmodels/common/src/main/yang/org-openroadm-common-types@2017-09-29.yang rename ordmodels/{src/main/yang/org-openroadm-equipment-states-types.yang => common/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang} (91%) rename ordmodels/{src/main/yang/org-openroadm-layerRate.yang => common/src/main/yang/org-openroadm-layerRate@2016-10-14.yang} (86%) rename ordmodels/{src/main/yang/org-openroadm-maintenance.yang => common/src/main/yang/org-openroadm-maintenance@2016-10-14.yang} (86%) create mode 100644 ordmodels/common/src/main/yang/org-openroadm-otn-common-types@2016-10-14.yang rename ordmodels/{src/main/yang/org-openroadm-pm-types.yang => common/src/main/yang/org-openroadm-pm-types@2016-10-14.yang} (94%) rename ordmodels/{src/main/yang/org-openroadm-pm.yang => common/src/main/yang/org-openroadm-pm@2016-10-14.yang} (92%) rename ordmodels/{src/main/yang/org-openroadm-port-types.yang => common/src/main/yang/org-openroadm-port-types@2017-09-29.yang} (73%) rename ordmodels/{src/main/yang/org-openroadm-probable-cause.yang => common/src/main/yang/org-openroadm-probable-cause@2016-10-14.yang} (96%) rename ordmodels/{src/main/yang/org-openroadm-resource-types.yang => common/src/main/yang/org-openroadm-resource-types@2016-10-14.yang} (92%) rename ordmodels/{src/main/yang/org-openroadm-resource.yang => common/src/main/yang/org-openroadm-resource@2016-10-14.yang} (89%) rename ordmodels/{src/main/yang/org-openroadm-tca.yang => common/src/main/yang/org-openroadm-tca@2016-10-14.yang} (88%) rename ordmodels/{src/main/yang/org-openroadm-user-mgmt.yang => common/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang} (88%) create mode 100644 ordmodels/device/pom.xml create mode 100644 ordmodels/device/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev161014/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java rename ordmodels/{src/main/yang/org-openroadm-database.yang => device/src/main/yang/org-openroadm-database@2016-10-14.yang} (80%) rename ordmodels/{src/main/yang/org-openroadm-de-operations.yang => device/src/main/yang/org-openroadm-de-operations@2016-10-14.yang} (85%) rename ordmodels/{src/main/yang/org-openroadm-device-resource-types.yang => device/src/main/yang/org-openroadm-device-resource-types@2016-10-14.yang} (94%) rename ordmodels/{src/main/yang/org-openroadm-device.yang => device/src/main/yang/org-openroadm-device@2017-02-06.yang} (95%) rename ordmodels/{src/main/yang/org-openroadm-ethernet-interfaces.yang => device/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang} (85%) rename ordmodels/{src/main/yang/org-openroadm-file-transfer.yang => device/src/main/yang/org-openroadm-file-transfer@2016-10-14.yang} (89%) rename ordmodels/{src/main/yang/org-openroadm-fwdl.yang => device/src/main/yang/org-openroadm-fwdl@2016-10-14.yang} (83%) rename ordmodels/{src/main/yang/org-openroadm-interfaces.yang => device/src/main/yang/org-openroadm-interfaces@2016-10-14.yang} (83%) rename ordmodels/{src/main/yang/org-openroadm-lldp.yang => device/src/main/yang/org-openroadm-lldp@2016-10-14.yang} (91%) rename ordmodels/{src/main/yang/org-openroadm-maintenance-loopback.yang => device/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang} (86%) rename ordmodels/{src/main/yang/org-openroadm-maintenance-testsignal.yang => device/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang} (91%) rename ordmodels/{src/main/yang/org-openroadm-optical-channel-interfaces.yang => device/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang} (93%) rename ordmodels/{src/main/yang/org-openroadm-optical-multiplex-interfaces.yang => device/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang} (87%) rename ordmodels/{src/main/yang/org-openroadm-optical-transport-interfaces.yang => device/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang} (91%) rename ordmodels/{src/main/yang/org-openroadm-otn-odu-interfaces.yang => device/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang} (95%) rename ordmodels/{src/main/yang/org-openroadm-otn-otu-interfaces.yang => device/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang} (92%) rename ordmodels/{src/main/yang/org-openroadm-physical-types.yang => device/src/main/yang/org-openroadm-physical-types@2016-10-14.yang} (89%) rename ordmodels/{src/main/yang/org-openroadm-rstp.yang => device/src/main/yang/org-openroadm-rstp@2016-10-14.yang} (95%) rename ordmodels/{src/main/yang/org-openroadm-swdl.yang => device/src/main/yang/org-openroadm-swdl@2016-10-14.yang} (89%) rename ordmodels/{src/main/yang/org-openroadm-syslog.yang => device/src/main/yang/org-openroadm-syslog@2016-10-14.yang} (80%) rename ordmodels/{src/main/yang/org-openroadm-wavelength-map.yang => device/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang} (86%) create mode 100644 ordmodels/network/pom.xml create mode 100644 ordmodels/network/src/main/yang/org-openroadm-amplifier@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-degree@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-link@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-roadm@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-srg@2017-09-29.yang create mode 100644 ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang create mode 100644 ordmodels/service/pom.xml rename ordmodels/{src/main/yang/org-openroadm-common-service-types.yang => service/src/main/yang/org-openroadm-common-service-types@2016-10-14.yang} (94%) rename ordmodels/{src/main/yang/org-openroadm-routing-constraints.yang => service/src/main/yang/org-openroadm-routing-constraints@2016-10-14.yang} (89%) rename ordmodels/{src/main/yang/org-openroadm-service.yang => service/src/main/yang/org-openroadm-service@2016-10-14.yang} (97%) rename ordmodels/{src/main/yang/org-openroadm-topology.yang => service/src/main/yang/org-openroadm-topology@2016-10-14.yang} (88%) diff --git a/api/pom.xml b/api/pom.xml index 96a2a4227..400e544e8 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -23,8 +23,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service ${project.version} diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml index fa43abc05..a3017b09f 100644 --- a/features/odl-transportpce-api/pom.xml +++ b/features/odl-transportpce-api/pom.xml @@ -49,8 +49,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${project.version} - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-device ${project.version} diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml index 317acf7d5..9fb3d9e24 100644 --- a/features/odl-transportpce-ordmodels/pom.xml +++ b/features/odl-transportpce-ordmodels/pom.xml @@ -43,8 +43,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL xml - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-device ${project.version} diff --git a/olm/pom.xml b/olm/pom.xml index 4316baf92..b0f2651e0 100644 --- a/olm/pom.xml +++ b/olm/pom.xml @@ -33,8 +33,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.version} - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-device ${project.version} diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml new file mode 100644 index 000000000..9572a9bb4 --- /dev/null +++ b/ordmodels/common/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + org.opendaylight.mdsal + binding-parent + 0.12.3-SNAPSHOT + + + + org.opendaylight.transportpce.ordmodels + transportpce-ordmodels-common + 0.2.0-SNAPSHOT + bundle + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.12.3-SNAPSHOT + import + pom + + + + + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + diff --git a/ordmodels/common/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java b/ordmodels/common/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java new file mode 100644 index 000000000..8a3ec1497 --- /dev/null +++ b/ordmodels/common/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java @@ -0,0 +1,18 @@ +package org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014; + +/** + * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation. + * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32). + * + * The reason behind putting it under src/main/java is: + * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent + * loss of user code. + * + */ +public class PmDataTypeBuilder { + + public static PmDataType getDefaultInstance(java.lang.String defaultValue) { + throw new java.lang.UnsupportedOperationException("Not yet implemented"); + } + +} diff --git a/ordmodels/src/main/yang/org-openroadm-alarm.yang b/ordmodels/common/src/main/yang/org-openroadm-alarm@2016-10-14.yang similarity index 90% rename from ordmodels/src/main/yang/org-openroadm-alarm.yang rename to ordmodels/common/src/main/yang/org-openroadm-alarm@2016-10-14.yang index 7f4bb3a2f..5ed8792b6 100644 --- a/ordmodels/src/main/yang/org-openroadm-alarm.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-alarm@2016-10-14.yang @@ -20,31 +20,31 @@ module org-openroadm-alarm { "OpenROADM.org"; description "YANG definitions of an alarm. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-common-types.yang b/ordmodels/common/src/main/yang/org-openroadm-common-types@2016-10-14.yang similarity index 93% rename from ordmodels/src/main/yang/org-openroadm-common-types.yang rename to ordmodels/common/src/main/yang/org-openroadm-common-types@2016-10-14.yang index 35ea26be1..e52b12bea 100644 --- a/ordmodels/src/main/yang/org-openroadm-common-types.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-common-types@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-common-types { "OpenROADM.org"; description "YANG definitions of common types. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { @@ -89,7 +89,7 @@ module org-openroadm-common-types { fraction-digits 3; } units "dB"; - } + } typedef severity { description diff --git a/ordmodels/common/src/main/yang/org-openroadm-common-types@2017-06-26.yang b/ordmodels/common/src/main/yang/org-openroadm-common-types@2017-06-26.yang new file mode 100644 index 000000000..7b19a91b2 --- /dev/null +++ b/ordmodels/common/src/main/yang/org-openroadm-common-types@2017-06-26.yang @@ -0,0 +1,582 @@ +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 2017-06-26 { + description + "Version 2.0"; + } + 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; + } + enum "ila" { + value 3; + } + enum "extplug" { + value 4; + } + } + description + "Identifier for node type + 1. rdm for ROADM + 2. xpdr for Transponder, Regen + 3. ila for in-line amplifier + 4. extplug for external plugable"; + } + + typedef xpdr-node-types { + type enumeration { + enum "tpdr" { + value 1; + } + enum "mpdr" { + value 2; + } + } + description + "Identifier for Xponder node type + 1. Transponder + 2. Muxponder"; + } + + typedef frequency-THz { + description + "Frequency value in THz."; + type decimal64 { + fraction-digits 8; + } + units "THz"; + } + + typedef frequency-GHz { + description + "Frequency value in GHz."; + type decimal64 { + fraction-digits 5; + } + units "GHz"; + } + + 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 fiber-pmd { + description + "Polarization Mode Dispersion expressed in ps/km(1/2)."; + type decimal64 { + fraction-digits 2; + } + units "ps/(km[1/2])"; + } + + typedef amplifier-types { + type enumeration { + enum "std" { + value 1; + } + } + description + "3 digit identifier for amplifier type + 1. std for standard amplifier as defined initially + To be completed if/when additional amplifier types are required "; + } + + typedef amplifier-operational-mode { + description + "Operational mode for the amplifier: this parameter will + allow modeling different operational modes for switch-gain amplifiers + The enum is to be completed/modified when new amplifiers are specified "; + type enumeration { + enum "Mode1" { + value 1; + } + enum "Mode2" { + value 2; + } + enum "Mode3" { + value 3; + } + enum "Mode4" { + value 4; + } + } + } + + 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 activate-notification-type { + description + "Type of notification on software or database activation events"; + type enumeration { + enum "activate" { + value 1; + description + "software or database activation"; + } + enum "commit" { + value 2; + description + "commit the software or database. + For software activate, this event can happen in the following scenarios: + 1) immediately when user issue db-activate command without rollBackTimer + or if the rollBackTimer is specified as 00-00-00; + 2) when user issue cancel-rollback-timer before it expires and with accept=true. + For database activate, this event can occur in the following scenarios: + 1) immediately when user issue db-activate command without rollBackTimer + or if the rollBackTimer is specified as 00-00-00; + 2) when user issue cancel-rollback-timer before it expires and with accept=true."; + } + enum "cancel" { + value 3; + description + "cancel the database or software activation operation. + For software activate, this event can happen in the following cases: + 1) when the rollBackTimer expires; + 2) when the user issues cancel-rollback-timer with accept=false. + For database activate, this event can happen in the following cases: + 1) when the rollBackTimer expires; + 2) when the user issues cancel-rollback-timer with accept=false."; + } + } + } + + 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 status"; + } + } + + typedef extended-rpc-status { + description + "status of RPC "; + type enumeration { + enum "Successful" { + value 1; + } + enum "Failed" { + value 2; + } + enum "In-progress" { + value 3; + } + } + } + + grouping extended-rpc-response-status { + leaf status { + type extended-rpc-status; + mandatory true; + description + "Successful, Failed or In-progress"; + } + leaf status-message { + type string; + description + "Gives a more detailed status."; + } + } + + 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; + } + enum "undeployed" { + value 6; + } + enum "proposed" { + value 7; + } + enum "draft" { + value 8; + } + } + } + + 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; + } + enum "notApplicable" { + value 4; + } + } + } + + typedef location { + type enumeration { + enum "notApplicable" { + value 1; + } + enum "nearEnd" { + value 2; + } + enum "farEnd" { + value 3; + } + } + } + + typedef wavelength-duplication-type { + description + "One per srg is applied to C/D add/drop group + one per degree is applied to C/D/C add drop group"; + type enumeration { + enum "one-per-srg" { + 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 "one-per-degree" { + 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; + } + } + } + + typedef 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; + } + enum "switch-network" { + value 6; + } + enum "switch-client" { + value 7; + } + enum "ila-external" { + value 8; + } + enum "ila-internal" { + value 9; + } + } + } + + identity och-rate-identity { + description + "A unique och rate identification"; + } + + identity R200G { + base och-rate-identity; + description + "Identity for 200G Rate"; + } + + identity R100G { + base och-rate-identity; + description + "Identity for 100G Rate"; + } + + identity R10.7G { + base och-rate-identity; + description + "Identity for 10.7G Rate"; + } + + identity R11.1G { + base och-rate-identity; + description + "Identity for 11.1G Rate"; + } + + typedef 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"; + } +} diff --git a/ordmodels/common/src/main/yang/org-openroadm-common-types@2017-09-29.yang b/ordmodels/common/src/main/yang/org-openroadm-common-types@2017-09-29.yang new file mode 100644 index 000000000..5957348ea --- /dev/null +++ b/ordmodels/common/src/main/yang/org-openroadm-common-types@2017-09-29.yang @@ -0,0 +1,629 @@ +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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + 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; + } + enum "ila" { + value 3; + } + enum "extplug" { + value 4; + } + } + description + "Identifier for node type + 1. rdm for ROADM + 2. xpdr for Transponder, Regen + 3. ila for in-line amplifier + 4. extplug for external plugable"; + } + + typedef node-id-type { + type string { + length "7..63"; + pattern "([a-zA-Z][a-zA-Z0-9-]{5,18}[a-zA-Z0-9])" { + error-message + "A node-id must be 7 to 63 characters in length. + A node-id can contain letters, numbers, and hyphens. + The first character must be a letter. + The last character must be a letter or number."; + } + } + description + "Globally unique identifer for a device."; + } + + typedef xpdr-node-types { + type enumeration { + enum "tpdr" { + value 1; + } + enum "mpdr" { + value 2; + } + enum "switch" { + value 3; + } + enum "regen" { + value 4; + } + enum "regen-uni" { + value 5; + } + } + description + "Identifier for Xponder node type + 1. Transponder + 2. Muxponder + 3. OTN switchponder + 4. Regenerator + 5. Regenerator based on unidirectional model"; + } + + typedef frequency-THz { + description + "Frequency value in THz."; + type decimal64 { + fraction-digits 8; + } + units "THz"; + } + + typedef frequency-GHz { + description + "Frequency value in GHz."; + type decimal64 { + fraction-digits 5; + } + units "GHz"; + } + + 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 fiber-pmd { + description + "Polarization Mode Dispersion expressed in ps/km(1/2)."; + type decimal64 { + fraction-digits 2; + } + units "ps/(km[1/2])"; + } + + typedef amplifier-types { + type enumeration { + enum "standard" { + value 1; + } + } + description + "identifier for amplifier type + 1. standard for amplifier as defined initially in the ROADM MSA specifications + To be completed if/when additional amplifier types are required "; + } + + typedef line-amplifier-control-mode { + description + "Identifies the line amplifier control mode, either off or gain."; + type enumeration { + enum "gainLoss" { + value 2; + } + enum "off" { + value 3; + } + } + } + + typedef amplifier-gain-range { + description + "Operational mode for the amplifier: + this parameter allows modeling different operational modes (gain ranges) ,notably for switched-gain amplifiers. + It indicates which performance model shall be used by the path feasibility engine. + For standard amplifier, or when performance evaluation is based on incremental noise, use gain-range-1. + When performance evaluation is based on advanced parameters, specify used gain-range (1 to 4). + Up to release 2.1, only gain-range-1 is to be used (default value) "; + type enumeration { + enum "gain-range-1" { + value 1; + } + enum "gain-range-2" { + value 2; + } + enum "gain-range-3" { + value 3; + } + enum "gain-range-4" { + value 4; + } + } + } + + 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 activate-notification-type { + description + "Type of notification on software or database activation events"; + type enumeration { + enum "activate" { + value 1; + description + "software or database activation"; + } + enum "commit" { + value 2; + description + "commit the software or database. + For software activate, this event can happen in the following scenarios: + 1) immediately when user issue db-activate command without rollBackTimer + or if the rollBackTimer is specified as 00-00-00; + 2) when user issue cancel-rollback-timer before it expires and with accept=true. + For database activate, this event can occur in the following scenarios: + 1) immediately when user issue db-activate command without rollBackTimer + or if the rollBackTimer is specified as 00-00-00; + 2) when user issue cancel-rollback-timer before it expires and with accept=true."; + } + enum "cancel" { + value 3; + description + "cancel the database or software activation operation. + For software activate, this event can happen in the following cases: + 1) when the rollBackTimer expires; + 2) when the user issues cancel-rollback-timer with accept=false. + For database activate, this event can happen in the following cases: + 1) when the rollBackTimer expires; + 2) when the user issues cancel-rollback-timer with accept=false."; + } + } + } + + 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 status"; + } + } + + typedef extended-rpc-status { + description + "status of RPC "; + type enumeration { + enum "Successful" { + value 1; + } + enum "Failed" { + value 2; + } + enum "In-progress" { + value 3; + } + } + } + + grouping extended-rpc-response-status { + leaf status { + type extended-rpc-status; + mandatory true; + description + "Successful, Failed or In-progress"; + } + leaf status-message { + type string; + description + "Gives a more detailed status."; + } + } + + 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; + } + enum "undeployed" { + value 6; + } + enum "proposed" { + value 7; + } + enum "draft" { + value 8; + } + } + } + + 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; + } + enum "notApplicable" { + value 4; + } + } + } + + typedef location { + type enumeration { + enum "notApplicable" { + value 1; + } + enum "nearEnd" { + value 2; + } + enum "farEnd" { + value 3; + } + } + } + + typedef wavelength-duplication-type { + description + "One per srg is applied to C/D add/drop group + one per degree is applied to C/D/C add drop group"; + type enumeration { + enum "one-per-srg" { + 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 "one-per-degree" { + 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; + } + } + } + + typedef 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; + } + enum "switch-network" { + value 6; + } + enum "switch-client" { + value 7; + } + enum "ila-external" { + value 8; + } + enum "ila-internal" { + value 9; + } + } + } + + identity och-rate-identity { + description + "A unique och rate identification"; + } + + identity R200G { + base och-rate-identity; + description + "Identity for 200G Rate"; + } + + identity R100G { + base och-rate-identity; + description + "Identity for 100G Rate"; + } + + identity R10.7G { + base och-rate-identity; + description + "Identity for 10.7G Rate"; + } + + identity R11.1G { + base och-rate-identity; + description + "Identity for 11.1G Rate"; + } + + typedef 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"; + } +} diff --git a/ordmodels/src/main/yang/org-openroadm-equipment-states-types.yang b/ordmodels/common/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang similarity index 91% rename from ordmodels/src/main/yang/org-openroadm-equipment-states-types.yang rename to ordmodels/common/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang index b1b9936de..11ce8f55b 100644 --- a/ordmodels/src/main/yang/org-openroadm-equipment-states-types.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-equipment-states-types { "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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-layerRate.yang b/ordmodels/common/src/main/yang/org-openroadm-layerRate@2016-10-14.yang similarity index 86% rename from ordmodels/src/main/yang/org-openroadm-layerRate.yang rename to ordmodels/common/src/main/yang/org-openroadm-layerRate@2016-10-14.yang index f1a615239..e9c7eb03b 100644 --- a/ordmodels/src/main/yang/org-openroadm-layerRate.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-layerRate@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-layerRate { "OpenROADM.org"; description "YANG definitions of layer rates. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-maintenance.yang b/ordmodels/common/src/main/yang/org-openroadm-maintenance@2016-10-14.yang similarity index 86% rename from ordmodels/src/main/yang/org-openroadm-maintenance.yang rename to ordmodels/common/src/main/yang/org-openroadm-maintenance@2016-10-14.yang index f8c058aeb..5c6e1ff2b 100644 --- a/ordmodels/src/main/yang/org-openroadm-maintenance.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-maintenance@2016-10-14.yang @@ -11,31 +11,31 @@ module org-openroadm-maintenance { "OpenROADM.org"; description "YANG definitions of maintenace operations. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/common/src/main/yang/org-openroadm-otn-common-types@2016-10-14.yang b/ordmodels/common/src/main/yang/org-openroadm-otn-common-types@2016-10-14.yang new file mode 100644 index 000000000..26a6879c6 --- /dev/null +++ b/ordmodels/common/src/main/yang/org-openroadm-otn-common-types@2016-10-14.yang @@ -0,0 +1,257 @@ +module org-openroadm-otn-common-types { + namespace "http://org/openroadm/otn-common-types"; + prefix org-openroadm-otn-common-types; + + organization + "Open ROADM MSA"; + contact + "OpenROADM.org"; + description + "YANG definitions for common otn related type definitions. + + 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 2017-09-29 { + description + "Version 2.1"; + } + + 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"; + } + + identity odu-payload-type-identity { + description + "A unique payload type identification of the ODU."; + } + + identity PT20 { + base odu-payload-type-identity; + description + "Identity for an ODU Payload 20"; + } + + identity PT21 { + base odu-payload-type-identity; + description + "Identity for an ODU Payload 21"; + } + + identity PT22 { + base odu-payload-type-identity; + description + "Identity for an ODU Payload 22"; + } + + identity odu-rate-identity { + description + "A unique rate identification of the ODU."; + } + + 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-cbr { + base odu-rate-identity; + description + "Identity for an ODUflex-cbr"; + } + + identity ODUflex-gfp { + base odu-rate-identity; + description + "Identity for an ODUflex-gfp"; + } + + 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, OPU4 MSI TS is occupied/allocated. + Applies to all ODTU4.x mappings"; + } + + 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"; + } + + identity odu-function-identity { + description + "A unique identification of the ODUk interface function."; + } + + identity ODU-TTP { + base odu-function-identity; + description + "ODU TTP facility facing trail termination"; + } + + identity ODU-CTP { + base odu-function-identity; + description + "ODU CTP connection termination"; + } + + identity ODU-TTP-CTP { + base odu-function-identity; + description + "ODU CTP mapper level connection termination with trail termination and client adaptation"; + } + +} diff --git a/ordmodels/src/main/yang/org-openroadm-pm-types.yang b/ordmodels/common/src/main/yang/org-openroadm-pm-types@2016-10-14.yang similarity index 94% rename from ordmodels/src/main/yang/org-openroadm-pm-types.yang rename to ordmodels/common/src/main/yang/org-openroadm-pm-types@2016-10-14.yang index d935dac61..3a7036204 100644 --- a/ordmodels/src/main/yang/org-openroadm-pm-types.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-pm-types@2016-10-14.yang @@ -4,6 +4,7 @@ module org-openroadm-pm-types { import org-openroadm-common-types { prefix org-openroadm-common-types; + revision-date 2016-10-14; } organization "Open ROADM MSA"; @@ -11,31 +12,31 @@ module org-openroadm-pm-types { "OpenROADM.org"; description "YANG definitions of performance management types. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-pm.yang b/ordmodels/common/src/main/yang/org-openroadm-pm@2016-10-14.yang similarity index 92% rename from ordmodels/src/main/yang/org-openroadm-pm.yang rename to ordmodels/common/src/main/yang/org-openroadm-pm@2016-10-14.yang index 2f2cb1b04..8a75c58a2 100644 --- a/ordmodels/src/main/yang/org-openroadm-pm.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-pm@2016-10-14.yang @@ -20,31 +20,31 @@ module org-openroadm-pm { "OpenROADM.org"; description "YANG definitions of performance management. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-port-types.yang b/ordmodels/common/src/main/yang/org-openroadm-port-types@2017-09-29.yang similarity index 73% rename from ordmodels/src/main/yang/org-openroadm-port-types.yang rename to ordmodels/common/src/main/yang/org-openroadm-port-types@2017-09-29.yang index 3299b81d1..fdae1d890 100644 --- a/ordmodels/src/main/yang/org-openroadm-port-types.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-port-types@2017-09-29.yang @@ -4,40 +4,54 @@ module org-openroadm-port-types { import org-openroadm-common-types { prefix org-openroadm-common-types; + revision-date 2017-09-29; } - organization "Open ROADM MSA"; + 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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } revision 2016-10-14 { description "Version 1.2"; @@ -64,6 +78,42 @@ module org-openroadm-port-types { base supported-if-capability; } + identity if-1GE { + base supported-if-capability; + } + + identity if-10GE { + base supported-if-capability; + } + + identity if-40GE { + base supported-if-capability; + } + + identity if-OCH-OTU1-ODU1 { + base supported-if-capability; + } + + identity if-OCH-OTU2-ODU2 { + base supported-if-capability; + } + + identity if-OCH-OTU2E-ODU2E { + base supported-if-capability; + } + + identity if-OCH-OTU3-ODU3 { + base supported-if-capability; + } + + identity if-OCH-OTU4-ODU4 { + base supported-if-capability; + } + + identity if-OTU4-ODU4 { + base supported-if-capability; + } + identity supported-xpdr-capability { description "Base identity from which specific supported xponder are derived"; @@ -82,12 +132,12 @@ module org-openroadm-port-types { enum "wavelength" { value 1; description - "Port on a transponder."; + "Port on a transponder or ROADM SRG add drop"; } - enum "multi-wavelegnth" { + enum "multi-wavelength" { value 2; description - "Port on a ROADM."; + "External port connecting to other roadm."; } } description @@ -108,7 +158,7 @@ module org-openroadm-port-types { 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; @@ -122,29 +172,10 @@ module org-openroadm-port-types { 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/ordmodels/src/main/yang/org-openroadm-probable-cause.yang b/ordmodels/common/src/main/yang/org-openroadm-probable-cause@2016-10-14.yang similarity index 96% rename from ordmodels/src/main/yang/org-openroadm-probable-cause.yang rename to ordmodels/common/src/main/yang/org-openroadm-probable-cause@2016-10-14.yang index e1757b254..eaa0d2a47 100644 --- a/ordmodels/src/main/yang/org-openroadm-probable-cause.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-probable-cause@2016-10-14.yang @@ -11,31 +11,31 @@ module org-openroadm-probable-cause { "OpenROADM.org"; description "YANG definitions of Probable Causes. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-resource-types.yang b/ordmodels/common/src/main/yang/org-openroadm-resource-types@2016-10-14.yang similarity index 92% rename from ordmodels/src/main/yang/org-openroadm-resource-types.yang rename to ordmodels/common/src/main/yang/org-openroadm-resource-types@2016-10-14.yang index e1031aa8b..bb6a80a92 100644 --- a/ordmodels/src/main/yang/org-openroadm-resource-types.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-resource-types@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-resource-types { "OpenROADM.org"; description "YANG definitions of common resource types. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { @@ -125,7 +125,7 @@ module org-openroadm-resource-types { "Device identifier. Unique within the Controller."; leaf node-id { description - "Node Id is a globally unique identifier for a device. + "Node Id is a globally unique identifier for a device. Same as leafref value in model, if applicable."; type string; } @@ -145,7 +145,7 @@ module org-openroadm-resource-types { uses circuit-pack-name; leaf port-name { description - "Port identifier. Unique within the context of a circuit-pack. + "Port identifier. Unique within the context of a circuit-pack. Same as leafref value in model, if applicable."; type string; } @@ -154,7 +154,7 @@ module org-openroadm-resource-types { grouping physical-link-name { leaf physical-link-name { description - "Physical Link identifier. Unique within the context of a device. + "Physical Link identifier. Unique within the context of a device. Same as leafref value in model, if applicable."; type string; mandatory true; @@ -164,7 +164,7 @@ module org-openroadm-resource-types { grouping internal-link-name { leaf internal-link-name { description - "Internal Link identifier. Unique within the context of a device. + "Internal Link identifier. Unique within the context of a device. Same as leafref value in model, if applicable."; type string; mandatory true; @@ -174,7 +174,7 @@ module org-openroadm-resource-types { grouping connection-number { leaf connection-number { description - "Connection identifier. Unique within the context of a device. + "Connection identifier. Unique within the context of a device. Same as leafref value in model, if applicable."; type string; } @@ -183,7 +183,7 @@ module org-openroadm-resource-types { grouping degree-number { leaf degree-number { description - "Degree identifier. Unique within the context of a device. + "Degree identifier. Unique within the context of a device. Same as leafref value in model, if applicable."; type uint16; } @@ -192,7 +192,7 @@ module org-openroadm-resource-types { grouping srg-number { leaf srg-number { description - "Shared Risk Group identifier. Unique within the context of a device. + "Shared Risk Group identifier. Unique within the context of a device. Same as leafref value in model, if applicable."; type uint16; } @@ -201,7 +201,7 @@ module org-openroadm-resource-types { grouping shelf-name { leaf shelf-name { description - "Shelf-id identifier. Unique within the context of a device. + "Shelf-id identifier. Unique within the context of a device. Same as leafref value in model, if applicable."; type string; mandatory true; @@ -211,7 +211,7 @@ module org-openroadm-resource-types { grouping service-name { leaf service-name { description - "Service identifier. Unique within the context of a network. + "Service identifier. Unique within the context of a network. Same as leafref value in model, if applicable."; type string; mandatory true; diff --git a/ordmodels/src/main/yang/org-openroadm-resource.yang b/ordmodels/common/src/main/yang/org-openroadm-resource@2016-10-14.yang similarity index 89% rename from ordmodels/src/main/yang/org-openroadm-resource.yang rename to ordmodels/common/src/main/yang/org-openroadm-resource@2016-10-14.yang index 6547a6b86..25cb9f182 100644 --- a/ordmodels/src/main/yang/org-openroadm-resource.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-resource@2016-10-14.yang @@ -11,31 +11,31 @@ module org-openroadm-resource { "OpenROADM.org"; description "YANG definitions of resources. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-tca.yang b/ordmodels/common/src/main/yang/org-openroadm-tca@2016-10-14.yang similarity index 88% rename from ordmodels/src/main/yang/org-openroadm-tca.yang rename to ordmodels/common/src/main/yang/org-openroadm-tca@2016-10-14.yang index c5d2be79d..632fc1889 100644 --- a/ordmodels/src/main/yang/org-openroadm-tca.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-tca@2016-10-14.yang @@ -7,6 +7,7 @@ module org-openroadm-tca { } import org-openroadm-common-types { prefix org-openroadm-common-types; + revision-date 2016-10-14; } import org-openroadm-pm-types { prefix org-openroadm-pm-types; @@ -23,31 +24,31 @@ module org-openroadm-tca { "OpenROADM.org"; description "YANG definitions of Threshold Crossing Alert types. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-user-mgmt.yang b/ordmodels/common/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang similarity index 88% rename from ordmodels/src/main/yang/org-openroadm-user-mgmt.yang rename to ordmodels/common/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang index 4bf5edbb2..fb5fa6d9e 100644 --- a/ordmodels/src/main/yang/org-openroadm-user-mgmt.yang +++ b/ordmodels/common/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-user-mgmt { "OpenROADM.org"; description "YANG definitions of user managements. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml new file mode 100644 index 000000000..372f42387 --- /dev/null +++ b/ordmodels/device/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + + org.opendaylight.mdsal + binding-parent + 0.12.3-SNAPSHOT + + + + org.opendaylight.transportpce.ordmodels + transportpce-ordmodels-device + 0.2.0-SNAPSHOT + bundle + + + + + org.opendaylight.netconf + netconf-artifacts + 1.4.3-SNAPSHOT + import + pom + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.12.3-SNAPSHOT + import + pom + + + + + + + + org.opendaylight.transportpce.ordmodels + transportpce-ordmodels-common + ${project.version} + + + + + org.opendaylight.netconf + ietf-netconf + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + iana-afn-safi + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + diff --git a/ordmodels/device/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev161014/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java b/ordmodels/device/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev161014/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java new file mode 100644 index 000000000..13595d324 --- /dev/null +++ b/ordmodels/device/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev161014/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java @@ -0,0 +1,19 @@ +package org.opendaylight.yang.gen.v1.http.org.openroadm.syslog.rev161014.syslog.selector.log.selector.selector.facility.log.facility; +import org.opendaylight.yang.gen.v1.http.org.openroadm.syslog.rev161014.syslog.selector.log.selector.selector.facility.log.facility.LogFacility.Facility; + +/** + * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation. + * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32). + * + * The reason behind putting it under src/main/java is: + * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent + * loss of user code. + * + */ +public class LogFacilityFacilityBuilder { + + public static Facility getDefaultInstance(java.lang.String defaultValue) { + throw new java.lang.UnsupportedOperationException("Not yet implemented"); + } + +} diff --git a/ordmodels/src/main/yang/org-openroadm-database.yang b/ordmodels/device/src/main/yang/org-openroadm-database@2016-10-14.yang similarity index 80% rename from ordmodels/src/main/yang/org-openroadm-database.yang rename to ordmodels/device/src/main/yang/org-openroadm-database@2016-10-14.yang index 7d77c9246..991e1cb59 100644 --- a/ordmodels/src/main/yang/org-openroadm-database.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-database@2016-10-14.yang @@ -4,38 +4,38 @@ module 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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { @@ -56,7 +56,7 @@ module org-openroadm-database { } } output { - uses org-openroadm-common-types:rpc-response-status; + uses org-openroadm-common-types:rpc-response-status; } } rpc db-restore { @@ -78,7 +78,7 @@ module org-openroadm-database { } } output { - uses org-openroadm-common-types:rpc-response-status; + uses org-openroadm-common-types:rpc-response-status; } } rpc db-activate { @@ -92,7 +92,7 @@ module org-openroadm-database { } } output { - uses org-openroadm-common-types:rpc-response-status; + uses org-openroadm-common-types:rpc-response-status; } } rpc cancel-rollback-timer { @@ -106,14 +106,14 @@ module org-openroadm-database { } } output { - uses org-openroadm-common-types:rpc-response-status; + 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 - } + uses org-openroadm-common-types:rpc-response-status; + } //output + } } diff --git a/ordmodels/src/main/yang/org-openroadm-de-operations.yang b/ordmodels/device/src/main/yang/org-openroadm-de-operations@2016-10-14.yang similarity index 85% rename from ordmodels/src/main/yang/org-openroadm-de-operations.yang rename to ordmodels/device/src/main/yang/org-openroadm-de-operations@2016-10-14.yang index 741439682..26c3673ef 100644 --- a/ordmodels/src/main/yang/org-openroadm-de-operations.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-de-operations@2016-10-14.yang @@ -8,38 +8,38 @@ module org-openroadm-de-operations { 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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { @@ -65,7 +65,7 @@ module org-openroadm-de-operations { } } output { - uses org-openroadm-common-types:rpc-response-status; + uses org-openroadm-common-types:rpc-response-status; } } notification restart-notification { diff --git a/ordmodels/src/main/yang/org-openroadm-device-resource-types.yang b/ordmodels/device/src/main/yang/org-openroadm-device-resource-types@2016-10-14.yang similarity index 94% rename from ordmodels/src/main/yang/org-openroadm-device-resource-types.yang rename to ordmodels/device/src/main/yang/org-openroadm-device-resource-types@2016-10-14.yang index 100de8dba..eb2d9a2c3 100644 --- a/ordmodels/src/main/yang/org-openroadm-device-resource-types.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-device-resource-types@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-device-resource-types { "OpenROADM.org"; description "YANG definitions of resource types. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-device.yang b/ordmodels/device/src/main/yang/org-openroadm-device@2017-02-06.yang similarity index 95% rename from ordmodels/src/main/yang/org-openroadm-device.yang rename to ordmodels/device/src/main/yang/org-openroadm-device@2017-02-06.yang index 03d96597d..6b84ee1a7 100644 --- a/ordmodels/src/main/yang/org-openroadm-device.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-device@2017-02-06.yang @@ -10,9 +10,10 @@ module org-openroadm-device { } import ietf-netconf { prefix ietf-nc; - } + } import org-openroadm-common-types { prefix org-openroadm-common-types; + revision-date 2016-10-14; } import org-openroadm-resource-types { prefix org-openroadm-resource-types; @@ -44,45 +45,45 @@ module org-openroadm-device { "OpenROADM.org"; description "YANG definitions of ROADM device - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 + 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 + + 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 + Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; revision 2017-02-06 { @@ -180,14 +181,14 @@ module org-openroadm-device { leaf result-file { type string; } - } - - rpc set-current-datetime { + } + + rpc set-current-datetime { description "Set the info/current-datetime leaf to the specified value."; - input { + input { leaf current-datetime { - type ietf-yang-types:date-and-time; + type ietf-yang-types:date-and-time; mandatory true; description "The current system date and time in UTC. Format: YYYY-MM-DDTHH:MM:SS"; @@ -197,7 +198,7 @@ module org-openroadm-device { output { uses org-openroadm-common-types:rpc-response-status; } - } + } grouping device-common { leaf node-id { @@ -209,7 +210,7 @@ module org-openroadm-device { leaf node-number { type uint32; description - "Number assigned to a ROADM node at a + "Number assigned to a ROADM node at a given office"; } leaf node-type { @@ -291,11 +292,11 @@ module org-openroadm-device { "Template information used in the deployment."; } leaf current-datetime { - type ietf-yang-types:date-and-time; + 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"; @@ -306,7 +307,7 @@ module org-openroadm-device { } description "[From wikipedia] Latitude is an angle (defined below) - which ranges from 0° at the Equator to 90° (North or + which ranges from 0° at the Equator to 90° (North or South) at the poles"; } leaf longitude { @@ -315,7 +316,7 @@ module org-openroadm-device { range "-180 .. 180"; } description - "[From wikipedia] The longitude is measured as the + "[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."; @@ -327,7 +328,7 @@ module org-openroadm-device { description "slots information. To be populated by NE during retrieval."; leaf slot-name { - type string; + type string; description "The name of this slot."; } @@ -342,14 +343,14 @@ module org-openroadm-device { } 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 @@ -388,14 +389,14 @@ module org-openroadm-device { description "due date for the shelf."; } - list slots { + 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 { @@ -464,7 +465,7 @@ module org-openroadm-device { 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."; @@ -473,7 +474,7 @@ module org-openroadm-device { type string; description "Slot name on parent-circuit-pack."; - } + } } list cp-slots { description @@ -481,7 +482,7 @@ module org-openroadm-device { key "slot-name"; config false; uses slot-info; - } + } list ports { key "port-name"; description @@ -503,10 +504,10 @@ module org-openroadm-device { type uint32; default "30"; units "m"; - } + } leaf port-direction { type org-openroadm-common-types:direction; - } + } } } } @@ -608,7 +609,7 @@ module org-openroadm-device { grouping external-links { description - "YANG definitions for external links.. + "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"; @@ -1155,18 +1156,18 @@ module org-openroadm-device { } } // 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"; + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-ethernet-interfaces.yang b/ordmodels/device/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang similarity index 85% rename from ordmodels/src/main/yang/org-openroadm-ethernet-interfaces.yang rename to ordmodels/device/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang index 0a5b9f57e..869a2c9cc 100644 --- a/ordmodels/src/main/yang/org-openroadm-ethernet-interfaces.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang @@ -14,45 +14,45 @@ module org-openroadm-ethernet-interfaces { "OpenROADM.org"; description "YANG definitions for device facility ethernet interfaces. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 + + 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 + + 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 + Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; revision 2016-10-14 { @@ -64,7 +64,7 @@ module org-openroadm-ethernet-interfaces { leaf speed { type uint32; description - "Set speed of the interface, unit mbps. + "Set speed of the interface, unit mbps. This is for ETH facility. "; } leaf fec { @@ -73,7 +73,7 @@ module org-openroadm-ethernet-interfaces { enum rsfec; } description "Forward Error Correction Choices. "; - } + } leaf duplex { type enumeration { enum "half" { diff --git a/ordmodels/src/main/yang/org-openroadm-file-transfer.yang b/ordmodels/device/src/main/yang/org-openroadm-file-transfer@2016-10-14.yang similarity index 89% rename from ordmodels/src/main/yang/org-openroadm-file-transfer.yang rename to ordmodels/device/src/main/yang/org-openroadm-file-transfer@2016-10-14.yang index aa507b396..1e1c8ff10 100644 --- a/ordmodels/src/main/yang/org-openroadm-file-transfer.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-file-transfer@2016-10-14.yang @@ -8,38 +8,38 @@ module org-openroadm-file-transfer { 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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { @@ -81,10 +81,10 @@ module org-openroadm-file-transfer { type inet:uri; mandatory true; description - "Remote file path. + "Remote file path. A URI for the remote file path. - - Format:sftp://user[:password]@host[:port]/path. + + Format:sftp://user[:password]@host[:port]/path. Ex: sftp://test:verify@[2001:db8:0:1::10]:22/home/user/sample"; } } diff --git a/ordmodels/src/main/yang/org-openroadm-fwdl.yang b/ordmodels/device/src/main/yang/org-openroadm-fwdl@2016-10-14.yang similarity index 83% rename from ordmodels/src/main/yang/org-openroadm-fwdl.yang rename to ordmodels/device/src/main/yang/org-openroadm-fwdl@2016-10-14.yang index e5f205ca8..95225f3f9 100644 --- a/ordmodels/src/main/yang/org-openroadm-fwdl.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-fwdl@2016-10-14.yang @@ -4,37 +4,37 @@ module 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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-interfaces.yang b/ordmodels/device/src/main/yang/org-openroadm-interfaces@2016-10-14.yang similarity index 83% rename from ordmodels/src/main/yang/org-openroadm-interfaces.yang rename to ordmodels/device/src/main/yang/org-openroadm-interfaces@2016-10-14.yang index 347f9635b..acd74fe6c 100644 --- a/ordmodels/src/main/yang/org-openroadm-interfaces.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-interfaces@2016-10-14.yang @@ -6,47 +6,47 @@ module org-openroadm-interfaces { contact "OpenROADM.org"; description - "YANG definitions for device facility interfaces. + "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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 + + 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 + + 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 + Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License."; revision 2016-10-14 { diff --git a/ordmodels/src/main/yang/org-openroadm-lldp.yang b/ordmodels/device/src/main/yang/org-openroadm-lldp@2016-10-14.yang similarity index 91% rename from ordmodels/src/main/yang/org-openroadm-lldp.yang rename to ordmodels/device/src/main/yang/org-openroadm-lldp@2016-10-14.yang index f8ecb1a98..d7813304a 100644 --- a/ordmodels/src/main/yang/org-openroadm-lldp.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-lldp@2016-10-14.yang @@ -23,38 +23,38 @@ module org-openroadm-lldp { "OpenROADM.org"; description "YANG definitions for lldp protocol. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { + grouping nbr-info-grp { description "Display LLDP Neighbour "; @@ -169,13 +169,13 @@ module org-openroadm-lldp { } description "Chassis ID Subtype Enumeration"; - } + } leaf remoteChassisId { type string; description "remote neighbour Chassis Id"; - } - } + } + } grouping lldp-container { container lldp { @@ -257,9 +257,9 @@ module org-openroadm-lldp { type string; description "Ethernet interface name where LLDP runs"; - } + } uses nbr-info-grp; - } + } } } } @@ -280,17 +280,17 @@ module org-openroadm-lldp { remoteChassisId All of the above attributes are sent in event"; leaf notification-type { - type org-openroadm-resource-types:resource-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"; + description + "resource-type for this notification is interface"; } - leaf resource { + leaf resource { type string; - description - "resource interface-name"; + description + "resource interface-name"; } container nbr-info { uses nbr-info-grp; @@ -298,5 +298,5 @@ module org-openroadm-lldp { leaf event-time { type yang:date-and-time; } - } + } } diff --git a/ordmodels/src/main/yang/org-openroadm-maintenance-loopback.yang b/ordmodels/device/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang similarity index 86% rename from ordmodels/src/main/yang/org-openroadm-maintenance-loopback.yang rename to ordmodels/device/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang index 519d9378b..4f50786b2 100644 --- a/ordmodels/src/main/yang/org-openroadm-maintenance-loopback.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-maintenance-loopback { "OpenROADM.org"; description "YANG definitions for maintenance loopback. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-maintenance-testsignal.yang b/ordmodels/device/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang similarity index 91% rename from ordmodels/src/main/yang/org-openroadm-maintenance-testsignal.yang rename to ordmodels/device/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang index b28cd6b2c..67d980b07 100644 --- a/ordmodels/src/main/yang/org-openroadm-maintenance-testsignal.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-maintenance-testsignal { "OpenROADM.org"; description "YANG definitions for maintenance testsignal. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-optical-channel-interfaces.yang b/ordmodels/device/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang similarity index 93% rename from ordmodels/src/main/yang/org-openroadm-optical-channel-interfaces.yang rename to ordmodels/device/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang index 37c54f49f..921ac438f 100644 --- a/ordmodels/src/main/yang/org-openroadm-optical-channel-interfaces.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang @@ -10,46 +10,47 @@ module org-openroadm-optical-channel-interfaces { } import org-openroadm-common-types { prefix org-openroadm-common-types; - } + revision-date 2016-10-14; + } 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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 @@ -165,7 +166,7 @@ module org-openroadm-optical-channel-interfaces { 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-optical-multiplex-interfaces.yang b/ordmodels/device/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang similarity index 87% rename from ordmodels/src/main/yang/org-openroadm-optical-multiplex-interfaces.yang rename to ordmodels/device/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang index 03be0d4e9..55032413e 100644 --- a/ordmodels/src/main/yang/org-openroadm-optical-multiplex-interfaces.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang @@ -12,39 +12,39 @@ module org-openroadm-optical-multiplex-interfaces { 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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 diff --git a/ordmodels/src/main/yang/org-openroadm-optical-transport-interfaces.yang b/ordmodels/device/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang similarity index 91% rename from ordmodels/src/main/yang/org-openroadm-optical-transport-interfaces.yang rename to ordmodels/device/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang index 84ca45381..75a909bab 100644 --- a/ordmodels/src/main/yang/org-openroadm-optical-transport-interfaces.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang @@ -10,7 +10,8 @@ module org-openroadm-optical-transport-interfaces { } import org-openroadm-common-types { prefix org-openroadm-common-types; - } + revision-date 2016-10-14; + } organization "Open ROADM MSA"; contact @@ -18,39 +19,39 @@ module org-openroadm-optical-transport-interfaces { description "This module contains YANG definitions for the Optical Transport Interfaces. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 @@ -124,7 +125,7 @@ module org-openroadm-optical-transport-interfaces { 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-otn-odu-interfaces.yang b/ordmodels/device/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang similarity index 95% rename from ordmodels/src/main/yang/org-openroadm-otn-odu-interfaces.yang rename to ordmodels/device/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang index 44e2d0d94..3b49effb1 100644 --- a/ordmodels/src/main/yang/org-openroadm-otn-odu-interfaces.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang @@ -17,39 +17,39 @@ module org-openroadm-otn-odu-interfaces { "OpenROADM.org"; description "YANG definitions for device facility otnodu interfaces. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 @@ -120,31 +120,31 @@ module org-openroadm-otn-odu-interfaces { 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 @@ -332,7 +332,7 @@ module org-openroadm-otn-odu-interfaces { enum "not-terminated" { description "Not Terminated: no detection or generation. - Overhead is passed through the interface transparently in receive direction + Overhead is passed through the interface transparently in receive direction unless extension is set for erase"; } enum "terminated" { @@ -344,7 +344,7 @@ module org-openroadm-otn-odu-interfaces { enum "monitored" { description "Monitored: detection enabled. - Overhead is passed through the interface transparently in receive direction + Overhead is passed through the interface transparently in receive direction unless extension is set for erase"; } } diff --git a/ordmodels/src/main/yang/org-openroadm-otn-otu-interfaces.yang b/ordmodels/device/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang similarity index 92% rename from ordmodels/src/main/yang/org-openroadm-otn-otu-interfaces.yang rename to ordmodels/device/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang index d3b5069cc..4fe3bb355 100644 --- a/ordmodels/src/main/yang/org-openroadm-otn-otu-interfaces.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang @@ -17,39 +17,39 @@ module org-openroadm-otn-otu-interfaces { "OpenROADM.org"; description "YANG definitions for device facility otnotu interfaces. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 diff --git a/ordmodels/src/main/yang/org-openroadm-physical-types.yang b/ordmodels/device/src/main/yang/org-openroadm-physical-types@2016-10-14.yang similarity index 89% rename from ordmodels/src/main/yang/org-openroadm-physical-types.yang rename to ordmodels/device/src/main/yang/org-openroadm-physical-types@2016-10-14.yang index 100a443c9..4251018c6 100644 --- a/ordmodels/src/main/yang/org-openroadm-physical-types.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-physical-types@2016-10-14.yang @@ -14,31 +14,31 @@ module org-openroadm-physical-types { "OpenROADM.org"; description "YANG definitions of physical types. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-rstp.yang b/ordmodels/device/src/main/yang/org-openroadm-rstp@2016-10-14.yang similarity index 95% rename from ordmodels/src/main/yang/org-openroadm-rstp.yang rename to ordmodels/device/src/main/yang/org-openroadm-rstp@2016-10-14.yang index 9cedd5cfd..0bec3d913 100644 --- a/ordmodels/src/main/yang/org-openroadm-rstp.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-rstp@2016-10-14.yang @@ -10,33 +10,33 @@ module org-openroadm-rstp { contact "OpenROADM.org"; description - "YANG definitions for rstp protocol. - - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + "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, + + 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 + + * 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 + * 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 + * 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 + + 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 { @@ -208,7 +208,7 @@ module org-openroadm-rstp { } leaf designated-bridgeid { description - "The Bridge Identifier of the bridge that this port considers + "The Bridge Identifier of the bridge that this port considers to be the Designated Bridge for this port's segment"; type bridge-id-type; } diff --git a/ordmodels/src/main/yang/org-openroadm-swdl.yang b/ordmodels/device/src/main/yang/org-openroadm-swdl@2016-10-14.yang similarity index 89% rename from ordmodels/src/main/yang/org-openroadm-swdl.yang rename to ordmodels/device/src/main/yang/org-openroadm-swdl@2016-10-14.yang index 1a8641289..0fdcdb605 100644 --- a/ordmodels/src/main/yang/org-openroadm-swdl.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-swdl@2016-10-14.yang @@ -15,31 +15,31 @@ module org-openroadm-swdl { "OpenROADM.org"; description "Yang definitions for System Management. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-syslog.yang b/ordmodels/device/src/main/yang/org-openroadm-syslog@2016-10-14.yang similarity index 80% rename from ordmodels/src/main/yang/org-openroadm-syslog.yang rename to ordmodels/device/src/main/yang/org-openroadm-syslog@2016-10-14.yang index b0d7709ac..cdac3e8c1 100644 --- a/ordmodels/src/main/yang/org-openroadm-syslog.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-syslog@2016-10-14.yang @@ -10,41 +10,41 @@ module org-openroadm-syslog { contact "OpenROADM.org"; description - "This module contains a collection of YANG definitions + "This module contains a collection of YANG definitions for Syslog configuration. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 @@ -61,8 +61,8 @@ module org-openroadm-syslog { feature selector-sevop-config { description - "This feature represents the ability to select messages - using the additional operators equal to, or not equal to + "This feature represents the ability to select messages + using the additional operators equal to, or not equal to when comparing the Syslog message severity."; } @@ -125,13 +125,13 @@ module org-openroadm-syslog { enum "all" { value 8; description - "This enum describes the case where all severities + "This enum describes the case where all severities are selected."; } enum "none" { value 9; description - "This enum describes the case where no severities + "This enum describes the case where no severities are selected."; } } @@ -142,15 +142,15 @@ module org-openroadm-syslog { grouping syslog-severity { description - "This grouping defines the Syslog severity which is used to + "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 + "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."; @@ -160,75 +160,75 @@ module org-openroadm-syslog { "../severity != 'all' and ../severity != 'none'" { description - "The severity-operator is not applicable for severity 'all' or + "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 + "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 + "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 + "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 + "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, + "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 [ ...]"; container log-selector { description - "This container describes the log selector parameters + "This container describes the log selector parameters for Syslog."; choice selector-facility { mandatory true; description - "This choice describes the option to specify no + "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 + "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 + "This leaf specifies that no facilities are selected for this log-action."; } } case log-facility { description - "This case specifies one or more specified facilities + "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 + "This list describes a collection of Syslog facilities and severities."; leaf facility { type union { @@ -238,7 +238,7 @@ module org-openroadm-syslog { type enumeration { enum "all" { description - "This enum describes the case where all + "This enum describes the case where all facilities are requested."; } } @@ -255,20 +255,20 @@ module org-openroadm-syslog { container syslog { description - "This container describes the configuration parameters for + "This container describes the configuration parameters for Syslog."; container log-actions { description - "This container describes the log-action parameters + "This container describes the log-action parameters for Syslog."; container remote { description - "This container describes the configuration parameters for + "This container describes the configuration parameters for remote logging."; list destination { key "name"; description - "This list describes a collection of remote logging + "This list describes a collection of remote logging destinations."; leaf name { type string; @@ -288,16 +288,16 @@ module org-openroadm-syslog { 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 + "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 + "This leaf specifies the port number used to deliver messages to the remote server."; } } @@ -311,16 +311,16 @@ module org-openroadm-syslog { 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, + "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 + "This leaf specifies the port number used to deliver messages to the remote server."; } } diff --git a/ordmodels/src/main/yang/org-openroadm-wavelength-map.yang b/ordmodels/device/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang similarity index 86% rename from ordmodels/src/main/yang/org-openroadm-wavelength-map.yang rename to ordmodels/device/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang index 0d2a63a78..451cae63a 100644 --- a/ordmodels/src/main/yang/org-openroadm-wavelength-map.yang +++ b/ordmodels/device/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang @@ -7,31 +7,31 @@ module org-openroadm-wavelength-map { "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, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml new file mode 100644 index 000000000..71824cf1c --- /dev/null +++ b/ordmodels/network/pom.xml @@ -0,0 +1,58 @@ + + + + 4.0.0 + + + org.opendaylight.mdsal + binding-parent + 0.12.3-SNAPSHOT + + + + org.opendaylight.transportpce.ordmodels + transportpce-ordmodels-network + 0.2.0-SNAPSHOT + bundle + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.12.3-SNAPSHOT + import + pom + + + + + + + + org.opendaylight.transportpce.ordmodels + transportpce-ordmodels-common + ${project.version} + + + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + ietf-network-2015-06-08 + + + diff --git a/ordmodels/network/src/main/yang/org-openroadm-amplifier@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-amplifier@2017-09-29.yang new file mode 100644 index 000000000..679da9974 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-amplifier@2017-09-29.yang @@ -0,0 +1,132 @@ +module org-openroadm-amplifier { + namespace "http://org/openroadm/amplifier"; + prefix amp; + + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2017-09-29; + } + + organization + "Open ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for an amplifier in Network Model + + + Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2017, + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-17 { + description + "Version 2.0"; + } + + grouping amplifier-node-attributes { + description + "Defines the group of amplifier attributes"; + leaf amp-type { + description + "Amplifier type"; + type org-openroadm-common-types:amplifier-types; + config true; + mandatory true; + } + leaf amp-gain-range { + description + "Amplifier gain-range (gain-range 1 to 4 for switched gain amplifiers) + gain-range-1 for standard amplifiers"; + type org-openroadm-common-types:amplifier-gain-range; + config true; + } + leaf ingress-span-loss-aging-margin { + type org-openroadm-common-types:ratio-dB; + description + "Span-loss margin used to set optical amplifier gain and output-voa + extracted from corresponding device OTS interface container, optional + since it concerns only line facing amp"; + config true; + } + leaf gain { + type org-openroadm-common-types:ratio-dB; + description + "Overall Amplifier Signal gain, excluding ASE, including VOA attenuation + retrieved from operational value (PM)"; + config true; + mandatory true; + } + leaf initially-planned-gain { + type org-openroadm-common-types:ratio-dB; + description + "Overall Amplifier Signal gain, excluding ASE, including VOA attenuation: + value coming from planning tool initial design"; + config true; + } + leaf tilt { + type org-openroadm-common-types:ratio-dB; + description + "Tilt of smart EDFA retrieved from operational value (PM)"; + config true; + } + leaf initially-planned-tilt { + type org-openroadm-common-types:ratio-dB; + description + "Tilt of smart EDFA: + value coming from planning tool initial design"; + config true; + } + leaf out-voa-att { + type org-openroadm-common-types:ratio-dB; + description + "output VOA attenuation"; + config true; + } + leaf initially-planned-out-voa-att { + type org-openroadm-common-types:ratio-dB; + description + "output VOA attenuation: value coming from planning tool initial design. + As in R2.0, output VOA can not be configured by controller, this parameter may be used by the controller + to check that value set by amplifiers is in the range of calculated value and take relevant decision if not"; + config true; + } + leaf eol-max-load-pIn { + type org-openroadm-common-types:power-dBm; + description + "End Of Life Total input power at maximum load used for amplifier and VOA setting + extracted from corresponding device OTS interface container"; + config true; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang b/ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang new file mode 100644 index 000000000..6dbd262d7 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang @@ -0,0 +1,68 @@ +module org-openroadm-clli-network { + namespace "http://org/openroadm/clli/network"; + prefix cn; + + import ietf-network { + prefix nd; + revision-date 2015-06-08; + } + + organization + "Open ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for a CLLI Network + + 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 2017-06-26 { + description + "Version 2.0"; + } + + augment "/nd:network/nd:network-types" { + description + "Introduce new network type for the Open ROADM optical network"; + container clli-network { + presence "indicates optical network of Open ROADMs"; + description + "The presence of the container node indicates Open ROADM + network"; + } + } + augment "/nd:network/nd:node" { + when "../nd:network-types/clli-network"; + description + "Augment the generic network node with Open ROADM attributes."; + leaf clli { + type string; + description + "CLLI identifier"; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-degree@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-degree@2017-09-29.yang new file mode 100644 index 000000000..b336718f1 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-degree@2017-09-29.yang @@ -0,0 +1,109 @@ +module org-openroadm-degree { + namespace "http://org/openroadm/degree"; + prefix dgr; + + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2017-09-29; + } + import org-openroadm-network-types { + prefix org-openroadm-network-types; + revision-date 2017-09-29; + } + + organization + "Open ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for a Degree in Network Model + + + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + revision 2016-10-14 { + description + "Version 1.2"; + } + + grouping degree-used-wavelengths { + description + "This list is created to accommodate fixed grid (1.2.1) as well as flex grid (2.0 above). In case of fixed grid + index number will refer to one of the 96 WL defined in the wavelength map file. In case of flex grid this + will hold list of used spectrums"; + list used-wavelengths { + key "index"; + uses org-openroadm-network-types:wavelengths; + + } + } + + grouping degree-node-attributes { + description + "Defines the group of degree attributes"; + leaf degree-number { + type uint16; + } + leaf max-wavelengths { + type uint32; + description + "maximum # of wavelengths"; + } + list available-wavelengths { + key "index"; + uses org-openroadm-network-types:wavelengths; + description + "This list is created to accommodate fixed grid (1.2.1) as well as flex grid (2.0 above). In case of fixed grid + index number will refer to one of the 96 WL defined in the wavelength map file. In case of flex grid this + will hold list of available spectrums"; + } + leaf ingress-span-loss-aging-margin { + type org-openroadm-common-types:ratio-dB; + description + "Span-loss margin extracted from corresponding device OTS interface container, optional"; + config true; + } + leaf eol-max-load-pIn { + type org-openroadm-common-types:power-dBm; + description + "End Of Life Total input power at maximum load extracted from corresponding device OTS interface container"; + config true; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2017-09-29.yang new file mode 100644 index 000000000..5f9b6d8e4 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2017-09-29.yang @@ -0,0 +1,106 @@ +module org-openroadm-external-pluggable { + namespace "http://org/openroadm/external/pluggable"; + prefix plg; + + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2017-09-29; + } + + organization + "OPEN ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for External Pluggable + + + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + revision 2016-10-14 { + description + "Version 1.2"; + } + + grouping pluggable-node-attributes { + leaf pluggable-id { + type string; + description + "Network-wide unique identifier for a pluggable"; + } + leaf customer-code { + type string; + description + "Owner of the pluggable"; + } + container tail { + leaf client-equipment { + type string; + } + leaf client-equipment-id { + type string; + } + leaf clfi { + type string; + } + } + } + + grouping pluggable-tp-attributes { + leaf rate { + type identityref { + base org-openroadm-common-types:och-rate-identity; + } + description + "rate"; + } + leaf modulation-format { + type org-openroadm-common-types:modulation-format; + } + leaf optic { + type org-openroadm-common-types:optic-types; + } + leaf state { + type org-openroadm-common-types:state; + description + "A xponder can be in one of the following + states"; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-link@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-link@2017-09-29.yang new file mode 100644 index 000000000..04c9088a2 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-link@2017-09-29.yang @@ -0,0 +1,200 @@ +module org-openroadm-link { + namespace "http://org/openroadm/link"; + prefix link; + + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2017-09-29; + } + import org-openroadm-amplifier { + prefix org-openroadm-amplifier; + revision-date 2017-09-29; + } + + organization + "Open ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for an amplifier in Network Model + + + Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2017, + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-17 { + description + "Version 2.0"; + } + + grouping OMS-attributes { + leaf TE-metric { + type uint32; + } + } + + grouping span-attributes { + leaf clfi { + type string; + } + leaf auto-spanloss { + type boolean; + default "true"; + description + "Flag to enable/disable automatic spanloss measurement"; + } + leaf spanloss-base { + type org-openroadm-common-types:ratio-dB; + description + "Baseline ROADM span loss measured and accepted during + degree turn-up."; + } + leaf spanloss-current { + type org-openroadm-common-types:ratio-dB; + description + "Current ROADM span loss measured and accepted during + degree turn-up."; + } + leaf engineered-spanloss { + type org-openroadm-common-types:ratio-dB; + description + "ROADM span loss provided by an external system"; + } + list link-concatenation { + key "SRLG-Id"; + leaf SRLG-Id { + type uint32; + description + "unique identifier for SRLG"; + } + 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)"; + } + } + } + leaf SRLG-length { + type uint32; + description + "fiber length in meters"; + } + leaf pmd { + type org-openroadm-common-types:fiber-pmd; + description + "Total PMD"; + } + } + } + + grouping amplified-link-attributes { + list amplified-link { + description + "defines the spans and the amplifier blocks of the amplified lines"; + key "section-elt-number"; + leaf section-elt-number { + type uint16; + description + "Id of the section element (whether it's a Span or an Amp)"; + } + container section-element { + choice section-element { + case ila { + container ila { + uses org-openroadm-amplifier:amplifier-node-attributes; + leaf node-id { + type org-openroadm-common-types:node-id-type; + mandatory true; + description + "Node id corresponding to the amplifier "; + } + leaf administrative-state { + type org-openroadm-common-types:state; + description + "according to RFC3630 definition"; + } + } + } + case span { + container span { + uses link:span-attributes; + leaf administrative-state { + type org-openroadm-common-types:state; + description + "according to RFC3630 definition"; + } + } + } + } + } + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang new file mode 100644 index 000000000..817cdf164 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang @@ -0,0 +1,291 @@ +module org-openroadm-network-topology { + namespace "http://org/openroadm/network/topology"; + prefix topo; + + import ietf-network { + prefix nd; + revision-date 2015-06-08; + } + import ietf-network-topology { + prefix nwt; + revision-date 2015-06-08; + } + import org-openroadm-network-types { + prefix org-openroadm-network-types; + revision-date 2017-09-29; + } + import org-openroadm-srg { + prefix srg; + revision-date 2017-09-29; + } + import org-openroadm-degree { + prefix dgr; + revision-date 2017-09-29; + } + import org-openroadm-xponder { + prefix xpdr; + revision-date 2017-09-29; + } + import org-openroadm-external-pluggable { + prefix plg; + revision-date 2017-09-29; + } + import org-openroadm-link { + prefix link; + revision-date 2017-09-29; + } + import org-openroadm-common-types { + prefix ct; + revision-date 2017-09-29; + } + + organization + "OPEN ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for network view of a ROADM + + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + + augment "/nd:network/nd:network-types" { + description + "Introduce new network type for the Open ROADM optical + ` network topology"; + container openroadm-topology { + presence "indicates optical network topology for Open ROADMs"; + } + } + augment "/nd:network/nd:node" { + when "../nd:network-types/openroadm-topology"; + description + "This augmentations adds the ROADM Node type to the generic node + definition and defines node-sepcific attributes for each node type + in the ROADM Topology."; + leaf node-type { + type org-openroadm-network-types:openroadm-node-type; + description + "The type of a node in the ROADM topology. Valid node types are 'SRG', 'DEGREE', + 'TPDR', 'SWITCH', 'REGEN', 'REGEN-UNI', 'EXT-PLUGGABLE' and 'MUXPDR'"; + } + container srg-attributes { + when "../node-type = 'SRG'"; + uses srg:srg-node-attributes; + description + "Topology-related attributes for SRG nodes"; + } + container degree-attributes { + when "../node-type = 'DEGREE'"; + uses dgr:degree-node-attributes; + description + "Topology-related attributes for degree nodes"; + } + container xpdr-attributes { + when "../node-type = 'TPDR' or ../node-type = 'MUXPDR' or ../node-type = 'REGEN' or + ../node-type = 'REGEN-UNI' or ../node-type = 'SWITCH'"; + uses xpdr:xpdr-topo-node-attributes; + description + "Topology-related attributes for Xponder nodes"; + } + } + augment "/nd:network/nd:node/nwt:termination-point" { + when "../../nd:network-types/openroadm-topology"; + description + "Defines the type of a termination point in the ROADM topology and + TP-specific attributes for each termination point type."; + leaf tp-type { + type org-openroadm-network-types:openroadm-tp-type; + must "../../topo:node-type != 'DEGREE' or (../../topo:node-type = 'DEGREE' and + (../topo:tp-type = 'DEGREE-TX-TTP' or ../topo:tp-type = 'DEGREE-RX-TTP' or ../topo:tp-type = 'DEGREE-TXRX-TTP' or + ../topo:tp-type = 'DEGREE-TX-CTP' or ../topo:tp-type = 'DEGREE-RX-CTP' or ../topo:tp-type = 'DEGREE-TXRX-CTP'))" { + error-message "Invalid TP for node type 'DEGREE'"; + } + must "../../topo:node-type != 'SRG' or (../../topo:node-type = 'SRG' and + (../topo:tp-type = 'SRG-TX-CP' or ../topo:tp-type = 'SRG-RX-CP' or ../topo:tp-type = 'SRG-TXRX-CP' or + ../topo:tp-type = 'SRG-RX-PP' or ../topo:tp-type = 'SRG-TX-PP' or ../topo:tp-type = 'SRG-TXRX-PP'))" { + error-message "Invalid TP for node type 'SRG'"; + } + must " (../../topo:node-type != 'TPDR' and ../../topo:node-type != 'MUXPDR' and ../../topo:node-type != 'REGEN' and + ../../topo:node-type != 'REGEN-UNI' and ../../topo:node-type != 'SWITCH') + or ((../../topo:node-type = 'TPDR' or ../../topo:node-type = 'MUXPDR' or ../../topo:node-type = 'REGEN' or + ../../topo:node-type = 'REGEN-UNI' or ../../topo:node-type = 'SWITCH') and + (../topo:tp-type = 'XPONDER-NETWORK' or ../topo:tp-type = 'XPONDER-CLIENT' or ../topo:tp-type = 'XPONDER-PORT'))" { + error-message "Invalid TP for node type 'XPONDER'"; + } + must "../../topo:node-type != 'EXT-PLUGGABLE' or (../../topo:node-type = 'EXT-PLUGGABLE' and ../topo:tp-type = 'EXT-PLUGGABLE-TP')" { + error-message "Invalid TP for node type 'EXT-PLUGGABLE'"; + } + description + "The TP type; also defines which TP types can be instantiated + on which Node types"; + } + container tx-ttp-attributes { + when "../tp-type = 'DEGREE-TX-TTP' or ../tp-type = 'DEGREE-TXRX-TTP'"; + description + "There must be only one TP of type DEGREE-TX-TTP in any given + degree node"; + uses dgr:degree-used-wavelengths; + } + container rx-ttp-attributes { + when "../tp-type = 'DEGREE-RX-TTP'"; + description + "There must be only one TP of type DEGREE-RX-TTP in any given + degree node"; + uses dgr:degree-used-wavelengths; + } + container ctp-attributes { + when "../tp-type = 'DEGREE-TX-CTP' or ../tp-type = 'DEGREE-RX-CTP' or ../tp-type = 'DEGREE-TXRX-CTP'"; + uses dgr:degree-used-wavelengths; + } + container cp-attributes { + when "../tp-type = 'SRG-TX-CP' or ../tp-type = 'SRG-RX-CP' or ../tp-type = 'SRG-TXRX-CP'"; + list used-wavelengths { + key "index"; + uses org-openroadm-network-types:wavelengths; + } + description + "This list is created to accommodate fixed grid (1.2.1) as well as flex grid (2.0 above). In case of fixed grid + index number will refer to one of the 96 WL defined in the wavelength map file. In case of flex grid this + will hold list of used spectrums"; + } + container pp-attributes { + when "../tp-type = 'SRG-TXRX-PP' or ../tp-type = 'SRG-TX-PP' or ../tp-type = 'SRG-RX-PP' "; + list used-wavelength { + key "index"; + uses org-openroadm-network-types:wavelengths; + } + description + "This list is created to accommodate fixed grid (1.2.1) as well as flex grid (2.0 above). In case of fixed grid + index number will refer to one of the 96 WL defined in the wavelength map file. In case of flex grid this + will hold list of used spectrums"; + } + leaf eqpt-srg-id { + when "../tp-type = 'XPONDER-CLIENT' or ../tp-type = 'XPONDER-NETWORK' or ../tp-type = 'EXT-PLUGGABLE-TP' or + ../tp-type = 'XPONDER-PORT'"; + description + "Shared Risk Group identifier. All ports in a circuit-pack will have same srg-id"; + type uint32; + } + container xpdr-client-attributes { + when "../tp-type = 'XPONDER-CLIENT'"; + uses xpdr:xpdr-connection-attributes; + uses xpdr:xpdr-port-connection-attributes; + } + container xpdr-network-attributes { + when "../tp-type = 'XPONDER-NETWORK'"; + uses xpdr:xpdr-connection-attributes; + uses xpdr:xpdr-port-connection-attributes; + } + container xpdr-port-attributes { + when "../tp-type = 'XPONDER-PORT'"; + uses xpdr:xpdr-connection-attributes; + uses xpdr:xpdr-port-connection-attributes; + } + container ext-pluggable-attributes { + when "../tp-type = 'EXT-PLUGGABLE-TP'"; + uses plg:pluggable-tp-attributes; + } + } + augment "/nd:network/nwt:link" { + when "../nd:network-types/openroadm-topology"; + description + "This augmentation defines ROADM link types in the ROADM topology"; + leaf link-type { + type org-openroadm-network-types:openroadm-link-type; + } + leaf link-length { + type decimal64 { + fraction-digits 2; + } + } + leaf administrative-group { + type uint32; + description + "according to RFC 3630 definition"; + } + leaf operational-state { + type ct:state; + description + "according to RFC 3630 definition"; + } + leaf administrative-state { + type ct:state; + description + "according to RFC 3630 definition"; + } + leaf link-latency { + type uint32; + description + "Latency of a link"; + } + leaf amplified { + when "../link-type = 'ROADM-TO-ROADM'"; + type boolean; + description + "defines whether an ROADM-TO-ROADM Link includes line amplifiers or not"; + } + container OMS-attributes { + when "../link-type = 'ROADM-TO-ROADM'"; + description + ""; + uses link:OMS-attributes; + leaf opposite-link { + type leafref { + path "../../../nwt:link/nwt:link-id"; + } + description + "optional - pointer to reverse link in case of bidirectional link"; + } + container span { + when "../../amplified = 'false'"; + description + ""; + uses link:span-attributes; + } + container amplified-link { + when "../../amplified = 'true'"; + description + "when amplified is set to true, rather than a simple OMS section + we have an amplified link"; + uses link:amplified-link-attributes; + } + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang new file mode 100644 index 000000000..bfc6da9c4 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang @@ -0,0 +1,334 @@ +module org-openroadm-network-types { + namespace "http://org/openroadm/network/types"; + prefix nt; + + import ietf-network-topology { + prefix nwt; + revision-date 2015-06-08; + } + import ietf-yang-types { + prefix yang; + revision-date 2013-07-15; + } + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2017-09-29; + } + import org-openroadm-port-types { + prefix org-openroadm-port-types; + revision-date 2017-09-29; + } + + organization + "OPEN ROADM MSA"; + contact + "www.OpenROADM.org."; + description + "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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + + typedef openroadm-node-type { + type enumeration { + enum "ROADM" { + value 1; + } + enum "DEGREE" { + value 11; + } + enum "SRG" { + value 12; + } + enum "XPONDER" { + value 3; + } + enum "EXT-PLUGGABLE" { + value 4; + } + enum "TPDR" { + value 13; + } + enum "MUXPDR" { + value 14; + } + enum "REGEN" { + value 15; + } + enum "REGEN-UNI" { + value 16; + } + enum "SWITCH" { + value 17; + } + } + } + + typedef openroadm-tp-type { + type enumeration { + enum "DEGREE-TX-TTP" { + value 1; + } + enum "DEGREE-RX-TTP" { + value 2; + } + enum "DEGREE-TX-CTP" { + value 3; + } + enum "DEGREE-RX-CTP" { + value 4; + } + enum "SRG-TX-CP" { + value 5; + } + enum "SRG-RX-CP" { + value 6; + } + enum "SRG-TXRX-PP" { + value 7; + } + enum "SRG-RX-PP" { + value 8; + } + enum "SRG-TX-PP" { + value 9; + } + enum "XPONDER-NETWORK" { + value 10; + } + enum "XPONDER-CLIENT" { + value 11; + } + enum "EXT-PLUGGABLE-TP" { + value 12; + } + enum "DEGREE-TXRX-TTP" { + value 13; + } + enum "SRG-TXRX-CP" { + value 14; + } + enum "XPONDER-PORT" { + value 15; + } + enum "DEGREE-TXRX-CTP" { + value 16; + } + } + } + + typedef openroadm-link-type { + type enumeration { + enum "EXPRESS-LINK" { + value 1; + } + enum "ADD-LINK" { + value 2; + } + enum "DROP-LINK" { + value 3; + } + enum "ROADM-TO-ROADM" { + value 4; + } + enum "XPONDER-INPUT" { + value 5; + } + enum "XPONDER-OUTPUT" { + value 6; + } + enum "OTN-LINK" { + value 7; + } + } + } + + typedef openroadm-node-status { + type enumeration { + enum "PLANNED" { + value 1; + } + enum "DEPLOYED" { + value 2; + } + enum "MAINTENANCE" { + value 3; + } + } + } + + typedef openroadm-node-mount-status { + type enumeration { + enum "MOUNTED" { + value 1; + } + enum "UNMOUNTED" { + value 2; + } + } + } + + grouping wavelengths { + leaf index { + type uint32; + } + uses flex-wave; + } + + grouping flex-wave { + leaf frequency { + type org-openroadm-common-types:frequency-THz; + description + "Center Frequency in THz"; + config true; + } + leaf width { + type org-openroadm-common-types:frequency-GHz; + description + "Frequency width in GHz."; + config true; + } + } + + grouping xpdr-tp-supported-interfaces { + list supported-interface-capability { + key "if-cap-type"; + description + "Supported interface capability on the port."; + leaf if-cap-type { + description + "Interface type/hierarchy/rate supported on this port"; + type identityref { + base org-openroadm-port-types:supported-if-capability; + } + } + } + } + + grouping xpdr-tp-bandwidth-sharing { + list tp-bandwidth-sharing { + key "tp-sharing-id"; + leaf tp-sharing-id { + type uint16; + } + leaf-list tp-list { + type nwt:tp-id; + } + leaf shared-bandwidth { + type uint16; + units "Gbps"; + } + } + } + + grouping xpdr-odu-switching-pools { + list odu-switching-pools { + key "switching-pool-number"; + leaf switching-pool-number { + description + "Unique identifier for this odu-switching-pool"; + type uint16; + } + leaf switching-pool-type { + type enumeration { + enum "non-blocking" { + value 1; + description + "Single non-blocking element"; + } + enum "blocking" { + value 2; + description + "Multiple connected non-blocking lists"; + } + } + } + list non-blocking-list { + description + "List of ports in a non-blocking switch element"; + key "nbl-number"; + leaf nbl-number { + description + "Identifier for this non-blocking-list. Unique within odu-switching-pool"; + type uint16; + } + leaf interconnect-bandwidth-unit { + description + "Switch fabric interconnect bandwidth unit rate in bits per second. + Represents granularity of switch fabric"; + type uint32; + } + leaf capable-interconnect-bandwidth { + description + "Total interconnect bandwidth for a non-blocking element expressed as + number of inter-connect-bandwidth units"; + type uint32; + } + leaf available-interconnect-bandwidth { + description + "Total interconnect bandwidth available for a non-blocking element can use as + number of inter-connect-bandwidth units"; + type uint32; + } + leaf-list tp-list { + description + "Termination point. Unique within device"; + type nwt:tp-id; + } + } + } + } + + grouping node-due-date-list { + list due-dates { + key "id"; + leaf id { + type uint16; + } + leaf start-date { + type yang:date-and-time; + description + "date and time node will begin maintenance status or date when node is planned"; + } + leaf end-date { + type yang:date-and-time; + description + "date and time node will end maintenance or date when node is deployed"; + } + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang new file mode 100644 index 000000000..cb9498675 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang @@ -0,0 +1,166 @@ +module org-openroadm-network { + namespace "http://org/openroadm/network"; + prefix net; + + import ietf-network { + prefix nd; + revision-date 2015-06-08; + } + import org-openroadm-network-types { + prefix nt; + revision-date 2017-09-29; + } + import org-openroadm-roadm { + prefix roadm; + revision-date 2017-09-29; + } + import org-openroadm-external-pluggable { + prefix plg; + revision-date 2017-09-29; + } + import org-openroadm-xponder { + prefix xpdr; + revision-date 2017-09-29; + } + import ietf-inet-types { + prefix inet; + revision-date 2013-07-15; + } + + organization + "OPEN ROADM MSA"; + contact + "www.OpenROADM.org."; + description + "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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + revision 2016-10-14 { + description + "Version 1.2"; + } + + augment "/nd:network/nd:network-types" { + description + "Introduce new network type for the Open ROADM optical network"; + container openroadm-network { + presence "indicates optical network of Open ROADMs"; + description + "The presence of the container node indicates Open ROADM + network"; + } + } + augment "/nd:network/nd:node" { + when "../nd:network-types/openroadm-network"; + description + "Augment the generic network node with Open ROADM attributes."; + leaf node-type { + type nt:openroadm-node-type; + description + "A component of the network topology. + Valid node types are XPONDER, EXT-PLUGGABLE and ROADM. + Once the node-type is configured, it should not be modified."; + } + leaf node-mount-status { + type nt:openroadm-node-mount-status; + description + "Mount status of a node"; + } + leaf software-version { + type string; + description + "Vendor software version"; + } + leaf openroadm-version { + type string; + description + "OpenROADM software version"; + } + leaf vendor { + type string; + description + "Identifier of the supplier"; + } + leaf model { + type string; + description + "Identifier of the supplier's equipment"; + } + leaf domain-subnetwork { + type string; + description + "Specific Domain-Subnetwork in which the node resides"; + } + leaf ip { + type inet:ip-address; + description + "IP address assigned to the node"; + } + leaf relay-rack { + type string; + description + "Frame Identification Code (FIC)"; + } + leaf shelf { + type string; + } + leaf node-status { + type nt:openroadm-node-status; + } + container roadm-attributes { + when "../node-type = 'ROADM'"; + description + "Attributes for the ROADM Node."; + uses roadm:roadm-node-attributes; + } + container xpdr-attributes { + when "../node-type = 'XPONDER'"; + uses xpdr:xpdr-node-attributes; + } + container pluggable-attributes { + when "../node-type = 'EXT-PLUGGABLE'"; + uses plg:pluggable-node-attributes; + } + container plan-due-dates { + uses nt:node-due-date-list; + } + container node-maintenance-schedule { + uses nt:node-due-date-list; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang new file mode 100644 index 000000000..67641777c --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang @@ -0,0 +1,31 @@ +module org-openroadm-opposite-links { + namespace "http://org/openroadm/opposite/links"; + prefix opp-links; + + import ietf-network { + prefix nd; + revision-date 2015-06-08; + } + import ietf-network-topology { + prefix nwt; + revision-date 2015-06-08; + } + + revision 2017-09-29 { + description + "Version 2.1"; + } + + augment "/nd:network/nwt:link" { + when "../nd:network-types/openroadm-topology"; + description + "Introduce new field opposite-links"; + leaf opposite-link { + type leafref { + path "../../nwt:link/nwt:link-id"; + } + description + "optional - pointer to reverse link in case of bidirectional link"; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang new file mode 100644 index 000000000..2b890510d --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang @@ -0,0 +1,174 @@ +module org-openroadm-otn-network-topology { + namespace "http://org/openroadm/otn/network/topology"; + prefix otn-topo; + + import ietf-network { + prefix nd; + revision-date 2015-06-08; + } + import ietf-network-topology { + prefix nwt; + revision-date 2015-06-08; + } + import org-openroadm-network-types { + prefix org-openroadm-network-types; + revision-date 2017-09-29; + } + import org-openroadm-xponder { + prefix xpdr; + revision-date 2017-09-29; + } + import org-openroadm-common-types { + prefix ct; + revision-date 2017-09-29; + } + + organization + "OPEN ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for network view of a ROADM + + 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 2017-09-29 { + description + "Version 2.1"; + } + + augment "/nd:network/nd:network-types" { + description + "Introduce new network type for the Open ROADM OTN + ` network topology"; + container otn-topology { + presence "indicates OTN topology for Muxponder, Switchponder and OTN-switch"; + } + } + augment "/nd:network/nd:node" { + when "../nd:network-types/otn-topology"; + description + "This augmentations adds the OTN Node type to the generic node + definition and defines node-sepcific attributes for each node type + in the OTN Topology."; + leaf node-type { + type org-openroadm-network-types:openroadm-node-type; + description + "The type of a node in the OTN topology. Valid node types are 'MUXPDR' and 'SWITCH'"; + } + container tp-bandwidth-sharing { + when "../node-type = 'MUXPDR' or ../node-type = 'SWITCH'"; + uses org-openroadm-network-types:xpdr-tp-bandwidth-sharing; + } + container switching-pools { + when "../node-type = 'MUXPDR' or ../node-type = 'SWITCH'"; + uses org-openroadm-network-types:xpdr-odu-switching-pools; + description + "ODU Switching pool"; + } + container xpdr-attributes { + when "../node-type = 'MUXPDR' or ../node-type = 'SWITCH'"; + uses xpdr:xpdr-topo-node-attributes; + description + "Topology-related attributes for Xponder nodes"; + } + } + augment "/nd:network/nd:node/nwt:termination-point" { + when "../../nd:network-types/otn-topology"; + description + "Defines the type of a termination point in the OTN topology and + TP-specific attributes for each termination point type."; + leaf tp-type { + type org-openroadm-network-types:openroadm-tp-type; + must "(../../otn-topo:node-type != 'MUXPDR' and ../../otn-topo:node-type != 'SWITCH') or + ((../../otn-topo:node-type = 'MUXPDR' or ../../otn-topo:node-type = 'SWITCH') and + (../otn-topo:tp-type = 'XPONDER-NETWORK' or ../otn-topo:tp-type = 'XPONDER-CLIENT' or ../otn-topo:tp-type = 'XPONDER-PORT'))" { + error-message "Invalid TP for node type Xponder"; + } + description + "The TP type; also defines which TP types can be instantiated + on which Node types"; + } + leaf eqpt-srg-id { + description + "Shared Risk Group identifier. All ports in a circuit-pack will have same srg-id"; + type uint32; + } + container tp-supported-interfaces { + when "../tp-type = 'XPONDER-NETWORK' or ../tp-type = 'XPONDER-CLIENT' or ../tp-type = 'XPONDER-PORT'"; + uses org-openroadm-network-types:xpdr-tp-supported-interfaces; + description + "Supported interface capability on the port."; + } + container xpdr-tp-port-connection-attributes { + when "../tp-type = 'XPONDER-NETWORK' or ../tp-type = 'XPONDER-CLIENT' or ../tp-type = 'XPONDER-PORT'"; + description + "Topology-related attributes for Xpdr nodes"; + uses xpdr:xpdr-otn-tp-attributes; + uses xpdr:xpdr-port-connection-attributes; + uses xpdr:xpdr-otn-tail-attributes; + } + } + augment "/nd:network/nwt:link" { + when "../nd:network-types/otn-topology"; + description + "This augmentation defines Logical link types in the OTN topology connecting OTN elements"; + leaf link-type { + type org-openroadm-network-types:openroadm-link-type; + } + leaf administrative-group { + type uint32; + description + "according to RFC 3630 definition"; + } + leaf operational-state { + type ct:state; + description + "according to RFC 3630 definition"; + } + leaf administrative-state { + type ct:state; + description + "according to RFC 3630 definition"; + } + leaf available-bandwidth { + type uint32; + description + "Availabled bandwidth between OTN elements"; + } + leaf used-bandwidth { + type uint32; + description + "Used bandwidth between OTN elements"; + } + leaf ODU-protected { + type boolean; + description + "ODU protection flag"; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-roadm@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-roadm@2017-09-29.yang new file mode 100644 index 000000000..75a6c4332 --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-roadm@2017-09-29.yang @@ -0,0 +1,73 @@ +module org-openroadm-roadm { + namespace "http://org/openroadm/roadm"; + prefix roadm; + + organization + "OPEN ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for network view of a ROADM + + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + revision 2016-10-14 { + description + "Version 1.2"; + } + + grouping roadm-node-attributes { + leaf max-degrees { + type uint16; + description + "Max no. of degrees supported by the node"; + } + leaf max-srgs { + type uint16; + description + "Max no. of SRGs supported by the node"; + } + leaf current-degrees { + type uint16; + description + "Current no. of degrees supported by the node"; + } + leaf current-srgs { + type uint16; + description + "Current no. of SRGs supported by the node"; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-srg@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-srg@2017-09-29.yang new file mode 100644 index 000000000..73d77a44d --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-srg@2017-09-29.yang @@ -0,0 +1,90 @@ +module org-openroadm-srg { + namespace "http://org/openroadm/srg"; + prefix srg; + + import org-openroadm-network-types { + prefix org-openroadm-network-types; + revision-date 2017-09-29; + } + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2017-09-29; + } + + organization + "OPEN ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for an Add/Drop group in Network Model + + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + revision 2016-10-14 { + description + "Version 1.2"; + } + + grouping srg-node-attributes { + leaf srg-number { + type uint16; + } + leaf max-pp { + type uint32; + description + "Maximum number of add/drop port pairs in an SRG"; + } + leaf current-provisioned-pp { + type uint32; + description + "current provisioned number of port pair in a given SRG"; + } + list available-wavelengths { + key "index"; + uses org-openroadm-network-types:wavelengths; + description + "This list is created to accommodate fix grid (1.2.1) as well as flex grid (2.0 above). In case of fixed grid + index number will refer to one of the 96 WL defined in the wavelength map file. In case of flex grid this + will hold list of available spectrums"; + } + leaf wavelength-duplication { + type org-openroadm-common-types:wavelength-duplication-type; + } + } +} diff --git a/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang new file mode 100644 index 000000000..d6934d2be --- /dev/null +++ b/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang @@ -0,0 +1,185 @@ +module org-openroadm-xponder { + namespace "http://org/openroadm/xponder"; + prefix xpndr; + + import ietf-network { + prefix nd; + revision-date 2015-06-08; + } + import ietf-network-topology { + prefix nwt; + revision-date 2015-06-08; + } + import org-openroadm-network-types { + prefix org-openroadm-network-types; + revision-date 2017-09-29; + } + import org-openroadm-common-types { + prefix org-openroadm-common-types; + revision-date 2017-09-29; + } + import org-openroadm-otn-common-types { + prefix org-openroadm-otn-common-types; + revision-date 2017-09-29; + } + + organization + "OPEN ROADM MSA"; + contact + "OpenROADM.org."; + description + "YANG definitions for xponder + + 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 2017-09-29 { + description + "Version 2.1"; + } + revision 2017-07-28 { + description + "Version 2.0.1 - added revision-date to imports"; + } + revision 2017-06-26 { + description + "Version 2.0"; + } + revision 2016-10-14 { + description + "Version 1.2"; + } + + grouping xpdr-node-attributes { + leaf customer-code { + type string; + description + "Owner of the xponder"; + } + } + + grouping xpdr-topo-node-attributes { + leaf xpdr-number { + type uint16; + } + } + + grouping xpdr-connection-attributes { + leaf local-lgx { + type string; + } + leaf rate { + type identityref { + base org-openroadm-common-types:och-rate-identity; + } + description + "rate"; + } + leaf modulation-format { + type org-openroadm-common-types:modulation-format; + } + leaf optic { + type org-openroadm-common-types:optic-types; + } + leaf state { + type org-openroadm-common-types:state; + description + "A xponder can be in one of the following + states"; + } + } + + grouping xpdr-port-connection-attributes { + container wavelength { + uses org-openroadm-network-types:wavelengths; + } + leaf tail-equipment { + type string; + } + leaf tail-equipment-id { + type string; + } + leaf tail-clfi { + type string; + } + } + + grouping xpdr-otn-tail-attributes { + leaf tp-id { + type nwt:tp-id; + } + leaf network-ref { + type leafref { + path "/nd:network/nd:network-id"; + } + description + "Used to reference a network, for example an underlay + network."; + } + leaf node-ref { + type leafref { + path "/nd:network[nd:network-id=current()/../network-ref]"+ + "/nd:node/nd:node-id"; + } + description + "Used to reference a node. + Nodes are identified relative to the network they are + contained in."; + } + } + + grouping xpdr-otn-tp-attributes { + leaf rate { + type identityref { + base org-openroadm-otn-common-types:odu-rate-identity; + } + description + "rate identity of the ODU. 'identityref' is used + to allow to extend for future higher rates"; + } + list odtu-tpn-pool { + key "odtu-type"; + leaf odtu-type { + type identityref { + base org-openroadm-otn-common-types:odtu-type-identity; + } + description + "ODTU type, part of the MSI (Multiplex Structure Identifier)"; + } + leaf-list tpn-pool { + type uint8; + description + "Tributary Port Number (0-based), part of the MSI"; + } + } + leaf-list ts-pool { + type uint16; + description + "Timeslots used by port"; + } + } + +} diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index f110dcf12..3351c842e 100644 --- a/ordmodels/pom.xml +++ b/ordmodels/pom.xml @@ -19,10 +19,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.transportpce transportpce-ordmodels 0.2.0-SNAPSHOT - bundle + pom + + + common + device + network + service + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + org.apache.maven.plugins maven-javadoc-plugin @@ -47,7 +68,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.netconf diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml new file mode 100644 index 000000000..e7176de15 --- /dev/null +++ b/ordmodels/service/pom.xml @@ -0,0 +1,54 @@ + + + + 4.0.0 + + + org.opendaylight.mdsal + binding-parent + 0.12.3-SNAPSHOT + + + + org.opendaylight.transportpce.ordmodels + transportpce-ordmodels-service + 0.2.0-SNAPSHOT + bundle + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.12.3-SNAPSHOT + import + pom + + + + + + + + org.opendaylight.transportpce.ordmodels + transportpce-ordmodels-common + ${project.version} + + + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + diff --git a/ordmodels/src/main/yang/org-openroadm-common-service-types.yang b/ordmodels/service/src/main/yang/org-openroadm-common-service-types@2016-10-14.yang similarity index 94% rename from ordmodels/src/main/yang/org-openroadm-common-service-types.yang rename to ordmodels/service/src/main/yang/org-openroadm-common-service-types@2016-10-14.yang index e7568b14d..f70b7d601 100644 --- a/ordmodels/src/main/yang/org-openroadm-common-service-types.yang +++ b/ordmodels/service/src/main/yang/org-openroadm-common-service-types@2016-10-14.yang @@ -9,13 +9,15 @@ module org-openroadm-common-service-types { prefix inet; } import org-openroadm-routing-constraints { - prefix org-openroadm-routing-constraints; + prefix org-openroadm-routing-constraints; + revision-date 2016-10-14; } import org-openroadm-topology { prefix org-openroadm-topology; } import org-openroadm-common-types { - prefix org-openroadm-common-types; + prefix org-openroadm-common-types; + revision-date 2016-10-14; } import org-openroadm-resource-types { prefix org-openroadm-resource-types; @@ -27,31 +29,31 @@ module org-openroadm-common-service-types { "OpenROADM.org"; description "YANG definitions of common service types. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { @@ -94,7 +96,7 @@ module org-openroadm-common-service-types { } leaf service-rate { when "../service-format!='OMS'"{ - description "service rate not applicable when service + description "service rate not applicable when service format is roadmline"; } type uint32; @@ -342,7 +344,7 @@ module org-openroadm-common-service-types { leaf common-id { type string; description - "To be used by the ROADM controller to identify the routing + "To be used by the ROADM controller to identify the routing constraints received from planning application (PED)."; } uses sdnc-request-header; @@ -397,7 +399,7 @@ module org-openroadm-common-service-types { } leaf-list supporting-service-name { description - "The service name that this runs over top. If connection-type is service, then this is the related + "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; } @@ -469,6 +471,10 @@ module org-openroadm-common-service-types { enum "service-restoration-result" { value 7; } + //Add Martial + enum "service-feasibility-check-result" { + value 8; + } } } diff --git a/ordmodels/src/main/yang/org-openroadm-routing-constraints.yang b/ordmodels/service/src/main/yang/org-openroadm-routing-constraints@2016-10-14.yang similarity index 89% rename from ordmodels/src/main/yang/org-openroadm-routing-constraints.yang rename to ordmodels/service/src/main/yang/org-openroadm-routing-constraints@2016-10-14.yang index 229726b08..e8f5a1ed6 100644 --- a/ordmodels/src/main/yang/org-openroadm-routing-constraints.yang +++ b/ordmodels/service/src/main/yang/org-openroadm-routing-constraints@2016-10-14.yang @@ -8,31 +8,31 @@ module org-openroadm-routing-constraints { "OpenROADM.org"; description "YANG definitions of routing constraints. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/ordmodels/src/main/yang/org-openroadm-service.yang b/ordmodels/service/src/main/yang/org-openroadm-service@2016-10-14.yang similarity index 97% rename from ordmodels/src/main/yang/org-openroadm-service.yang rename to ordmodels/service/src/main/yang/org-openroadm-service@2016-10-14.yang index 63dfa8a3c..09192eee4 100644 --- a/ordmodels/src/main/yang/org-openroadm-service.yang +++ b/ordmodels/service/src/main/yang/org-openroadm-service@2016-10-14.yang @@ -10,6 +10,7 @@ module org-openroadm-service { } import org-openroadm-common-types { prefix org-openroadm-common-types; + revision-date 2016-10-14; } import org-openroadm-resource-types { prefix org-openroadm-resource-types; @@ -24,31 +25,31 @@ module org-openroadm-service { "OpenROADM.org"; description "YANG definitions of services. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { @@ -98,7 +99,7 @@ module org-openroadm-service { type string; mandatory true; description - "To be used by the ROADM controller to identify the routing + "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; @@ -327,7 +328,7 @@ module org-openroadm-service { leaf common-id { type string; description - "To be used by the ROADM controller to identify the routing + "To be used by the ROADM controller to identify the routing constraints received from planning application (PED)."; } leaf connection-type { diff --git a/ordmodels/src/main/yang/org-openroadm-topology.yang b/ordmodels/service/src/main/yang/org-openroadm-topology@2016-10-14.yang similarity index 88% rename from ordmodels/src/main/yang/org-openroadm-topology.yang rename to ordmodels/service/src/main/yang/org-openroadm-topology@2016-10-14.yang index 93c965bd1..f616c6a99 100644 --- a/ordmodels/src/main/yang/org-openroadm-topology.yang +++ b/ordmodels/service/src/main/yang/org-openroadm-topology@2016-10-14.yang @@ -12,31 +12,31 @@ module org-openroadm-topology { "OpenROADM.org"; description "YANG definitions of topology. - - Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + + 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, + + 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 + + * 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 + * 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 + * 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 + + 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 { diff --git a/renderer/pom.xml b/renderer/pom.xml index 6e5321ec2..c86a9ee65 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -29,8 +29,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.version} - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-device ${project.version} diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index 78aa81669..ff7c44a44 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -31,8 +31,23 @@ Author: Martial Coulibaly on behalf of Orange ${project.version} - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-device ${project.version} diff --git a/tests/stubmodels/pom.xml b/tests/stubmodels/pom.xml index 37007f599..835f45ff9 100644 --- a/tests/stubmodels/pom.xml +++ b/tests/stubmodels/pom.xml @@ -23,8 +23,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-device ${project.version} diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml index 88cee40ec..3d4efaa5d 100644 --- a/tests/stubpce/pom.xml +++ b/tests/stubpce/pom.xml @@ -48,8 +48,23 @@ Author: Martial Coulibaly on behalf of Orange ${project.version} - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-device ${project.version} diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml index 921303a53..81f168299 100644 --- a/tests/stubrenderer/pom.xml +++ b/tests/stubrenderer/pom.xml @@ -31,8 +31,23 @@ Author: Martial Coulibaly on behalf of Orange ${project.version} - ${project.groupId} - transportpce-ordmodels + ${project.groupId}.ordmodels + transportpce-ordmodels-common + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-service + ${project.version} + + + ${project.groupId}.ordmodels + transportpce-ordmodels-device ${project.version} -- 2.36.6