Skip to content

Commit

Permalink
Merge pull request #47 from beegeesquare/7.1.0
Browse files Browse the repository at this point in the history 
Release 7.1.0
  • Loading branch information
@OpenROADM
OpenROADM authored Jun 5, 2020
2 parents 5a7cb7f + ed15c48 commit aaa5a0e
Show file tree
Hide file tree
Showing 57 changed files with 1,006 additions and 518 deletions.
8 changes: 6 additions & 2 deletions model/Common/org-openroadm-alarm.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ module org-openroadm-alarm {
}
import org-openroadm-resource {
prefix org-openroadm-resource;
revision-date 2020-03-27;
revision-date 2020-05-29;
}
import org-openroadm-probable-cause {
prefix org-openroadm-probable-cause;
revision-date 2020-03-27;
revision-date 2020-05-29;
}

organization
Expand Down Expand Up @@ -48,6 +48,10 @@ module org-openroadm-alarm {
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.";

revision 2020-05-29 {
description
"Version 7.1.0";
}
revision 2020-03-27 {
description
"Version 7.0.0";
Expand Down
34 changes: 11 additions & 23 deletions model/Common/org-openroadm-common-optical-channel-types.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ module org-openroadm-common-optical-channel-types {
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE";

revision 2020-05-29 {
description
"Version 7.1.0";
}
revision 2020-03-27 {
description
"Version 7.0.0";
Expand Down Expand Up @@ -64,39 +68,23 @@ module org-openroadm-common-optical-channel-types {
"Version 3.0.0";
}

identity optical-rate-identity {
description
"base for otsi and och idenity";
}

identity och-rate-identity {
base optical-rate-identity;
description
"A unique och rate identification";
}

identity otsi-rate-identity {
base optical-rate-identity;
description
"A unique OTSi rate identification";
}

identity fec-identity {
description
"A unique FEC identification";
}

identity sc-fec {
base fec-identity;
description
"Staircase FEC identification";
}

identity rs-fec {
base fec-identity;
description
"Reed Solomon FEC identification";
}

identity o-fec {
base fec-identity;
description
"OpenROADM FEC identification";
}

identity foic-identity {
description
"A unique FOICx.k identification (G.709.3 FlexO-LR and
Expand Down
122 changes: 122 additions & 0 deletions model/Common/org-openroadm-common-types.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ module org-openroadm-common-types {
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE";

revision 2020-05-29 {
description
"Version 7.1.0";
}
revision 2020-03-27 {
description
"Version 7.0.0";
Expand Down Expand Up @@ -226,6 +230,11 @@ module org-openroadm-common-types {
description
"value for 7.0";
}
enum 7.1 {
value 16;
description
"value for 7.1";
}
}
description
"OpenROADM version enum type";
Expand Down Expand Up @@ -302,4 +311,117 @@ module org-openroadm-common-types {
"TCM direction capability for the port";
}






//
// Identities for FEC -- used for Device and Service models
//

// Base Identity
identity fec-identity {
description
"A unique FEC identification";
}

// FEC Off (duplications for backwards compatibility)
identity off-fec {
status deprecated;
base fec-identity;
description
"FEC Off";
}
identity off {
base fec-identity;
description
"FEC Off";
}

// Staircase FEC (duplications for backwards compatibility)
identity sc-fec {
status deprecated;
base fec-identity;
description
"Staircase FEC identification";
}
identity scfec {
base fec-identity;
description
"Staircase FEC identification";
}

// Reed Solomon FEC (duplication for backwards compatibility)
identity rs-fec {
status deprecated;
base fec-identity;
description
"Reed Solomon FEC identification";
}
identity rsfec {
base fec-identity;
description
"Reed Solomon FEC identification";
}

// OpenROADM FEC (duplication for backwards compatibility)
identity o-fec {
status deprecated;
base fec-identity;
description
"OpenROADM FEC identification";
}
identity ofec {
base fec-identity;
description
"OpenROADM FEC identification";
}

// G.975.1 I.4
identity efec {
base fec-identity;
description
"G.975.1 I.4";
}

// G.975.1 I.7
identity ufec {
base fec-identity;
description
"G.975.1 I.7";
}

// Soft Decision FEC
identity sdfec {
base fec-identity;
description
"Soft Decision FEC";
}

// Clariphy SDFEC
identity sdfeca1 {
base fec-identity;
description
"Clariphy SDFEC";
}

// SDFEC with SCFED
identity sdfecb1 {
base fec-identity;
description
"SDFEC with SCFEC";
}


grouping fec-grouping {
leaf fec {
type identityref {
base org-openroadm-common-types:fec-identity;
}
description
"FEC / Forward Error Correction";
}
}

}
8 changes: 6 additions & 2 deletions model/Common/org-openroadm-pm.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ module org-openroadm-pm {
}
import org-openroadm-common-types {
prefix org-openroadm-common-types;
revision-date 2020-03-27;
revision-date 2020-05-29;
}
import org-openroadm-common-alarm-pm-types {
prefix org-openroadm-common-alarm-pm-types;
revision-date 2019-11-29;
}
import org-openroadm-resource {
prefix org-openroadm-resource;
revision-date 2020-03-27;
revision-date 2020-05-29;
}
import org-openroadm-resource-types {
prefix org-openroadm-resource-types;
Expand Down Expand Up @@ -60,6 +60,10 @@ module org-openroadm-pm {
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE";

revision 2020-05-29 {
description
"Version 7.1.0";
}
revision 2020-03-27 {
description
"Version 7.0.0";
Expand Down
11 changes: 11 additions & 0 deletions model/Common/org-openroadm-probable-cause.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ module org-openroadm-probable-cause {
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE";

revision 2020-05-29 {
description
"Version 7.1.0";
}
revision 2020-03-27 {
description
"Version 7.0.0";
Expand Down Expand Up @@ -827,6 +831,13 @@ module org-openroadm-probable-cause {
reference
"IEEE 802.3-2018 Section 119";
}
enum farEndFaultIndication {
value 283;
description
"Far End Fault Indication";
reference
"IEEE 802.3-2018 Section 24.3.2.1";
}
}
description
"probable cause group";
Expand Down
6 changes: 5 additions & 1 deletion model/Common/org-openroadm-resource.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module org-openroadm-resource {
}
import org-openroadm-common-optical-channel-types {
prefix org-openroadm-common-optical-channel-types;
revision-date 2020-03-27;
revision-date 2020-05-29;
}
import org-openroadm-resource-types {
prefix org-openroadm-resource-types;
Expand Down Expand Up @@ -52,6 +52,10 @@ module org-openroadm-resource {
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE";

revision 2020-05-29 {
description
"Version 7.1.0";
}
revision 2020-03-27 {
description
"Version 7.0.0";
Expand Down
6 changes: 5 additions & 1 deletion model/Device/org-openroadm-database.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module org-openroadm-database {

import org-openroadm-common-types {
prefix org-openroadm-common-types;
revision-date 2020-03-27;
revision-date 2020-05-29;
}

organization
Expand Down Expand Up @@ -40,6 +40,10 @@ module org-openroadm-database {
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.";

revision 2020-05-29 {
description
"Version 7.1.0";
}
revision 2020-03-27 {
description
"Version 7.0.0";
Expand Down
8 changes: 6 additions & 2 deletions model/Device/org-openroadm-de-operations.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ module org-openroadm-de-operations {

import org-openroadm-resource {
prefix org-openroadm-resource;
revision-date 2020-03-27;
revision-date 2020-05-29;
}
import org-openroadm-common-types {
prefix org-openroadm-common-types;
revision-date 2020-03-27;
revision-date 2020-05-29;
}

organization
Expand Down Expand Up @@ -44,6 +44,10 @@ module org-openroadm-de-operations {
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.";

revision 2020-05-29 {
description
"Version 7.1.0";
}
revision 2020-03-27 {
description
"Version 7.0.0";
Expand Down
Loading

0 comments on commit aaa5a0e

Please sign in to comment.