Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/smartnics (492e11c6) · Commits · TFS / controller

.gitignore

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,12 +25,14 @@ share/python-wheels/
	.installed.cfg		.installed.cfg
	*.egg		*.egg
	MANIFEST		MANIFEST
			.my_venv/
	# requirements.txt # removed to enable tracking versions of packages over time		# requirements.txt # removed to enable tracking versions of packages over time

	# PyInstaller		# PyInstaller
	# Usually these files are written by a python script from a template		# Usually these files are written by a python script from a template
	# before PyInstaller builds the exe, so as to inject date/other infos into it.		# before PyInstaller builds the exe, so as to inject date/other infos into it.
	*.manifest		*.manifest
			.manifest/
	*.spec		*.spec

	# Installer logs		# Installer logs
	@@ -171,5 +173,9 @@ local_k8s_deployment.sh
	# asdf configuration		# asdf configuration
	.tool-versions		.tool-versions

			# libyang build files
			libyang/

	# Other logs		# Other logs
	*/logs/.log.*		*/logs/.log.*

.gitlab-ci.yml

+18 −6

Original line number	Original line	Diff line number	Diff line
	# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)		# Copyright 2022-2024 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
	#		#
	# Licensed under the Apache License, Version 2.0 (the "License");		# Licensed under the Apache License, Version 2.0 (the "License");
	# you may not use this file except in compliance with the License.		# you may not use this file except in compliance with the License.
	@@ -17,10 +17,9 @@ stages:
	#- dependencies		#- dependencies
	- build		- build
	- unit_test		- unit_test
	#- deploy		- end2end_test
	#- end2end_test

	# include the individual .gitlab-ci.yml of each micro-service		# include the individual .gitlab-ci.yml of each micro-service and tests
	include:		include:
	#- local: '/manifests/.gitlab-ci.yml'		#- local: '/manifests/.gitlab-ci.yml'
	- local: '/src/monitoring/.gitlab-ci.yml'		- local: '/src/monitoring/.gitlab-ci.yml'
	@@ -31,11 +30,13 @@ include:
	- 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/opticalattackdetector/.gitlab-ci.yml'		- local: '/src/opticalattackdetector/.gitlab-ci.yml'
	# - local: '/src/opticalattackmanager/.gitlab-ci.yml'		- local: '/src/opticalattackmanager/.gitlab-ci.yml'
			- local: '/src/opticalcontroller/.gitlab-ci.yml'
	- local: '/src/ztp/.gitlab-ci.yml'		- local: '/src/ztp/.gitlab-ci.yml'
	- local: '/src/policy/.gitlab-ci.yml'		- local: '/src/policy/.gitlab-ci.yml'
			- local: '/src/automation/.gitlab-ci.yml'
	- local: '/src/forecaster/.gitlab-ci.yml'		- local: '/src/forecaster/.gitlab-ci.yml'
	- local: '/src/webui/.gitlab-ci.yml'		#- local: '/src/webui/.gitlab-ci.yml'
	#- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'		#- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
	#- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'		#- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
	#- local: '/src/l3_attackmitigator/.gitlab-ci.yml'		#- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
	@@ -45,3 +46,14 @@ include:
	#- local: '/src/dlt/.gitlab-ci.yml'		#- local: '/src/dlt/.gitlab-ci.yml'
	- local: '/src/load_generator/.gitlab-ci.yml'		- local: '/src/load_generator/.gitlab-ci.yml'
	- local: '/src/bgpls_speaker/.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'

README.md

+18 −7

