From 734ea2fda145e7382eb6687e122766267720f438 Mon Sep 17 00:00:00 2001
From: hajipour <shajipour@cttc.es>
Date: Tue, 28 Jan 2025 09:47:18 +0100
Subject: [PATCH] debug & refactoring: - ofc25-camara tests added to
.gitlab-cy.yml - redundant .xml test reports removed - minor changes in
ofc25-camara-agg-net-controller .gitlab-ci.yml
---
src/tests/.gitlab-ci.yml | 3 ++-
src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml | 9 +++++----
.../report_e2e_ietf_l3vpn_operations.xml | 1 -
.../report_e2e_ietf_slice_operations.xml | 1 -
.../report_onboarding.xml | 1 -
5 files changed, 7 insertions(+), 8 deletions(-)
delete mode 100644 src/tests/ofc25-camara-agg-net-controller/report_e2e_ietf_l3vpn_operations.xml
delete mode 100644 src/tests/ofc25-camara-agg-net-controller/report_e2e_ietf_slice_operations.xml
delete mode 100644 src/tests/ofc25-camara-agg-net-controller/report_onboarding.xml
diff --git a/src/tests/.gitlab-ci.yml b/src/tests/.gitlab-ci.yml
index cd3c3cc21..b49d40c11 100644
--- a/src/tests/.gitlab-ci.yml
+++ b/src/tests/.gitlab-ci.yml
@@ -21,5 +21,6 @@ include:
#- local: '/src/tests/ofc23/.gitlab-ci.yml'
- local: '/src/tests/ofc24/.gitlab-ci.yml'
- local: '/src/tests/eucnc24/.gitlab-ci.yml'
- - local: '/src/tests/ofc25/.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'
diff --git a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
index 9469568ca..08c22b2c8 100644
--- a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
@@ -15,7 +15,7 @@
# Build, tag, and push the Docker images to the GitLab Docker registry
build ofc25:
variables:
- TEST_NAME: 'ofc25_camara_agg_net'
+ TEST_NAME: 'ofc25-camara-agg-net-controller'
IP_NAME: 'ip'
IP_PORT: '9090'
stage: build
@@ -28,7 +28,7 @@ build ofc25:
- docker buildx build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile .
- docker tag "${TEST_NAME}:latest" "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest"
- docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest"
- - docker buildx build -t "${IP_NAME}:latest" -f ./src/tests/tools/mock_ietf_l3vpn_sdn_ctrl/Dockerfile .
+ - docker buildx build -t "${IP_NAME}:latest" -f ./src/tests/tools/mock_ietf_l3vpn_sdn_ctrl/Dockerfile ./src/tests/tools/mock_ietf_l3vpn_sdn_ctrl
- docker tag "${IP_NAME}:latest" "$CI_REGISTRY_IMAGE/${IP_NAME}:latest"
- docker push "$CI_REGISTRY_IMAGE/${IP_NAME}:latest"
after_script:
@@ -46,7 +46,7 @@ build ofc25:
# Deploy TeraFlowSDN and Execute end-2-end test
end2end_test ofc25_camara_agg_net:
variables:
- TEST_NAME: 'ofc25_camara_agg_net'
+ TEST_NAME: 'ofc25-camara-agg-net-controller'
IP_NAME: 'ip'
IP_PORT: '9090'
stage: end2end_test
@@ -89,13 +89,14 @@ end2end_test ofc25_camara_agg_net:
docker run -t --rm --name ${TEST_NAME} --network=host
--volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
--volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
- $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-e2e-ietf-slice-operations.sh
+ $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-agg-net-ietf-slice-operations.sh
after_script:
- kubectl --namespace tfs logs deployment/contextservice -c server
- kubectl --namespace tfs logs deployment/deviceservice -c server
- kubectl --namespace tfs logs deployment/pathcompservice -c frontend
- kubectl --namespace tfs logs deployment/serviceservice -c server
+ - kubectl --namespace tfs logs deployment/sliceservice -c server
- kubectl --namespace tfs logs deployment/nbiservice -c server
# Destroy Scenario
diff --git a/src/tests/ofc25-camara-agg-net-controller/report_e2e_ietf_l3vpn_operations.xml b/src/tests/ofc25-camara-agg-net-controller/report_e2e_ietf_l3vpn_operations.xml
deleted file mode 100644
index 8b0d3b207..000000000
--- a/src/tests/ofc25-camara-agg-net-controller/report_e2e_ietf_l3vpn_operations.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="1" time="3.160" timestamp="2025-01-20T15:45:51.391725" hostname="twilight"><testcase classname="tests.ofc25-camara-agg-net-controller.tests.test_agg_net_ietf_slice_operations" name="test_ietf_slice_creation_removal" time="3.086" /></testsuite></testsuites>
\ No newline at end of file
diff --git a/src/tests/ofc25-camara-agg-net-controller/report_e2e_ietf_slice_operations.xml b/src/tests/ofc25-camara-agg-net-controller/report_e2e_ietf_slice_operations.xml
deleted file mode 100644
index f567a4429..000000000
--- a/src/tests/ofc25-camara-agg-net-controller/report_e2e_ietf_slice_operations.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="1" time="12.092" timestamp="2025-01-19T13:03:23.064636" hostname="twilight"><testcase classname="tests.ofc25-camara-e2e-controller.tests.test_e2e_ietf_slice_operations" name="test_ietf_slice_creation_removal" time="12.028" /></testsuite></testsuites>
\ No newline at end of file
diff --git a/src/tests/ofc25-camara-agg-net-controller/report_onboarding.xml b/src/tests/ofc25-camara-agg-net-controller/report_onboarding.xml
deleted file mode 100644
index b7922065e..000000000
--- a/src/tests/ofc25-camara-agg-net-controller/report_onboarding.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="2" time="1.749" timestamp="2025-01-20T15:45:49.127674" hostname="twilight"><testcase classname="tests.ofc25-camara-agg-net-controller.tests.test_onboarding" name="test_scenario_onboarding" time="0.653" /><testcase classname="tests.ofc25-camara-agg-net-controller.tests.test_onboarding" name="test_scenario_devices_enabled" time="1.017" /></testsuite></testsuites>
\ No newline at end of file
--
GitLab