From ea556848a855de6c5d4371658152694b997a2bc7 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 19 Feb 2025 07:31:25 +0000
Subject: [PATCH] OFC22 test:
- recovered all integration tests
- disabled debug log in monitoring
- enlarged wait times for enabling devices and creating KPIs
---
.gitlab-ci.yml | 66 +++++++++----------
manifests/monitoringservice.yaml | 2 +-
src/tests/.gitlab-ci.yml | 22 +++----
src/tests/ofc22/.gitlab-ci.yml | 2 +-
.../ofc22/tests/test_functional_bootstrap.py | 8 +--
5 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce9084631..769ccd80e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,39 +21,39 @@ stages:
# include the individual .gitlab-ci.yml of each micro-service and tests
include:
-# #- local: '/manifests/.gitlab-ci.yml'
-# - local: '/src/monitoring/.gitlab-ci.yml'
-# - local: '/src/nbi/.gitlab-ci.yml'
-# - local: '/src/context/.gitlab-ci.yml'
-# - local: '/src/device/.gitlab-ci.yml'
-# - local: '/src/service/.gitlab-ci.yml'
-# - local: '/src/dbscanserving/.gitlab-ci.yml'
-# - local: '/src/opticalattackmitigator/.gitlab-ci.yml'
-# - local: '/src/opticalattackdetector/.gitlab-ci.yml'
-# - local: '/src/opticalattackmanager/.gitlab-ci.yml'
-# - local: '/src/opticalcontroller/.gitlab-ci.yml'
-# - local: '/src/ztp/.gitlab-ci.yml'
-# - local: '/src/policy/.gitlab-ci.yml'
-# #- local: '/src/automation/.gitlab-ci.yml'
-# - local: '/src/forecaster/.gitlab-ci.yml'
-# #- local: '/src/webui/.gitlab-ci.yml'
-# #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
-# #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
-# #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
-# - local: '/src/slice/.gitlab-ci.yml'
-# #- local: '/src/interdomain/.gitlab-ci.yml'
-# - local: '/src/pathcomp/.gitlab-ci.yml'
-# #- local: '/src/dlt/.gitlab-ci.yml'
-# - local: '/src/load_generator/.gitlab-ci.yml'
-# - local: '/src/bgpls_speaker/.gitlab-ci.yml'
-# - local: '/src/kpi_manager/.gitlab-ci.yml'
-# - local: '/src/kpi_value_api/.gitlab-ci.yml'
-# - local: '/src/kpi_value_writer/.gitlab-ci.yml'
-# - local: '/src/telemetry/.gitlab-ci.yml'
-# - local: '/src/analytics/.gitlab-ci.yml'
-# - local: '/src/qos_profile/.gitlab-ci.yml'
-# - local: '/src/vnt_manager/.gitlab-ci.yml'
-# - local: '/src/e2e_orchestrator/.gitlab-ci.yml'
+ #- local: '/manifests/.gitlab-ci.yml'
+ - local: '/src/monitoring/.gitlab-ci.yml'
+ - local: '/src/nbi/.gitlab-ci.yml'
+ - local: '/src/context/.gitlab-ci.yml'
+ - local: '/src/device/.gitlab-ci.yml'
+ - local: '/src/service/.gitlab-ci.yml'
+ - local: '/src/dbscanserving/.gitlab-ci.yml'
+ - local: '/src/opticalattackmitigator/.gitlab-ci.yml'
+ - local: '/src/opticalattackdetector/.gitlab-ci.yml'
+ - local: '/src/opticalattackmanager/.gitlab-ci.yml'
+ - local: '/src/opticalcontroller/.gitlab-ci.yml'
+ - local: '/src/ztp/.gitlab-ci.yml'
+ - local: '/src/policy/.gitlab-ci.yml'
+ #- local: '/src/automation/.gitlab-ci.yml'
+ - local: '/src/forecaster/.gitlab-ci.yml'
+ #- local: '/src/webui/.gitlab-ci.yml'
+ #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
+ #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
+ #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
+ - local: '/src/slice/.gitlab-ci.yml'
+ #- local: '/src/interdomain/.gitlab-ci.yml'
+ - local: '/src/pathcomp/.gitlab-ci.yml'
+ #- local: '/src/dlt/.gitlab-ci.yml'
+ - local: '/src/load_generator/.gitlab-ci.yml'
+ - local: '/src/bgpls_speaker/.gitlab-ci.yml'
+ - local: '/src/kpi_manager/.gitlab-ci.yml'
+ - local: '/src/kpi_value_api/.gitlab-ci.yml'
+ - local: '/src/kpi_value_writer/.gitlab-ci.yml'
+ - local: '/src/telemetry/.gitlab-ci.yml'
+ - local: '/src/analytics/.gitlab-ci.yml'
+ - local: '/src/qos_profile/.gitlab-ci.yml'
+ - local: '/src/vnt_manager/.gitlab-ci.yml'
+ - local: '/src/e2e_orchestrator/.gitlab-ci.yml'
# This should be last one: end-to-end integration tests
- local: '/src/tests/.gitlab-ci.yml'
diff --git a/manifests/monitoringservice.yaml b/manifests/monitoringservice.yaml
index 5b44f91be..3178b487e 100644
--- a/manifests/monitoringservice.yaml
+++ b/manifests/monitoringservice.yaml
@@ -36,7 +36,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "DEBUG"
+ value: "INFO"
envFrom:
- secretRef:
name: qdb-data
diff --git a/src/tests/.gitlab-ci.yml b/src/tests/.gitlab-ci.yml
index 3abdc0ed4..06578bea8 100644
--- a/src/tests/.gitlab-ci.yml
+++ b/src/tests/.gitlab-ci.yml
@@ -15,14 +15,14 @@
# include the individual .gitlab-ci.yml of each end-to-end integration test
include:
- local: '/src/tests/ofc22/.gitlab-ci.yml'
-# #- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'
-# - local: '/src/tests/ecoc22/.gitlab-ci.yml'
-# #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'
-# #- 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-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/tools/mock_tfs_nbi_dependencies/.gitlab-ci.yml'
+ #- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'
+ - local: '/src/tests/ecoc22/.gitlab-ci.yml'
+ #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'
+ #- 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-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/tools/mock_tfs_nbi_dependencies/.gitlab-ci.yml'
diff --git a/src/tests/ofc22/.gitlab-ci.yml b/src/tests/ofc22/.gitlab-ci.yml
index 851089657..0fbe2375a 100644
--- a/src/tests/ofc22/.gitlab-ci.yml
+++ b/src/tests/ofc22/.gitlab-ci.yml
@@ -61,7 +61,7 @@ end2end_test ofc22:
#- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.yaml
#- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/sliceservice.yaml
#- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/nbiservice.yaml
- - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/monitoringservice.yaml
+ #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/monitoringservice.yaml
- source src/tests/${TEST_NAME}/deploy_specs.sh
#- export TFS_REGISTRY_IMAGES="${CI_REGISTRY_IMAGE}"
#- export TFS_SKIP_BUILD="YES"
diff --git a/src/tests/ofc22/tests/test_functional_bootstrap.py b/src/tests/ofc22/tests/test_functional_bootstrap.py
index c8a4803ed..9318c1378 100644
--- a/src/tests/ofc22/tests/test_functional_bootstrap.py
+++ b/src/tests/ofc22/tests/test_functional_bootstrap.py
@@ -56,8 +56,8 @@ def test_scenario_devices_enabled(
num_devices = -1
num_devices_enabled, num_retry = 0, 0
- while (num_devices != num_devices_enabled) and (num_retry < 10):
- time.sleep(1.0)
+ while (num_devices != num_devices_enabled) and (num_retry < 30):
+ time.sleep(2.0)
response = context_client.ListDevices(Empty())
num_devices = len(response.devices)
num_devices_enabled = 0
@@ -88,10 +88,10 @@ def test_scenario_kpis_created(
LOGGER.info('Num KPIs expected: {:d}'.format(num_kpis_expected))
num_kpis_created, num_retry = 0, 0
- while (num_kpis_created != num_kpis_expected) and (num_retry < 10):
+ while (num_kpis_created != num_kpis_expected) and (num_retry < 30):
+ time.sleep(2.0)
response: KpiDescriptorList = monitoring_client.GetKpiDescriptorList(Empty())
num_kpis_created = len(response.kpi_descriptor_list)
LOGGER.info('Num KPIs created: {:d}'.format(num_kpis_created))
- time.sleep(0.5)
num_retry += 1
assert num_kpis_created == num_kpis_expected
--
GitLab