Skip to content
Snippets Groups Projects
Commit faa5e3ca authored by Neil-Jocelyn Schark's avatar Neil-Jocelyn Schark Committed by Malte Bauch
Browse files

Improve error message on route creation


See merge request !220

Co-authored-by: default avatarMalte Bauch <malte.bauch@h-da.de>
parent 2bf943f0
No related branches found
No related tags found
1 merge request!220Improve error message on route creation
Pipeline #226116 passed
......@@ -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))
}
log.Debugf("Received Update within AssignForwardingHandler")
forwarding := config.GetOrCreateAssignForwarding()
pathId := forwarding.GetPathId()
......@@ -56,9 +58,11 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi
if nextHop != nil {
nextHopString = nextHop.GetNodeId()
log.Debugf("AssignForwardingHandler - NextHopString: %s", nextHopString)
}
if prevHop != nil {
prevHopString = prevHop.GetNodeId()
log.Debugf("AssignForwardingHandler - PrevHopString: %s", prevHopString)
}
var initKMS *util.RemoteKMS
......@@ -69,15 +73,16 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi
addressPrefix = initiatingKmsAddress.GetIpAddress()
} else if 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{
Id: initiatingKmsAddress.GetNodeId(),
Address: addressPrefix,
Port: initiatingKmsAddress.GetPort(),
log.Debugf("AssignForwardingHandler - InitiatingKMSAddress was set with the following parameters: NodeId: %s, Hostname: %s, IpAddress: %s, Port: %d", initiatingKmsAddress.GetNodeId(), initiatingKmsAddress.GetHostname(), initiatingKmsAddress.GetIpAddress(), initiatingKmsAddress.GetPort())
if addressPrefix != "" {
initKMS = &util.RemoteKMS{
Id: initiatingKmsAddress.GetNodeId(),
Address: addressPrefix,
Port: initiatingKmsAddress.GetPort(),
}
}
}
......
......@@ -384,11 +384,6 @@ func (kms *KMS) AssignForwardingRoute(pId, pHop, nHop string, remoteKMS *util.Re
kms.routingTable[pathId] = tmpRoute
kms.routingTableMutex.Unlock()
if tmpRoute.RemoteKMS == nil {
log.Error("NOOOOO REMOTE KMS")
return fmt.Errorf("NOOOOO REMOTE KMS")
}
if tmpRoute.RemoteKMS != nil {
kms.remoteKMSMappingMutex.Lock()
if _, ok := kms.remoteKMSMapping[tmpRoute.RemoteKMS.Id]; !ok {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment