Commit 61b1a65c authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

QKD E2E Test: 

- Corrected JSON data filenames
- Addec cleanup of Failed system pods
parent dbd3e5e6

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

+6 −0
Original line number Diff line number Diff line
@@ -73,6 +73,12 @@ end2end_test qkd_end2end: 
    - echo "OLD_NAMESPACES=${OLD_NAMESPACES}"

    - kubectl delete namespace ${OLD_NAMESPACES} || true



    # Clean-up Kubernetes Failed pods

    - >

      kubectl get pods --all-namespaces --field-selector=status.phase=Failed

        -o custom-columns=NAMESPACE:.metadata.namespace,NAME:.metadata.name

        --no-headers | xargs -r -n2 kubectl delete pod -n



    # Login Docker repository

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

src/tests/qkd_end2end/tests/test_01_onboarding.py

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ from .Fixtures import context_client, device_client # pylint: disable=unused-imp 
LOGGER = logging.getLogger(__name__)

LOGGER.setLevel(logging.DEBUG)



DESCRIPTOR_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', 'tfs-topology.json')

DESCRIPTOR_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', 'tfs-01-topology.json')

ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))



def test_scenario_onboarding(

src/tests/qkd_end2end/tests/test_02_create_links.py

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ def test_create_direct_link_qkd1_qkd2( 
    device_client  : DeviceClient,  # pylint: disable=redefined-outer-name

    service_client : ServiceClient, # pylint: disable=redefined-outer-name

):

    descriptor_file = compose_path('tfs-direct-link-qkd1-qkd2.json')

    descriptor_file = compose_path('tfs-02-direct-link-qkd1-qkd2.json')



    # Load descriptors and validate the base scenario

    descriptor_loader = DescriptorLoader(
@@ -106,7 +106,7 @@ def test_create_direct_link_qkd2_qkd3( 
    device_client  : DeviceClient,  # pylint: disable=redefined-outer-name

    service_client : ServiceClient, # pylint: disable=redefined-outer-name

):

    descriptor_file = compose_path('tfs-direct-link-qkd2-qkd3.json')

    descriptor_file = compose_path('tfs-03-direct-link-qkd2-qkd3.json')



    # Load descriptors and validate the base scenario

    descriptor_loader = DescriptorLoader(
@@ -152,7 +152,7 @@ def test_create_virtual_link_qkd1_qkd3( 
    device_client  : DeviceClient,  # pylint: disable=redefined-outer-name

    service_client : ServiceClient, # pylint: disable=redefined-outer-name

):

    descriptor_file = compose_path('tfs-virtual-link-qkd1-qkd3.json'),

    descriptor_file = compose_path('tfs-04-virtual-link-qkd1-qkd3.json'),



    # Load descriptors and validate the base scenario

    descriptor_loader = DescriptorLoader(

src/tests/qkd_end2end/tests/test_03_create_external_app.py

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ def test_create_external_app_qkd1_to_qkd3( 
def test_create_external_app_qkd3_to_qkd1(

    qkd_app_client : QKDAppClient,

):

    request_file = compose_path('tfs-05-app-1-qkd3-qkd1.json')

    request_file = compose_path('tfs-06-app-1-qkd3-qkd1.json')



    # Issue external QKD App creation request (QKD3-QKD1)

    with open(request_file, 'r', encoding='UTF-8') as f:

src/tests/qkd_end2end/tests/test_06_cleanup.py

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ from .Fixtures import context_client, device_client # pylint: disable=unused- 
LOGGER = logging.getLogger(__name__)

LOGGER.setLevel(logging.DEBUG)



DESCRIPTOR_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', 'tfs-topology.json')

DESCRIPTOR_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', 'tfs-01-topology.json')

ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))



def test_scenario_cleanup(