diff --git a/config/controller/add_devices.sh b/config/controller/add_devices.sh index 265de342ae7ca24c5a55f750e43f55d8712e72fc..530178711de63b7a2b4fd31c7878bd780bf99161 100755 --- a/config/controller/add_devices.sh +++ b/config/controller/add_devices.sh @@ -3,8 +3,8 @@ ## Note: This script does not clean up network elements already existing in the storage. Running it repeatedly will ## create a garbage storage. -GOSDNC_PATH="./gosdnc" -GOSDN_ADDRESS="qkdn-controller:55055" +GOSDNC_PATH="./artifacts/gosdnc" +GOSDN_ADDRESS="127.0.0.1:55055" ADMINPW="TestPassword" KMS_PLUGIN="e404ecf7-4860-41ee-9cee-3dd6af6c5e2b" PND_UUID="5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d" @@ -28,6 +28,3 @@ $GOSDNC_PATH mne create --address "kms01:7030" --name kms01 --password admin --p $GOSDNC_PATH mne create --address "kms02:7030" --name kms02 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid 5e41c291-6121-4335-84f6-41e04b8bdaa2 $GOSDNC_PATH mne create --address "kms03:7030" --name kms03 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid f80db2c0-2480-46b9-b7d1-b63f954e8227 $GOSDNC_PATH mne create --address "kms04:7030" --name kms03 --password admin --plugin-id $KMS_PLUGIN --username admin --uuid 968fd594-b0e7-41f0-ba4b-de259047a933 - -## Add additional user for an app -$GOSDNC_PATH user create --u app --p TestApp --r app diff --git a/config/controller/qkdn-gosdn.toml b/config/controller/qkdn-gosdn.toml index 68c57016b0ce6c57e750087c3bb8dc4fe71823bd..f8989af56d64b5efabb57d8460199ebfd29b0ee9 100644 --- a/config/controller/qkdn-gosdn.toml +++ b/config/controller/qkdn-gosdn.toml @@ -15,5 +15,5 @@ log-level = 'debug' nogrpcpassthrough = false plugin-folder = 'plugins' plugin-registry = 'plugin-registry:55057' -security = 'insecure' +security = 'secure' socket = ':55055' diff --git a/docker-compose.yml b/docker-compose.yml index 3941846f12a45695cbcac17a449971962057676e..32355fb8cdc1d8074579e1d6e4bb62430ff3bc35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,132 +1,128 @@ services: - kms01: - image: gokms - command: - ["--log", "debug", "--kms_config", "/tmp/kms/config/kms01.yaml"] - volumes: - - ./config/goKMS/example01.yaml:/tmp/kms/config/kms01.yaml - - ./artifacts/ssl:/ssl - ports: - - "127.0.0.1:4401:1337" - - "127.0.0.1:9696:9696" - - kms02: - image: gokms - command: - ["--log", "debug", "--kms_config", "/tmp/kms/config/kms02.yaml"] - volumes: - - ./config/goKMS/example02.yaml:/tmp/kms/config/kms02.yaml - - ./artifacts/ssl:/ssl - ports: - - "127.0.0.1:4402:1337" - - kms03: - image: gokms - command: - ["--log", "debug", "--kms_config", "/tmp/kms/config/kms03.yaml"] - volumes: - - ./config/goKMS/example03.yaml:/tmp/kms/config/kms03.yaml - - ./artifacts/ssl:/ssl - ports: - - "127.0.0.1:4403:1337" - - kms04: - image: gokms - command: - ["--log", "debug", "--kms_config", "/tmp/kms/config/kms04.yaml"] - volumes: - - ./config/goKMS/example04.yaml:/tmp/kms/config/kms04.yaml - - ./artifacts/ssl:/ssl - ports: - - "127.0.0.1:4404:1337" - - "127.0.0.1:9697:9696" - - qlayer01: - image: quantumlayer - command: ["--config", "/tmp/quantumlayer/config/quantumlayer01.yaml"] - volumes: - - ./config/quantumlayer/example01.yaml:/tmp/quantumlayer/config/quantumlayer01.yaml - - qlayer02: - image: quantumlayer - command: ["--config", "/tmp/quantumlayer/config/quantumlayer02.yaml"] - volumes: - - ./config/quantumlayer/example02.yaml:/tmp/quantumlayer/config/quantumlayer02.yaml - - qlayer03: - image: quantumlayer - command: ["--config", "/tmp/quantumlayer/config/quantumlayer03.yaml"] - volumes: - - ./config/quantumlayer/example03.yaml:/tmp/quantumlayer/config/quantumlayer03.yaml - - qlayer04: - image: quantumlayer - command: ["--config", "/tmp/quantumlayer/config/quantumlayer04.yaml"] - volumes: - - ./config/quantumlayer/example04.yaml:/tmp/quantumlayer/config/quantumlayer04.yaml - - qlayer05: - image: quantumlayer - command: ["--config", "/tmp/quantumlayer/config/quantumlayer05.yaml"] - volumes: - - ./config/quantumlayer/example05.yaml:/tmp/quantumlayer/config/quantumlayer05.yaml - - qlayer06: - image: quantumlayer - command: ["--config", "/tmp/quantumlayer/config/quantumlayer06.yaml"] - volumes: - - ./config/quantumlayer/example06.yaml:/tmp/quantumlayer/config/quantumlayer06.yaml - - qlayer07: - image: quantumlayer - command: ["--config", "/tmp/quantumlayer/config/quantumlayer07.yaml"] - volumes: - - ./config/quantumlayer/example07.yaml:/tmp/quantumlayer/config/quantumlayer07.yaml - - qlayer08: - image: quantumlayer - command: ["--config", "/tmp/quantumlayer/config/quantumlayer08.yaml"] - volumes: - - ./config/quantumlayer/example08.yaml:/tmp/quantumlayer/config/quantumlayer08.yaml - - akms-receiver01: - image: akms-simulator - - akms-receiver02: - image: akms-simulator - - 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: - - "127.0.0.1:55055:55055" - environment: - GOSDN_ADMIN_PASSWORD: TestPassword - - gosdnc: - image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/gosdnc:qkdn-main - volumes: - - ./config/controller/add_devices.sh:/scripts/add_devices.sh - entrypoint: ["./scripts/add_devices.sh"] - - 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 + kms01: + image: gokms + command: ["--log", "debug", "--kms_config", "/tmp/kms/config/kms01.yaml"] + volumes: + - ./config/goKMS/example01.yaml:/tmp/kms/config/kms01.yaml + - ./artifacts/ssl:/ssl + ports: + - "127.0.0.1:4401:1337" + - "127.0.0.1:9696:9696" + + kms02: + image: gokms + command: ["--log", "debug", "--kms_config", "/tmp/kms/config/kms02.yaml"] + volumes: + - ./config/goKMS/example02.yaml:/tmp/kms/config/kms02.yaml + - ./artifacts/ssl:/ssl + ports: + - "127.0.0.1:4402:1337" + + kms03: + image: gokms + command: ["--log", "debug", "--kms_config", "/tmp/kms/config/kms03.yaml"] + volumes: + - ./config/goKMS/example03.yaml:/tmp/kms/config/kms03.yaml + - ./artifacts/ssl:/ssl + ports: + - "127.0.0.1:4403:1337" + + kms04: + image: gokms + command: ["--log", "debug", "--kms_config", "/tmp/kms/config/kms04.yaml"] + volumes: + - ./config/goKMS/example04.yaml:/tmp/kms/config/kms04.yaml + - ./artifacts/ssl:/ssl + ports: + - "127.0.0.1:4404:1337" + - "127.0.0.1:9697:9696" + + qlayer01: + image: quantumlayer + command: ["--config", "/tmp/quantumlayer/config/quantumlayer01.yaml"] + volumes: + - ./config/quantumlayer/example01.yaml:/tmp/quantumlayer/config/quantumlayer01.yaml + + qlayer02: + image: quantumlayer + command: ["--config", "/tmp/quantumlayer/config/quantumlayer02.yaml"] + volumes: + - ./config/quantumlayer/example02.yaml:/tmp/quantumlayer/config/quantumlayer02.yaml + + qlayer03: + image: quantumlayer + command: ["--config", "/tmp/quantumlayer/config/quantumlayer03.yaml"] + volumes: + - ./config/quantumlayer/example03.yaml:/tmp/quantumlayer/config/quantumlayer03.yaml + + qlayer04: + image: quantumlayer + command: ["--config", "/tmp/quantumlayer/config/quantumlayer04.yaml"] + volumes: + - ./config/quantumlayer/example04.yaml:/tmp/quantumlayer/config/quantumlayer04.yaml + + qlayer05: + image: quantumlayer + command: ["--config", "/tmp/quantumlayer/config/quantumlayer05.yaml"] + volumes: + - ./config/quantumlayer/example05.yaml:/tmp/quantumlayer/config/quantumlayer05.yaml + + qlayer06: + image: quantumlayer + command: ["--config", "/tmp/quantumlayer/config/quantumlayer06.yaml"] + volumes: + - ./config/quantumlayer/example06.yaml:/tmp/quantumlayer/config/quantumlayer06.yaml + + qlayer07: + image: quantumlayer + command: ["--config", "/tmp/quantumlayer/config/quantumlayer07.yaml"] + volumes: + - ./config/quantumlayer/example07.yaml:/tmp/quantumlayer/config/quantumlayer07.yaml + + qlayer08: + image: quantumlayer + command: ["--config", "/tmp/quantumlayer/config/quantumlayer08.yaml"] + volumes: + - ./config/quantumlayer/example08.yaml:/tmp/quantumlayer/config/quantumlayer08.yaml + + akms-receiver01: + image: akms-simulator + + akms-receiver02: + image: akms-simulator + + 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: + - "127.0.0.1:55055:55055" + environment: + GOSDN_ADMIN_PASSWORD: TestPassword + + gosdnc: + image: registry.code.fbi.h-da.de/demoquandt/qkdn-controller/gosdnc:qkdn-main + volumes: + - ./config/controller/add_devices.sh:/scripts/add_devices.sh + entrypoint: ["/scripts/add_devices.sh"] + + 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