VOL-2625 - fix SCA issues
Change-Id: If32cc66371f53040dc242679934a642a9488221a
diff --git a/internal/pkg/ofagent/changeEvent.go b/internal/pkg/ofagent/changeEvent.go
index 20c55de..8972e1c 100644
--- a/internal/pkg/ofagent/changeEvent.go
+++ b/internal/pkg/ofagent/changeEvent.go
@@ -117,7 +117,9 @@
ofDesc.SetState(ofp.PortState(desc.GetState()))
ofDesc.SetSupported(ofp.PortFeatures(desc.GetSupported()))
ofPortStatus.SetDesc(*ofDesc)
- ofa.getOFClient(deviceID).SendMessage(ofPortStatus)
+ if err := ofa.getOFClient(deviceID).SendMessage(ofPortStatus); err != nil {
+ log.Errorw("handle-change-events-send-message", log.Fields{"error": err})
+ }
}
}
diff --git a/internal/pkg/ofagent/ofagent.go b/internal/pkg/ofagent/ofagent.go
index 25041ab..c81fd58 100644
--- a/internal/pkg/ofagent/ofagent.go
+++ b/internal/pkg/ofagent/ofagent.go
@@ -130,11 +130,9 @@
case <-ctx.Done():
if volthaDone != nil {
volthaDone()
- volthaDone = nil
}
if hdlDone != nil {
hdlDone()
- hdlDone = nil
}
return
case event := <-ofa.events:
@@ -150,7 +148,12 @@
// Kick off process to attempt to establish
// connection to voltha
state = ofaStateConnecting
- go ofa.establishConnectionToVoltha(p)
+ go func() {
+ if err := ofa.establishConnectionToVoltha(p); err != nil {
+ logger.Errorw("voltha-connection-failed", log.Fields{"error": err})
+ panic(err)
+ }
+ }()
case ofaEventVolthaConnected:
logger.Debug("ofagent-voltha-connect-event")
@@ -194,11 +197,15 @@
}
volthaDone()
volthaDone = nil
- volthaCtx = nil
}
if state != ofaStateConnecting {
state = ofaStateConnecting
- go ofa.establishConnectionToVoltha(p)
+ go func() {
+ if err := ofa.establishConnectionToVoltha(p); err != nil {
+ log.Errorw("voltha-connection-failed", log.Fields{"error": err})
+ panic(err)
+ }
+ }()
}
case ofaEventError:
diff --git a/internal/pkg/ofagent/packetIn.go b/internal/pkg/ofagent/packetIn.go
index 175a9c8..0f5ad71 100644
--- a/internal/pkg/ofagent/packetIn.go
+++ b/internal/pkg/ofagent/packetIn.go
@@ -166,7 +166,11 @@
ofPacketIn.SetTableId(uint8(packetIn.GetTableId()))
ofPacketIn.SetTotalLen(uint16(len(ofPacketIn.GetData())))
ofc := ofa.getOFClient(deviceID)
- ofc.SendMessage(ofPacketIn)
+ if err := ofc.SendMessage(ofPacketIn); err != nil {
+ logger.Errorw("send-message-failed", log.Fields{
+ "device-id": deviceID,
+ "error": err})
+ }
}
}