From 838262024108166be373680f5d9d50f700e41680 Mon Sep 17 00:00:00 2001
From: Malte Bauch <malte.bauch@stud.h-da.de>
Date: Tue, 10 Oct 2023 19:36:14 +0200
Subject: [PATCH] Update proto-kms
---
examples/example01/etsiqkdnclient/etsi-qkdn-client.go | 2 +-
examples/example01/handlers/etsi/etsi15Handler.go | 1 -
go.mod | 2 +-
go.sum | 4 ++--
internal/gnmiserver/subscribe.go | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/examples/example01/etsiqkdnclient/etsi-qkdn-client.go b/examples/example01/etsiqkdnclient/etsi-qkdn-client.go
index 48fa036..42f8833 100644
--- a/examples/example01/etsiqkdnclient/etsi-qkdn-client.go
+++ b/examples/example01/etsiqkdnclient/etsi-qkdn-client.go
@@ -112,7 +112,7 @@ func emulatedKMS(config *Config, peerChannel chan string) *kms.EKMS {
if peer.Sync {
go func() {
time.Sleep(time.Second * 32)
- if err := p.SyncBulkKeys(config.InterComAddr); err != nil {
+ if err := p.SyncBulkKeys(); err != nil {
log.Println("SYNC ERROR: ", err)
}
}()
diff --git a/examples/example01/handlers/etsi/etsi15Handler.go b/examples/example01/handlers/etsi/etsi15Handler.go
index 7b3c17c..6fe819f 100644
--- a/examples/example01/handlers/etsi/etsi15Handler.go
+++ b/examples/example01/handlers/etsi/etsi15Handler.go
@@ -158,7 +158,6 @@ func updateOrCreateQkdNode(confQkdNode *gnmitargetygot.EtsiQkdSdnNode_QkdNode, q
} else {
qkdIface.QkdiStatus = gnmitargetygot.EtsiQkdSdnNode_IfaceStatusTypes_DISABLED
}
- qkdIface.QkdiStatus = gnmitargetygot.EtsiQkdSdnNode_IfaceStatusTypes_ENABLED
qkdIface.QkdiModel = &QkdiModel
//qkdIface.QkdiAttPoint.Device =
element.QuantumElementLink.GetLocalQLPort()
diff --git a/go.mod b/go.mod
index 1100692..491b7a6 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module code.fbi.h-da.de/danet/gnmi-target
go 1.20
require (
- code.fbi.h-da.de/danet/proto-kms v0.0.0-20230929112325-21ce79cfdcf3
+ code.fbi.h-da.de/danet/proto-kms v0.0.0-20231010134253-1aaf11da29b9
github.com/golang/glog v1.1.2
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.3.0
diff --git a/go.sum b/go.sum
index c35d6e9..9ee833d 100644
--- a/go.sum
+++ b/go.sum
@@ -35,8 +35,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-code.fbi.h-da.de/danet/proto-kms v0.0.0-20230929112325-21ce79cfdcf3 h1:NqXKDgJF8NhO/zd6Z3XwvUfFqFUGrGMXaGj4A9z/osM=
-code.fbi.h-da.de/danet/proto-kms v0.0.0-20230929112325-21ce79cfdcf3/go.mod h1:7dji2FbqT/K0ygRuq5OkiTQK+DOzs5qE+ygVw8fja0g=
+code.fbi.h-da.de/danet/proto-kms v0.0.0-20231010134253-1aaf11da29b9 h1:9aqZn5Noule8DfdFwxsL2zNL5N/oP3i3eiz0QQ+TuTw=
+code.fbi.h-da.de/danet/proto-kms v0.0.0-20231010134253-1aaf11da29b9/go.mod h1:7dji2FbqT/K0ygRuq5OkiTQK+DOzs5qE+ygVw8fja0g=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
diff --git a/internal/gnmiserver/subscribe.go b/internal/gnmiserver/subscribe.go
index 97ce743..4bc3f42 100644
--- a/internal/gnmiserver/subscribe.go
+++ b/internal/gnmiserver/subscribe.go
@@ -42,7 +42,7 @@ func (s *Server) Subscribe(stream gnmi.GNMI_SubscribeServer) error {
}
// Print the path a subscription is requested for.
- log.Infof("Received subscribe for gnmi path %s", path.String())
+ log.Infof("Received subscribe for gnmi path %s with mode %s", path.String(), subscriptions.GetMode().String())
}
subscribeMode = subscriptions.GetMode()
--
GitLab