Commit 8cd8e0d9 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' into 'master' 

Release TeraFlowSDN 2.1

See merge request !142
parents 122cc813 a82c61e0

.dockerignore

0 → 100644
+16 −0
Original line number Original line Diff line number Diff line 
# Avoid including these folders when building the components

.git/

.gitlab/

.vscode/

coverage/

data/

deploy/

ecoc22/

hackfest/

manifests/

nfvsdn22/

oeccpsc22/

ofc22/

ofc23/

scripts/

tmp/

.gitignore

+3 −0
Original line number Original line Diff line number Diff line
@@ -168,5 +168,8 @@ delete_local_deployment.sh 
local_docker_deployment.sh

local_docker_deployment.sh

local_k8s_deployment.sh

local_k8s_deployment.sh





# asdf configuration

.tool-versions



# Other logs

# Other logs

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

.gitlab-ci.yml

+4 −3
Original line number Original line Diff line number Diff line
@@ -28,9 +28,10 @@ include: 
  - local: '/src/context/.gitlab-ci.yml'

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

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

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

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

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

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

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

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

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

  #- local: '/src/opticalcentralizedattackdetector/.gitlab-ci.yml'

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

  # - local: '/src/opticalattackmanager/.gitlab-ci.yml'

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

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

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

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

  #- local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/webui/.gitlab-ci.yml'

common_requirements.in

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ coverage==6.3 
grpcio==1.47.*

grpcio==1.47.*

grpcio-health-checking==1.47.*

grpcio-health-checking==1.47.*

grpcio-tools==1.47.*

grpcio-tools==1.47.*

grpclib==0.4.4

prettytable==3.5.0

prettytable==3.5.0

prometheus-client==0.13.0

prometheus-client==0.13.0

protobuf==3.20.*

protobuf==3.20.*