Skip to content
Snippets Groups Projects
Commit 3dc72fec authored by Fabian Seidl's avatar Fabian Seidl Committed by Neil-Jocelyn Schark
Browse files

Fix unused default of max key fill level

See merge request !184
parent d3c0908e
No related branches found
No related tags found
1 merge request!184Fix unused default of max key fill level
Pipeline #220943 failed
...@@ -18,15 +18,6 @@ import ( ...@@ -18,15 +18,6 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
const (
maxFailedKeyRequestAttempts = 10
defaultKeyFetchInterval = 10
defaultKeyFetchAmount = int64(1)
defualtMaxKeyFillLevel = uint64(100)
backgroundKeyStoreUpdateInterval = 1
)
type ETSI014HTTPQuantumModule struct { type ETSI014HTTPQuantumModule struct {
id uuid.UUID id uuid.UUID
kmsId string kmsId string
...@@ -88,7 +79,7 @@ func NewETSI014HTTPQuantumModule(addr, kmsId, localSAEID, targetSAEID string, tl ...@@ -88,7 +79,7 @@ func NewETSI014HTTPQuantumModule(addr, kmsId, localSAEID, targetSAEID string, tl
} }
if maxKeyFillLevel == 0 { if maxKeyFillLevel == 0 {
maxKeyFillLevel = defualtMaxKeyFillLevel maxKeyFillLevel = DefaultMaxKeyFillLevel
} }
return &ETSI014HTTPQuantumModule{ return &ETSI014HTTPQuantumModule{
......
...@@ -6,6 +6,15 @@ import ( ...@@ -6,6 +6,15 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
) )
const (
maxFailedKeyRequestAttempts = 10
defaultKeyFetchInterval = 10
defaultKeyFetchAmount = int64(1)
DefaultMaxKeyFillLevel = uint64(100)
backgroundKeyStoreUpdateInterval = 1
)
// QuantumModule interface definition. // QuantumModule interface definition.
type QuantumModule interface { type QuantumModule interface {
ID() uuid.UUID ID() uuid.UUID
......
...@@ -43,6 +43,7 @@ import ( ...@@ -43,6 +43,7 @@ import (
kmsHandler "code.fbi.h-da.de/danet/quant/goKMS/gnmiHandlers/kms" kmsHandler "code.fbi.h-da.de/danet/quant/goKMS/gnmiHandlers/kms"
"code.fbi.h-da.de/danet/quant/goKMS/gnmiHandlers/system" "code.fbi.h-da.de/danet/quant/goKMS/gnmiHandlers/system"
"code.fbi.h-da.de/danet/quant/goKMS/kms" "code.fbi.h-da.de/danet/quant/goKMS/kms"
"code.fbi.h-da.de/danet/quant/goKMS/kms/peers"
"code.fbi.h-da.de/danet/quant/goKMS/kms/receiver" "code.fbi.h-da.de/danet/quant/goKMS/kms/receiver"
gnmitargetygot "code.fbi.h-da.de/danet/quant/goKMS/model" gnmitargetygot "code.fbi.h-da.de/danet/quant/goKMS/model"
qkdnmanager "code.fbi.h-da.de/danet/quant/goKMS/qkdnManager" qkdnmanager "code.fbi.h-da.de/danet/quant/goKMS/qkdnManager"
...@@ -237,11 +238,17 @@ func setupQkdnManagerServer(kms *kms.KMS, config config.QkdnManagerServer) { ...@@ -237,11 +238,17 @@ func setupQkdnManagerServer(kms *kms.KMS, config config.QkdnManagerServer) {
cancel() cancel()
} }
func getMaxKeyFillLevelsFromConfig(peers []config.Peer) map[string]uint64 { func getMaxKeyFillLevelsFromConfig(configPeers []config.Peer) map[string]uint64 {
maxKeyFillLevels := make(map[string]uint64, 0) maxKeyFillLevels := make(map[string]uint64, 0)
for _, peer := range peers { for _, peer := range configPeers {
maxKeyFillLevels[peer.PeerId] = uint64(peer.QuantumModule.MaxKeyFillLevel) maxKeyFillLevel := uint64(peer.QuantumModule.MaxKeyFillLevel)
if maxKeyFillLevel == 0 {
maxKeyFillLevel = peers.DefaultMaxKeyFillLevel
}
maxKeyFillLevels[peer.PeerId] = maxKeyFillLevel
} }
return maxKeyFillLevels return maxKeyFillLevels
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment