diff --git a/ekms/etsiqkdnclient/etsi-qkdn-client.go b/ekms/etsiqkdnclient/etsi-qkdn-client.go index 97b73367566597f31229c5a52648327eeec52d6b..4ff54d68e3bae3a5c2ac78ef92a4844583c29c83 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 2e989d05c0a912310392721edcab3a67ae3e4939..ee9c637568f06cb113ef87cb0a527a2a9566c0ad 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,