Commit d531f6ae authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

OFC25 Test: 

- Renamed test ECOC24 to OFC25
- Added deploy.sh and undeploy.sh scripts
- Corrected test parameters and settings
parent ea556848

ecoc24

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
src/tests/ecoc24/
 
 No newline at end of file

ofc25

0 → 120000
+1 −0
Original line number Diff line number Diff line 
src/tests/ofc25/
 
 No newline at end of file

src/tests/.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ include: 
  - local: '/src/tests/eucnc24/.gitlab-ci.yml'

  - local: '/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml'

  - local: '/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml'

  #- local: '/src/tests/ecoc24/.gitlab-ci.yml'

  #- local: '/src/tests/ofc25/.gitlab-ci.yml'



  - local: '/src/tests/tools/mock_tfs_nbi_dependencies/.gitlab-ci.yml'

src/tests/ecoc24/.gitlab-ci.yml→src/tests/ofc25/.gitlab-ci.yml

+14 −14
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
# limitations under the License.



# Build, tag, and push the Docker image to the GitLab Docker registry

build ecoc24:

build ofc25:

  variables:

    TEST_NAME: 'ecoc24'

    TEST_NAME: 'ofc25'

  stage: build

  before_script:

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
@@ -36,13 +36,13 @@ build ecoc24: 
      - .gitlab-ci.yml



# Deploy TeraFlowSDN and Execute end-2-end test

end2end_test ecoc24:

end2end_test ofc25:

  variables:

    TEST_NAME: 'ecoc24'

    TEST_NAME: 'ofc25'

  stage: end2end_test

  # Disable to force running it after all other tasks

  #needs:

  #  - build ecoc24

  #  - build ofc25

  before_script:

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

    - docker network rm -f na-br
@@ -85,11 +85,11 @@ end2end_test ecoc24: 




    # Delete secondary ingress controllers

    - kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-opt.yaml --ignore-not-found

    - kubectl delete -f src/tests/ofc25/nginx-ingress-controller-opt.yaml --ignore-not-found

    # Create secondary ingress controllers

    - kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-opt.yaml

    - kubectl apply -f src/tests/ofc25/nginx-ingress-controller-opt.yaml

    # Deploy TFS for OPT

    - source src/tests/ecoc24/deploy_specs_opt.sh

    - source src/tests/ofc25/deploy_specs_opt.sh



    # Change the name for the database

    - cp manifests/contextservice.yaml manifests/contextservice.yaml.bak
@@ -115,13 +115,13 @@ end2end_test ecoc24: 


    # Deploy IP TeraFlowSDN

    # Delete secondary ingress controllers

    - kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml --ignore-not-found

    - kubectl delete -f src/tests/ofc25/nginx-ingress-controller-ip.yaml --ignore-not-found



    # Create secondary ingress controllers

    - kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml

    - kubectl apply -f src/tests/ofc25/nginx-ingress-controller-ip.yaml



    # Deploy TFS for IP

    - source src/tests/ecoc24/deploy_specs_ip.sh

    - source src/tests/ofc25/deploy_specs_ip.sh



    # Change the name for the database

    - cp manifests/contextservice.yaml manifests/contextservice.yaml.bak
@@ -151,10 +151,10 @@ end2end_test ecoc24: 




    # Delete secondary ingress controllers

    - kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml --ignore-not-found

    - kubectl delete -f src/tests/ofc25/nginx-ingress-controller-e2e.yaml --ignore-not-found



    # Create secondary ingress controllers

    - kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml

    - kubectl apply -f src/tests/ofc25/nginx-ingress-controller-e2e.yaml



    # Change the name for the database

    - cp manifests/contextservice.yaml manifests/contextservice.yaml.bak
@@ -175,7 +175,7 @@ end2end_test ecoc24: 
    - mv manifests/contextservice.yaml.bak manifests/contextservice.yaml



    #Configure Subscription WS

    - ./src/tests/ecoc24/subscription_ws_e2e.sh

    - ./src/tests/ofc25/subscription_ws_e2e.sh



    - mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh

src/tests/ecoc24/Dockerfile→src/tests/ofc25/Dockerfile

+14 −14
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ RUN rm *.proto 
RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;



# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/tests/ecoc24

WORKDIR /var/teraflow/tests/ecoc24

COPY src/tests/ofc24/requirements.in requirements.in

RUN mkdir -p /var/teraflow/tests/ofc25

WORKDIR /var/teraflow/tests/ofc25

COPY src/tests/ofc25/requirements.in requirements.in

RUN pip-compile --quiet --output-file=requirements.txt requirements.in

RUN python3 -m pip install -r requirements.txt
@@ -74,23 +74,23 @@ COPY src/service/client/. service/client/ 
COPY src/slice/__init__.py slice/__init__.py

COPY src/slice/client/. slice/client/

COPY src/tests/*.py ./tests/

COPY src/tests/ecoc24/__init__.py ./tests/ecoc24/__init__.py

COPY src/tests/ecoc24/descriptors/descriptor_ip.json ./tests/ecoc24/descriptors/descriptor_ip.json

COPY src/tests/ecoc24/descriptors/descriptor_opt.json ./tests/ecoc24/descriptors/descriptor_opt.json

COPY src/tests/ecoc24/descriptors/descriptor_e2e.json ./tests/ecoc24/descriptors/descriptor_e2e.json

COPY src/tests/ecoc24/tests/. ./tests/ecoc24/tests/

COPY src/tests/ofc25/__init__.py ./tests/ofc25/__init__.py

COPY src/tests/ofc25/descriptors/descriptor_ip.json ./tests/ofc25/descriptors/descriptor_ip.json

COPY src/tests/ofc25/descriptors/descriptor_opt.json ./tests/ofc25/descriptors/descriptor_opt.json

COPY src/tests/ofc25/descriptors/descriptor_e2e.json ./tests/ofc25/descriptors/descriptor_e2e.json

COPY src/tests/ofc25/tests/. ./tests/ofc25/tests/



RUN tee ./run_tests.sh <<EOF

!/bin/bash

source /var/teraflow/tfs_runtime_env_vars.sh

export PYTHONPATH=/var/teraflow

pytest --verbose --log-level=INFO /var/teraflow/tests/ecoc24/tests/test_functional_bootstrap_opt.py --junitxml=/opt/results/report_bootstrap_opt.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ecoc24/tests/test_functional_bootstrap_ip.py --junitxml=/opt/results/report_bootstrap_ip.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc25/tests/test_functional_bootstrap_opt.py --junitxml=/opt/results/report_bootstrap_opt.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc25/tests/test_functional_bootstrap_ip.py --junitxml=/opt/results/report_bootstrap_ip.xml

sleep 5

pytest --verbose --log-level=INFO /var/teraflow/tests/ecoc24/tests/test_functional_bootstrap_e2e.py --junitxml=/opt/results/report_bootstrap_e2e.xml

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

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

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

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc25/tests/test_functional_bootstrap_e2e.py --junitxml=/opt/results/report_bootstrap_e2e.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc25/tests/test_functional_create_service.py --junitxml=/opt/results/report_create_service.xml

pytest --verbose --log-level=INFO /var/teraflow/tests/ofc25/tests/test_functional_delete_service.py --junitxml=/opt/results/report_delete_service.xml

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

EOF

RUN chmod ug+x ./run_tests.sh