Original line number	Original line	Diff line number	Diff line
	# ETSI TeraFlowSDN Controller		# ETSI TeraFlowSDN Controller

	[ETSI OpenSource Group for TeraFlowSDN](https://tfs.etsi.org/)		The [ETSI Software Development Group TeraFlowSDN (SDG TFS)](https://tfs.etsi.org/) is developing an open source cloud native SDN controller enabling smart connectivity services for future networks beyond 5G.

	Former, [Teraflow H2020 project](https://teraflow-h2020.eu/) - Secured autonomic traffic management for a Tera of SDN Flows		The project originated from "[Teraflow H2020 project](https://teraflow-h2020.eu/) - Secured autonomic traffic management for a Tera of SDN Flows", a project funded by the European Union’s Horizon 2020 Research and Innovation programme that finished on 30th June 2023.

	Branch "master" : [![pipeline status](https://labs.etsi.org/rep/tfs/controller/badges/master/pipeline.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/master) [![coverage report](https://labs.etsi.org/rep/tfs/controller/badges/master/coverage.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/master)

	Branch "develop" : [![pipeline status](https://labs.etsi.org/rep/tfs/controller/badges/develop/pipeline.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/develop) [![coverage report](https://labs.etsi.org/rep/tfs/controller/badges/develop/coverage.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/develop)		## Available branches and releases

	# Installation Instructions and Functional Tests		[![Latest Release](https://labs.etsi.org/rep/tfs/controller/-/badges/release.svg)](https://labs.etsi.org/rep/tfs/controller/-/releases)
	The [TeraFlowSDN Wiki](https://labs.etsi.org/rep/tfs/controller/-/wikis/home) pages include details on using the ETSI TeraFlowSDN release 2.0.

	The documentation, installation instructions, and description of the functional tests defined to enable experimentation with the ETSI TeraFlowSDN Controller can be found in the Wiki pages		- The branch `master` ([![pipeline status](https://labs.etsi.org/rep/tfs/controller/badges/master/pipeline.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/master) [![coverage report](https://labs.etsi.org/rep/tfs/controller/badges/master/coverage.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/master)), points always to the latest stable version of the TeraFlowSDN controller.

			- The branches `release/X.Y.Z`, point to the code for the different release versions indicated in the branch name.
			- Code in these branches can be considered stable, and no new features are planned.
			- In case of bugs, point releases increasing revision number (Z) might be created.

			- The `develop` ([![pipeline status](https://labs.etsi.org/rep/tfs/controller/badges/develop/pipeline.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/develop) [![coverage report](https://labs.etsi.org/rep/tfs/controller/badges/develop/coverage.svg)](https://labs.etsi.org/rep/tfs/controller/-/commits/develop)) branch is the main development branch and contains the latest contributions.
			- Use it with care! It might not be stable.
			- The latest developments and contributions are added to this branch for testing and validation before reaching a release.


			## Documentation
			The [TeraFlowSDN Wiki](https://labs.etsi.org/rep/tfs/controller/-/wikis/home) pages include the main documentation for the ETSI TeraFlowSDN Controller.
			The documentation includes project documentation, installation instructions, functional tests, supported NBIs and SBIs, etc.

clean_testing_environment.sh

+1 −1

Original line number	Original line	Diff line number	Diff line
	#!/usr/bin/env bash		#!/usr/bin/env bash
	# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)		# Copyright 2022-2024 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
	#		#
	# Licensed under the Apache License, Version 2.0 (the "License");		# Licensed under the Apache License, Version 2.0 (the "License");
	# you may not use this file except in compliance with the License.		# you may not use this file except in compliance with the License.

common_requirements.in

+2 −1

Original line number	Original line	Diff line number	Diff line
	# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)		# Copyright 2022-2024 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
	#		#
	# Licensed under the Apache License, Version 2.0 (the "License");		# Licensed under the Apache License, Version 2.0 (the "License");
	# you may not use this file except in compliance with the License.		# you may not use this file except in compliance with the License.
	@@ -15,6 +15,7 @@
	coverage==6.3		coverage==6.3
	grpcio==1.47.*		grpcio==1.47.*
	grpcio-health-checking==1.47.*		grpcio-health-checking==1.47.*
			grpcio-reflection==1.47.*
	grpcio-tools==1.47.*		grpcio-tools==1.47.*
	grpclib==0.4.4		grpclib==0.4.4
	prettytable==3.5.0		prettytable==3.5.0