Commit bbd80642 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/327-tid-new-service-to-ipowdm-controller-to-manage-transceivers-configuration-on-external-agent
parents acec9682 eb5af569

.dockerignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
# Avoid including these folders when building the components

# Avoid including these folders when building the components

.git/

.git/

.gitlab/

.gitlab/

.github/

.vscode/

.vscode/

coverage/

coverage/

data/

data/

.gitignore

+1 −1
Original line number Original line Diff line number Diff line
@@ -172,6 +172,7 @@ cython_debug/ 




# Other

# Other

/tmp

/tmp

.github





# Sqlite

# Sqlite

*.db

*.db
@@ -192,4 +193,3 @@ libyang/ 




# Other logs

# Other logs

**/logs/*.log.*
 
**/logs/*.log.*

.gitlab-ci.yml

+3 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
# See the License for the specific language governing permissions and

# See the License for the specific language governing permissions and

# limitations under the License.

# limitations under the License.







# stages of the cicd pipeline

# stages of the cicd pipeline

stages:

stages:

  #- dependencies

  #- dependencies
@@ -57,6 +58,8 @@ include: 
  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'

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

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

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

  - local: '/src/osm_client/.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

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

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

common_requirements.in

+0 −1
Original line number Original line Diff line number Diff line
@@ -24,4 +24,3 @@ protobuf==3.20.* 
pytest==6.2.5

pytest==6.2.5

pytest-benchmark==3.4.1

pytest-benchmark==3.4.1

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

common_requirements_py313.in

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
# Copyright 2022-2025 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.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



coverage==7.9.*

grpcio==1.73.*

grpcio-health-checking==1.73.*

grpcio-reflection==1.73.*

grpcio-tools==1.73.*

grpclib==0.4.8

prettytable==3.16.0

prometheus-client==0.22.*

protobuf==6.32.*

pytest==8.4.1

pytest-benchmark==5.1.0

python-dateutil==2.9.0

pytest-depends==1.0.1