Skip to content
Snippets Groups Projects
Commit bfd65ace authored by Neil-Jocelyn Schark's avatar Neil-Jocelyn Schark
Browse files

prioritize hostname

parent b1b3076d
No related branches found
No related tags found
1 merge request!208Draft: Resolve "Enable TLS for all local settings (integration-tests, debug, etc.)"
Pipeline #223831 failed
Stage: build
Stage: build-integration-test
Stage: test
Stage: analyze
Hide whitespace changes
Inline Side-by-side
goKMS/gnmiHandlers/kms/assignForwardingHandler.go
+ 3
− 3
View file @ bfd65ace
...@@ -65,10 +65,10 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi ...@@ -65,10 +65,10 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi
// check if initiating kms address is set // check if initiating kms address is set
if initiatingKmsAddress := forwarding.GetInitiatingKmsAddress(); initiatingKmsAddress != nil { if initiatingKmsAddress := forwarding.GetInitiatingKmsAddress(); initiatingKmsAddress != nil {
addressPrefix := "" addressPrefix := ""
if initiatingKmsAddress.GetIpAddress() != "" { if initiatingKmsAddress.GetHostname() != "" {
addressPrefix = initiatingKmsAddress.GetIpAddress()
} else if initiatingKmsAddress.GetHostname() != "" {
addressPrefix = initiatingKmsAddress.GetHostname() addressPrefix = initiatingKmsAddress.GetHostname()
} else if initiatingKmsAddress.GetIpAddress() != "" {
addressPrefix = initiatingKmsAddress.GetIpAddress()
} else { } else {
log.Error("initiatingKmsAddress must have either an IP address or a hostname") 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") return fmt.Errorf("initiatingKmsAddress must have either an IP address or a hostname")
......
goKMS/gnmiHandlers/kms/keyRoutingSessionsHandler.go
+ 3
− 3
View file @ bfd65ace
...@@ -118,10 +118,10 @@ func (yh *KeyRoutingSessionHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnm ...@@ -118,10 +118,10 @@ func (yh *KeyRoutingSessionHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnm
// check if initiating kms address is set // check if initiating kms address is set
if initiatingKmsAddress := routingSession.GetInitiatingKmsAddress(); initiatingKmsAddress != nil { if initiatingKmsAddress := routingSession.GetInitiatingKmsAddress(); initiatingKmsAddress != nil {
addressPrefix := "" addressPrefix := ""
if initiatingKmsAddress.GetIpAddress() != "" { if initiatingKmsAddress.GetHostname() != "" {
addressPrefix = initiatingKmsAddress.GetIpAddress()
} else if initiatingKmsAddress.GetHostname() != "" {
addressPrefix = initiatingKmsAddress.GetHostname() addressPrefix = initiatingKmsAddress.GetHostname()
} else if initiatingKmsAddress.GetIpAddress() != "" {
addressPrefix = initiatingKmsAddress.GetIpAddress()
} else { } else {
log.Error("initiatingKmsAddress must have either an IP address or a hostname") 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") return fmt.Errorf("initiatingKmsAddress must have either an IP address or a hostname")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment