VOL-3809: Add 32-bit FEC Counter ME
- Note: same Word/OMCI parsing fix also provides a fix to the General Purpose Buffer ME which may be useful in future releases.
Change-Id: Ia1ff69a5272cb9058a812e13ffe2d53eb910bdfe
diff --git a/VERSION b/VERSION
index a803cc2..a551051 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.14.0
+0.15.0
diff --git a/generated/fecperformancemonitoringhistorydata.go b/generated/fecperformancemonitoringhistorydata.go
new file mode 100644
index 0000000..b990013
--- /dev/null
+++ b/generated/fecperformancemonitoringhistorydata.go
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2018 - present. Boling Consulting Solutions (bcsw.net)
+ * Copyright 2020-present Open Networking Foundation
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * NOTE: This file was generated, manual edits will be overwritten!
+ *
+ * Generated by 'goCodeGenerator.py':
+ * https://github.com/cboling/OMCI-parser/README.md
+ */
+
+package generated
+
+import "github.com/deckarep/golang-set"
+
+// FecPerformanceMonitoringHistoryDataClassID is the 16-bit ID for the OMCI
+// Managed entity FEC performance monitoring history data
+const FecPerformanceMonitoringHistoryDataClassID ClassID = ClassID(312)
+
+var fecperformancemonitoringhistorydataBME *ManagedEntityDefinition
+
+// FecPerformanceMonitoringHistoryData (class ID #312)
+// This ME collects PM data associated with PON downstream forward error correction (FEC) counters.
+// Instances of this ME are created and deleted by the OLT.
+//
+// For a complete discussion of generic PM architecture, refer to clause I.4.
+//
+// Relationships
+// An instance of this ME is associated with an instance of the ANI-G ME or an instance of the time
+// and wavelength division multiplexing (TWDM) channel ME.
+//
+// Attributes
+// Managed Entity Id
+// Managed entity ID: This attribute uniquely identifies each instance of this ME. Through an
+// identical ID, this ME is implicitly linked to an instance of the ANI-G or a TWDM channel. (R,
+// setbycreate) (mandatory) (2-bytes)
+//
+// Interval End Time
+// Interval end time: This attribute identifies the most recently finished 15-min interval. (R)
+// (mandatory) (1-byte)
+//
+// Threshold Data 1_2 Id
+// Threshold data 1/2 ID: This attribute points to an instance of the threshold data 1 ME that
+// contains PM threshold values. Since no threshold value attribute number exceeds 7, a threshold
+// data 2 ME is optional. (R,-W, setbycreate) (mandatory) (2-bytes)
+//
+// Corrected Bytes
+// Corrected bytes: This attribute counts the number of bytes that were corrected by the FEC
+// function. (R) (mandatory) (4-bytes)
+//
+// Corrected Code Words
+// Corrected code words: This attribute counts the code words that were corrected by the FEC
+// function. (R) (mandatory) (4-bytes)
+//
+// Uncorrectable Code Words
+// Uncorrectable code words: This attribute counts errored code words that could not be corrected
+// by the FEC function. (R) (mandatory) (4-bytes)
+//
+// Total Code Words
+// Total code words: This attribute counts the total received code words. (R) (mandatory) (4-bytes)
+//
+// Fec Seconds
+// FEC seconds: This attribute counts seconds during which there was an FEC anomaly. (R)
+// (mandatory) (2-bytes)
+//
+type FecPerformanceMonitoringHistoryData struct {
+ ManagedEntityDefinition
+ Attributes AttributeValueMap
+}
+
+func init() {
+ fecperformancemonitoringhistorydataBME = &ManagedEntityDefinition{
+ Name: "FecPerformanceMonitoringHistoryData",
+ ClassID: 312,
+ MessageTypes: mapset.NewSetWith(
+ Create,
+ Delete,
+ Get,
+ Set,
+ GetCurrentData,
+ ),
+ AllowedAttributeMask: 0xfe00,
+ AttributeDefinitions: AttributeDefinitionMap{
+ 0: Uint16Field("ManagedEntityId", PointerAttributeType, 0x0000, 0, mapset.NewSetWith(Read, SetByCreate), false, false, false, 0),
+ 1: ByteField("IntervalEndTime", UnsignedIntegerAttributeType, 0x8000, 0, mapset.NewSetWith(Read), false, false, false, 1),
+ 2: Uint16Field("ThresholdData12Id", UnsignedIntegerAttributeType, 0x4000, 0, mapset.NewSetWith(Read, SetByCreate, Write), false, false, false, 2),
+ 3: Uint32Field("CorrectedBytes", CounterAttributeType, 0x2000, 0, mapset.NewSetWith(Read), false, false, false, 3),
+ 4: Uint32Field("CorrectedCodeWords", CounterAttributeType, 0x1000, 0, mapset.NewSetWith(Read), false, false, false, 4),
+ 5: Uint32Field("UncorrectableCodeWords", CounterAttributeType, 0x0800, 0, mapset.NewSetWith(Read), false, false, false, 5),
+ 6: Uint32Field("TotalCodeWords", CounterAttributeType, 0x0400, 0, mapset.NewSetWith(Read), false, false, false, 6),
+ 7: Uint16Field("FecSeconds", CounterAttributeType, 0x0200, 0, mapset.NewSetWith(Read), false, false, false, 7),
+ },
+ Access: CreatedByOlt,
+ Support: UnknownSupport,
+ Alarms: AlarmMap{
+ 0: "Corrected bytes",
+ 1: "Corrected code words",
+ 2: "Uncorrectable code words",
+ 4: "FEC seconds",
+ },
+ }
+}
+
+// NewFecPerformanceMonitoringHistoryData (class ID 312) creates the basic
+// Managed Entity definition that is used to validate an ME of this type that
+// is received from or transmitted to the OMCC.
+func NewFecPerformanceMonitoringHistoryData(params ...ParamData) (*ManagedEntity, OmciErrors) {
+ return NewManagedEntity(*fecperformancemonitoringhistorydataBME, params...)
+}
diff --git a/generated/generalpurposebuffer.go b/generated/generalpurposebuffer.go
new file mode 100644
index 0000000..cd323bf
--- /dev/null
+++ b/generated/generalpurposebuffer.go
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2018 - present. Boling Consulting Solutions (bcsw.net)
+ * Copyright 2020-present Open Networking Foundation
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * NOTE: This file was generated, manual edits will be overwritten!
+ *
+ * Generated by 'goCodeGenerator.py':
+ * https://github.com/cboling/OMCI-parser/README.md
+ */
+
+package generated
+
+import "github.com/deckarep/golang-set"
+
+// GeneralPurposeBufferClassID is the 16-bit ID for the OMCI
+// Managed entity General purpose buffer
+const GeneralPurposeBufferClassID ClassID = ClassID(308)
+
+var generalpurposebufferBME *ManagedEntityDefinition
+
+// GeneralPurposeBuffer (class ID #308)
+// This ME is created by the OLT when needed to store the results of an operation, such as a test
+// command, that needs to return a block of data of indeterminate size. The buffer is retrieved
+// with get next operations, since its size is not known a priori. An instance of this ME is
+// created and deleted by the OLT, and typically made known to an ONU ME or to an action through a
+// pointer.
+//
+// The ME is defined as generically as possible, such that it can be used for other applications
+// that may not initially be apparent, such as logging. The format of its content is specific to
+// each application, and is documented there.
+//
+// The general purpose buffer is neither captured in an MIB upload, nor retained in a non-volatile
+// ONU memory.
+//
+// Relationships
+// Through a pointer, the OLT may associate a general purpose buffer with an ME or an operation
+// that has a need to create large or indeterminate blocks of data for subsequent upload.
+//
+// Attributes
+// Managed Entity Id
+// Managed entity ID: This attribute uniquely identifies each instance of this ME. (R, setbycreate)
+// (mandatory) (2-bytes)
+//
+// Maximum Size
+// Maximum size: The ONU determines the actual size of the buffer table in the process of capturing
+// the data directed to it. The maximum size attribute permits the OLT to restrict the maximum size
+// of the buffer table. The value 0 indicates that the OLT imposes no limit on the size; it is
+// recognized that ONU implementations will impose their own limits. The ONU will not create a
+// buffer table larger than the value of this attribute. If the ONU cannot allocate enough memory
+// to accommodate this size, it should deny the ME create action or a write operation that attempts
+// to expand an existing ME. (R,-W, setbycreate) (optional) (4-bytes)
+//
+// Buffer Table
+// Buffer table: This attribute is an octet string that contains the result of some operation
+// performed on the ONU. The exact content depends on the operation, and is documented with the
+// definition of each operation. (R) (mandatory) (N bytes)
+//
+type GeneralPurposeBuffer struct {
+ ManagedEntityDefinition
+ Attributes AttributeValueMap
+}
+
+func init() {
+ generalpurposebufferBME = &ManagedEntityDefinition{
+ Name: "GeneralPurposeBuffer",
+ ClassID: 308,
+ MessageTypes: mapset.NewSetWith(
+ Create,
+ Delete,
+ Get,
+ GetNext,
+ ),
+ AllowedAttributeMask: 0xc000,
+ AttributeDefinitions: AttributeDefinitionMap{
+ 0: Uint16Field("ManagedEntityId", PointerAttributeType, 0x0000, 0, mapset.NewSetWith(Read, SetByCreate), false, false, false, 0),
+ 1: Uint32Field("MaximumSize", UnsignedIntegerAttributeType, 0x8000, 0, mapset.NewSetWith(Read, SetByCreate, Write), false, true, false, 1),
+ 2: TableField("BufferTable", TableAttributeType, 0x4000, TableInfo{nil, -1}, mapset.NewSetWith(Read), true, false, false, 2),
+ },
+ Access: CreatedByOlt,
+ Support: UnknownSupport,
+ }
+}
+
+// NewGeneralPurposeBuffer (class ID 308) creates the basic
+// Managed Entity definition that is used to validate an ME of this type that
+// is received from or transmitted to the OMCC.
+func NewGeneralPurposeBuffer(params ...ParamData) (*ManagedEntity, OmciErrors) {
+ return NewManagedEntity(*generalpurposebufferBME, params...)
+}
diff --git a/generated/version.go b/generated/version.go
index 66b5ccf..8ec3ae6 100644
--- a/generated/version.go
+++ b/generated/version.go
@@ -46,8 +46,8 @@
Versions = append(Versions,
VersionInfo{
Name: "parser",
- Version: "0.15.7",
- CreateTime: 1612882485.267378,
+ Version: "0.15.8",
+ CreateTime: 1613579234.3730865,
ItuDocName: "T-REC-G.988-201711-I!!MSW-E.docx",
SHA256: "96ffc8bca6f70175c8e281e87e1cf21662d07a7502ebf595c5c3180a9972b9ac",
})
@@ -55,9 +55,9 @@
Versions = append(Versions,
VersionInfo{
Name: "pre-parser",
- Version: "0.12.2",
- CreateTime: 1574973863.791287,
- ItuDocName: "T-REC-G.988-2017-11.docx",
+ Version: "0.15.8",
+ CreateTime: 1613579104.450186,
+ ItuDocName: "T-REC-G.988-201711-I!!MSW-E.docx",
SHA256: "96ffc8bca6f70175c8e281e87e1cf21662d07a7502ebf595c5c3180a9972b9ac",
})
@@ -65,7 +65,7 @@
VersionInfo{
Name: "code-generator",
Version: "0.15.8",
- CreateTime: 1612882722.152137,
+ CreateTime: 1613579245.5924196,
ItuDocName: "T-REC-G.988-201711-I!!MSW-E.docx",
SHA256: "96ffc8bca6f70175c8e281e87e1cf21662d07a7502ebf595c5c3180a9972b9ac",
})