From bfd65ace93bdd54347a01672a1cf81a90f122111 Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Fri, 13 Sep 2024 14:59:25 +0000
Subject: [PATCH] prioritize hostname
---
goKMS/gnmiHandlers/kms/assignForwardingHandler.go | 6 +++---
goKMS/gnmiHandlers/kms/keyRoutingSessionsHandler.go | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/goKMS/gnmiHandlers/kms/assignForwardingHandler.go b/goKMS/gnmiHandlers/kms/assignForwardingHandler.go
index 01ebfedb..c0266fee 100644
--- a/goKMS/gnmiHandlers/kms/assignForwardingHandler.go
+++ b/goKMS/gnmiHandlers/kms/assignForwardingHandler.go
@@ -65,10 +65,10 @@ func (yh *AssignForwardingHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnmi
// check if initiating kms address is set
if initiatingKmsAddress := forwarding.GetInitiatingKmsAddress(); initiatingKmsAddress != nil {
addressPrefix := ""
- if initiatingKmsAddress.GetIpAddress() != "" {
- addressPrefix = initiatingKmsAddress.GetIpAddress()
- } else if initiatingKmsAddress.GetHostname() != "" {
+ if initiatingKmsAddress.GetHostname() != "" {
addressPrefix = initiatingKmsAddress.GetHostname()
+ } else if initiatingKmsAddress.GetIpAddress() != "" {
+ addressPrefix = initiatingKmsAddress.GetIpAddress()
} 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")
diff --git a/goKMS/gnmiHandlers/kms/keyRoutingSessionsHandler.go b/goKMS/gnmiHandlers/kms/keyRoutingSessionsHandler.go
index 6bce9e8e..80503ac3 100644
--- a/goKMS/gnmiHandlers/kms/keyRoutingSessionsHandler.go
+++ b/goKMS/gnmiHandlers/kms/keyRoutingSessionsHandler.go
@@ -118,10 +118,10 @@ func (yh *KeyRoutingSessionHandler) Update(c ygot.ValidatedGoStruct, jobs []*gnm
// check if initiating kms address is set
if initiatingKmsAddress := routingSession.GetInitiatingKmsAddress(); initiatingKmsAddress != nil {
addressPrefix := ""
- if initiatingKmsAddress.GetIpAddress() != "" {
- addressPrefix = initiatingKmsAddress.GetIpAddress()
- } else if initiatingKmsAddress.GetHostname() != "" {
+ if initiatingKmsAddress.GetHostname() != "" {
addressPrefix = initiatingKmsAddress.GetHostname()
+ } else if initiatingKmsAddress.GetIpAddress() != "" {
+ addressPrefix = initiatingKmsAddress.GetIpAddress()
} 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")
--
GitLab