Refactoring logs with correct messages
Change-Id: I14c874c091f507d97e8d0ebd947f2bac7e2c155c
diff --git a/VERSION b/VERSION
index 45a1b3f..9889c59 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.2
+1.1.3-dev
diff --git a/internal/pkg/openflow/client.go b/internal/pkg/openflow/client.go
index 4ec41e9..f43bb11 100644
--- a/internal/pkg/openflow/client.go
+++ b/internal/pkg/openflow/client.go
@@ -408,7 +408,11 @@
}
func (ofc *OFClient) parseHeader(header ofp.IHeader) {
- switch header.GetType() {
+ headerType := header.GetType()
+ logger.Debugw("packet-header-type",
+ log.Fields{
+ "header-type": ofp.Type(headerType).String()})
+ switch headerType {
case ofp.OFPTHello:
//x := header.(*ofp.Hello)
case ofp.OFPTError:
diff --git a/internal/pkg/openflow/flowMod.go b/internal/pkg/openflow/flowMod.go
index da4fc1d..6fee761 100644
--- a/internal/pkg/openflow/flowMod.go
+++ b/internal/pkg/openflow/flowMod.go
@@ -219,14 +219,14 @@
}
if logger.V(log.DebugLevel) {
flowUpdateJs, _ := json.Marshal(flowUpdate)
- logger.Debugf("FlowUpdate being sent to Voltha",
+ logger.Debugf("FlowAdd being sent to Voltha",
log.Fields{
"device-id": ofc.DeviceID,
"flow-mod-object": flowUpdate,
"flow-mod-request": flowUpdateJs})
}
if _, err := ofc.VolthaClient.UpdateLogicalDeviceFlowTable(context.Background(), &flowUpdate); err != nil {
- logger.Errorw("Error calling FlowUpdate ",
+ logger.Errorw("Error calling FlowAdd ",
log.Fields{
"device-id": ofc.DeviceID,
"error": err})
@@ -236,7 +236,7 @@
func (ofc *OFClient) handleFlowMod(flowMod *ofp.FlowMod) {
if logger.V(log.DebugLevel) {
js, _ := json.Marshal(flowMod)
- logger.Debugw("handleMod called",
+ logger.Debugw("handleFlowMod called",
log.Fields{
"device-id": ofc.DeviceID,
"flow-mod": js})
@@ -273,7 +273,7 @@
func (ofc *OFClient) handleFlowDeleteStrict(flowDeleteStrict *ofp.FlowDeleteStrict) {
if logger.V(log.DebugLevel) {
js, _ := json.Marshal(flowDeleteStrict)
- logger.Debugw("handleFlowAdd called",
+ logger.Debugw("handleFlowDeleteStrict called",
log.Fields{
"device-id": ofc.DeviceID,
"flow-delete-strict": js})
@@ -375,13 +375,13 @@
if logger.V(log.DebugLevel) {
flowUpdateJs, _ := json.Marshal(flowUpdate)
- logger.Debugf("FlowUpdate being sent to Voltha",
+ logger.Debugf("FlowDeleteStrict being sent to Voltha",
log.Fields{
"device-id": ofc.DeviceID,
"flow-update": flowUpdateJs})
}
if _, err := ofc.VolthaClient.UpdateLogicalDeviceFlowTable(context.Background(), &flowUpdate); err != nil {
- logger.Errorw("Error calling FlowUpdate ",
+ logger.Errorw("Error calling FlowDelete ",
log.Fields{
"device-id": ofc.DeviceID,
"error": err})