[VOL-3987] Do not validate GemPort 4069 as it's reserved for multicast and shared across ONUs
Change-Id: Id34c5a58b93f18b10e20d94351d3bb8e4d664a98
diff --git a/internal/bbsim/devices/onu.go b/internal/bbsim/devices/onu.go
index 1ee67dd..f9e2e32 100644
--- a/internal/bbsim/devices/onu.go
+++ b/internal/bbsim/devices/onu.go
@@ -823,21 +823,24 @@
msgObj, err := omcilib.ParseCreateRequest(msg.OmciPkt)
if err == nil {
if msgObj.EntityClass == me.GemPortNetworkCtpClassID {
- if used, sn = o.PonPort.isGemPortAllocated(msgObj.EntityInstance); used {
- onuLogger.WithFields(log.Fields{
- "IntfId": o.PonPortID,
- "OnuId": o.ID,
- "GemPortId": msgObj.EntityInstance,
- "SerialNumber": o.Sn(),
- }).Errorf("gemport-already-allocated-to-onu-with-sn-%s", common.OnuSnToString(sn))
- } else {
- onuLogger.WithFields(log.Fields{
- "IntfId": o.PonPortID,
- "OnuId": o.ID,
- "GemPortId": msgObj.EntityInstance,
- "SerialNumber": o.Sn(),
- }).Trace("storing-gem-port-id-via-omci")
- o.PonPort.storeGemPort(msgObj.EntityInstance, o.SerialNumber)
+ // GemPort 4069 is reserved for multicast and shared across ONUs
+ if msgObj.EntityInstance != 4069 {
+ if used, sn = o.PonPort.isGemPortAllocated(msgObj.EntityInstance); used {
+ onuLogger.WithFields(log.Fields{
+ "IntfId": o.PonPortID,
+ "OnuId": o.ID,
+ "GemPortId": msgObj.EntityInstance,
+ "SerialNumber": o.Sn(),
+ }).Errorf("gemport-already-allocated-to-onu-with-sn-%s", common.OnuSnToString(sn))
+ } else {
+ onuLogger.WithFields(log.Fields{
+ "IntfId": o.PonPortID,
+ "OnuId": o.ID,
+ "GemPortId": msgObj.EntityInstance,
+ "SerialNumber": o.Sn(),
+ }).Trace("storing-gem-port-id-via-omci")
+ o.PonPort.storeGemPort(msgObj.EntityInstance, o.SerialNumber)
+ }
}
}
}
diff --git a/internal/common/omci/get.go b/internal/common/omci/get.go
index 5172f60..4b02bda 100644
--- a/internal/common/omci/get.go
+++ b/internal/common/omci/get.go
@@ -204,7 +204,7 @@
omciLogger.WithFields(log.Fields{
"EntityInstance": entityInstance,
- }).Info("received-get-software-image-request")
+ }).Trace("received-get-software-image-request")
// Only one image can be active and committed
committed := 0
@@ -240,7 +240,7 @@
"entityId": entityInstance,
"active": active,
"committed": committed,
- }).Info("Reporting SoftwareImage")
+ }).Trace("Reporting SoftwareImage")
return res
}