[VOL-4678] BBSIM: OMCI extended message set - make OMCC version configurable
Change-Id: I6a6bdde944612621dd8e5696075fe09b3c341709
diff --git a/internal/common/omci/get.go b/internal/common/omci/get.go
index 71d7d87..b450b87 100644
--- a/internal/common/omci/get.go
+++ b/internal/common/omci/get.go
@@ -24,6 +24,7 @@
"strconv"
"github.com/google/gopacket"
+ "github.com/opencord/bbsim/internal/common"
"github.com/opencord/omci-lib-go/v2"
me "github.com/opencord/omci-lib-go/v2/generated"
"github.com/opencord/voltha-protos/v5/go/openolt"
@@ -143,7 +144,7 @@
Attributes: me.AttributeValueMap{
me.ManagedEntityID: entityID,
me.Onu2G_EquipmentId: ToOctets("12345123451234512345", 20),
- me.Onu2G_OpticalNetworkUnitManagementAndControlChannelOmccVersion: 180,
+ me.Onu2G_OpticalNetworkUnitManagementAndControlChannelOmccVersion: common.Config.BBSim.OmccVersion,
me.Onu2G_VendorProductCode: 0,
me.Onu2G_SecurityCapability: 1,
me.Onu2G_SecurityMode: 1,
diff --git a/internal/common/omci/get_test.go b/internal/common/omci/get_test.go
index 82bbe7a..94422c1 100644
--- a/internal/common/omci/get_test.go
+++ b/internal/common/omci/get_test.go
@@ -23,6 +23,7 @@
"testing"
"github.com/google/gopacket"
+ "github.com/opencord/bbsim/internal/common"
"github.com/opencord/omci-lib-go/v2"
me "github.com/opencord/omci-lib-go/v2/generated"
"github.com/opencord/voltha-protos/v5/go/openolt"
@@ -69,6 +70,8 @@
func TestGetResponse(t *testing.T) {
+ common.Config = common.GetDefaultOps()
+
// NOTE that we're not testing the SerialNumber attribute part of the ONU-G
// response here as it is a special case and it requires transformation.
// we specifically test that in TestCreateOnugResponse
@@ -83,7 +86,7 @@
}{
{"getOnu2gResponse",
getArgs{createOnu2gResponse(false, 57344, 10), 1},
- getWant{1, map[string]interface{}{"OpticalNetworkUnitManagementAndControlChannelOmccVersion": uint8(180)}},
+ getWant{1, map[string]interface{}{"OpticalNetworkUnitManagementAndControlChannelOmccVersion": uint8(163)}},
},
{"getOnugResponse",
getArgs{createOnugResponse(false, 40960, 10, sn), 1},