diff --git a/.vscode/launch.json b/.vscode/launch.json
index 70f8fa1d662f4a79adb6470d5ad123a139cbcbc1..cbc246efc7304673d8adf749676b245696c2d0f5 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -130,8 +130,8 @@
{
"name": "Debug open integration test and kms",
"configurations": [
- "integration-test-kms01-debug",
- "integration-test-kms02-debug",
+ "integration-test-aes-kms01-debug",
+ "integration-test-aes-kms02-debug",
"Launch currently open test"
],
"stopAll": true
diff --git a/Makefile b/Makefile
index eba6ccf031e933139dd664e51fa65c00e03e6915..5d703b23c03b803b8b4239ebf09c5b02a98ec1af 100644
--- a/Makefile
+++ b/Makefile
@@ -119,19 +119,19 @@ integration-test-aes-debug-compose-down:
docker compose -f integration-tests/docker-compose.yml -f integration-tests/docker-compose.override.debug.yml down
integration-test-otp: install-gosdnc generate-integration-test-certs build-images
- docker compose -f integration-tests/docker-compose-otp.yml down
- docker compose -f integration-tests/docker-compose-otp.yml up -d
+ docker compose -f integration-tests/docker-compose.override.otp.yml -f docker-compose.yml down
+ docker compose -f integration-tests/docker-compose.override.otp.yml -f docker-compose.yml up -d
echo "Will sleep for the quantumlayers to get ready"
sleep 45
go test -p 1 -count=1 -v ./integration-tests/code/*
- docker compose -f integration-tests/docker-compose-otp.yml down
+ docker compose -f integration-tests/docker-compose.override.otp.yml -f docker-compose.yml down
integration-test-otp-debug-compose-up: generate-integration-test-certs build-images install-gosdnc
- docker compose -f integration-tests/docker-compose-otp.yml -f integration-tests/docker-compose.override.debug.yml down
- docker compose -f integration-tests/docker-compose-otp.yml -f integration-tests/docker-compose.override.debug.yml up -d
+ docker compose -f integration-tests/docker-compose.override.otp.yml -f docker-compose.yml -f integration-tests/docker-compose.override.debug.yml down
+ docker compose -f integration-tests/docker-compose.override.otp.yml -f docker-compose.yml -f integration-tests/docker-compose.override.debug.yml up -d
integration-test-otp-debug-compose-down:
- docker compose -f integration-tests/docker-compose-otp.yml -f integration-tests/docker-compose.override.debug.yml down
+ docker compose -f integration-tests/docker-compose.override.otp.yml -f docker-compose.yml -f integration-tests/docker-compose.override.debug.yml down
longevity-test: generate-gokms-certs build-images install-gosdnc
rm -rf longevity-tests/akms1-logs
diff --git a/akms-simulator/akms-simulator.go b/akms-simulator/akms-simulator.go
index 79fe50212517239f12cdfd1ec9d7854d893ea0ae..dd2d12eb70f87e5b4296f07086aebd6f2f46a4de 100644
--- a/akms-simulator/akms-simulator.go
+++ b/akms-simulator/akms-simulator.go
@@ -84,8 +84,8 @@ func main() {
func logFileRequest(w http.ResponseWriter, r *http.Request) {
if r.Method == http.MethodDelete {
- if _, err := os.Stat("akms-simulator.log"); err == nil {
- err := os.Remove("akms-simulator.log")
+ if _, err := os.Stat(LogFilePath); err == nil {
+ err := os.Remove(LogFilePath)
if err != nil {
logrus.Errorf("Error deleting log file: %s", err)
w.WriteHeader(http.StatusInternalServerError)
diff --git a/integration-tests/code/testRestartOfKMSTest/testRestartOfKMS_test.go b/integration-tests/code/testRestartOfKMSTest/testRestartOfKMS_test.go
index 838547a243364b16fe5fae480d4bdbbc231cd166..56d9e55dc8295ee410c31ea86fd74c125978d3f0 100644
--- a/integration-tests/code/testRestartOfKMSTest/testRestartOfKMS_test.go
+++ b/integration-tests/code/testRestartOfKMSTest/testRestartOfKMS_test.go
@@ -19,7 +19,7 @@ import (
)
// For log file.
-type LogFile struct {
+type LogFileEntry struct {
Source string `json:"source"`
Body PushKSAKeyRequest `json:"body"`
}
@@ -137,7 +137,7 @@ func TestRestartOfKMS(t *testing.T) { //nolint:gocyclo
return
}
- var logFile LogFile
+ var logFile LogFileEntry
err = json.Unmarshal(body, &logFile)
if err != nil {
t.Errorf("Error parsing logFile answer from AKMS: %s. \n Most likely the AKMS never received a ksa key. It told us: %s", err, string(body))
@@ -163,7 +163,7 @@ func TestRestartOfKMS(t *testing.T) { //nolint:gocyclo
t.Errorf("Error reading response body: %s", err)
return
}
- var logFile2 LogFile
+ var logFile2 LogFileEntry
err = json.Unmarshal(body, &logFile2)
if err != nil {
diff --git a/integration-tests/docker-compose-otp.yml b/integration-tests/docker-compose-otp.yml
deleted file mode 100644
index 50f043d1f732a8fb7fc8b8e4e18b1fa05021d472..0000000000000000000000000000000000000000
--- a/integration-tests/docker-compose-otp.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-services:
- kms01:
- image: gokms
- command:
- ["--log", "debug", "--kms_config", "/tmp/kms/config/kms_1_otp.yaml"]
- volumes:
- - ./config/kms/kms_1_otp.yaml:/tmp/kms/config/kms_1_otp.yaml
- - ../artifacts/integration-tests/ssl:/config/ssl
- ports:
- - "127.0.0.1:7030:7030"
- - "127.0.0.1:9696:9696"
- - "127.0.0.1:1414:1414"
-
- kms02:
- image: gokms
- command:
- ["--log", "debug", "--kms_config", "/tmp/kms/config/kms_2_otp.yaml"]
- volumes:
- - ./config/kms/kms_2_otp.yaml:/tmp/kms/config/kms_2_otp.yaml
- - ../artifacts/integration-tests/ssl:/config/ssl
- ports:
- - "127.0.0.1:7031:7030"
- - "127.0.0.1:1415:1414"
-
- quantumlayer_1:
- image: quantumlayer
- command:
- [
- "--log",
- "debug",
- "--config",
- "/tmp/quantumlayer/config/quantumlayer_1.yaml",
- ]
- volumes:
- - ./config/quantumlayer/quantumlayer_1.yaml:/tmp/quantumlayer/config/quantumlayer_1.yaml
-
- quantumlayer_2:
- image: quantumlayer
- command:
- [
- "--log",
- "debug",
- "--config",
- "/tmp/quantumlayer/config/quantumlayer_2.yaml",
- ]
- volumes:
- - ./config/quantumlayer/quantumlayer_2.yaml:/tmp/quantumlayer/config/quantumlayer_2.yaml
-
- akms-simulator_1:
- image: akms-simulator
- ports:
- - "127.0.0.1:4444:4444"
- volumes:
- - ../artifacts/integration-tests/ssl:/config/ssl
- command:
- [
- "--ca",
- "config/ssl/ca.crt",
- "--cert",
- "config/ssl/kms/kms2-selfsigned.crt",
- "--key",
- "config/ssl/kms/kms2-selfsigned.key",
- ]
-
- akms-simulator_2:
- image: akms-simulator
- volumes:
- - ../artifacts/integration-tests/ssl:/config/ssl
- ports:
- - "127.0.0.1:4445:4444"
- command:
- [
- "--ca",
- "config/ssl/ca.crt",
- "--cert",
- "config/ssl/kms/kms1-selfsigned.crt",
- "--key",
- "config/ssl/kms/kms1-selfsigned.key",
- ]
-
- qkdn-controller:
- image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller:qkdn-main
- volumes:
- - ./config/controller/qkdn-gosdn.toml:/app/configs/qkdn-gosdn.toml
- - ./config/controller/gNMISubscriptions.txt:/app/configs/gNMISubscriptions.txt
- command: --config ./configs/qkdn-gosdn.toml
- ports:
- - 0.0.0.0:55055:55055
- - 127.0.0.1:8080:8080
- - 127.0.0.1:40000:40000
- environment:
- GOSDN_ADMIN_PASSWORD: TestPassword
-
- plugin-registry:
- image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/plugin-registry:qkdn-main
-
- mongo:
- image: mongo:7
- environment:
- MONGO_INITDB_ROOT_USERNAME: root
- MONGO_INITDB_ROOT_PASSWORD: example
-
- rabbitmq:
- image: rabbitmq:3-management
-
- routing-app:
- image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/routing-app:qkdn-main
- entrypoint: ["./start_ra_sleep.sh"]
- volumes:
- - ./config/controller/start_ra_sleep.sh:/app/start_ra_sleep.sh
- - ./config/controller/routing-config.yaml:/new/routing-config.yaml
diff --git a/integration-tests/docker-compose.override.otp.yml b/integration-tests/docker-compose.override.otp.yml
new file mode 100644
index 0000000000000000000000000000000000000000..740031a6a21bcc3009aa3b7aed0fff765bcb48c4
--- /dev/null
+++ b/integration-tests/docker-compose.override.otp.yml
@@ -0,0 +1,16 @@
+services:
+ kms01:
+ image: gokms
+ command:
+ ["--log", "debug", "--kms_config", "/tmp/kms/config/kms_1_otp.yaml"]
+ volumes:
+ - ./config/kms/kms_1_otp.yaml:/tmp/kms/config/kms_1_otp.yaml
+ - ../artifacts/integration-tests/ssl:/config/ssl
+
+ kms02:
+ image: gokms
+ command:
+ ["--log", "debug", "--kms_config", "/tmp/kms/config/kms_2_otp.yaml"]
+ volumes:
+ - ./config/kms/kms_2_otp.yaml:/tmp/kms/config/kms_2_otp.yaml
+ - ../artifacts/integration-tests/ssl:/config/ssl