Skip to content
Snippets Groups Projects
Verified Commit 99e5ef78 authored by Malte Bauch's avatar Malte Bauch
Browse files

Additional logging for AssignForwardingHandler

Additionally the remoteKMS within the AssignForwardingHandler is only
created if the addressPrefix is not an empty string.
parent 80ccabf1
No related branches found
No related tags found
1 merge request!220Improve error message on route creation
Pipeline #226094 failed
This commit is part of merge request !220. Comments created here will be created in the context of that merge request.
...@@ -45,6 +45,8 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi ...@@ -45,6 +45,8 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi
return fmt.Errorf("failed type assertion for newConfig %T", (*gnmitargetygot.Gnmitarget)(nil)) return fmt.Errorf("failed type assertion for newConfig %T", (*gnmitargetygot.Gnmitarget)(nil))
} }
log.Debugf("Received Update within AssignForwardingHandler")
forwarding := config.GetOrCreateAssignForwarding() forwarding := config.GetOrCreateAssignForwarding()
pathId := forwarding.GetPathId() pathId := forwarding.GetPathId()
...@@ -56,9 +58,11 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi ...@@ -56,9 +58,11 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi
if nextHop != nil { if nextHop != nil {
nextHopString = nextHop.GetNodeId() nextHopString = nextHop.GetNodeId()
log.Debugf("AssignForwardingHandler - NextHopString: %s", nextHopString)
} }
if prevHop != nil { if prevHop != nil {
prevHopString = prevHop.GetNodeId() prevHopString = prevHop.GetNodeId()
log.Debugf("AssignForwardingHandler - PrevHopString: %s", prevHopString)
} }
var initKMS *util.RemoteKMS var initKMS *util.RemoteKMS
...@@ -69,15 +73,16 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi ...@@ -69,15 +73,16 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi
addressPrefix = initiatingKmsAddress.GetIpAddress() addressPrefix = initiatingKmsAddress.GetIpAddress()
} else if initiatingKmsAddress.GetHostname() != "" { } else if initiatingKmsAddress.GetHostname() != "" {
addressPrefix = initiatingKmsAddress.GetHostname() addressPrefix = initiatingKmsAddress.GetHostname()
} else {
log.Error("initiatingKmsAddress must have either an IP address or a hostname")
return fmt.Errorf("initiatingKmsAddress must have either an IP address or a hostname")
} }
initKMS = &util.RemoteKMS{ log.Debugf("AssignForwardingHandler - InitiatingKMSAddress was set with the following parameters; NodeId: %s, Hostname: %s, IpAddress: %s, Port: %s", initiatingKmsAddress.GetNodeId(), initiatingKmsAddress.GetHostname(), initiatingKmsAddress.GetIpAddress(), initiatingKmsAddress.GetPort())
Id: initiatingKmsAddress.GetNodeId(),
Address: addressPrefix, if addressPrefix != "" {
Port: initiatingKmsAddress.GetPort(), initKMS = &util.RemoteKMS{
Id: initiatingKmsAddress.GetNodeId(),
Address: addressPrefix,
Port: initiatingKmsAddress.GetPort(),
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment