VOL-4238: Bugfix for invalid code-generated class IDs from 11/2017 version of G.988. Specifically EthernetFrameExtendedPm64BitClassID
Change-Id: I326273386e2f1b39a60d5f8e800dba74a652c84f
diff --git a/VERSION b/VERSION
index 3a3cd8c..1892b92 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.1
+1.3.2
diff --git a/generated/classidmap.go b/generated/classidmap.go
index b074c11..71abb89 100644
--- a/generated/classidmap.go
+++ b/generated/classidmap.go
@@ -208,14 +208,14 @@
classToManagedEntityMap[412] = NewXdslChannelConfigurationProfilePart2
classToManagedEntityMap[413] = NewXtuDataGatheringConfiguration
classToManagedEntityMap[414] = NewXdslLineInventoryAndStatusDataPart8
- classToManagedEntityMap[419] = NewEfmBondingGroup
- classToManagedEntityMap[420] = NewEfmBondingLink
- classToManagedEntityMap[421] = NewEfmBondingGroupPerformanceMonitoringHistoryData
- classToManagedEntityMap[422] = NewEfmBondingGroupPerformanceMonitoringHistoryDataPart2
- classToManagedEntityMap[423] = NewEfmBondingLinkPerformanceMonitoringHistoryData
- classToManagedEntityMap[424] = NewEfmBondingPortPerformanceMonitoringHistoryData
- classToManagedEntityMap[425] = NewEfmBondingPortPerformanceMonitoringHistoryDataPart2
- classToManagedEntityMap[426] = NewEthernetFrameExtendedPm64Bit
+ classToManagedEntityMap[418] = NewEfmBondingGroup
+ classToManagedEntityMap[419] = NewEfmBondingLink
+ classToManagedEntityMap[420] = NewEfmBondingGroupPerformanceMonitoringHistoryData
+ classToManagedEntityMap[421] = NewEfmBondingGroupPerformanceMonitoringHistoryDataPart2
+ classToManagedEntityMap[422] = NewEfmBondingLinkPerformanceMonitoringHistoryData
+ classToManagedEntityMap[423] = NewEfmBondingPortPerformanceMonitoringHistoryData
+ classToManagedEntityMap[424] = NewEfmBondingPortPerformanceMonitoringHistoryDataPart2
+ classToManagedEntityMap[425] = NewEthernetFrameExtendedPm64Bit
classToManagedEntityMap[432] = NewFastChannelConfigurationProfile
classToManagedEntityMap[433] = NewFastDataPathConfigurationProfile
classToManagedEntityMap[434] = NewFastVectoringLineConfigurationExtensions
diff --git a/generated/efmbondinggroup.go b/generated/efmbondinggroup.go
index 93df527..299f00d 100644
--- a/generated/efmbondinggroup.go
+++ b/generated/efmbondinggroup.go
@@ -27,11 +27,11 @@
// EfmBondingGroupClassID is the 16-bit ID for the OMCI
// Managed entity EFM bonding group
-const EfmBondingGroupClassID ClassID = ClassID(419)
+const EfmBondingGroupClassID ClassID = ClassID(418)
var efmbondinggroupBME *ManagedEntityDefinition
-// EfmBondingGroup (class ID #419)
+// EfmBondingGroup (class ID #418)
// The EFM bonding group represents a group of links that are bonded. In [IEEE 802.3], a bonding
// group is known as a PAF [physical medium entity (PME) aggregation function] and a link is known
// as a PME instance of this ME are created and deleted by the OLT.
@@ -73,7 +73,7 @@
func init() {
efmbondinggroupBME = &ManagedEntityDefinition{
Name: "EfmBondingGroup",
- ClassID: 419,
+ ClassID: 418,
MessageTypes: mapset.NewSetWith(
Create,
Delete,
@@ -100,7 +100,7 @@
}
}
-// NewEfmBondingGroup (class ID 419) creates the basic
+// NewEfmBondingGroup (class ID 418) 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 NewEfmBondingGroup(params ...ParamData) (*ManagedEntity, OmciErrors) {
diff --git a/generated/efmbondinggroupperformancemonitoringhistorydata.go b/generated/efmbondinggroupperformancemonitoringhistorydata.go
index a73c150..6157d8f 100644
--- a/generated/efmbondinggroupperformancemonitoringhistorydata.go
+++ b/generated/efmbondinggroupperformancemonitoringhistorydata.go
@@ -27,11 +27,11 @@
// EfmBondingGroupPerformanceMonitoringHistoryDataClassID is the 16-bit ID for the OMCI
// Managed entity EFM bonding group performance monitoring history data
-const EfmBondingGroupPerformanceMonitoringHistoryDataClassID ClassID = ClassID(421)
+const EfmBondingGroupPerformanceMonitoringHistoryDataClassID ClassID = ClassID(420)
var efmbondinggroupperformancemonitoringhistorydataBME *ManagedEntityDefinition
-// EfmBondingGroupPerformanceMonitoringHistoryData (class ID #421)
+// EfmBondingGroupPerformanceMonitoringHistoryData (class ID #420)
// This ME collects PM data as seen at the xTU-C. Instances of this ME are created and deleted by
// the OLT.
//
@@ -94,7 +94,7 @@
func init() {
efmbondinggroupperformancemonitoringhistorydataBME = &ManagedEntityDefinition{
Name: "EfmBondingGroupPerformanceMonitoringHistoryData",
- ClassID: 421,
+ ClassID: 420,
MessageTypes: mapset.NewSetWith(
Create,
Delete,
@@ -129,7 +129,7 @@
}
}
-// NewEfmBondingGroupPerformanceMonitoringHistoryData (class ID 421) creates the basic
+// NewEfmBondingGroupPerformanceMonitoringHistoryData (class ID 420) 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 NewEfmBondingGroupPerformanceMonitoringHistoryData(params ...ParamData) (*ManagedEntity, OmciErrors) {
diff --git a/generated/efmbondinggroupperformancemonitoringhistorydatapart2.go b/generated/efmbondinggroupperformancemonitoringhistorydatapart2.go
index b8f00fa..e7d9c7e 100644
--- a/generated/efmbondinggroupperformancemonitoringhistorydatapart2.go
+++ b/generated/efmbondinggroupperformancemonitoringhistorydatapart2.go
@@ -27,11 +27,11 @@
// EfmBondingGroupPerformanceMonitoringHistoryDataPart2ClassID is the 16-bit ID for the OMCI
// Managed entity EFM bonding group performance monitoring history data part 2
-const EfmBondingGroupPerformanceMonitoringHistoryDataPart2ClassID ClassID = ClassID(422)
+const EfmBondingGroupPerformanceMonitoringHistoryDataPart2ClassID ClassID = ClassID(421)
var efmbondinggroupperformancemonitoringhistorydatapart2BME *ManagedEntityDefinition
-// EfmBondingGroupPerformanceMonitoringHistoryDataPart2 (class ID #422)
+// EfmBondingGroupPerformanceMonitoringHistoryDataPart2 (class ID #421)
// This ME collects PM data as seen at the xTU-C. Instances of this ME are created and deleted by
// the OLT.
//
@@ -108,7 +108,7 @@
func init() {
efmbondinggroupperformancemonitoringhistorydatapart2BME = &ManagedEntityDefinition{
Name: "EfmBondingGroupPerformanceMonitoringHistoryDataPart2",
- ClassID: 422,
+ ClassID: 421,
MessageTypes: mapset.NewSetWith(
Create,
Delete,
@@ -139,7 +139,7 @@
}
}
-// NewEfmBondingGroupPerformanceMonitoringHistoryDataPart2 (class ID 422) creates the basic
+// NewEfmBondingGroupPerformanceMonitoringHistoryDataPart2 (class ID 421) 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 NewEfmBondingGroupPerformanceMonitoringHistoryDataPart2(params ...ParamData) (*ManagedEntity, OmciErrors) {
diff --git a/generated/efmbondinglink.go b/generated/efmbondinglink.go
index 34db557..089195e 100644
--- a/generated/efmbondinglink.go
+++ b/generated/efmbondinglink.go
@@ -27,11 +27,11 @@
// EfmBondingLinkClassID is the 16-bit ID for the OMCI
// Managed entity EFM bonding link
-const EfmBondingLinkClassID ClassID = ClassID(420)
+const EfmBondingLinkClassID ClassID = ClassID(419)
var efmbondinglinkBME *ManagedEntityDefinition
-// EfmBondingLink (class ID #420)
+// EfmBondingLink (class ID #419)
// The EFM bonding link represents a link that can be bonded with other links to form a group. In
// [IEEE 802.3], a bonding group is known as a PAF and a link is known as a PME. Instances of this
// ME are created and deleted by the OLT.
@@ -62,7 +62,7 @@
func init() {
efmbondinglinkBME = &ManagedEntityDefinition{
Name: "EfmBondingLink",
- ClassID: 420,
+ ClassID: 419,
MessageTypes: mapset.NewSetWith(
Create,
Delete,
@@ -83,7 +83,7 @@
}
}
-// NewEfmBondingLink (class ID 420) creates the basic
+// NewEfmBondingLink (class ID 419) 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 NewEfmBondingLink(params ...ParamData) (*ManagedEntity, OmciErrors) {
diff --git a/generated/efmbondinglinkperformancemonitoringhistorydata.go b/generated/efmbondinglinkperformancemonitoringhistorydata.go
index ec48e2f..d80c83f 100644
--- a/generated/efmbondinglinkperformancemonitoringhistorydata.go
+++ b/generated/efmbondinglinkperformancemonitoringhistorydata.go
@@ -27,11 +27,11 @@
// EfmBondingLinkPerformanceMonitoringHistoryDataClassID is the 16-bit ID for the OMCI
// Managed entity EFM bonding link performance monitoring history data
-const EfmBondingLinkPerformanceMonitoringHistoryDataClassID ClassID = ClassID(423)
+const EfmBondingLinkPerformanceMonitoringHistoryDataClassID ClassID = ClassID(422)
var efmbondinglinkperformancemonitoringhistorydataBME *ManagedEntityDefinition
-// EfmBondingLinkPerformanceMonitoringHistoryData (class ID #423)
+// EfmBondingLinkPerformanceMonitoringHistoryData (class ID #422)
// This ME collects PM data as seen at the xTU-C. Instances of this ME are created and deleted by
// the OLT.
//
@@ -84,7 +84,7 @@
func init() {
efmbondinglinkperformancemonitoringhistorydataBME = &ManagedEntityDefinition{
Name: "EfmBondingLinkPerformanceMonitoringHistoryData",
- ClassID: 423,
+ ClassID: 422,
MessageTypes: mapset.NewSetWith(
Create,
Delete,
@@ -111,7 +111,7 @@
}
}
-// NewEfmBondingLinkPerformanceMonitoringHistoryData (class ID 423) creates the basic
+// NewEfmBondingLinkPerformanceMonitoringHistoryData (class ID 422) 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 NewEfmBondingLinkPerformanceMonitoringHistoryData(params ...ParamData) (*ManagedEntity, OmciErrors) {
diff --git a/generated/efmbondingportperformancemonitoringhistorydata.go b/generated/efmbondingportperformancemonitoringhistorydata.go
index fe99125..4186478 100644
--- a/generated/efmbondingportperformancemonitoringhistorydata.go
+++ b/generated/efmbondingportperformancemonitoringhistorydata.go
@@ -27,11 +27,11 @@
// EfmBondingPortPerformanceMonitoringHistoryDataClassID is the 16-bit ID for the OMCI
// Managed entity EFM bonding port performance monitoring history data
-const EfmBondingPortPerformanceMonitoringHistoryDataClassID ClassID = ClassID(424)
+const EfmBondingPortPerformanceMonitoringHistoryDataClassID ClassID = ClassID(423)
var efmbondingportperformancemonitoringhistorydataBME *ManagedEntityDefinition
-// EfmBondingPortPerformanceMonitoringHistoryData (class ID #424)
+// EfmBondingPortPerformanceMonitoringHistoryData (class ID #423)
// This ME collects PM data as seen at the xTU-C. Instances of this ME are created and deleted by
// the OLT.
//
@@ -83,7 +83,7 @@
func init() {
efmbondingportperformancemonitoringhistorydataBME = &ManagedEntityDefinition{
Name: "EfmBondingPortPerformanceMonitoringHistoryData",
- ClassID: 424,
+ ClassID: 423,
MessageTypes: mapset.NewSetWith(
Create,
Delete,
@@ -108,7 +108,7 @@
}
}
-// NewEfmBondingPortPerformanceMonitoringHistoryData (class ID 424) creates the basic
+// NewEfmBondingPortPerformanceMonitoringHistoryData (class ID 423) 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 NewEfmBondingPortPerformanceMonitoringHistoryData(params ...ParamData) (*ManagedEntity, OmciErrors) {
diff --git a/generated/efmbondingportperformancemonitoringhistorydatapart2.go b/generated/efmbondingportperformancemonitoringhistorydatapart2.go
index 4bbb56e..947e454 100644
--- a/generated/efmbondingportperformancemonitoringhistorydatapart2.go
+++ b/generated/efmbondingportperformancemonitoringhistorydatapart2.go
@@ -27,11 +27,11 @@
// EfmBondingPortPerformanceMonitoringHistoryDataPart2ClassID is the 16-bit ID for the OMCI
// Managed entity EFM bonding port performance monitoring history data part 2
-const EfmBondingPortPerformanceMonitoringHistoryDataPart2ClassID ClassID = ClassID(425)
+const EfmBondingPortPerformanceMonitoringHistoryDataPart2ClassID ClassID = ClassID(424)
var efmbondingportperformancemonitoringhistorydatapart2BME *ManagedEntityDefinition
-// EfmBondingPortPerformanceMonitoringHistoryDataPart2 (class ID #425)
+// EfmBondingPortPerformanceMonitoringHistoryDataPart2 (class ID #424)
// This ME collects PM data as seen at the xTU-C. Instances of this ME are created and deleted by
// the OLT.
//
@@ -109,7 +109,7 @@
func init() {
efmbondingportperformancemonitoringhistorydatapart2BME = &ManagedEntityDefinition{
Name: "EfmBondingPortPerformanceMonitoringHistoryDataPart2",
- ClassID: 425,
+ ClassID: 424,
MessageTypes: mapset.NewSetWith(
Create,
Delete,
@@ -140,7 +140,7 @@
}
}
-// NewEfmBondingPortPerformanceMonitoringHistoryDataPart2 (class ID 425) creates the basic
+// NewEfmBondingPortPerformanceMonitoringHistoryDataPart2 (class ID 424) 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 NewEfmBondingPortPerformanceMonitoringHistoryDataPart2(params ...ParamData) (*ManagedEntity, OmciErrors) {
diff --git a/generated/ethernetframeextendedpm64-bit.go b/generated/ethernetframeextendedpm64-bit.go
index c3cbae7..580319c 100644
--- a/generated/ethernetframeextendedpm64-bit.go
+++ b/generated/ethernetframeextendedpm64-bit.go
@@ -27,11 +27,11 @@
// EthernetFrameExtendedPm64BitClassID is the 16-bit ID for the OMCI
// Managed entity Ethernet frame extended PM 64-bit
-const EthernetFrameExtendedPm64BitClassID ClassID = ClassID(426)
+const EthernetFrameExtendedPm64BitClassID ClassID = ClassID(425)
var ethernetframeextendedpm64bitBME *ManagedEntityDefinition
-// EthernetFrameExtendedPm64Bit (class ID #426)
+// EthernetFrameExtendedPm64Bit (class ID #425)
// This ME collects some of the PM data at a point where an Ethernet flow can be observed. It is
// based on the Etherstats group of [IETF RFC 2819] and [IETF RFC 2863]. Instances of this ME are
// created and deleted by the OLT. References to received frames are to be interpreted as the
@@ -122,7 +122,7 @@
func init() {
ethernetframeextendedpm64bitBME = &ManagedEntityDefinition{
Name: "EthernetFrameExtendedPm64Bit",
- ClassID: 426,
+ ClassID: 425,
MessageTypes: mapset.NewSetWith(
Create,
Delete,
@@ -161,7 +161,7 @@
}
}
-// NewEthernetFrameExtendedPm64Bit (class ID 426) creates the basic
+// NewEthernetFrameExtendedPm64Bit (class ID 425) 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 NewEthernetFrameExtendedPm64Bit(params ...ParamData) (*ManagedEntity, OmciErrors) {
diff --git a/messagetypes_test.go b/messagetypes_test.go
index 30672c6..69f8abe 100644
--- a/messagetypes_test.go
+++ b/messagetypes_test.go
@@ -4404,7 +4404,7 @@
}
func TestGetCurrentDataRequestDecode(t *testing.T) {
- goodMessage := "035e5c0a01aa0000004400000000000000000000000000000000000000000000000000000000000000000028"
+ goodMessage := "035e5c0a01a90000004400000000000000000000000000000000000000000000000000000000000000000028"
data, err := stringToPacket(goodMessage)
assert.NoError(t, err)
@@ -4437,7 +4437,7 @@
}
func TestGetCurrentDataRequestSerialize(t *testing.T) {
- goodMessage := "035e5c0a01aa0000004400000000000000000000000000000000000000000000000000000000000000000028"
+ goodMessage := "035e5c0a01a90000004400000000000000000000000000000000000000000000000000000000000000000028"
omciLayer := &OMCI{
TransactionID: 0x035e,
@@ -4466,7 +4466,7 @@
}
func TestGetCurrentDataResponseDecode(t *testing.T) {
- goodMessage := "035e3c0a01aa0000000044123456781234dbcb432187654321dac1000000000000000000000000000028"
+ goodMessage := "035e3c0a01a90000000044123456781234dbcb432187654321dac1000000000000000000000000000028"
data, err := stringToPacket(goodMessage)
assert.NoError(t, err)
@@ -4502,7 +4502,7 @@
}
func TestGetCurrentDataResponseSerialize(t *testing.T) {
- goodMessage := "035e3c0a01aa0000000044123456781234dbcb432187654321dac10000000000000000000000000000000028"
+ goodMessage := "035e3c0a01a90000000044123456781234dbcb432187654321dac10000000000000000000000000000000028"
omciLayer := &OMCI{
TransactionID: 0x035e,