Commit 1d0ce9bc authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Merge branch 'develop' of ssh://labs.etsi.org:29419/tfs/controller into... 

Merge branch 'develop' of ssh://labs.etsi.org:29419/tfs/controller into feat/304-cttc-netconf-based-openconfig-telemetry-collector
parents 40f4bc8b 805d1f1b

.dockerignore

+2 −1
Original line number Diff line number Diff line 
# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

# Copyright 2022-2026 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@ 
# Avoid including these folders when building the components

.git/

.gitlab/

.github/

.vscode/

coverage/

data/

.gitignore

+4 −2
Original line number Diff line number Diff line 
# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

# Copyright 2022-2026 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -173,10 +173,13 @@ cython_debug/ 


# Other

/tmp

.github



# Sqlite

*.db



#temp files to test telemetry

src/telemetry/backend/tempFiles/

# TeraFlowSDN-generated files

tfs_runtime_env_vars.sh

tfs_runtime_env_vars*.sh
@@ -193,4 +196,3 @@ libyang/ 


# Other logs

**/logs/*.log.*

.gitlab-ci.yml

+13 −1
Original line number Diff line number Diff line 
# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

# Copyright 2022-2026 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.





# stages of the cicd pipeline

stages:

  #- dependencies
@@ -19,6 +20,12 @@ stages: 
  - unit_test

  - end2end_test



workflow:

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

      when: always

    - when: never



# include the individual .gitlab-ci.yml of each micro-service and tests

include:

  #- local: '/manifests/.gitlab-ci.yml'
@@ -27,6 +34,7 @@ include: 
  - local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'

  - local: '/src/service/.gitlab-ci.yml'

  - local: '/src/qkd_app/.gitlab-ci.yml'

  - local: '/src/dbscanserving/.gitlab-ci.yml'

  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'

  - local: '/src/opticalattackdetector/.gitlab-ci.yml'
@@ -54,6 +62,10 @@ include: 
  - local: '/src/qos_profile/.gitlab-ci.yml'

  - local: '/src/vnt_manager/.gitlab-ci.yml'

  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'

  - local: '/src/ztp_server/.gitlab-ci.yml'

  - local: '/src/osm_client/.gitlab-ci.yml'

  - local: '/src/simap_connector/.gitlab-ci.yml'

  - local: '/src/pluggables/.gitlab-ci.yml'



  # This should be last one: end-to-end integration tests

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

clean_testing_environment.sh

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash

# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

# Copyright 2022-2026 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

common_requirements.in

+1 −2
Original line number Diff line number Diff line 
# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

# Copyright 2022-2026 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -24,4 +24,3 @@ protobuf==3.20.* 
pytest==6.2.5

pytest-benchmark==3.4.1

python-dateutil==2.8.2
 
pytest-depends==1.0.1