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

OFC22 test: 

- recovered all integration tests
- disabled debug log in monitoring
- enlarged wait times for enabling devices and creating KPIs
parent a4cac8f2

.gitlab-ci.yml

+33 −33
Original line number Diff line number Diff line
@@ -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'

manifests/monitoringservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ spec: 
            - containerPort: 9192

          env:

            - name: LOG_LEVEL

              value: "DEBUG"

              value: "INFO"

          envFrom:

            - secretRef:

                name: qdb-data

src/tests/.gitlab-ci.yml

+11 −11
Original line number Diff line number Diff line
@@ -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'

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

+1 −1
Original line number Diff line number Diff line
@@ -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"

src/tests/ofc22/tests/test_functional_bootstrap.py

+4 −4
Original line number Diff line number Diff line
@@ -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