From 043e509ddc2493d95d7f29aded7022f22b528cb7 Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Wed, 24 Jan 2024 13:44:42 +0000
Subject: [PATCH] parameters
---
ekms/etsiqkdnclient/etsi-qkdn-client.go | 11 ++++++++---
ekms/internal/kms/kms.go | 4 ++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ekms/etsiqkdnclient/etsi-qkdn-client.go b/ekms/etsiqkdnclient/etsi-qkdn-client.go
index 97b73367..4ff54d68 100644
--- a/ekms/etsiqkdnclient/etsi-qkdn-client.go
+++ b/ekms/etsiqkdnclient/etsi-qkdn-client.go
@@ -54,6 +54,8 @@ type Config struct {
Sync bool `yaml:"Sync"`
QuantumModule QuantumModule `yaml:"QuantumModule"`
} `yaml:"Peers"`
+ AkmsURL string `yaml:"AkmsURL"`
+ AkmsCkmsServerPort string `yaml:"AkmsCkmsServerPort"`
}
type QuantumModule struct {
@@ -126,8 +128,10 @@ func NewEkmsClient(bootInfo *Config) (myInfo *ekmsInfo) {
// TODO: return an error.
func emulatedKMS(config *Config, id uuid.UUID, peerChannel chan string) *kms.EKMS {
// Attach to eKMS
- emuKMS := kms.NewEKMS(config.Name, id, os.Stdout, log.TraceLevel, false, config.InterComAddr)
- akmsCkmsReceiverServer := akmsCkmsServer.NewAKMSReceiver("4567", emuKMS)
+ emuKMS := kms.NewEKMS(config.Name, id, os.Stdout, log.TraceLevel, false, config.InterComAddr, config.AkmsURL)
+
+ // Create AKMSReceiverServer object
+ akmsCkmsReceiverServer := akmsCkmsServer.NewAKMSReceiver(config.AkmsCkmsServerPort, emuKMS)
var qm kms.QuantumModule
var err error
@@ -172,8 +176,9 @@ func emulatedKMS(config *Config, id uuid.UUID, peerChannel chan string) *kms.EKM
// Start the SDN/management and key retrieval interface
go kms.StartETSI(config.GRPCAddr, emuKMS)
- // Start the AKMSReceiverServer
+ // Start the akmsCkmsReceiverServer
go akmsCkmsReceiverServer.Serve()
+
return emuKMS
}
diff --git a/ekms/internal/kms/kms.go b/ekms/internal/kms/kms.go
index 2e989d05..ee9c6375 100644
--- a/ekms/internal/kms/kms.go
+++ b/ekms/internal/kms/kms.go
@@ -65,7 +65,7 @@ type QuantumElementInterface interface {
GetQlID() qlElementId
}*/
-func NewEKMS(kmsName string, kmsUUID uuid.UUID, logOutput io.Writer, logLevel log.Level, logInJson bool, interComAddr string) (newEKMS *EKMS) {
+func NewEKMS(kmsName string, kmsUUID uuid.UUID, logOutput io.Writer, logLevel log.Level, logInJson bool, interComAddr string, akmsURL string) (newEKMS *EKMS) {
/*
* Setup logging
*/
@@ -86,7 +86,7 @@ func NewEKMS(kmsName string, kmsUUID uuid.UUID, logOutput io.Writer, logLevel lo
log.SetReportCaller(false)
}
- ckmsAkmsClient := akmsCkmsClient.NewCkmsAkmsClient("127.0.0.1:1234")
+ ckmsAkmsClient := akmsCkmsClient.NewCkmsAkmsClient(akmsURL)
createdEKMS := &EKMS{
kmsName: kmsName,
--
GitLab