Commit 67c89954 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code fixes and cleanup

parent fa087587

deploy/crdb.sh

+2 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ if [ "$CRDB_DEPLOY_MODE" == "single" ]; then 
    fi



    crdb_deploy_single

    sleep 3



    if [ "$CRDB_DROP_DATABASE_IF_EXISTS" == "YES" ]; then

        crdb_drop_databases_single
@@ -400,6 +401,7 @@ elif [ "$CRDB_DEPLOY_MODE" == "cluster" ]; then 
    fi



    crdb_deploy_cluster

    sleep 3



    if [ "$CRDB_DROP_DATABASE_IF_EXISTS" == "YES" ]; then

        crdb_drop_databases_cluster

src/tests/ofc24/Dockerfile

+3 −2
Original line number Diff line number Diff line
@@ -92,8 +92,9 @@ export PYTHONPATH=/var/teraflow 
pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_bootstrap.py             --junitxml=/opt/results/report_bootstrap.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_unidir.py --junitxml=/opt/results/report_create_service_unidir.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_delete_service_unidir.py --junitxml=/opt/results/report_delete_service_unidir.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_bidir.py  --junitxml=/opt/results/report_create_service_bidir.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_delete_service_bidir.py  --junitxml=/opt/results/report_delete_service_bidir.xml

# TODO: review bidirectional code. For now, test is disabled til reworked.

#pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_bidir.py  --junitxml=/opt/results/report_create_service_bidir.xml

#pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_delete_service_bidir.py  --junitxml=/opt/results/report_delete_service_bidir.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_cleanup.py               --junitxml=/opt/results/report_cleanup.xml

EOF

RUN chmod ug+x ./run_tests.sh

src/tests/ofc24/tests/test_functional_delete_service_unidir.py

+22 −1
Original line number Diff line number Diff line
@@ -69,9 +69,30 @@ def test_service_removal_unidir( 
    assert len(context_service_uuids) == 1

    context_uuid, service_uuid = set(context_service_uuids).pop()



    # Delete Service

    # NOTE: For optical bands, the service needs to be removed twice,

    # first time for the lightpath, second for the optical band.



    # Check there is exactly 1 service

    response = context_client.ListServices(ADMIN_CONTEXT_ID)

    LOGGER.warning('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))

    assert len(response.services) == 1



    # Delete Service (lightpath)

    service_client.DeleteService(ServiceId(**json_service_id(service_uuid, json_context_id(context_uuid))))



    # Check there is exactly 1 service

    response = context_client.ListServices(ADMIN_CONTEXT_ID)

    LOGGER.warning('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))

    assert len(response.services) == 1



    # Delete Service (optical band)

    service_client.DeleteService(ServiceId(**json_service_id(service_uuid, json_context_id(context_uuid))))



    # Check there are no services

    response = context_client.ListServices(ADMIN_CONTEXT_ID)

    LOGGER.warning('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))

    assert len(response.services) == 0



    # Verify the scenario has no services/slices

    response = context_client.GetContext(ADMIN_CONTEXT_ID)

    assert len(response.service_ids) == 0