diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7bf6642aa4c21767f57f43ee9c6b4e6ada229532..9f793961a6fcd1db86113027a621c3284c8511a1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,7 +1,7 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/python
{
- "name": "ekms-develop-go",
+ "name": "quant-develop-go",
"build": {
"dockerfile": "Dockerfile"
},
@@ -33,8 +33,8 @@
// Creates a named volume mounted to /home/vscode. Survives a rebuild.
// Creates a named volume mounted to /root/.docker. Survives a rebuild.
// Creates an anonymous volume mounted to /home/vscode/.vscode-server. Gets destroyed on rebuild, which allows vscode to reinstall the extensions and dotfiles.
- "source=ekms-vscode-home-dir,target=/home/vscode,type=volume",
- "source=ekms-docker-root-config,target=/root/.docker,type=volume",
+ "source=quant-vscode-home-dir,target=/home/vscode,type=volume",
+ "source=quant-docker-root-config,target=/root/.docker,type=volume",
"target=/home/vscode/.vscode-server,type=volume"
]
}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19f2c3f7718b19368d7a2b40d79882ae6f99ef07..ffc8e12b3181ed0d10e7ada9e58ee48d99257e66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ build-ekms-ubuntu:
script:
- TAG=${CI_COMMIT_BRANCH//\//-}
- IMAGE_NAME="$IMAGE_PATH/ubuntu"
- - docker buildx build -t "$IMAGE_NAME:$TAG" -f Dockerfile --target "ubuntu" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
+ - docker buildx build -t "$IMAGE_NAME:$TAG" -f ekms/Dockerfile --target "ubuntu" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
- docker push "$IMAGE_NAME:$TAG"
<<: *build
@@ -31,6 +31,6 @@ build-ekms-debian:
script:
- TAG=${CI_COMMIT_BRANCH//\//-}
- IMAGE_NAME="$IMAGE_PATH/debian"
- - docker buildx build -t "$IMAGE_NAME:$TAG" -f Dockerfile --target "debian" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
+ - docker buildx build -t "$IMAGE_NAME:$TAG" -f ekms/Dockerfile --target "debian" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
- docker push "$IMAGE_NAME:$TAG"
<<: *build
diff --git a/.gitmodules b/.gitmodules
index 281481ba0080e7c49066458866c69babbc42da7e..9bc116484576d0b65889784d84690599a1faa5b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "models/third_party/public"]
- path = models/third_party/public
- url = https://github.com/openconfig/public.git
[submodule "models/third_party/openconfig"]
- path = models/third_party/openconfig
+ path = ekms/models/third_party/openconfig
url = https://github.com/openconfig/public.git
diff --git a/docker-compose.yml b/docker-compose.yml
index 87a9bfafc6399d2bb94977a45f884ae01298a989..631866ea13c5dae3ed4534067c09176aabccc7ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
services:
ekms01:
build:
- dockerfile: Dockerfile
+ dockerfile: ekms/Dockerfile
command: ["start", "--log", "debug", "--kms_config", "/tmp/kms/config/ekms01.yaml", "--insecure"]
volumes:
- ./config/ekms/example01.yaml:/tmp/kms/config/ekms01.yaml
@@ -16,7 +16,7 @@ services:
ekms02:
build:
- dockerfile: Dockerfile
+ dockerfile: ekms/Dockerfile
command: ["start", "--log", "debug", "--kms_config", "/tmp/kms/config/ekms02.yaml", "--insecure"]
volumes:
- ./config/ekms/example02.yaml:/tmp/kms/config/ekms02.yaml
diff --git a/.dockerignore b/ekms/.dockerignore
similarity index 100%
rename from .dockerignore
rename to ekms/.dockerignore
diff --git a/.gitignore b/ekms/.gitignore
similarity index 100%
rename from .gitignore
rename to ekms/.gitignore
diff --git a/Dockerfile b/ekms/Dockerfile
similarity index 100%
rename from Dockerfile
rename to ekms/Dockerfile
diff --git a/Dockerfile.debug b/ekms/Dockerfile.debug
similarity index 100%
rename from Dockerfile.debug
rename to ekms/Dockerfile.debug
diff --git a/Makefile b/ekms/Makefile
similarity index 100%
rename from Makefile
rename to ekms/Makefile
diff --git a/api/buf.gen.yaml b/ekms/api/buf.gen.yaml
similarity index 100%
rename from api/buf.gen.yaml
rename to ekms/api/buf.gen.yaml
diff --git a/api/buf.work.yaml b/ekms/api/buf.work.yaml
similarity index 100%
rename from api/buf.work.yaml
rename to ekms/api/buf.work.yaml
diff --git a/api/go/grpc/etsi/etsi14.pb.go b/ekms/api/go/grpc/etsi/etsi14.pb.go
similarity index 100%
rename from api/go/grpc/etsi/etsi14.pb.go
rename to ekms/api/go/grpc/etsi/etsi14.pb.go
diff --git a/api/go/grpc/etsi/etsi14.pb.gw.go b/ekms/api/go/grpc/etsi/etsi14.pb.gw.go
similarity index 100%
rename from api/go/grpc/etsi/etsi14.pb.gw.go
rename to ekms/api/go/grpc/etsi/etsi14.pb.gw.go
diff --git a/api/go/grpc/etsi/etsi14_grpc.pb.go b/ekms/api/go/grpc/etsi/etsi14_grpc.pb.go
similarity index 100%
rename from api/go/grpc/etsi/etsi14_grpc.pb.go
rename to ekms/api/go/grpc/etsi/etsi14_grpc.pb.go
diff --git a/api/go/rest/etsi/client/.gitignore b/ekms/api/go/rest/etsi/client/.gitignore
similarity index 100%
rename from api/go/rest/etsi/client/.gitignore
rename to ekms/api/go/rest/etsi/client/.gitignore
diff --git a/api/go/rest/etsi/client/.openapi-generator-ignore b/ekms/api/go/rest/etsi/client/.openapi-generator-ignore
similarity index 100%
rename from api/go/rest/etsi/client/.openapi-generator-ignore
rename to ekms/api/go/rest/etsi/client/.openapi-generator-ignore
diff --git a/api/go/rest/etsi/client/.openapi-generator/FILES b/ekms/api/go/rest/etsi/client/.openapi-generator/FILES
similarity index 100%
rename from api/go/rest/etsi/client/.openapi-generator/FILES
rename to ekms/api/go/rest/etsi/client/.openapi-generator/FILES
diff --git a/api/go/rest/etsi/client/.openapi-generator/VERSION b/ekms/api/go/rest/etsi/client/.openapi-generator/VERSION
similarity index 100%
rename from api/go/rest/etsi/client/.openapi-generator/VERSION
rename to ekms/api/go/rest/etsi/client/.openapi-generator/VERSION
diff --git a/api/go/rest/etsi/client/.travis.yml b/ekms/api/go/rest/etsi/client/.travis.yml
similarity index 100%
rename from api/go/rest/etsi/client/.travis.yml
rename to ekms/api/go/rest/etsi/client/.travis.yml
diff --git a/api/go/rest/etsi/client/README.md b/ekms/api/go/rest/etsi/client/README.md
similarity index 100%
rename from api/go/rest/etsi/client/README.md
rename to ekms/api/go/rest/etsi/client/README.md
diff --git a/api/go/rest/etsi/client/api/openapi.yaml b/ekms/api/go/rest/etsi/client/api/openapi.yaml
similarity index 100%
rename from api/go/rest/etsi/client/api/openapi.yaml
rename to ekms/api/go/rest/etsi/client/api/openapi.yaml
diff --git a/api/go/rest/etsi/client/api_default.go b/ekms/api/go/rest/etsi/client/api_default.go
similarity index 100%
rename from api/go/rest/etsi/client/api_default.go
rename to ekms/api/go/rest/etsi/client/api_default.go
diff --git a/api/go/rest/etsi/client/client.go b/ekms/api/go/rest/etsi/client/client.go
similarity index 100%
rename from api/go/rest/etsi/client/client.go
rename to ekms/api/go/rest/etsi/client/client.go
diff --git a/api/go/rest/etsi/client/configuration.go b/ekms/api/go/rest/etsi/client/configuration.go
similarity index 100%
rename from api/go/rest/etsi/client/configuration.go
rename to ekms/api/go/rest/etsi/client/configuration.go
diff --git a/api/go/rest/etsi/client/docs/DefaultAPI.md b/ekms/api/go/rest/etsi/client/docs/DefaultAPI.md
similarity index 100%
rename from api/go/rest/etsi/client/docs/DefaultAPI.md
rename to ekms/api/go/rest/etsi/client/docs/DefaultAPI.md
diff --git a/api/go/rest/etsi/client/docs/ErrorFormat.md b/ekms/api/go/rest/etsi/client/docs/ErrorFormat.md
similarity index 100%
rename from api/go/rest/etsi/client/docs/ErrorFormat.md
rename to ekms/api/go/rest/etsi/client/docs/ErrorFormat.md
diff --git a/api/go/rest/etsi/client/docs/KeyContainer.md b/ekms/api/go/rest/etsi/client/docs/KeyContainer.md
similarity index 100%
rename from api/go/rest/etsi/client/docs/KeyContainer.md
rename to ekms/api/go/rest/etsi/client/docs/KeyContainer.md
diff --git a/api/go/rest/etsi/client/docs/KeyContainerKeysInner.md b/ekms/api/go/rest/etsi/client/docs/KeyContainerKeysInner.md
similarity index 100%
rename from api/go/rest/etsi/client/docs/KeyContainerKeysInner.md
rename to ekms/api/go/rest/etsi/client/docs/KeyContainerKeysInner.md
diff --git a/api/go/rest/etsi/client/docs/KeyIDsRequest.md b/ekms/api/go/rest/etsi/client/docs/KeyIDsRequest.md
similarity index 100%
rename from api/go/rest/etsi/client/docs/KeyIDsRequest.md
rename to ekms/api/go/rest/etsi/client/docs/KeyIDsRequest.md
diff --git a/api/go/rest/etsi/client/docs/KeyIDsRequestKeyIDsInner.md b/ekms/api/go/rest/etsi/client/docs/KeyIDsRequestKeyIDsInner.md
similarity index 100%
rename from api/go/rest/etsi/client/docs/KeyIDsRequestKeyIDsInner.md
rename to ekms/api/go/rest/etsi/client/docs/KeyIDsRequestKeyIDsInner.md
diff --git a/api/go/rest/etsi/client/docs/KeyRequest.md b/ekms/api/go/rest/etsi/client/docs/KeyRequest.md
similarity index 100%
rename from api/go/rest/etsi/client/docs/KeyRequest.md
rename to ekms/api/go/rest/etsi/client/docs/KeyRequest.md
diff --git a/api/go/rest/etsi/client/docs/Status.md b/ekms/api/go/rest/etsi/client/docs/Status.md
similarity index 100%
rename from api/go/rest/etsi/client/docs/Status.md
rename to ekms/api/go/rest/etsi/client/docs/Status.md
diff --git a/api/go/rest/etsi/client/model_error_format.go b/ekms/api/go/rest/etsi/client/model_error_format.go
similarity index 100%
rename from api/go/rest/etsi/client/model_error_format.go
rename to ekms/api/go/rest/etsi/client/model_error_format.go
diff --git a/api/go/rest/etsi/client/model_key_container.go b/ekms/api/go/rest/etsi/client/model_key_container.go
similarity index 100%
rename from api/go/rest/etsi/client/model_key_container.go
rename to ekms/api/go/rest/etsi/client/model_key_container.go
diff --git a/api/go/rest/etsi/client/model_key_container_keys_inner.go b/ekms/api/go/rest/etsi/client/model_key_container_keys_inner.go
similarity index 100%
rename from api/go/rest/etsi/client/model_key_container_keys_inner.go
rename to ekms/api/go/rest/etsi/client/model_key_container_keys_inner.go
diff --git a/api/go/rest/etsi/client/model_key_ids_request.go b/ekms/api/go/rest/etsi/client/model_key_ids_request.go
similarity index 100%
rename from api/go/rest/etsi/client/model_key_ids_request.go
rename to ekms/api/go/rest/etsi/client/model_key_ids_request.go
diff --git a/api/go/rest/etsi/client/model_key_ids_request_key_ids_inner.go b/ekms/api/go/rest/etsi/client/model_key_ids_request_key_ids_inner.go
similarity index 100%
rename from api/go/rest/etsi/client/model_key_ids_request_key_ids_inner.go
rename to ekms/api/go/rest/etsi/client/model_key_ids_request_key_ids_inner.go
diff --git a/api/go/rest/etsi/client/model_key_request.go b/ekms/api/go/rest/etsi/client/model_key_request.go
similarity index 100%
rename from api/go/rest/etsi/client/model_key_request.go
rename to ekms/api/go/rest/etsi/client/model_key_request.go
diff --git a/api/go/rest/etsi/client/model_status.go b/ekms/api/go/rest/etsi/client/model_status.go
similarity index 100%
rename from api/go/rest/etsi/client/model_status.go
rename to ekms/api/go/rest/etsi/client/model_status.go
diff --git a/api/go/rest/etsi/client/response.go b/ekms/api/go/rest/etsi/client/response.go
similarity index 100%
rename from api/go/rest/etsi/client/response.go
rename to ekms/api/go/rest/etsi/client/response.go
diff --git a/api/go/rest/etsi/client/test/api_default_test.go b/ekms/api/go/rest/etsi/client/test/api_default_test.go
similarity index 86%
rename from api/go/rest/etsi/client/test/api_default_test.go
rename to ekms/api/go/rest/etsi/client/test/api_default_test.go
index da225e2cbbfc2cf9d453ad5684e836a832b65158..ebdf4fe85544ed6772c96360f05f19abcd57ebc2 100644
--- a/api/go/rest/etsi/client/test/api_default_test.go
+++ b/ekms/api/go/rest/etsi/client/test/api_default_test.go
@@ -11,20 +11,19 @@ package etsi14
import (
"context"
+ "testing"
+
+ openapiclient "code.fbi.h-da.de/danet/quant/ekms/api/go/rest/etsi/client"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "testing"
- openapiclient "code.fbi.h-da.de/danet/ekms/api/go/rest/etsi/client"
)
func Test_etsi14_DefaultAPIService(t *testing.T) {
-
configuration := openapiclient.NewConfiguration()
apiClient := openapiclient.NewAPIClient(configuration)
t.Run("Test DefaultAPIService GetKey", func(t *testing.T) {
-
- t.Skip("skip test") // remove to run test
+ t.Skip("skip test") // remove to run test
var slaveSAEID interface{}
@@ -33,12 +32,10 @@ func Test_etsi14_DefaultAPIService(t *testing.T) {
require.Nil(t, err)
require.NotNil(t, resp)
assert.Equal(t, 200, httpRes.StatusCode)
-
})
t.Run("Test DefaultAPIService GetKeyPost", func(t *testing.T) {
-
- t.Skip("skip test") // remove to run test
+ t.Skip("skip test") // remove to run test
var slaveSAEID interface{}
@@ -47,12 +44,10 @@ func Test_etsi14_DefaultAPIService(t *testing.T) {
require.Nil(t, err)
require.NotNil(t, resp)
assert.Equal(t, 200, httpRes.StatusCode)
-
})
t.Run("Test DefaultAPIService GetKeyWithIds", func(t *testing.T) {
-
- t.Skip("skip test") // remove to run test
+ t.Skip("skip test") // remove to run test
var masterSAEID interface{}
@@ -61,12 +56,10 @@ func Test_etsi14_DefaultAPIService(t *testing.T) {
require.Nil(t, err)
require.NotNil(t, resp)
assert.Equal(t, 200, httpRes.StatusCode)
-
})
t.Run("Test DefaultAPIService GetKeyWithIdsPost", func(t *testing.T) {
-
- t.Skip("skip test") // remove to run test
+ t.Skip("skip test") // remove to run test
var masterSAEID interface{}
@@ -75,12 +68,10 @@ func Test_etsi14_DefaultAPIService(t *testing.T) {
require.Nil(t, err)
require.NotNil(t, resp)
assert.Equal(t, 200, httpRes.StatusCode)
-
})
t.Run("Test DefaultAPIService GetStatus", func(t *testing.T) {
-
- t.Skip("skip test") // remove to run test
+ t.Skip("skip test") // remove to run test
var slaveSAEID interface{}
@@ -89,7 +80,5 @@ func Test_etsi14_DefaultAPIService(t *testing.T) {
require.Nil(t, err)
require.NotNil(t, resp)
assert.Equal(t, 200, httpRes.StatusCode)
-
})
-
}
diff --git a/api/go/rest/etsi/client/utils.go b/ekms/api/go/rest/etsi/client/utils.go
similarity index 100%
rename from api/go/rest/etsi/client/utils.go
rename to ekms/api/go/rest/etsi/client/utils.go
diff --git a/api/go/rest/etsi/server/.openapi-generator-ignore b/ekms/api/go/rest/etsi/server/.openapi-generator-ignore
similarity index 100%
rename from api/go/rest/etsi/server/.openapi-generator-ignore
rename to ekms/api/go/rest/etsi/server/.openapi-generator-ignore
diff --git a/api/go/rest/etsi/server/.openapi-generator/FILES b/ekms/api/go/rest/etsi/server/.openapi-generator/FILES
similarity index 100%
rename from api/go/rest/etsi/server/.openapi-generator/FILES
rename to ekms/api/go/rest/etsi/server/.openapi-generator/FILES
diff --git a/api/go/rest/etsi/server/.openapi-generator/VERSION b/ekms/api/go/rest/etsi/server/.openapi-generator/VERSION
similarity index 100%
rename from api/go/rest/etsi/server/.openapi-generator/VERSION
rename to ekms/api/go/rest/etsi/server/.openapi-generator/VERSION
diff --git a/api/go/rest/etsi/server/Dockerfile b/ekms/api/go/rest/etsi/server/Dockerfile
similarity index 100%
rename from api/go/rest/etsi/server/Dockerfile
rename to ekms/api/go/rest/etsi/server/Dockerfile
diff --git a/api/go/rest/etsi/server/README.md b/ekms/api/go/rest/etsi/server/README.md
similarity index 100%
rename from api/go/rest/etsi/server/README.md
rename to ekms/api/go/rest/etsi/server/README.md
diff --git a/api/go/rest/etsi/server/api/openapi.yaml b/ekms/api/go/rest/etsi/server/api/openapi.yaml
similarity index 100%
rename from api/go/rest/etsi/server/api/openapi.yaml
rename to ekms/api/go/rest/etsi/server/api/openapi.yaml
diff --git a/api/go/rest/etsi/server/go/api.go b/ekms/api/go/rest/etsi/server/go/api.go
similarity index 100%
rename from api/go/rest/etsi/server/go/api.go
rename to ekms/api/go/rest/etsi/server/go/api.go
diff --git a/api/go/rest/etsi/server/go/api_default.go b/ekms/api/go/rest/etsi/server/go/api_default.go
similarity index 100%
rename from api/go/rest/etsi/server/go/api_default.go
rename to ekms/api/go/rest/etsi/server/go/api_default.go
diff --git a/api/go/rest/etsi/server/go/api_default_service.go b/ekms/api/go/rest/etsi/server/go/api_default_service.go
similarity index 100%
rename from api/go/rest/etsi/server/go/api_default_service.go
rename to ekms/api/go/rest/etsi/server/go/api_default_service.go
diff --git a/api/go/rest/etsi/server/go/error.go b/ekms/api/go/rest/etsi/server/go/error.go
similarity index 100%
rename from api/go/rest/etsi/server/go/error.go
rename to ekms/api/go/rest/etsi/server/go/error.go
diff --git a/api/go/rest/etsi/server/go/helpers.go b/ekms/api/go/rest/etsi/server/go/helpers.go
similarity index 100%
rename from api/go/rest/etsi/server/go/helpers.go
rename to ekms/api/go/rest/etsi/server/go/helpers.go
diff --git a/api/go/rest/etsi/server/go/impl.go b/ekms/api/go/rest/etsi/server/go/impl.go
similarity index 100%
rename from api/go/rest/etsi/server/go/impl.go
rename to ekms/api/go/rest/etsi/server/go/impl.go
diff --git a/api/go/rest/etsi/server/go/logger.go b/ekms/api/go/rest/etsi/server/go/logger.go
similarity index 100%
rename from api/go/rest/etsi/server/go/logger.go
rename to ekms/api/go/rest/etsi/server/go/logger.go
diff --git a/api/go/rest/etsi/server/go/model_error_format.go b/ekms/api/go/rest/etsi/server/go/model_error_format.go
similarity index 100%
rename from api/go/rest/etsi/server/go/model_error_format.go
rename to ekms/api/go/rest/etsi/server/go/model_error_format.go
diff --git a/api/go/rest/etsi/server/go/model_key_container.go b/ekms/api/go/rest/etsi/server/go/model_key_container.go
similarity index 100%
rename from api/go/rest/etsi/server/go/model_key_container.go
rename to ekms/api/go/rest/etsi/server/go/model_key_container.go
diff --git a/api/go/rest/etsi/server/go/model_key_container_keys_inner.go b/ekms/api/go/rest/etsi/server/go/model_key_container_keys_inner.go
similarity index 100%
rename from api/go/rest/etsi/server/go/model_key_container_keys_inner.go
rename to ekms/api/go/rest/etsi/server/go/model_key_container_keys_inner.go
diff --git a/api/go/rest/etsi/server/go/model_key_ids_request.go b/ekms/api/go/rest/etsi/server/go/model_key_ids_request.go
similarity index 100%
rename from api/go/rest/etsi/server/go/model_key_ids_request.go
rename to ekms/api/go/rest/etsi/server/go/model_key_ids_request.go
diff --git a/api/go/rest/etsi/server/go/model_key_ids_request_key_ids_inner.go b/ekms/api/go/rest/etsi/server/go/model_key_ids_request_key_ids_inner.go
similarity index 100%
rename from api/go/rest/etsi/server/go/model_key_ids_request_key_ids_inner.go
rename to ekms/api/go/rest/etsi/server/go/model_key_ids_request_key_ids_inner.go
diff --git a/api/go/rest/etsi/server/go/model_key_request.go b/ekms/api/go/rest/etsi/server/go/model_key_request.go
similarity index 100%
rename from api/go/rest/etsi/server/go/model_key_request.go
rename to ekms/api/go/rest/etsi/server/go/model_key_request.go
diff --git a/api/go/rest/etsi/server/go/model_status.go b/ekms/api/go/rest/etsi/server/go/model_status.go
similarity index 100%
rename from api/go/rest/etsi/server/go/model_status.go
rename to ekms/api/go/rest/etsi/server/go/model_status.go
diff --git a/api/go/rest/etsi/server/go/routers.go b/ekms/api/go/rest/etsi/server/go/routers.go
similarity index 100%
rename from api/go/rest/etsi/server/go/routers.go
rename to ekms/api/go/rest/etsi/server/go/routers.go
diff --git a/api/go/rest/etsi/server/main.go b/ekms/api/go/rest/etsi/server/main.go
similarity index 87%
rename from api/go/rest/etsi/server/main.go
rename to ekms/api/go/rest/etsi/server/main.go
index 244f9cbf6a103a41270de4f0f36ac241967b4d93..ea0e4a06aac380f6009a17cc13a63a6601f32b23 100644
--- a/api/go/rest/etsi/server/main.go
+++ b/ekms/api/go/rest/etsi/server/main.go
@@ -13,7 +13,7 @@ import (
"log"
"net/http"
- etsi14 "code.fbi.h-da.de/danet/ekms/api/go/rest/etsi/server/go"
+ etsi14 "code.fbi.h-da.de/danet/quant/ekms/api/go/rest/etsi/server/go"
)
func main() {
diff --git a/api/openapiv2/ekms_etsi14.swagger.json b/ekms/api/openapiv2/ekms_etsi14.swagger.json
similarity index 100%
rename from api/openapiv2/ekms_etsi14.swagger.json
rename to ekms/api/openapiv2/ekms_etsi14.swagger.json
diff --git a/api/openapiv3/etsi14.yaml b/ekms/api/openapiv3/etsi14.yaml
similarity index 100%
rename from api/openapiv3/etsi14.yaml
rename to ekms/api/openapiv3/etsi14.yaml
diff --git a/api/proto/buf.lock b/ekms/api/proto/buf.lock
similarity index 100%
rename from api/proto/buf.lock
rename to ekms/api/proto/buf.lock
diff --git a/api/proto/buf.yaml b/ekms/api/proto/buf.yaml
similarity index 100%
rename from api/proto/buf.yaml
rename to ekms/api/proto/buf.yaml
diff --git a/api/proto/etsi/etsi14.proto b/ekms/api/proto/etsi/etsi14.proto
similarity index 100%
rename from api/proto/etsi/etsi14.proto
rename to ekms/api/proto/etsi/etsi14.proto
diff --git a/cmd/root.go b/ekms/cmd/root.go
similarity index 100%
rename from cmd/root.go
rename to ekms/cmd/root.go
diff --git a/cmd/start.go b/ekms/cmd/start.go
similarity index 96%
rename from cmd/start.go
rename to ekms/cmd/start.go
index 20eeb5232f96864b1b376ecf2e55907d9057ebb6..b2c374124ce3752bfdfed8d6cb26f34fba40b05d 100644
--- a/cmd/start.go
+++ b/ekms/cmd/start.go
@@ -34,13 +34,13 @@ import (
"fmt"
"os"
- "code.fbi.h-da.de/danet/ekms/etsiqkdnclient"
- "code.fbi.h-da.de/danet/ekms/handlers/danet"
- "code.fbi.h-da.de/danet/ekms/handlers/system"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
- "code.fbi.h-da.de/danet/ekms/restserver"
gnmitarget "code.fbi.h-da.de/danet/gnmi-target"
"code.fbi.h-da.de/danet/gnmi-target/handler"
+ "code.fbi.h-da.de/danet/quant/ekms/etsiqkdnclient"
+ "code.fbi.h-da.de/danet/quant/ekms/handlers/danet"
+ "code.fbi.h-da.de/danet/quant/ekms/handlers/system"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/restserver"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
diff --git a/config/ekms/example01.yaml b/ekms/config/ekms/example01.yaml
similarity index 100%
rename from config/ekms/example01.yaml
rename to ekms/config/ekms/example01.yaml
diff --git a/config/ekms/example02.yaml b/ekms/config/ekms/example02.yaml
similarity index 100%
rename from config/ekms/example02.yaml
rename to ekms/config/ekms/example02.yaml
diff --git a/config/quantumlayer/example01.yaml b/ekms/config/quantumlayer/example01.yaml
similarity index 100%
rename from config/quantumlayer/example01.yaml
rename to ekms/config/quantumlayer/example01.yaml
diff --git a/config/quantumlayer/example02.yaml b/ekms/config/quantumlayer/example02.yaml
similarity index 100%
rename from config/quantumlayer/example02.yaml
rename to ekms/config/quantumlayer/example02.yaml
diff --git a/etsiqkdnclient/etsi-qkdn-client.go b/ekms/etsiqkdnclient/etsi-qkdn-client.go
similarity index 98%
rename from etsiqkdnclient/etsi-qkdn-client.go
rename to ekms/etsiqkdnclient/etsi-qkdn-client.go
index a816338273eff9e63ae242a39d42b98a758281ec..fd0179d492561683f59b5d1fed61584dc19a76e1 100644
--- a/etsiqkdnclient/etsi-qkdn-client.go
+++ b/ekms/etsiqkdnclient/etsi-qkdn-client.go
@@ -6,7 +6,7 @@ import (
log "github.com/sirupsen/logrus"
- "code.fbi.h-da.de/danet/ekms/internal/kms"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms"
"github.com/google/uuid"
)
diff --git a/handlers/danet/assignForwardingHandler.go b/ekms/handlers/danet/assignForwardingHandler.go
similarity index 92%
rename from handlers/danet/assignForwardingHandler.go
rename to ekms/handlers/danet/assignForwardingHandler.go
index db2cba859c877425e741aa7e5aef55f5a76cece4..8ecf6325694940e0c91798611542b067391e4c42 100644
--- a/handlers/danet/assignForwardingHandler.go
+++ b/ekms/handlers/danet/assignForwardingHandler.go
@@ -3,8 +3,8 @@ package danet
import (
"fmt"
- "code.fbi.h-da.de/danet/ekms/etsiqkdnclient"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/etsiqkdnclient"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
)
@@ -20,7 +20,7 @@ func NewAssignForwardingHandler(client etsiqkdnclient.EkmsClient) *AssignForward
return &AssignForwardingHandler{
name: "assign-forwarding-handler",
paths: map[string]struct{}{
- "/assign-forwarding": struct{}{},
+ "/assign-forwarding": {},
},
ekmsClient: client,
}
diff --git a/handlers/danet/keyRoutingSessionsHandler.go b/ekms/handlers/danet/keyRoutingSessionsHandler.go
similarity index 91%
rename from handlers/danet/keyRoutingSessionsHandler.go
rename to ekms/handlers/danet/keyRoutingSessionsHandler.go
index 6508e4de3d018d4222fdd1aa4a8c9455c839331f..f59ac0e8866bf750b17bcb758a41da3d78dcae8f 100644
--- a/handlers/danet/keyRoutingSessionsHandler.go
+++ b/ekms/handlers/danet/keyRoutingSessionsHandler.go
@@ -3,9 +3,9 @@ package danet
import (
"fmt"
- "code.fbi.h-da.de/danet/ekms/etsiqkdnclient"
- "code.fbi.h-da.de/danet/ekms/internal/kms/event"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/etsiqkdnclient"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms/event"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
log "github.com/sirupsen/logrus"
@@ -23,7 +23,7 @@ func NewKeyRoutingSessionHandler(client etsiqkdnclient.EkmsClient) *KeyRoutingSe
name: "kms-handler",
paths: map[string]struct{}{
// TODO:change to right path
- "/key-routing-sessions": struct{}{},
+ "/key-routing-sessions": {},
},
ekmsClient: client,
}
@@ -126,10 +126,10 @@ func updateOrCreateKeyRoutingSessions(confKMS *gnmitargetygot.Temp_KeyRoutingSes
}
// TODO: add key properties
- //confKeyProperties := confTempRoutingSession.GetOrCreateKeyProperties()
+ // confKeyProperties := confTempRoutingSession.GetOrCreateKeyProperties()
// TODO: add amount key forwarded
- //confTempRoutingSession.AmountKeysForwarded = ygot.Int64(0)
+ // confTempRoutingSession.AmountKeysForwarded = ygot.Int64(0)
// TODO: add operation status
}
diff --git a/handlers/danet/kmsHandler.go b/ekms/handlers/danet/kmsHandler.go
similarity index 92%
rename from handlers/danet/kmsHandler.go
rename to ekms/handlers/danet/kmsHandler.go
index f53554101516409e3e4cc3a638a89e950529a431..84735acc099bd03e954fdc9ad267236c7016e489 100644
--- a/handlers/danet/kmsHandler.go
+++ b/ekms/handlers/danet/kmsHandler.go
@@ -3,8 +3,8 @@ package danet
import (
"fmt"
- "code.fbi.h-da.de/danet/ekms/etsiqkdnclient"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/etsiqkdnclient"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
)
@@ -19,7 +19,7 @@ func NewKmsHandler(client etsiqkdnclient.EkmsClient) *KmsHandler {
return &KmsHandler{
name: "kms-handler",
paths: map[string]struct{}{
- "/kms": struct{}{},
+ "/kms": {},
},
ekmsClient: client,
}
diff --git a/handlers/danet/peerHandler.go b/ekms/handlers/danet/peerHandler.go
similarity index 93%
rename from handlers/danet/peerHandler.go
rename to ekms/handlers/danet/peerHandler.go
index ddefca7d9b01d52bd83c434af8db33409b0ceb8d..cd8806ea70c0b98d311136ebf17fbba4c0bde613 100644
--- a/handlers/danet/peerHandler.go
+++ b/ekms/handlers/danet/peerHandler.go
@@ -3,10 +3,10 @@ package danet
import (
"fmt"
- "code.fbi.h-da.de/danet/ekms/etsiqkdnclient"
- "code.fbi.h-da.de/danet/ekms/internal/kms"
- "code.fbi.h-da.de/danet/ekms/internal/kms/event"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/etsiqkdnclient"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms/event"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
log "github.com/sirupsen/logrus"
@@ -24,7 +24,7 @@ func NewPeerHandler(client etsiqkdnclient.EkmsClient) *PeerHandler {
name: "kms-handler",
paths: map[string]struct{}{
// TODO:change to right path
- "kms-peers": struct{}{},
+ "kms-peers": {},
},
ekmsClient: client,
}
diff --git a/handlers/system/hostnameHandler.go b/ekms/handlers/system/hostnameHandler.go
similarity index 92%
rename from handlers/system/hostnameHandler.go
rename to ekms/handlers/system/hostnameHandler.go
index 4c0187dfd4116b3b563c37cbe783c128f30a426a..3cd079b0db67edb323201a8888fcf6e80a6fcfc7 100644
--- a/handlers/system/hostnameHandler.go
+++ b/ekms/handlers/system/hostnameHandler.go
@@ -3,8 +3,8 @@ package system
import (
"fmt"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
- "code.fbi.h-da.de/danet/ekms/osclient"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/osclient"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
"github.com/sirupsen/logrus"
@@ -22,7 +22,7 @@ func NewHostnameHandler() *HostnameHandler {
return &HostnameHandler{
name: "openconfig-hostname-handler",
paths: map[string]struct{}{
- "/system/config/hostname": struct{}{},
+ "/system/config/hostname": {},
},
osClient: osclient.NewOsClient(),
}
@@ -81,7 +81,7 @@ func updateOrCreateHostname(confSystem *gnmitargetygot.OpenconfigSystem_System,
config.Hostname = &h
}
- //validate struct
+ // validate struct
if err := confSystem.Validate(); err != nil {
return err
}
diff --git a/handlers/system/memoryHandler.go b/ekms/handlers/system/memoryHandler.go
similarity index 91%
rename from handlers/system/memoryHandler.go
rename to ekms/handlers/system/memoryHandler.go
index 696cd57a0db930ee4d2c06f3a21c371cab570f3a..5d1b9cc1c8de4325b2476a44228f737cd6e63fc9 100644
--- a/handlers/system/memoryHandler.go
+++ b/ekms/handlers/system/memoryHandler.go
@@ -3,8 +3,8 @@ package system
import (
"fmt"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
- "code.fbi.h-da.de/danet/ekms/osclient"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/osclient"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
)
@@ -20,7 +20,7 @@ func NewMemoryHandler() *MemoryHandler {
return &MemoryHandler{
name: "openconfig-memory-handler",
paths: map[string]struct{}{
- "/system/memory/state": struct{}{},
+ "/system/memory/state": {},
},
osClient: osclient.NewOsClient(),
}
@@ -59,7 +59,7 @@ func updateOrCreateMemory(confSystem *gnmitargetygot.OpenconfigSystem_System, os
memory.GetOrCreateState().Used = ygot.Uint64(os.GetUsedMemory())
}
- //validate struct
+ // validate struct
if err := confSystem.Validate(); err != nil {
return err
}
diff --git a/handlers/system/motdHandler.go b/ekms/handlers/system/motdHandler.go
similarity index 92%
rename from handlers/system/motdHandler.go
rename to ekms/handlers/system/motdHandler.go
index 4c906f6b66ffe69deac7f0aeacbe5ad7ed240d29..958c290b9b726b5c833e93a87d784ff9791361f2 100644
--- a/handlers/system/motdHandler.go
+++ b/ekms/handlers/system/motdHandler.go
@@ -3,8 +3,8 @@ package system
import (
"fmt"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
- "code.fbi.h-da.de/danet/ekms/osclient"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/osclient"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
"github.com/sirupsen/logrus"
@@ -21,7 +21,7 @@ func NewMotdHandler() *MotdHandler {
return &MotdHandler{
name: "openconfig-motd-handler",
paths: map[string]struct{}{
- "/system/config/motd-banner": struct{}{},
+ "/system/config/motd-banner": {},
},
osClient: osclient.NewOsClient(),
}
@@ -80,7 +80,7 @@ func updateOrCreateMotd(confSystem *gnmitargetygot.OpenconfigSystem_System, os o
config.MotdBanner = ygot.String(motd)
}
- //validate struct
+ // validate struct
if err := confSystem.Validate(); err != nil {
return err
}
diff --git a/handlers/system/stateHandler.go b/ekms/handlers/system/stateHandler.go
similarity index 92%
rename from handlers/system/stateHandler.go
rename to ekms/handlers/system/stateHandler.go
index 3e23c3adecae982a12e59f535d4d0bf2870328a9..81e9973155d92369728914ada2bb48559f1752e2 100644
--- a/handlers/system/stateHandler.go
+++ b/ekms/handlers/system/stateHandler.go
@@ -4,8 +4,8 @@ import (
"fmt"
"time"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
- "code.fbi.h-da.de/danet/ekms/osclient"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/osclient"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
gopshost "github.com/shirou/gopsutil/host"
@@ -22,7 +22,7 @@ func NewStateHandler() *StateHandler {
return &StateHandler{
name: "openconfig-memory-handler",
paths: map[string]struct{}{
- "/system/state": struct{}{},
+ "/system/state": {},
},
osClient: osclient.NewOsClient(),
}
@@ -69,7 +69,7 @@ func updateOrCreateState(confSystem *gnmitargetygot.OpenconfigSystem_System, os
state.SoftwareVersion = ygot.String(osVersion)
}
- //validate struct
+ // validate struct
if err := confSystem.Validate(); err != nil {
return err
}
diff --git a/handlers/system/systemHandler.go b/ekms/handlers/system/systemHandler.go
similarity index 92%
rename from handlers/system/systemHandler.go
rename to ekms/handlers/system/systemHandler.go
index f00ea81baebdfd279d826af2d42e0216304b095a..932594bc883e82a124b5fa69ec3ebad489b985ca 100644
--- a/handlers/system/systemHandler.go
+++ b/ekms/handlers/system/systemHandler.go
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
- gnmitargetygot "code.fbi.h-da.de/danet/ekms/model"
- "code.fbi.h-da.de/danet/ekms/osclient"
+ gnmitargetygot "code.fbi.h-da.de/danet/quant/ekms/model"
+ "code.fbi.h-da.de/danet/quant/ekms/osclient"
"github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
)
@@ -21,7 +21,7 @@ func NewSystemHandler() *SystemHandler {
return &SystemHandler{
name: "openconfig-system-handler",
paths: map[string]struct{}{
- "/system": struct{}{},
+ "/system": {},
},
osClient: osclient.NewOsClient(),
}
@@ -68,7 +68,7 @@ func updateOrCreateSystem(confSystem *gnmitargetygot.OpenconfigSystem_System, os
}
}
- //validate struct
+ // validate struct
if err := confSystem.Validate(); err != nil {
return err
}
diff --git a/internal/LICENSE b/ekms/internal/LICENSE
similarity index 100%
rename from internal/LICENSE
rename to ekms/internal/LICENSE
diff --git a/internal/README.md b/ekms/internal/README.md
similarity index 100%
rename from internal/README.md
rename to ekms/internal/README.md
diff --git a/internal/api/buf.gen.yaml b/ekms/internal/api/buf.gen.yaml
similarity index 100%
rename from internal/api/buf.gen.yaml
rename to ekms/internal/api/buf.gen.yaml
diff --git a/internal/api/buf.work.yaml b/ekms/internal/api/buf.work.yaml
similarity index 100%
rename from internal/api/buf.work.yaml
rename to ekms/internal/api/buf.work.yaml
diff --git a/internal/api/gen/proto/go/kmsetsi/kmsetsiproto.pb.go b/ekms/internal/api/gen/proto/go/kmsetsi/kmsetsiproto.pb.go
similarity index 100%
rename from internal/api/gen/proto/go/kmsetsi/kmsetsiproto.pb.go
rename to ekms/internal/api/gen/proto/go/kmsetsi/kmsetsiproto.pb.go
diff --git a/internal/api/gen/proto/go/kmsetsi/kmsetsiproto_grpc.pb.go b/ekms/internal/api/gen/proto/go/kmsetsi/kmsetsiproto_grpc.pb.go
similarity index 100%
rename from internal/api/gen/proto/go/kmsetsi/kmsetsiproto_grpc.pb.go
rename to ekms/internal/api/gen/proto/go/kmsetsi/kmsetsiproto_grpc.pb.go
diff --git a/internal/api/gen/proto/go/kmsintercom/kmsintercom.pb.go b/ekms/internal/api/gen/proto/go/kmsintercom/kmsintercom.pb.go
similarity index 100%
rename from internal/api/gen/proto/go/kmsintercom/kmsintercom.pb.go
rename to ekms/internal/api/gen/proto/go/kmsintercom/kmsintercom.pb.go
diff --git a/internal/api/gen/proto/go/kmsintercom/kmsintercom_grpc.pb.go b/ekms/internal/api/gen/proto/go/kmsintercom/kmsintercom_grpc.pb.go
similarity index 100%
rename from internal/api/gen/proto/go/kmsintercom/kmsintercom_grpc.pb.go
rename to ekms/internal/api/gen/proto/go/kmsintercom/kmsintercom_grpc.pb.go
diff --git a/internal/api/kmsetsi/kmsetsi/buf.lock b/ekms/internal/api/kmsetsi/kmsetsi/buf.lock
similarity index 100%
rename from internal/api/kmsetsi/kmsetsi/buf.lock
rename to ekms/internal/api/kmsetsi/kmsetsi/buf.lock
diff --git a/internal/api/kmsetsi/kmsetsi/buf.yaml b/ekms/internal/api/kmsetsi/kmsetsi/buf.yaml
similarity index 100%
rename from internal/api/kmsetsi/kmsetsi/buf.yaml
rename to ekms/internal/api/kmsetsi/kmsetsi/buf.yaml
diff --git a/internal/api/kmsetsi/kmsetsi/kmsetsiproto.proto b/ekms/internal/api/kmsetsi/kmsetsi/kmsetsiproto.proto
similarity index 100%
rename from internal/api/kmsetsi/kmsetsi/kmsetsiproto.proto
rename to ekms/internal/api/kmsetsi/kmsetsi/kmsetsiproto.proto
diff --git a/internal/api/kmsintercom/kmsintercom/buf.lock b/ekms/internal/api/kmsintercom/kmsintercom/buf.lock
similarity index 100%
rename from internal/api/kmsintercom/kmsintercom/buf.lock
rename to ekms/internal/api/kmsintercom/kmsintercom/buf.lock
diff --git a/internal/api/kmsintercom/kmsintercom/buf.yaml b/ekms/internal/api/kmsintercom/kmsintercom/buf.yaml
similarity index 100%
rename from internal/api/kmsintercom/kmsintercom/buf.yaml
rename to ekms/internal/api/kmsintercom/kmsintercom/buf.yaml
diff --git a/internal/api/kmsintercom/kmsintercom/kmsintercom.proto b/ekms/internal/api/kmsintercom/kmsintercom/kmsintercom.proto
similarity index 100%
rename from internal/api/kmsintercom/kmsintercom/kmsintercom.proto
rename to ekms/internal/api/kmsintercom/kmsintercom/kmsintercom.proto
diff --git a/internal/docs/grpcurl-sheet.md b/ekms/internal/docs/grpcurl-sheet.md
similarity index 100%
rename from internal/docs/grpcurl-sheet.md
rename to ekms/internal/docs/grpcurl-sheet.md
diff --git a/internal/docs/run.sh b/ekms/internal/docs/run.sh
similarity index 100%
rename from internal/docs/run.sh
rename to ekms/internal/docs/run.sh
diff --git a/internal/figures/BMBF_gefoerdert_2017_en.jpg b/ekms/internal/figures/BMBF_gefoerdert_2017_en.jpg
similarity index 100%
rename from internal/figures/BMBF_gefoerdert_2017_en.jpg
rename to ekms/internal/figures/BMBF_gefoerdert_2017_en.jpg
diff --git a/internal/kms/crypto.go b/ekms/internal/kms/crypto.go
similarity index 100%
rename from internal/kms/crypto.go
rename to ekms/internal/kms/crypto.go
diff --git a/internal/kms/event/bus.go b/ekms/internal/kms/event/bus.go
similarity index 100%
rename from internal/kms/event/bus.go
rename to ekms/internal/kms/event/bus.go
diff --git a/internal/kms/event/event.go b/ekms/internal/kms/event/event.go
similarity index 100%
rename from internal/kms/event/event.go
rename to ekms/internal/kms/event/event.go
diff --git a/internal/kms/kms-keystore.go b/ekms/internal/kms/kms-keystore.go
similarity index 100%
rename from internal/kms/kms-keystore.go
rename to ekms/internal/kms/kms-keystore.go
diff --git a/internal/kms/kms.go b/ekms/internal/kms/kms.go
similarity index 95%
rename from internal/kms/kms.go
rename to ekms/internal/kms/kms.go
index 86cc72e4c6e465caa604dd6edc1ce3d6f91d54ca..6868480fd557950076076cd4cfbfd569a2324056 100644
--- a/internal/kms/kms.go
+++ b/ekms/internal/kms/kms.go
@@ -15,9 +15,9 @@ import (
"google.golang.org/grpc/health"
healthpb "google.golang.org/grpc/health/grpc_health_v1"
- pbETSI "code.fbi.h-da.de/danet/ekms/internal/api/gen/proto/go/kmsetsi"
- pbIC "code.fbi.h-da.de/danet/ekms/internal/api/gen/proto/go/kmsintercom"
- "code.fbi.h-da.de/danet/ekms/internal/kms/event"
+ pbETSI "code.fbi.h-da.de/danet/quant/ekms/internal/api/gen/proto/go/kmsetsi"
+ pbIC "code.fbi.h-da.de/danet/quant/ekms/internal/api/gen/proto/go/kmsintercom"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms/event"
pbQS "code.fbi.h-da.de/danet/quipsec/gen/go/quipsec"
"github.com/google/uuid"
)
@@ -145,7 +145,7 @@ func (kms *EKMS) AddQuantumElement(qm QuantumModule) error {
}
func (kms *EKMS) AddPeer(peerKmsId string, kmsPeerSocket string, servingQLE QuantumModule) (*kmsPeer, error) {
- //check if peer exists
+ // check if peer exists
if _, there := kms.KmsPeers[kmsPeerSocket]; there {
log.Errorf("Trying to add existing peer %s", kmsPeerSocket)
return nil, fmt.Errorf("Trying to add existing peer %s", kmsPeerSocket)
@@ -160,7 +160,7 @@ func (kms *EKMS) AddPeer(peerKmsId string, kmsPeerSocket string, servingQLE Quan
kms.KmsPeers[kmsPeerSocket] = peer
kms.kmsPeersMutex.Unlock()
- //go peer.PeerHandler(kms.kmsName)
+ // go peer.PeerHandler(kms.kmsName)
return peer, nil
}
@@ -210,7 +210,7 @@ func (kms *EKMS) EventBus() *event.EventBus {
// TODO/XXX error handling
func (kms *EKMS) RemovePeer(kmsPeerSocket string) {
if _, there := kms.KmsPeers[kmsPeerSocket]; there {
- //peer.quit <- true
+ // peer.quit <- true
delete(kms.KmsPeers, kmsPeerSocket)
return
}
diff --git a/internal/kms/kmsetsi.go b/ekms/internal/kms/kmsetsi.go
similarity index 92%
rename from internal/kms/kmsetsi.go
rename to ekms/internal/kms/kmsetsi.go
index 7e26e469ac7046cafccc96807679aa979d5cee8d..767d4a919c0965c3369163e3e34474ac79b4a94e 100644
--- a/internal/kms/kmsetsi.go
+++ b/ekms/internal/kms/kmsetsi.go
@@ -11,16 +11,14 @@ import (
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
- pb "code.fbi.h-da.de/danet/ekms/internal/api/gen/proto/go/kmsetsi"
- "code.fbi.h-da.de/danet/ekms/internal/kms/event"
+ pb "code.fbi.h-da.de/danet/quant/ekms/internal/api/gen/proto/go/kmsetsi"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms/event"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
-var (
- etsiPort = flag.Int("port", 50900, "The server port")
-)
+var etsiPort = flag.Int("port", 50900, "The server port")
// TODO: remove etsiServer
type etsiServer struct {
@@ -54,20 +52,20 @@ func (es *etsiServer) ETSIGetQuantumInterfaces(ctx context.Context, in *pb.ETSIK
// TODO: reimplement
func (es *etsiServer) ETSIAddKMSPeer(ctx context.Context, in *pb.ETSIKMSPeerRequest) (*pb.ETSIKMSPeerReply, error) {
- //determine the kms structure to call
+ // determine the kms structure to call
log.Debugf("AddKMSPeer called.")
// Check first if KmsLocalQLEId is actually one of ours...
qleID := uuid.MustParse(in.KmsLocalQLEId)
servingQLE, _ := es.handlingEkms.quantumModules[""]
if servingQLE == nil {
- //no such element!
+ // no such element!
err := errors.New(fmt.Sprintf("Unknown local quantum element with ID %d", qleID))
return &pb.ETSIKMSPeerReply{}, err
}
- //TODO: remove hardcoded id
+ // TODO: remove hardcoded id
es.handlingEkms.AddPeer("default", in.GetKmsPeerSocket(), servingQLE)
return &pb.ETSIKMSPeerReply{
@@ -76,15 +74,14 @@ func (es *etsiServer) ETSIAddKMSPeer(ctx context.Context, in *pb.ETSIKMSPeerRequ
}
func (es *etsiServer) ETSIRemoveKMSPeer(ctx context.Context, in *pb.ETSIKMSPeerRequest) (*pb.ETSIKMSPeerReply, error) {
- //kms.RemovePeer(in.GetKmsPeerSocket())
+ // kms.RemovePeer(in.GetKmsPeerSocket())
return &pb.ETSIKMSPeerReply{
- //KmsPeerName: kms.kmsName,
+ // KmsPeerName: kms.kmsName,
}, nil
}
func (es *etsiServer) ETSIGetPeerList(ctx context.Context, in *pb.ETSIKMSPeerListRequest) (*pb.ETSIKMSPeerListReply, error) {
-
ep := make([]*pb.ETSIKMSPeer, 2)
r := new(pb.ETSIKMSPeerListReply)
@@ -180,7 +177,7 @@ func (es *etsiServer) ETSISendPayload(ctx context.Context, in *pb.ETSISendPayloa
func StartETSI(listenAddr string, callingKMS *EKMS) {
flag.Parse()
- //lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *etsiPort))
+ // lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *etsiPort))
lis, err := net.Listen("tcp", listenAddr)
if err != nil {
log.Fatalf("failed to listen: %v", err)
diff --git a/internal/kms/kmsintercom.go b/ekms/internal/kms/kmsintercom.go
similarity index 96%
rename from internal/kms/kmsintercom.go
rename to ekms/internal/kms/kmsintercom.go
index dfe4161d78778089bd08df89520cff06f14e833f..a941444e5c60eee8fd3a51d5cf2dd32f43646621 100644
--- a/internal/kms/kmsintercom.go
+++ b/ekms/internal/kms/kmsintercom.go
@@ -9,9 +9,9 @@ import (
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
- etsi14 "code.fbi.h-da.de/danet/ekms/api/go/rest/etsi/client"
- pb "code.fbi.h-da.de/danet/ekms/internal/api/gen/proto/go/kmsintercom"
- "code.fbi.h-da.de/danet/ekms/internal/kms/event"
+ etsi14 "code.fbi.h-da.de/danet/quant/ekms/api/go/rest/etsi/client"
+ pb "code.fbi.h-da.de/danet/quant/ekms/internal/api/gen/proto/go/kmsintercom"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms/event"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
@@ -40,7 +40,7 @@ func (s *kmsTalkerServer) KeyIdNotification(ctx context.Context, in *pb.KeyIdNot
// check if a peer exists
peer, ok := s.eKMS.KmsPeers[in.GetInterComAddr()]
if !ok {
- //TODO: proper error message
+ // TODO: proper error message
return nil, status.Error(codes.Internal, "peer does not exist")
}
@@ -90,7 +90,7 @@ func (s *kmsTalkerServer) SyncQkdBulk(ctx context.Context, in *pb.SyncQkdBulkReq
// check if a peer exists
peer, ok := s.eKMS.KmsPeers[in.GetInterComAddr()]
if !ok {
- //TODO: proper error message
+ // TODO: proper error message
return nil, status.Errorf(codes.Internal, "peer does not exist")
}
diff --git a/internal/kms/kmspeers.go b/ekms/internal/kms/kmspeers.go
similarity index 94%
rename from internal/kms/kmspeers.go
rename to ekms/internal/kms/kmspeers.go
index 301c0aec6839f9922c46e2fa6b8af18de6f705a8..70d8e3472b3849cb6bb22b9c12653539af76e2ac 100644
--- a/internal/kms/kmspeers.go
+++ b/ekms/internal/kms/kmspeers.go
@@ -7,8 +7,8 @@ import (
"net"
"time"
- pbIC "code.fbi.h-da.de/danet/ekms/internal/api/gen/proto/go/kmsintercom"
- "code.fbi.h-da.de/danet/ekms/internal/kms/event"
+ pbIC "code.fbi.h-da.de/danet/quant/ekms/internal/api/gen/proto/go/kmsintercom"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms/event"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
@@ -109,8 +109,8 @@ func (ph *kmsPeer) SyncBulkKeys() error {
// the peer KMS. The key that was agreed upon, is used to create a encrypted
// payload.
func (ph *kmsPeer) TransportKeyNegotiation() error {
- //ctx, cancel := context.WithTimeout(context.Background(), time.Second)
- //req, err := ph.peerClient.InterComTransportKeyNegotiation()
+ // ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+ // req, err := ph.peerClient.InterComTransportKeyNegotiation()
return nil
}
diff --git a/internal/kms/module.go b/ekms/internal/kms/module.go
similarity index 94%
rename from internal/kms/module.go
rename to ekms/internal/kms/module.go
index 93b91d7d4a4ded05560a1a64117feff0a8b509a1..14afaa9f903727892897e41b83c6c9932900da3f 100644
--- a/internal/kms/module.go
+++ b/ekms/internal/kms/module.go
@@ -8,10 +8,10 @@ import (
"sync"
"time"
- etsi14 "code.fbi.h-da.de/danet/ekms/api/go/rest/etsi/client"
- pbIC "code.fbi.h-da.de/danet/ekms/internal/api/gen/proto/go/kmsintercom"
- "code.fbi.h-da.de/danet/ekms/internal/kms/event"
- restclient "code.fbi.h-da.de/danet/ekms/restclient"
+ etsi14 "code.fbi.h-da.de/danet/quant/ekms/api/go/rest/etsi/client"
+ pbIC "code.fbi.h-da.de/danet/quant/ekms/internal/api/gen/proto/go/kmsintercom"
+ "code.fbi.h-da.de/danet/quant/ekms/internal/kms/event"
+ restclient "code.fbi.h-da.de/danet/quant/ekms/restclient"
"code.fbi.h-da.de/danet/quantumlayer"
"github.com/google/uuid"
"github.com/sirupsen/logrus"
@@ -33,8 +33,8 @@ type QuantumModule interface {
type EmulatedQuantumModule struct {
QlID uuid.UUID
- //QuantumElementLink *quantumlayer.QuantumlayerEmuPRNG // contains information about the quantum links
- //key stores of unchopped bulk keys go here
+ // QuantumElementLink *quantumlayer.QuantumlayerEmuPRNG // contains information about the quantum links
+ // key stores of unchopped bulk keys go here
addr string
rawBulkKeysMutex sync.Mutex
rawBulkKeys map[int64]*quantumlayer.QuantumLayerBulkKey
@@ -45,7 +45,7 @@ type EmulatedQuantumModule struct {
func NewEmulatedQuantumModule(kmsUDPAddr string) *EmulatedQuantumModule {
return &EmulatedQuantumModule{
QlID: uuid.New(),
- //QuantumElementLink: ql,
+ // QuantumElementLink: ql,
addr: kmsUDPAddr,
rawBulkKeys: make(map[int64]*quantumlayer.QuantumLayerBulkKey),
keyStore: NewKmsKeyStore(256),
@@ -59,7 +59,7 @@ func (eqe *EmulatedQuantumModule) ID() uuid.UUID {
func (eqe *EmulatedQuantumModule) Initialize() error {
// TODO: error handling
- //go eqe.keyHandler()
+ // go eqe.keyHandler()
return nil
}
diff --git a/internal/kms/quipsec.go b/ekms/internal/kms/quipsec.go
similarity index 100%
rename from internal/kms/quipsec.go
rename to ekms/internal/kms/quipsec.go
diff --git a/internal/kms/util.go b/ekms/internal/kms/util.go
similarity index 96%
rename from internal/kms/util.go
rename to ekms/internal/kms/util.go
index 3857dfe8c2f002bdb97bf2e50e792908fa670c28..8a9949e6226deec5d3a99a4f43f0001c4b7af00a 100644
--- a/internal/kms/util.go
+++ b/ekms/internal/kms/util.go
@@ -6,7 +6,7 @@ import (
"fmt"
"net/http"
- etsi14 "code.fbi.h-da.de/danet/ekms/api/go/rest/etsi/client"
+ etsi14 "code.fbi.h-da.de/danet/quant/ekms/api/go/rest/etsi/client"
"github.com/google/uuid"
)
diff --git a/main.go b/ekms/main.go
similarity index 97%
rename from main.go
rename to ekms/main.go
index 8d757f12e88f1f4168f264c71d4d7c619ebc106d..6387eb873aa2cd05205389b6d52e593483e53aa6 100644
--- a/main.go
+++ b/ekms/main.go
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
*/
package main
-import "code.fbi.h-da.de/danet/ekms/cmd"
+import "code.fbi.h-da.de/danet/quant/ekms/cmd"
func main() {
cmd.Execute()
diff --git a/model/config.yaml b/ekms/model/config.yaml
similarity index 100%
rename from model/config.yaml
rename to ekms/model/config.yaml
diff --git a/model/yang.go b/ekms/model/yang.go
similarity index 100%
rename from model/yang.go
rename to ekms/model/yang.go
diff --git a/models/danet/temp.yang b/ekms/models/danet/temp.yang
similarity index 100%
rename from models/danet/temp.yang
rename to ekms/models/danet/temp.yang
diff --git a/models/third_party/etsi/qkd/etsi-qkd-node-types.yang b/ekms/models/third_party/etsi/qkd/etsi-qkd-node-types.yang
similarity index 100%
rename from models/third_party/etsi/qkd/etsi-qkd-node-types.yang
rename to ekms/models/third_party/etsi/qkd/etsi-qkd-node-types.yang
diff --git a/models/third_party/etsi/qkd/etsi-qkd-sdn-node-no-notififcations.yang b/ekms/models/third_party/etsi/qkd/etsi-qkd-sdn-node-no-notififcations.yang
similarity index 100%
rename from models/third_party/etsi/qkd/etsi-qkd-sdn-node-no-notififcations.yang
rename to ekms/models/third_party/etsi/qkd/etsi-qkd-sdn-node-no-notififcations.yang
diff --git a/models/third_party/openconfig b/ekms/models/third_party/openconfig
similarity index 100%
rename from models/third_party/openconfig
rename to ekms/models/third_party/openconfig
diff --git a/osclient/additions/system.go b/ekms/osclient/additions/system.go
similarity index 100%
rename from osclient/additions/system.go
rename to ekms/osclient/additions/system.go
diff --git a/osclient/additions/system_freebsd.go b/ekms/osclient/additions/system_freebsd.go
similarity index 100%
rename from osclient/additions/system_freebsd.go
rename to ekms/osclient/additions/system_freebsd.go
diff --git a/osclient/additions/system_freebsd_test.go b/ekms/osclient/additions/system_freebsd_test.go
similarity index 100%
rename from osclient/additions/system_freebsd_test.go
rename to ekms/osclient/additions/system_freebsd_test.go
diff --git a/osclient/additions/system_linux.go b/ekms/osclient/additions/system_linux.go
similarity index 100%
rename from osclient/additions/system_linux.go
rename to ekms/osclient/additions/system_linux.go
diff --git a/osclient/additions/system_linux_test.go b/ekms/osclient/additions/system_linux_test.go
similarity index 100%
rename from osclient/additions/system_linux_test.go
rename to ekms/osclient/additions/system_linux_test.go
diff --git a/osclient/additions/types.go b/ekms/osclient/additions/types.go
similarity index 100%
rename from osclient/additions/types.go
rename to ekms/osclient/additions/types.go
diff --git a/osclient/client.go b/ekms/osclient/client.go
similarity index 89%
rename from osclient/client.go
rename to ekms/osclient/client.go
index 12767dd66f2cfe973be620cafb7e1f98ba921b1d..6c235555f5681bba9c3f76f2c2b76a6cbe879a0f 100644
--- a/osclient/client.go
+++ b/ekms/osclient/client.go
@@ -1,7 +1,7 @@
package osclient
import (
- "code.fbi.h-da.de/danet/ekms/osclient/additions"
+ "code.fbi.h-da.de/danet/quant/ekms/osclient/additions"
"github.com/openconfig/ygot/ygot"
)
diff --git a/restclient/restclient.go b/ekms/restclient/restclient.go
similarity index 96%
rename from restclient/restclient.go
rename to ekms/restclient/restclient.go
index 201673eb6c70ca5f34b74347a5431a35666144cd..8b1e00e19653e3c45a86c21db12a9dbc17c9e22c 100644
--- a/restclient/restclient.go
+++ b/ekms/restclient/restclient.go
@@ -4,7 +4,7 @@ import (
"context"
"net/http"
- restclient "code.fbi.h-da.de/danet/ekms/api/go/rest/etsi/client"
+ restclient "code.fbi.h-da.de/danet/quant/ekms/api/go/rest/etsi/client"
"github.com/sirupsen/logrus"
)
@@ -52,7 +52,6 @@ func (c *ClientImpl) GetKeyWithId(masterSAEID, keyID string) (*restclient.KeyCon
req := c.restClient.DefaultAPI.GetKeyWithIds(context.Background(), masterSAEID).KeyID(keyID)
return req.Execute()
-
}
func (c *ClientImpl) GetKeyWithIdPost(masterSAEID string, keyIDs []restclient.KeyIDsRequestKeyIDsInner) (*restclient.KeyContainer, *http.Response, error) {
diff --git a/restserver/restserver.go b/ekms/restserver/restserver.go
similarity index 98%
rename from restserver/restserver.go
rename to ekms/restserver/restserver.go
index 84baa26fb27d587838c7926718c1052bfd7f3b73..2ba5a8d3bc8f3bd7e32664510c09a6f5a3dd4cff 100644
--- a/restserver/restserver.go
+++ b/ekms/restserver/restserver.go
@@ -4,7 +4,7 @@ import (
"context"
"net/http"
- restserver "code.fbi.h-da.de/danet/ekms/api/go/rest/etsi/server/go"
+ restserver "code.fbi.h-da.de/danet/quant/ekms/api/go/rest/etsi/server/go"
"github.com/sirupsen/logrus"
)
diff --git a/go.mod b/go.mod
index 540fee127f46327c6eb98909ff3a13182dd1ef25..d87ca56e8d039a557b6db1fe3f78e6b3052c4317 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module code.fbi.h-da.de/danet/ekms
+module code.fbi.h-da.de/danet/quant
go 1.21