Commit 8faf3244 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Test - QKD E2E: 

- Fixing CI/CD test
parent 77cf26a8

src/tests/qkd_end2end/.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -104,15 +104,15 @@ end2end_test qkd_end2end: 
    # Deploy scenario with mock QKD Nodes

    - docker network create --driver bridge --subnet=172.254.250.0/24 --gateway=172.254.250.254 qkd-node-br

    - >

      docker run --detach --name qkd-node-01 --network qkd-node-br --ip 172.254.250.101 --publish 8881:8080

      docker run --detach --name qkd-node-01 --network qkd-node-br --ip 172.254.250.101 --publish 8080

      --volume "$PWD/src/tests/${TEST_NAME}/data/qkd-node-01.json:/var/mock_qkd_node/startup.json"

      ${CI_REGISTRY_IMAGE}/mock-qkd-node:test

    - >

      docker run --detach --name qkd-node-02 --network qkd-node-br --ip 172.254.250.102 --publish 8882:8080

      docker run --detach --name qkd-node-02 --network qkd-node-br --ip 172.254.250.102 --publish 8080

      --volume "$PWD/src/tests/${TEST_NAME}/data/qkd-node-02.json:/var/mock_qkd_node/startup.json"

      ${CI_REGISTRY_IMAGE}/mock-qkd-node:test

    - >

      docker run --detach --name qkd-node-03 --network qkd-node-br --ip 172.254.250.103 --publish 8883:8080

      docker run --detach --name qkd-node-03 --network qkd-node-br --ip 172.254.250.103 --publish 8080

      --volume "$PWD/src/tests/${TEST_NAME}/data/qkd-node-03.json:/var/mock_qkd_node/startup.json"

      ${CI_REGISTRY_IMAGE}/mock-qkd-node:test

src/tests/qkd_end2end/data/tfs-01-topology.json

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
            "device_id": {"device_uuid": {"uuid": "QKD1"}}, "device_type": "qkd-node", "device_drivers": ["DEVICEDRIVER_QKD"],

            "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.254.250.101"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "8881"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "8080"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"scheme": "http"}}}

            ]}

        },
@@ -18,7 +18,7 @@ 
            "device_id": {"device_uuid": {"uuid": "QKD2"}}, "device_type": "qkd-node", "device_drivers": ["DEVICEDRIVER_QKD"],

            "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.254.250.102"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "8082"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "8080"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"scheme": "http"}}}

            ]}

        },
@@ -26,7 +26,7 @@ 
            "device_id": {"device_uuid": {"uuid": "QKD3"}}, "device_type": "qkd-node", "device_drivers": ["DEVICEDRIVER_QKD"],

            "device_config": {"config_rules": [

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.254.250.103"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "8883"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "8080"}},

                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"scheme": "http"}}}

            ]}

        }

src/tests/qkd_end2end/redeploy-all.sh

+3 −3
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ docker network rm --force qkd-node-br 
docker network create --driver bridge --subnet=172.254.250.0/24 --gateway=172.254.250.254 qkd-node-br



# Create QKD Nodes

docker run --detach --name qkd-node-01 --network qkd-node-br --ip 172.254.250.101 \

docker run --detach --name qkd-node-01 --network qkd-node-br --ip 172.254.250.101 --publish 8080 \

    --volume "$PWD/src/tests/qkd_end2end/data/qkd-node-01.json:/var/mock_qkd_node/startup.json" \

    mock-qkd-node:test

docker run --detach --name qkd-node-02 --network qkd-node-br --ip 172.254.250.102 \

docker run --detach --name qkd-node-02 --network qkd-node-br --ip 172.254.250.102 --publish 8080 \

    --volume "$PWD/src/tests/qkd_end2end/data/qkd-node-02.json:/var/mock_qkd_node/startup.json" \

    mock-qkd-node:test

docker run --detach --name qkd-node-03 --network qkd-node-br --ip 172.254.250.103 \

docker run --detach --name qkd-node-03 --network qkd-node-br --ip 172.254.250.103 --publish 8080 \

    --volume "$PWD/src/tests/qkd_end2end/data/qkd-node-03.json:/var/mock_qkd_node/startup.json" \

    mock-qkd-node:test

src/tests/qkd_end2end/redeploy-qkd-nodes.sh

+3 −3
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ docker network rm --force qkd-node-br 
docker network create --driver bridge --subnet=172.254.250.0/24 --gateway=172.254.250.254 qkd-node-br



# Create QKD Nodes

docker run --detach --name qkd-node-01 --network qkd-node-br --ip 172.254.250.101 --publish 8881:8080 \

docker run --detach --name qkd-node-01 --network qkd-node-br --ip 172.254.250.101 --publish 8080 \

    --volume "$PWD/src/tests/qkd_end2end/data/qkd-node-01.json:/var/mock_qkd_node/startup.json" \

    mock-qkd-node:test

docker run --detach --name qkd-node-02 --network qkd-node-br --ip 172.254.250.102 --publish 8882:8080 \

docker run --detach --name qkd-node-02 --network qkd-node-br --ip 172.254.250.102 --publish 8080 \

    --volume "$PWD/src/tests/qkd_end2end/data/qkd-node-02.json:/var/mock_qkd_node/startup.json" \

    mock-qkd-node:test

docker run --detach --name qkd-node-03 --network qkd-node-br --ip 172.254.250.103 --publish 8883:8080 \

docker run --detach --name qkd-node-03 --network qkd-node-br --ip 172.254.250.103 --publish 8080 \

    --volume "$PWD/src/tests/qkd_end2end/data/qkd-node-03.json:/var/mock_qkd_node/startup.json" \

    mock-qkd-node:test