From abb1ad98e2e36dbe1a2f5c39de0e6f5861370e37 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 1 Feb 2023 15:10:01 +0000
Subject: [PATCH 1/4] Common:

- Removed unused ORM
- Removed old tutorial folder
- Commented out unfinished unitary tests
---
 src/common/orm/Database.py                    |  52 --
 src/common/orm/Exceptions.py                  |  19 -
 src/common/orm/Factory.py                     |  46 --
 src/common/orm/HighLevel.py                   |  84 ---
 src/common/orm/__init__.py                    |  14 -
 src/common/orm/backend/BackendEnum.py         |  22 -
 src/common/orm/backend/Tools.py               |  19 -
 src/common/orm/backend/_Backend.py            |  67 --
 src/common/orm/backend/__init__.py            |  14 -
 .../orm/backend/inmemory/InMemoryBackend.py   | 161 -----
 src/common/orm/backend/inmemory/Tools.py      |  45 --
 src/common/orm/backend/inmemory/__init__.py   |  14 -
 src/common/orm/backend/redis/Mutex.py         | 136 ----
 src/common/orm/backend/redis/RedisBackend.py  | 131 ----
 src/common/orm/backend/redis/__init__.py      |  14 -
 src/common/orm/fields/BooleanField.py         |  31 -
 src/common/orm/fields/EnumeratedField.py      |  38 -
 src/common/orm/fields/Field.py                |  63 --
 src/common/orm/fields/FloatField.py           |  34 -
 src/common/orm/fields/ForeignKeyField.py      |  34 -
 src/common/orm/fields/IntegerField.py         |  34 -
 src/common/orm/fields/PrimaryKeyField.py      |  29 -
 src/common/orm/fields/StringField.py          |  39 --
 src/common/orm/fields/__init__.py             |  22 -
 src/common/orm/model/Model.py                 | 308 --------
 src/common/orm/model/Tools.py                 |  31 -
 src/common/orm/model/__init__.py              |  14 -
 src/common/orm/tests/__init__.py              |  14 -
 src/common/orm/tests/test_unitary.py          | 656 ------------------
 .../connector/tests/PrepareTestScenario.py    | 190 ++---
 src/dlt/connector/tests/test_unitary.py       |  81 +--
 tutorial/1-0-deployment.md                    |  14 -
 tutorial/1-1-1-create-vm-oracle-virtualbox.md |  94 ---
 tutorial/1-1-2-create-vm-vmware-fusion.md     |  54 --
 tutorial/1-1-create-vm.md                     |  17 -
 tutorial/1-2-install-microk8s.md              | 165 -----
 tutorial/1-3-deploy-tfs.md                    |  84 ---
 tutorial/1-4-access-webui.md                  |  26 -
 tutorial/1-5-deploy-logs-troubleshooting.md   |  35 -
 tutorial/2-0-run-experiments.md               |  19 -
 tutorial/2-1-python-environment.md            | 131 ----
 tutorial/2-2-ofc22.md                         | 200 ------
 tutorial/2-3-oeccpsc22.md                     |   8 -
 tutorial/2-4-ecoc22.md                        | 132 ----
 tutorial/2-5-nfvsdn22.md                      |   1 -
 tutorial/3-0-development.md                   |  18 -
 tutorial/3-1-configure-vscode.md              |  98 ---
 tutorial/3-2-develop-new-component.md         | 132 ----
 tutorial/3-3-debug-comp.md                    |  55 --
 tutorial/3-4-develop-cth.md                   |  50 --
 tutorial/README.md                            |  45 --
 51 files changed, 136 insertions(+), 3698 deletions(-)
 delete mode 100644 src/common/orm/Database.py
 delete mode 100644 src/common/orm/Exceptions.py
 delete mode 100644 src/common/orm/Factory.py
 delete mode 100644 src/common/orm/HighLevel.py
 delete mode 100644 src/common/orm/__init__.py
 delete mode 100644 src/common/orm/backend/BackendEnum.py
 delete mode 100644 src/common/orm/backend/Tools.py
 delete mode 100644 src/common/orm/backend/_Backend.py
 delete mode 100644 src/common/orm/backend/__init__.py
 delete mode 100644 src/common/orm/backend/inmemory/InMemoryBackend.py
 delete mode 100644 src/common/orm/backend/inmemory/Tools.py
 delete mode 100644 src/common/orm/backend/inmemory/__init__.py
 delete mode 100644 src/common/orm/backend/redis/Mutex.py
 delete mode 100644 src/common/orm/backend/redis/RedisBackend.py
 delete mode 100644 src/common/orm/backend/redis/__init__.py
 delete mode 100644 src/common/orm/fields/BooleanField.py
 delete mode 100644 src/common/orm/fields/EnumeratedField.py
 delete mode 100644 src/common/orm/fields/Field.py
 delete mode 100644 src/common/orm/fields/FloatField.py
 delete mode 100644 src/common/orm/fields/ForeignKeyField.py
 delete mode 100644 src/common/orm/fields/IntegerField.py
 delete mode 100644 src/common/orm/fields/PrimaryKeyField.py
 delete mode 100644 src/common/orm/fields/StringField.py
 delete mode 100644 src/common/orm/fields/__init__.py
 delete mode 100644 src/common/orm/model/Model.py
 delete mode 100644 src/common/orm/model/Tools.py
 delete mode 100644 src/common/orm/model/__init__.py
 delete mode 100644 src/common/orm/tests/__init__.py
 delete mode 100644 src/common/orm/tests/test_unitary.py
 delete mode 100644 tutorial/1-0-deployment.md
 delete mode 100644 tutorial/1-1-1-create-vm-oracle-virtualbox.md
 delete mode 100644 tutorial/1-1-2-create-vm-vmware-fusion.md
 delete mode 100644 tutorial/1-1-create-vm.md
 delete mode 100644 tutorial/1-2-install-microk8s.md
 delete mode 100644 tutorial/1-3-deploy-tfs.md
 delete mode 100644 tutorial/1-4-access-webui.md
 delete mode 100644 tutorial/1-5-deploy-logs-troubleshooting.md
 delete mode 100644 tutorial/2-0-run-experiments.md
 delete mode 100644 tutorial/2-1-python-environment.md
 delete mode 100644 tutorial/2-2-ofc22.md
 delete mode 100644 tutorial/2-3-oeccpsc22.md
 delete mode 100644 tutorial/2-4-ecoc22.md
 delete mode 100644 tutorial/2-5-nfvsdn22.md
 delete mode 100644 tutorial/3-0-development.md
 delete mode 100644 tutorial/3-1-configure-vscode.md
 delete mode 100644 tutorial/3-2-develop-new-component.md
 delete mode 100644 tutorial/3-3-debug-comp.md
 delete mode 100644 tutorial/3-4-develop-cth.md
 delete mode 100644 tutorial/README.md

diff --git a/src/common/orm/Database.py b/src/common/orm/Database.py
deleted file mode 100644
index e5ec7b0a9..000000000
--- a/src/common/orm/Database.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-import logging
-from typing import List, Set, Tuple
-from .backend._Backend import _Backend
-
-LOGGER = logging.getLogger(__name__)
-
-class Database:
-    def __init__(self, backend : _Backend):
-        if not isinstance(backend, _Backend):
-            str_class_path = '{}.{}'.format(_Backend.__module__, _Backend.__name__)
-            raise AttributeError('backend must inherit from {}'.format(str_class_path))
-        self._backend = backend
-
-    @property
-    def backend(self) -> _Backend: return self._backend
-
-    def clear_all(self, keep_keys : Set[str] = set()) -> None:
-        for key in self._backend.keys():
-            if key in keep_keys: continue
-            self._backend.delete(key)
-
-    def dump(self) -> List[Tuple[str, str, str]]:
-        entries = self._backend.dump()
-        entries.sort()
-        _entries = []
-        for str_key, str_type, value in entries:
-            if isinstance(value, list):
-                str_value = ', '.join(map("'{:s}'".format, sorted(list(value))))
-                str_value = '[' + str_value + ']'
-            elif isinstance(value, set):
-                str_value = ', '.join(map("'{:s}'".format, sorted(list(value))))
-                str_value = '{' + str_value + '}'
-            elif isinstance(value, dict):
-                sorted_keys = sorted(value.keys())
-                str_value = ', '.join(["'{}': '{}'".format(key, value[key]) for key in sorted_keys])
-                str_value = '{' + str_value + '}'
-            _entries.append((str_type, str_key, str_value))
-        return _entries
diff --git a/src/common/orm/Exceptions.py b/src/common/orm/Exceptions.py
deleted file mode 100644
index cf91bd2f7..000000000
--- a/src/common/orm/Exceptions.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-class ConstraintException(Exception):
-    pass
-
-class MutexException(Exception):
-    pass
diff --git a/src/common/orm/Factory.py b/src/common/orm/Factory.py
deleted file mode 100644
index 15940ce7c..000000000
--- a/src/common/orm/Factory.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-import logging, os
-from typing import Optional, Union
-from .backend._Backend import _Backend
-from .backend.BackendEnum import BackendEnum
-from .backend.inmemory.InMemoryBackend import InMemoryBackend
-from .backend.redis.RedisBackend import RedisBackend
-
-LOGGER = logging.getLogger(__name__)
-
-BACKENDS = {
-    BackendEnum.INMEMORY.value: InMemoryBackend,
-    BackendEnum.REDIS.value: RedisBackend,
-    #BackendEnum.MONGODB.value: MongoDBBackend,
-    #BackendEnum.RETHINKDB.value: RethinkDBBackend,
-    #BackendEnum.ETCD.value: EtcdBackend,
-}
-
-DEFAULT_DB_BACKEND = BackendEnum.INMEMORY
-
-def get_database_backend(backend : Optional[Union[str, BackendEnum]] = None, **settings) -> _Backend:
-    # return an instance of Database initialized with selected backend.
-    # The backend is selected using following criteria (first that is not None is selected):
-    # 1. user selected by parameter (backend=...)
-    # 2. environment variable DB_BACKEND
-    # 3. default backend: INMEMORY
-    if backend is None: backend = os.environ.get('DB_BACKEND', DEFAULT_DB_BACKEND)
-    if backend is None: raise Exception('Database Backend not specified')
-    if isinstance(backend, BackendEnum): backend = backend.value
-    backend_class = BACKENDS.get(backend)
-    if backend_class is None: raise Exception('Unsupported DatabaseBackend({:s})'.format(backend))
-    LOGGER.info('Selected Database Backend: {:s}'.format(backend))
-    return backend_class(**settings)
diff --git a/src/common/orm/HighLevel.py b/src/common/orm/HighLevel.py
deleted file mode 100644
index 3a4b0d661..000000000
--- a/src/common/orm/HighLevel.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from typing import Any, Dict, List, Optional, Set, Tuple
-from common.method_wrappers.ServiceExceptions import NotFoundException
-from common.orm.Database import Database
-from common.orm.backend.Tools import key_to_str
-from common.orm.fields.ForeignKeyField import ForeignKeyField
-from common.orm.model.Model import Model, MetaModel
-
-def get_all_objects(database : Database, model_class : MetaModel) -> List[Model]:
-    db_pks = sorted(list(model_class.get_primary_keys(database)))
-    return [model_class(database, db_pk) for db_pk in db_pks]
-
-def get_object(
-    database : Database, model_class : Model, key_parts : List[str], raise_if_not_found : bool = True
-    ) -> Optional[Model]:
-
-    str_key = key_to_str(key_parts)
-    db_object = model_class(database, str_key, auto_load=False)
-    found = db_object.load()
-    if found: return db_object
-    if raise_if_not_found: raise NotFoundException(model_class.__name__.replace('Model', ''), str_key)
-    return None
-
-def get_related_objects(
-    source_instance : Model, reference_model_class : MetaModel, navigation_field_name : str = None) -> Set[Model]:
-
-    database = source_instance.database
-    db_target_instances = set()
-
-    if navigation_field_name is not None:
-        navigation_fk_field : Optional[ForeignKeyField] = getattr(reference_model_class, navigation_field_name, None)
-        if navigation_fk_field is None or not isinstance(navigation_fk_field, ForeignKeyField):
-            msg = 'navigation_field_name({:s}) must be a ForeignKeyField in reference_model_class({:s})'
-            raise AttributeError(msg.format(navigation_field_name, reference_model_class.__name__))
-        target_model_class = navigation_fk_field.foreign_model
-
-    for db_reference_pk,_ in source_instance.references(reference_model_class):
-        db_reference = reference_model_class(database, db_reference_pk)
-        if navigation_field_name is not None:
-            target_fk_field = getattr(db_reference, navigation_field_name, None)
-            if target_fk_field is None: continue
-            db_reference = target_model_class(database, target_fk_field)
-        db_target_instances.add(db_reference)
-    return db_target_instances
-
-def update_or_create_object(
-    database : Database, model_class : Model, key_parts : List[str], attributes : Dict[str, Any]
-    ) -> Tuple[Model, bool]:
-
-    str_key = key_to_str(key_parts)
-    db_object : Model = model_class(database, str_key, auto_load=False)
-    found = db_object.load()
-    for attr_name, attr_value in attributes.items():
-        setattr(db_object, attr_name, attr_value)
-    db_object.save()
-    updated = found # updated if found, else created
-    return db_object, updated
-
-def get_or_create_object(
-    database : Database, model_class : Model, key_parts : List[str], defaults : Dict[str, Any] = {}
-    ) -> Tuple[Model, bool]:
-
-    str_key = key_to_str(key_parts)
-    db_object : Model = model_class(database, str_key, auto_load=False)
-    found = db_object.load()
-    if not found:
-        for attr_name, attr_value in defaults.items():
-            setattr(db_object, attr_name, attr_value)
-        db_object.save()
-    created = not found # created if not found, else loaded
-    return db_object, created
diff --git a/src/common/orm/__init__.py b/src/common/orm/__init__.py
deleted file mode 100644
index 70a332512..000000000
--- a/src/common/orm/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
diff --git a/src/common/orm/backend/BackendEnum.py b/src/common/orm/backend/BackendEnum.py
deleted file mode 100644
index 0297ca7be..000000000
--- a/src/common/orm/backend/BackendEnum.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from enum import Enum
-
-class BackendEnum(Enum):
-    INMEMORY = 'inmemory'
-    REDIS = 'redis'
-    #MONGODB = 'mongodb'
-    #RETHINKDB = 'rethinkdb'
-    #ETCD = 'etcd'
diff --git a/src/common/orm/backend/Tools.py b/src/common/orm/backend/Tools.py
deleted file mode 100644
index 30223feac..000000000
--- a/src/common/orm/backend/Tools.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from typing import List, Union
-
-def key_to_str(key : Union[str, List[str]], separator : str = '/') -> str:
-    if isinstance(key, str): return key
-    return separator.join(map(str, key))
diff --git a/src/common/orm/backend/_Backend.py b/src/common/orm/backend/_Backend.py
deleted file mode 100644
index 08b346ea7..000000000
--- a/src/common/orm/backend/_Backend.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from typing import Any, Dict, List, Optional, Set, Tuple
-
-class _Backend:
-    def __init__(self, **settings) -> None:
-        raise NotImplementedError()
-
-    def lock(self, keys : List[List[str]], owner_key : Optional[str] = None) -> Tuple[bool, str]:
-        raise NotImplementedError()
-
-    def unlock(self, keys : List[List[str]], owner_key : str) -> bool:
-        raise NotImplementedError()
-
-    def keys(self) -> list:
-        raise NotImplementedError()
-
-    def exists(self, key : List[str]) -> bool:
-        raise NotImplementedError()
-
-    def delete(self, key : List[str]) -> bool:
-        raise NotImplementedError()
-
-    def dict_get(self, key : List[str], fields : List[str] = []) -> Dict[str, str]:
-        raise NotImplementedError()
-
-    def dict_update(self, key : List[str], fields : Dict[str, str] = {}) -> None:
-        raise NotImplementedError()
-
-    def dict_delete(self, key : List[str], fields : List[str] = []) -> None:
-        raise NotImplementedError()
-
-    def list_get_all(self, key : List[str]) -> List[str]:
-        raise NotImplementedError()
-
-    def list_push_last(self, key : List[str], item : str) -> None:
-        raise NotImplementedError()
-
-    def list_remove_first_occurrence(self, key : List[str], item: str) -> None:
-        raise NotImplementedError()
-
-    def set_add(self, key : List[str], item : str) -> None:
-        raise NotImplementedError()
-
-    def set_has(self, key : List[str], item : str) -> bool:
-        raise NotImplementedError()
-
-    def set_get_all(self, key : List[str]) -> Set[str]:
-        raise NotImplementedError()
-
-    def set_remove(self, key : List[str], item : str) -> None:
-        raise NotImplementedError()
-
-    def dump(self) -> List[Tuple[str, str, Any]]:
-        raise NotImplementedError()
diff --git a/src/common/orm/backend/__init__.py b/src/common/orm/backend/__init__.py
deleted file mode 100644
index 70a332512..000000000
--- a/src/common/orm/backend/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
diff --git a/src/common/orm/backend/inmemory/InMemoryBackend.py b/src/common/orm/backend/inmemory/InMemoryBackend.py
deleted file mode 100644
index 4930d5957..000000000
--- a/src/common/orm/backend/inmemory/InMemoryBackend.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-# InMemeory Database Backend
-# --------------------------
-# - Concurrency is limited to 1 operation at a time
-# - All operations are strictly sequential by means of locks
-# - WARNING: DESIGNED AND BUILT FOR UNIT TESTING AND INTEGRATION TESTING PURPOSES ONLY !!!
-#            USE ANOTHER BACKEND IN PRODUCTION ENVIRONMENTS.
-
-import copy, logging, threading, uuid
-from typing import Any, Dict, List, Optional, Set, Tuple, Union
-from .._Backend import _Backend
-from ..Tools import key_to_str
-from .Tools import get_dict, get_list, get_or_create_dict, get_or_create_list, get_or_create_set, get_set
-
-LOGGER = logging.getLogger(__name__)
-
-class InMemoryBackend(_Backend):
-    def __init__(self, **settings): # pylint: disable=super-init-not-called
-        self._lock = threading.Lock()
-        self._keys : Dict[str, Union[Set[str], List[str], Dict[str, str], str]]= {} # key => set/list/dict/string
-
-    def lock(self, keys : List[List[str]], owner_key : Optional[str] = None) -> Tuple[bool, str]:
-        # InMemoryBackend uses a database where all operations are atomic. Locks are implemented by assigning the lock
-        # owner key into a string variable. If the field is empty and enables to 
-        owner_key = str(uuid.uuid4()) if owner_key is None else owner_key
-        str_keys = {key_to_str(key) for key in keys}
-        with self._lock:
-            acquired_lock_keys : Dict[str, str] = {}
-            for str_key in str_keys:
-                if (str_key in self._keys) and (len(self._keys[str_key]) > 0) and (self._keys[str_key] != owner_key):
-                    # lock already acquired, cannot acquire all locks atomically
-                    for str_key_acquired in acquired_lock_keys:
-                        if str_key_acquired not in self._keys: continue
-                        del self._keys[str_key_acquired]
-                    return False, None
-
-                # lock available, temporarily acquire it; locks will be released if some of them for a requested
-                # key is not available
-                self._keys[str_key] = owner_key
-                acquired_lock_keys[str_key] = owner_key
-            return True, owner_key
-
-    def unlock(self, keys : List[List[str]], owner_key : str) -> bool:
-        str_keys = {key_to_str(key) for key in keys}
-        with self._lock:
-            for str_key in str_keys:
-                if str_key not in self._keys: return False
-                if self._keys[str_key] != owner_key: return False
-            # Up to here, we own all the keys we want to release
-            for str_key in str_keys:
-                del self._keys[str_key]
-            return True
-
-    def keys(self) -> list:
-        with self._lock:
-            return copy.deepcopy(list(self._keys.keys()))
-
-    def exists(self, key : List[str]) -> bool:
-        str_key = key_to_str(key)
-        with self._lock:
-            return str_key in self._keys
-
-    def delete(self, key : List[str]) -> bool:
-        str_key = key_to_str(key)
-        with self._lock:
-            if str_key not in self._keys: return False
-            del self._keys[str_key]
-            return True
-
-    def dict_get(self, key : List[str], fields : List[str] = []) -> Dict[str, str]:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_dict(self._keys, str_key)
-            if container is None: return {}
-            if len(fields) == 0: fields = container.keys()
-            return copy.deepcopy({
-                field_name : field_value for field_name,field_value in container.items() if field_name in fields
-            })
-
-    def dict_update(self, key : List[str], fields : Dict[str,str] = {}) -> None:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_or_create_dict(self._keys, str_key)
-            container.update(fields)
-
-    def dict_delete(self, key : List[str], fields : List[str] = []) -> None:
-        str_key = key_to_str(key)
-        with self._lock:
-            if len(fields) == 0:
-                if str_key not in self._keys: return False
-                del self._keys[str_key]
-            else:
-                container = get_or_create_dict(self._keys, str_key)
-                for field in list(fields): container.pop(field, None)
-                if len(container) == 0: self._keys.pop(str_key)
-
-    def list_get_all(self, key : List[str]) -> List[str]:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_list(self._keys, str_key)
-            if container is None: return []
-            return copy.deepcopy(container)
-
-    def list_push_last(self, key : List[str], item : str) -> None:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_or_create_list(self._keys, str_key)
-            container.append(item)
-
-    def list_remove_first_occurrence(self, key : List[str], item: str) -> None:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_or_create_list(self._keys, str_key)
-            container.remove(item)
-            if len(container) == 0: self._keys.pop(str_key)
-
-    def set_add(self, key : List[str], item : str) -> None:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_or_create_set(self._keys, str_key)
-            container.add(item)
-
-    def set_has(self, key : List[str], item : str) -> bool:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_or_create_set(self._keys, str_key)
-            return item in container
-
-    def set_get_all(self, key : List[str]) -> Set[str]:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_set(self._keys, str_key)
-            if container is None: return {}
-            return copy.deepcopy(container)
-
-    def set_remove(self, key : List[str], item : str) -> None:
-        str_key = key_to_str(key)
-        with self._lock:
-            container = get_or_create_set(self._keys, str_key)
-            container.discard(item)
-            if len(container) == 0: self._keys.pop(str_key)
-
-    def dump(self) -> List[Tuple[str, str, Any]]:
-        with self._lock:
-            entries = []
-            for str_key,key_value in self._keys.items():
-                entries.append((str_key, type(key_value).__name__, key_value))
-        return entries
diff --git a/src/common/orm/backend/inmemory/Tools.py b/src/common/orm/backend/inmemory/Tools.py
deleted file mode 100644
index 9f8e2b5c9..000000000
--- a/src/common/orm/backend/inmemory/Tools.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from typing import Dict, List, Set, Union
-
-def get_dict(keys : Dict[str, Union[Dict, List, Set]], str_key : str) -> Dict:
-    return keys.get(str_key, None)
-
-def get_or_create_dict(keys : Dict[str, Union[Dict, List, Set]], str_key : str) -> Dict:
-    container = keys.get(str_key, None)
-    if container is None: container = keys.setdefault(str_key, dict())
-    if not isinstance(container, dict):
-        raise Exception('Key({:s}, {:s}) is not a dict'.format(str(type(container).__name__), str(str_key)))
-    return container
-
-def get_list(keys : Dict[str, Union[Dict, List, Set]], str_key : str) -> List:
-    return keys.get(str_key, None)
-
-def get_or_create_list(keys : Dict[str, Union[Dict, List, Set]], str_key : str) -> List:
-    container = keys.get(str_key, None)
-    if container is None: container = keys.setdefault(str_key, list())
-    if not isinstance(container, list):
-        raise Exception('Key({:s}, {:s}) is not a list'.format(str(type(container).__name__), str(str_key)))
-    return container
-
-def get_set(keys : Dict[str, Union[Dict, List, Set]], str_key : str) -> Set:
-    return keys.get(str_key, None)
-
-def get_or_create_set(keys : Dict[str, Union[Dict, List, Set]], str_key : str) -> Set:
-    container = keys.get(str_key, None)
-    if container is None: container = keys.setdefault(str_key, set())
-    if not isinstance(container, set):
-        raise Exception('Key({:s}, {:s}) is not a set'.format(str(type(container).__name__), str(str_key)))
-    return container
diff --git a/src/common/orm/backend/inmemory/__init__.py b/src/common/orm/backend/inmemory/__init__.py
deleted file mode 100644
index 70a332512..000000000
--- a/src/common/orm/backend/inmemory/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
diff --git a/src/common/orm/backend/redis/Mutex.py b/src/common/orm/backend/redis/Mutex.py
deleted file mode 100644
index 6424b7a79..000000000
--- a/src/common/orm/backend/redis/Mutex.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-import random, time, uuid
-from typing import Set, Tuple, Union
-from redis.client import Redis
-
-KEY_LOCK = '{}/lock'
-MIN_WAIT_TIME = 0.01
-
-class Mutex:
-    def __init__(self, client: Redis) -> None:
-        if not isinstance(client, Redis):
-            str_class_path = '{}.{}'.format(Redis.__module__, Redis.__name__)
-            raise AttributeError('client must be an instance of {}'.format(str_class_path))
-        self._client = client
-        self._script_release = None
-        self._script_refresh_expire = None
-        self._register_scripts()
-
-    def _register_scripts(self) -> None:
-        # Script mutex_release
-        #   Description: atomic script to release a set of mutex keys, only if all mutex keys are owned by the caller.
-        #                if owner_key matches key stored in all mutexes, remove all mutexes and return 1. if some key
-        #                does not match, do nothing and return 0.
-        #   Keys: set of entity_keys to be released
-        #   Args: owner_key
-        #   Ret : 1 if all keys have been released, 0 otherwise (no action performed)
-        #   Use : acquired = (int(self._script_release(keys=['mutex1', 'mutex2'], args=[owner_key])) == 1)
-        self._script_release = self._client.register_script('\n'.join([
-            "for _,key in ipairs(KEYS) do",
-            "    local owner_key = redis.call('get', key)",
-            "    if owner_key ~= ARGV[1] then return 0 end",
-            "end",
-            "for _,key in ipairs(KEYS) do",
-            "    redis.call('del', key)",
-            "end",
-            "return 1",
-        ]))
-
-        # Script mutex_refresh_expire
-        #   Description: atomic script to refresh expiracy of a set of mutex keys, only if all of them are owned by the
-        #                caller. if owner_key matches key stored in all mutexes, refresh expiracy on all mutexes and
-        #                return 1. if some key does not match, do nothing and return 0.
-        #   Keys: set of entity_keys to be refreshed
-        #   Args: owner_key, expiracy_seconds
-        #   Ret : 1 if all keys have been refreshed, 0 otherwise (no action performed)
-        #   Use : done = (int(self._script_refresh_expire(keys=['mutex1', 'mutex2'], args=[owner_key, seconds])) == 1)
-        self._script_refresh_expire = self._client.register_script('\n'.join([
-            "for _,key in ipairs(KEYS) do",
-            "    local owner_key = redis.call('get', key)",
-            "    if owner_key ~= ARGV[1] then return 0 end",
-            "end",
-            "for _,key in ipairs(KEYS) do",
-            "    redis.call('expire', key, ARGV[2])",
-            "end",
-            "return 1",
-        ]))
-
-    def acquire(self, entity_key_or_keys : Union[str, Set[str]], owner_key : Union[str, None] = None,
-                blocking : bool = True, timeout : Union[float, int] = 5,
-                expiracy_seconds : Union[float, int, None] = None) -> Tuple[bool, str]:
-        # Atomically set all entity_keys or none of them.
-        # entity_key_or_keys contains either a string with a specific entity key or a set with all entity keys to be
-        # set atomically.
-        # owner_key enables to specify the desired key to use to mark the mutex. When releasing, the owner_key must be
-        # correct, otherwise, the key will not be released. It can also be used to check if mutex is still owned by
-        # oneself or was lost and acquired by another party. If set to None, a random key is generated and returned
-        # together with the acquired boolean value.
-        # blocking defines wether the acquisition should be blocking, meaning that acquisition will be retired with
-        # random increments until timeout timeout is elapsed.
-        # Optionally, an expiracy_seconds period can be specified in expiracy_seconds. If mutex is not released after
-        # that period of time, the mutex will be released automatically.
-        # If mutex(es) is(are) acquired, the method returns True and the owner_key used to create the lock; otherwise,
-        # False and None owner_key are returned.
-
-        owner_key = owner_key or str(uuid.uuid4())
-        entity_keys = entity_key_or_keys if isinstance(entity_key_or_keys, set) else {str(entity_key_or_keys)}
-        entity_key_map = {KEY_LOCK.format(entity_key):owner_key for entity_key in entity_keys}
-        acquired = False
-        if blocking:
-            remaining_wait_time = timeout
-            while not acquired:
-                acquired = (self._client.msetnx(entity_key_map) == 1)
-                if acquired: break
-                if remaining_wait_time < MIN_WAIT_TIME: return False, None
-                wait_time = remaining_wait_time * random.random()
-                remaining_wait_time -= wait_time
-                time.sleep(wait_time)
-        else:
-            acquired = (self._client.msetnx(entity_key_map) == 1)
-
-        if not acquired: return False, None
-
-        if expiracy_seconds is not None:
-            pipeline = self._client.pipeline()
-            for entity_key in entity_key_map.keys(): pipeline.expire(entity_key, expiracy_seconds)
-            pipeline.execute()
-
-        return True, owner_key
-
-    def release(self, entity_key_or_keys : Union[str, Set[str]], owner_key : str) -> bool:
-        # release mutex keys only if all of them are owned by the caller
-        # return True if succeeded, False (nothing changed) otherwise
-        entity_keys = entity_key_or_keys if isinstance(entity_key_or_keys, set) else {str(entity_key_or_keys)}
-        entity_keys = {KEY_LOCK.format(entity_key) for entity_key in entity_keys}
-        return int(self._script_release(keys=list(entity_keys), args=[owner_key])) == 1
-
-    def acquired(self, entity_key : str, owner_key : str) -> bool:
-        # check if a mutex is owned by the owner with owner_key
-        value = self._client.get(KEY_LOCK.format(entity_key))
-        if(value is None): return(False)
-        return str(value) == owner_key
-
-    def get_ttl(self, entity_key : str) -> float:
-        # check a mutex's time to live
-        return self._client.ttl(KEY_LOCK.format(entity_key))
-
-    def refresh_expiracy(self, entity_key_or_keys : Union[str, Set[str]], owner_key : str,
-                         expiracy_seconds : Union[float, int]) -> bool:
-        # refresh expiracy on specified mutex keys only if all of them are owned by the caller
-        # return True if succeeded, False (nothing changed) otherwise
-        entity_keys = entity_key_or_keys if isinstance(entity_key_or_keys, set) else {str(entity_key_or_keys)}
-        entity_keys = {KEY_LOCK.format(entity_key) for entity_key in entity_keys}
-        return int(self._script_refresh_expire(keys=entity_keys, args=[owner_key, expiracy_seconds])) == 1
diff --git a/src/common/orm/backend/redis/RedisBackend.py b/src/common/orm/backend/redis/RedisBackend.py
deleted file mode 100644
index 30225eaa2..000000000
--- a/src/common/orm/backend/redis/RedisBackend.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-import os, uuid
-from typing import Any, Dict, List, Optional, Set, Tuple
-from redis.client import Redis
-from .._Backend import _Backend
-from ..Tools import key_to_str
-from .Mutex import Mutex
-
-DEFAULT_SERVICE_HOST = '127.0.0.1'
-DEFAULT_SERVICE_PORT = 6379
-DEFAULT_DATABASE_ID  = 0
-
-def get_setting(settings : Dict[str, Any], name : str, default : Any) -> Any:
-    value = settings.get(name, os.environ.get(name))
-    return default if value is None else value
-
-class RedisBackend(_Backend):
-    def __init__(self, **settings) -> None: # pylint: disable=super-init-not-called
-        host = get_setting(settings, 'REDIS_SERVICE_HOST', DEFAULT_SERVICE_HOST)
-        port = get_setting(settings, 'REDIS_SERVICE_PORT', DEFAULT_SERVICE_PORT)
-        dbid = get_setting(settings, 'REDIS_DATABASE_ID',  DEFAULT_DATABASE_ID )
-        self._client = Redis.from_url('redis://{host}:{port}/{dbid}'.format(host=host, port=port, dbid=dbid))
-        self._mutex = Mutex(self._client)
-
-    def lock(self, keys : List[List[str]], owner_key : Optional[str] = None) -> Tuple[bool, str]:
-        str_keys = {key_to_str(key) for key in keys}
-        owner_key = str(uuid.uuid4()) if owner_key is None else owner_key
-        return self._mutex.acquire(str_keys, owner_key=owner_key, blocking=True)
-
-    def unlock(self, keys : List[List[str]], owner_key : str) -> bool:
-        str_keys = {key_to_str(key) for key in keys}
-        return self._mutex.release(str_keys, owner_key)
-
-    def keys(self) -> list:
-        return [k.decode('UTF-8') for k in self._client.keys()]
-
-    def exists(self, key : List[str]) -> bool:
-        str_key = key_to_str(key)
-        return self._client.exists(str_key) == 1
-
-    def delete(self, key : List[str]) -> bool:
-        str_key = key_to_str(key)
-        return self._client.delete(str_key) == 1
-
-    def dict_get(self, key : List[str], fields : List[str] = []) -> Dict[str, str]:
-        str_key = key_to_str(key)
-        if len(fields) == 0:
-            keys_values = self._client.hgetall(str_key).items()
-        else:
-            fields = list(fields)
-            keys_values = zip(fields, self._client.hmget(str_key, fields))
-
-        attributes = {}
-        for key,value in keys_values:
-            str_key = key.decode('UTF-8') if isinstance(key, bytes) else key
-            attributes[str_key] = value.decode('UTF-8') if isinstance(value, bytes) else value
-        return attributes
-
-    def dict_update(self, key : List[str], fields : Dict[str, str] = {}) -> None:
-        str_key = key_to_str(key)
-        if len(fields) > 0:
-            self._client.hset(str_key, mapping=fields)
-
-    def dict_delete(self, key : List[str], fields : List[str] = []) -> None:
-        str_key = key_to_str(key)
-        if len(fields) == 0:
-            self._client.delete(str_key)
-        else:
-            self._client.hdel(str_key, set(fields))
-
-    def list_get_all(self, key : List[str]) -> List[str]:
-        str_key = key_to_str(key)
-        return list(map(lambda m: m.decode('UTF-8'), self._client.lrange(str_key, 0, -1)))
-
-    def list_push_last(self, key : List[str], item : str) -> None:
-        str_key = key_to_str(key)
-        self._client.rpush(str_key, item)
-
-    def list_remove_first_occurrence(self, key : List[str], item: str) -> None:
-        str_key = key_to_str(key)
-        self._client.lrem(str_key, 1, item)
-
-    def set_add(self, key : List[str], item : str) -> None:
-        str_key = key_to_str(key)
-        self._client.sadd(str_key, item)
-
-    def set_has(self, key : List[str], item : str) -> bool:
-        str_key = key_to_str(key)
-        return self._client.sismember(str_key, item) == 1
-
-    def set_get_all(self, key : List[str]) -> Set[str]:
-        str_key = key_to_str(key)
-        return set(map(lambda m: m.decode('UTF-8'), self._client.smembers(str_key)))
-
-    def set_remove(self, key : List[str], item : str) -> None:
-        str_key = key_to_str(key)
-        self._client.srem(str_key, item)
-
-    def dump(self) -> List[Tuple[str, str, Any]]:
-        entries = []
-        for str_key in self._client.keys():
-            str_key = str_key.decode('UTF-8')
-            key_type = self._client.type(str_key)
-            if key_type is not None: key_type = key_type.decode('UTF-8')
-            key_type = {
-                'hash'  : 'dict',
-                'list'  : 'list',
-                'set'   : 'set',
-                'string': 'str',
-            }.get(key_type)
-            key_content = {
-                'dict': lambda key: {k.decode('UTF-8'):v.decode('UTF-8') for k,v in self._client.hgetall(key).items()},
-                'list': lambda key: [m.decode('UTF-8') for m in self._client.lrange(key, 0, -1)],
-                'set' : lambda key: {m.decode('UTF-8') for m in self._client.smembers(key)},
-                'str' : lambda key: self._client.get(key).decode('UTF-8'),
-            }.get(key_type, lambda key: 'UNSUPPORTED_TYPE')
-            entries.append((str_key, key_type, key_content(str_key)))
-        return entries
diff --git a/src/common/orm/backend/redis/__init__.py b/src/common/orm/backend/redis/__init__.py
deleted file mode 100644
index 70a332512..000000000
--- a/src/common/orm/backend/redis/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
diff --git a/src/common/orm/fields/BooleanField.py b/src/common/orm/fields/BooleanField.py
deleted file mode 100644
index ae9ac8eaf..000000000
--- a/src/common/orm/fields/BooleanField.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-from typing import Union
-from common.type_checkers.Checkers import chk_boolean
-from .Field import Field
-
-BOOL_TRUE_VALUES = {'TRUE', 'T', '1'}
-
-class BooleanField(Field):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, type_=bool, **kwargs)
-
-    def validate(self, value : Union[bool, str], try_convert_type=False) -> bool:
-        value = self.is_required(value)
-        if value is None: return None
-        if try_convert_type and isinstance(value, str):
-            return value.upper() in BOOL_TRUE_VALUES
-        return chk_boolean(self.name, value)
diff --git a/src/common/orm/fields/EnumeratedField.py b/src/common/orm/fields/EnumeratedField.py
deleted file mode 100644
index f684649e1..000000000
--- a/src/common/orm/fields/EnumeratedField.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-from enum import Enum
-from typing import Union
-from common.orm.fields.Field import Field
-from common.type_checkers.Checkers import chk_issubclass, chk_options, chk_type
-from .Field import Field
-
-class EnumeratedField(Field):
-    def __init__(self, enumeration_class : 'Enum', *args, required : bool = True, **kwargs) -> None:
-        self.enumeration_class : Enum = chk_issubclass('EnumeratedField.enumeration_class', enumeration_class, Enum)
-        super().__init__(*args, type_=self.enumeration_class, required=required, **kwargs)
-
-    def validate(self, value : Union['Enum', str], try_convert_type=False) -> 'Enum':
-        value = super().is_required(value)
-        if value is None: return None
-        if try_convert_type and isinstance(value, str):
-            chk_options(self.name, value, self.enumeration_class.__members__.keys())
-            value = self.enumeration_class.__members__[value]
-        return chk_type(self.name, value, self.enumeration_class)
-
-    def serialize(self, value: 'Enum') -> str:
-        value = self.validate(value, try_convert_type=True)
-        if value is None: return None
-        return str(value.name)
diff --git a/src/common/orm/fields/Field.py b/src/common/orm/fields/Field.py
deleted file mode 100644
index 68d868cf7..000000000
--- a/src/common/orm/fields/Field.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-import logging
-from typing import TYPE_CHECKING, Any, List, Set, Tuple, Union
-from common.type_checkers.Checkers import chk_boolean, chk_not_none, chk_string, chk_type
-
-if TYPE_CHECKING:
-    from ..model.Model import Model
-
-LOGGER = logging.getLogger(__name__)
-
-# Ref: https://docs.python.org/3.9/howto/descriptor.html
-
-class Field:
-    def __init__(
-        self, name : str = None, type_ : Union[type, Set[type], Tuple[type], List[type]] = object,
-        required : bool = False) -> None:
-
-        self.name = None if name is None else chk_string('Field.name', name)
-        self.type_ = chk_type('Field.type', type_, (type, set, tuple, list))
-        self.required = chk_boolean('Field.required', required)
-
-    def __get__(self, instance : 'Model', objtype=None):
-        if instance is None: return self
-        return instance.__dict__.get(self.name)
-
-    def __set__(self, instance : 'Model', value : Any) -> None:
-        instance.__dict__[self.name] = self.validate(value)
-
-    def __delete__(self, instance : 'Model'):
-        raise AttributeError('Attribute "{:s}" cannot be deleted'.format(self.name))
-
-    def is_required(self, value):
-        if self.required:
-            chk_not_none(self.name, value, reason='is required. It cannot be None.')
-        return value
-    
-    def validate(self, value, try_convert_type=False):
-        value = self.is_required(value)
-        if value is None: return None
-        if try_convert_type: value = self.type_(value)
-        return value
-
-    def serialize(self, value : Any) -> str:
-        value = self.validate(value)
-        if value is None: return None
-        return str(value)
-
-    def deserialize(self, value : str) -> Any:
-        return self.validate(value, try_convert_type=True)
diff --git a/src/common/orm/fields/FloatField.py b/src/common/orm/fields/FloatField.py
deleted file mode 100644
index 8d006e773..000000000
--- a/src/common/orm/fields/FloatField.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-from typing import Optional, Union
-from common.type_checkers.Checkers import chk_float
-from .Field import Field
-
-class FloatField(Field):
-    def __init__(
-        self, *args, min_value : Optional[float] = None, max_value : Optional[float] = None, **kwargs) -> None:
-
-        super().__init__(*args, type_=float, **kwargs)
-        self._min_value = None if min_value is None else \
-            chk_float('FloatField.min_value', min_value)
-        self._max_value = None if max_value is None else \
-            chk_float('FloatField.max_value', max_value, min_value=self._min_value)
-
-    def validate(self, value : Union[float, str], try_convert_type=False) -> float:
-        value = super().validate(value)
-        if value is None: return None
-        if try_convert_type and isinstance(value, str): value = float(value)
-        return chk_float(self.name, value, min_value=self._min_value, max_value=self._max_value)
diff --git a/src/common/orm/fields/ForeignKeyField.py b/src/common/orm/fields/ForeignKeyField.py
deleted file mode 100644
index 12e720d17..000000000
--- a/src/common/orm/fields/ForeignKeyField.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-from typing import TYPE_CHECKING
-from common.type_checkers.Checkers import chk_issubclass, chk_type
-from .StringField import StringField
-
-if TYPE_CHECKING:
-    from ..model.Model import Model
-
-class ForeignKeyField(StringField):
-    def __init__(self, foreign_model : 'Model', *args, required : bool = True, **kwargs) -> None:
-        from ..model.Model import Model
-        self.foreign_model : Model = chk_issubclass('ForeignKeyField.foreign_model', foreign_model, Model)
-        super().__init__(*args, required=required, allow_empty=not required, **kwargs)
-
-    def __set__(self, instance : 'Model', value : 'Model') -> None:
-        model_instance : 'Model' = chk_type('value', value, self.foreign_model)
-        super().__set__(instance, self.validate(model_instance.instance_key))
-
-    def __delete__(self, instance: 'Model'):
-        super().__set__(instance, self.validate(None))
diff --git a/src/common/orm/fields/IntegerField.py b/src/common/orm/fields/IntegerField.py
deleted file mode 100644
index 87ddab464..000000000
--- a/src/common/orm/fields/IntegerField.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-from typing import Optional, Union
-from common.type_checkers.Checkers import chk_integer
-from .Field import Field
-
-class IntegerField(Field):
-    def __init__(
-        self, *args, min_value : Optional[int] = None, max_value : Optional[int] = None, **kwargs) -> None:
-
-        super().__init__(*args, type_=int, **kwargs)
-        self._min_value = None if min_value is None else \
-            chk_integer('IntegerField.min_value', min_value)
-        self._max_value = None if max_value is None else \
-            chk_integer('IntegerField.max_value', max_value, min_value=self._min_value)
-
-    def validate(self, value : Union[int, str], try_convert_type=False) -> int:
-        value = super().validate(value)
-        if value is None: return None
-        if try_convert_type and isinstance(value, str): value = int(value)
-        return chk_integer(self.name, value, min_value=self._min_value, max_value=self._max_value)
diff --git a/src/common/orm/fields/PrimaryKeyField.py b/src/common/orm/fields/PrimaryKeyField.py
deleted file mode 100644
index 86fdc7e24..000000000
--- a/src/common/orm/fields/PrimaryKeyField.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-from typing import TYPE_CHECKING
-from .StringField import StringField
-
-if TYPE_CHECKING:
-    from ..model.Model import Model
-
-class PrimaryKeyField(StringField):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, required=True, allow_empty=False, min_length=1, **kwargs)
-
-    def __set__(self, instance : 'Model', value : str) -> None:
-        if (self.name in instance.__dict__) and (instance.__dict__[self.name] is not None):
-            raise ValueError('PrimaryKeyField cannot be modified')
-        super().__set__(instance, self.validate(value))
diff --git a/src/common/orm/fields/StringField.py b/src/common/orm/fields/StringField.py
deleted file mode 100644
index ead8487ea..000000000
--- a/src/common/orm/fields/StringField.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-import re
-from typing import Optional, Pattern, Union
-from common.type_checkers.Checkers import chk_boolean, chk_integer, chk_string
-from .Field import Field
-
-class StringField(Field):
-    def __init__(
-        self, *args, allow_empty : bool = False, min_length : Optional[int] = None, max_length : Optional[int] = None,
-        pattern : Optional[Union[Pattern, str]] = None, **kwargs) -> None:
-
-        super().__init__(*args, type_=str, **kwargs)
-        self._allow_empty = chk_boolean('StringField.allow_empty', allow_empty)
-        self._min_length = None if min_length is None else \
-            chk_integer('StringField.min_length', min_length, min_value=0)
-        self._max_length = None if max_length is None else \
-            chk_integer('StringField.max_length', max_length, min_value=self._min_length)
-        self._pattern = None if pattern is None else re.compile(pattern)
-
-    def validate(self, value : str, try_convert_type=False) -> str:
-        value = super().validate(value, try_convert_type=try_convert_type)
-        if value is None: return None
-        return chk_string(
-            self.name, value, allow_empty=self._allow_empty, min_length=self._min_length, max_length=self._max_length,
-            pattern=self._pattern)
diff --git a/src/common/orm/fields/__init__.py b/src/common/orm/fields/__init__.py
deleted file mode 100644
index 2a4cccb63..000000000
--- a/src/common/orm/fields/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from .BooleanField import BooleanField
-from .Field import Field
-from .FloatField import FloatField
-from .ForeignKeyField import ForeignKeyField
-from .IntegerField import IntegerField
-from .PrimaryKeyField import PrimaryKeyField
-from .StringField import StringField
-__all__ = ['BooleanField', 'Field', 'FloatField', 'ForeignKeyField', 'IntegerField', 'PrimaryKeyField', 'StringField']
diff --git a/src/common/orm/model/Model.py b/src/common/orm/model/Model.py
deleted file mode 100644
index ffb957114..000000000
--- a/src/common/orm/model/Model.py
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from __future__ import annotations
-import logging, re
-from typing import Any, Dict, List, Mapping, Optional, Set, Tuple, Union
-from common.orm.Database import Database
-from common.orm.backend.Tools import key_to_str
-from common.orm.fields.ForeignKeyField import ForeignKeyField
-from ..Exceptions import ConstraintException, MutexException
-from ..fields.Field import Field
-from ..fields.PrimaryKeyField import PrimaryKeyField
-from .Tools import NoDupOrderedDict
-
-LOGGER = logging.getLogger(__name__)
-DEFAULT_PRIMARY_KEY_NAME = 'pk_auto'
-
-class MetaModel(type):
-    @classmethod
-    def __prepare__(cls, name : str, bases : Tuple[type, ...], **attrs : Any) -> Mapping[str, Any]:
-        return NoDupOrderedDict()
-
-    def __new__(cls, name : str, bases : Tuple[type, ...], attrs : NoDupOrderedDict[str, Any]):
-        field_names = list()
-        pk_field_name = None
-        for key, value in attrs.items():
-            if not isinstance(value, Field): continue
-            value.name = key
-            field_names.append(key)
-            if not isinstance(value, PrimaryKeyField): continue
-            if pk_field_name is None:
-                pk_field_name = key
-                continue
-            raise AttributeError('PrimaryKeyField for Model({:s}) already set to attribute({:s})'.format(
-                str(name), str(pk_field_name)))
-        if pk_field_name is None:
-            if DEFAULT_PRIMARY_KEY_NAME in attrs.keys():
-                msg = 'PrimaryKeyField for Model({:s}) not defined and attribute "{:s}" already used. '\
-                      'Leave attribute name "{:s}" for automatic PrimaryKeyField, or set a PrimaryKeyField.'
-                raise AttributeError(msg.format(str(name), DEFAULT_PRIMARY_KEY_NAME, DEFAULT_PRIMARY_KEY_NAME))
-            pk_field_name = DEFAULT_PRIMARY_KEY_NAME
-            attrs[pk_field_name] = PrimaryKeyField(name=pk_field_name)
-            field_names.append(pk_field_name)
-        cls_obj = super().__new__(cls, name, bases, dict(attrs))
-        setattr(cls_obj, '_pk_field_name', pk_field_name)
-        setattr(cls_obj, '_field_names_list', field_names)
-        setattr(cls_obj, '_field_names_set', set(field_names))
-        return cls_obj
-
-KEYWORD_INSTANCES  = 'instances'
-KEYWORD_LOCK       = 'lock'
-KEYWORD_REFERENCES = 'references'
-KEYWORD_STORED     = '_stored'
-
-class Model(metaclass=MetaModel):
-    @classmethod
-    def get_backend_key_instances(cls) -> str:
-        return key_to_str(['{:s}'.format(cls.__name__), KEYWORD_INSTANCES])
-
-    @classmethod
-    def get_backend_key_instance(cls, primary_key : str) -> str:
-        return '{:s}[{:s}]'.format(cls.__name__, primary_key)
-
-    @classmethod
-    def get_backend_key_references(cls, primary_key : str) -> str:
-        match = re.match(r'^[a-zA-Z0-9\_]+\[([^\]]*)\]', primary_key)
-        if not match: primary_key = cls.get_backend_key_instance(primary_key)
-        return key_to_str([primary_key, KEYWORD_REFERENCES])
-
-    @staticmethod
-    def get_backend_key_lock(backend_key : str) -> str:
-        if backend_key.endswith(KEYWORD_LOCK): return backend_key
-        return key_to_str([backend_key, KEYWORD_LOCK])
-
-    @staticmethod
-    def get_backend_key_locks(backend_keys : List[str]) -> List[str]:
-        return [Model.get_backend_key_lock(backend_key) for backend_key in backend_keys]
-
-    @classmethod
-    def backend_key__to__instance_key(cls, backend_key : str) -> str:
-        class_name = cls.__name__
-        if backend_key.startswith(class_name):
-            match = re.match(r'^{:s}\[([^\]]*)\]'.format(class_name), backend_key)
-            if match: return match.group(1)
-        return backend_key
-
-    def __init__(self, database : Database, primary_key : str, auto_load : bool = True) -> None:
-        if not isinstance(database, Database):
-            str_class_path = '{}.{}'.format(Database.__module__, Database.__name__)
-            raise AttributeError('database must inherit from {}'.format(str_class_path))
-        self._model_class = type(self)
-        self._class_name = self._model_class.__name__
-        pk_field_name = self._pk_field_name # pylint: disable=no-member
-        pk_field_instance : 'PrimaryKeyField' = getattr(self._model_class, pk_field_name)
-        primary_key = pk_field_instance.validate(primary_key)
-        primary_key = self.backend_key__to__instance_key(primary_key)
-        setattr(self, pk_field_name, primary_key)
-        self._database = database
-        self._backend = database.backend
-        self._instance_key : str = self.get_backend_key_instance(primary_key)
-        self._instances_key : str = self.get_backend_key_instances()
-        self._references_key : str = self.get_backend_key_references(primary_key)
-        self._owner_key : Optional[str] = None
-        if auto_load: self.load()
-
-    @property
-    def database(self) -> Database: return self._database
-
-    @property
-    def instance_key(self) -> str: return self._instance_key
-
-    def lock(self, extra_keys : List[List[str]] = [], blocking : bool = True):
-        while True:
-            lock_keys = Model.get_backend_key_locks(
-                [self._instance_key, self._instances_key, self._references_key] + extra_keys)
-            acquired,self._owner_key = self._backend.lock(lock_keys, owner_key=self._owner_key)
-            if acquired: return
-            if not blocking: break
-        raise MutexException('Unable to lock keys {:s} using owner_key {:s}'.format(
-            str(lock_keys), str(self._owner_key)))
-
-    def unlock(self, extra_keys : List[List[str]] = []):
-        lock_keys = Model.get_backend_key_locks(
-            [self._instance_key, self._instances_key, self._references_key] + extra_keys)
-        released = self._backend.unlock(lock_keys, self._owner_key)
-        if released: return
-        raise MutexException('Unable to unlock keys {:s} using owner_key {:s}'.format(
-            str(lock_keys), str(self._owner_key)))
-
-    def load(self) -> bool:
-        pk_field_name = self._pk_field_name # pylint: disable=no-member
-
-        try:
-            self.lock()
-
-            attributes = self._backend.dict_get(self._instance_key)
-            if attributes is None or len(attributes) == 0: return False
-            for field_name in self._field_names_list: # pylint: disable=no-member
-                if field_name == pk_field_name: continue
-                if field_name not in attributes: continue
-                raw_field_value = attributes[field_name]
-                field_instance : 'Field' = getattr(self._model_class, field_name)
-                field_value = field_instance.deserialize(raw_field_value)
-                if isinstance(field_instance, ForeignKeyField):
-                    setattr(self, field_name + KEYWORD_STORED, field_value)
-                    field_value = field_instance.foreign_model(self._database, field_value, auto_load=True)
-                setattr(self, field_name, field_value)
-            return True
-        finally:
-            self.unlock()
-
-    def save(self) -> None:
-        attributes : Dict[str, Any] = dict()
-        required_keys : Set[str] = set()
-        foreign_additions : Dict[str, str] = dict()
-        foreign_removals : Dict[str, str] = dict()
-        for field_name in self._field_names_list: # pylint: disable=no-member
-            field_value = getattr(self, field_name)
-            field_instance : 'Field' = getattr(self._model_class, field_name)
-            serialized_field_value = field_instance.serialize(field_value)
-            if (serialized_field_value is None) and (not field_instance.required): continue
-            if isinstance(field_instance, ForeignKeyField):
-                foreign_reference = '{:s}:{:s}'.format(self._instance_key, field_name)
-                field_value_stored = getattr(self, field_name + KEYWORD_STORED, None)
-                if field_value_stored is not None:
-                    foreign_removals[self.get_backend_key_references(field_value_stored)] = foreign_reference
-                foreign_additions[self.get_backend_key_references(serialized_field_value)] = foreign_reference
-                required_keys.add(serialized_field_value)
-            attributes[field_name] = serialized_field_value
-
-        extra_keys = []
-        extra_keys.extend(list(foreign_removals.keys()))
-        extra_keys.extend(list(foreign_additions.keys()))
-
-        try:
-            self.lock(extra_keys=extra_keys)
-
-            not_exists = [
-                str(required_key)
-                for required_key in required_keys
-                if not self._backend.exists(required_key)]
-            if len(not_exists) > 0:
-                raise ConstraintException('Required Keys ({:s}) does not exist'.format(', '.join(sorted(not_exists))))
-
-            self._backend.dict_update(self._instance_key, attributes)
-            self._backend.set_add(self._instances_key, self._instance_key)
-
-            for serialized_field_value,foreign_reference in foreign_removals.items():
-                self._backend.set_remove(serialized_field_value, foreign_reference)
-
-            for serialized_field_value,foreign_reference in foreign_additions.items():
-                self._backend.set_add(serialized_field_value, foreign_reference)
-        finally:
-            self.unlock(extra_keys=extra_keys)
-
-        for serialized_field_value,foreign_reference in foreign_additions.items():
-            setattr(self, (foreign_reference.rsplit(':', 1)[-1]) + KEYWORD_STORED, field_value_stored)
-
-    def delete(self) -> None:
-        foreign_removals : Dict[str, str] = {}
-        for field_name in self._field_names_list: # pylint: disable=no-member
-            field_instance : 'Field' = getattr(self._model_class, field_name)
-            if not isinstance(field_instance, ForeignKeyField): continue
-            foreign_reference = '{:s}:{:s}'.format(self._instance_key, field_name)
-            field_value_stored = getattr(self, field_name + KEYWORD_STORED, None)
-            if field_value_stored is None: continue
-            foreign_removals[self.get_backend_key_references(field_value_stored)] = foreign_reference
-
-        extra_keys = []
-        extra_keys.extend(list(foreign_removals.keys()))
-
-        try:
-            self.lock(extra_keys=extra_keys)
-
-            if self._backend.exists(self._references_key):
-                references = self._backend.set_get_all(self._references_key)
-                raise ConstraintException('Instance is used by Keys ({:s})'.format(', '.join(sorted(references))))
-
-            self._backend.delete(self._instance_key)
-            self._backend.set_remove(self._instances_key, self._instance_key)
-
-            for serialized_field_value,foreign_reference in foreign_removals.items():
-                self._backend.set_remove(serialized_field_value, foreign_reference)
-        finally:
-            self.unlock(extra_keys=extra_keys)
-
-    @staticmethod
-    def get_model_name(model_or_str) -> str:
-        if isinstance(model_or_str, str):
-            return model_or_str
-        if (type(model_or_str).__name__ == 'MetaModel') and issubclass(model_or_str, Model):
-            return model_or_str.__name__
-        raise Exception()
-
-    def references(
-        self, filter_by_models : Optional[Union[type, List[type], Set[type], Tuple[type]]] = None
-        ) -> Set[Tuple[str, str]]:
-
-        try:
-            self.lock()
-            if not self._backend.exists(self._references_key): return {}
-            references = self._backend.set_get_all(self._references_key)
-            try:
-                if filter_by_models is None:
-                    pass
-                elif isinstance(filter_by_models, str):
-                    filter_by_models = {filter_by_models}
-                elif isinstance(filter_by_models, (list, set, tuple)):
-                    filter_by_models = {Model.get_model_name(model_or_str) for model_or_str in filter_by_models}
-                elif (type(filter_by_models).__name__ == 'MetaModel') and issubclass(filter_by_models, Model):
-                    filter_by_models = {Model.get_model_name(filter_by_models)}
-                else:
-                    raise Exception()
-            except Exception as e:
-                msg = 'filter_by_models({:s}) unsupported. Expected a type or a list/set of types. Optionally, keep '\
-                      'it as None to retrieve all the references pointing to this instance.'
-                raise AttributeError(msg.format(str(filter_by_models))) from e
-            if filter_by_models:
-                references = filter(lambda instance_key: instance_key.split('[', 1)[0] in filter_by_models, references)
-            return {tuple(reference.rsplit(':', 1)) for reference in references}
-        finally:
-            self.unlock()
-
-    @classmethod
-    def get_primary_keys(cls, database : Database):
-        backend = database.backend
-        key_model_instances = cls.get_backend_key_instances()
-        key_model_instances_lock = cls.get_backend_key_lock(key_model_instances)
-
-        acquired,owner_key = backend.lock(key_model_instances_lock)
-        if not acquired:
-            raise MutexException('Unable to lock keys {:s}'.format(
-                str(key_model_instances_lock)))
-
-        instance_keys = backend.set_get_all(key_model_instances)
-
-        released = backend.unlock(key_model_instances_lock, owner_key)
-        if not released:
-            raise MutexException('Unable to unlock keys {:s} using owner_key {:s}'.format(
-                str(key_model_instances_lock), str(owner_key)))
-
-        return instance_keys
-
-    def dump_id(self) -> Dict:
-        raise NotImplementedError()
-
-    def dump(self) -> Dict:
-        raise NotImplementedError()
-
-    def __repr__(self) -> str:
-        pk_field_name = self._pk_field_name # pylint: disable=no-member
-        arguments = ', '.join(
-            '{:s}={:s}{:s}'.format(
-                name, repr(getattr(self, name)), '(PK)' if name == pk_field_name else '')
-            for name in self._field_names_list # pylint: disable=no-member
-        )
-        return '{:s}({:s})'.format(self._class_name, arguments)
diff --git a/src/common/orm/model/Tools.py b/src/common/orm/model/Tools.py
deleted file mode 100644
index aed6a14bc..000000000
--- a/src/common/orm/model/Tools.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-from collections import OrderedDict
-
-class NoDupOrderedDict(OrderedDict):
-    def __setitem__(self, key, value):
-        if key in self: raise NameError('{:s} already defined'.format(str(key)))
-        super().__setitem__(key, value)
-
-def format_key(key_pattern, instance, **kwargs):
-    attributes = {}
-    for attribute_name in instance.__dir__():
-        if attribute_name[0] == '_': continue
-        attribute_obj = getattr(instance, attribute_name, None)
-        if attribute_obj is None: continue
-        if type(attribute_obj).__name__ == 'method': continue
-        attributes[attribute_name] = attribute_obj
-    attributes.update(kwargs)
-    return key_pattern.format(**attributes)
diff --git a/src/common/orm/model/__init__.py b/src/common/orm/model/__init__.py
deleted file mode 100644
index 70a332512..000000000
--- a/src/common/orm/model/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
diff --git a/src/common/orm/tests/__init__.py b/src/common/orm/tests/__init__.py
deleted file mode 100644
index 70a332512..000000000
--- a/src/common/orm/tests/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
diff --git a/src/common/orm/tests/test_unitary.py b/src/common/orm/tests/test_unitary.py
deleted file mode 100644
index 586a96235..000000000
--- a/src/common/orm/tests/test_unitary.py
+++ /dev/null
@@ -1,656 +0,0 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
-#
-# 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.
-
-import logging, pytest
-from enum import Enum
-from common.orm.Exceptions import ConstraintException
-from common.orm.Database import Database
-from common.orm.Factory import get_database_backend
-from common.orm.backend.BackendEnum import BackendEnum
-from common.orm.backend._Backend import _Backend
-from common.orm.fields.BooleanField import BooleanField
-from common.orm.fields.EnumeratedField import EnumeratedField
-from common.orm.fields.FloatField import FloatField
-from common.orm.fields.ForeignKeyField import ForeignKeyField
-from common.orm.fields.IntegerField import IntegerField
-from common.orm.fields.PrimaryKeyField import PrimaryKeyField
-from common.orm.fields.StringField import StringField
-from common.orm.model.Model import DEFAULT_PRIMARY_KEY_NAME, Model
-
-logging.basicConfig(level=logging.INFO)
-LOGGER = logging.getLogger(__name__)
-
-def test_database_instantiation():
-    with pytest.raises(AttributeError) as e:
-        Database(None)
-    str_class_path = '{}.{}'.format(_Backend.__module__, _Backend.__name__)
-    assert str(e.value) == 'backend must inherit from {}'.format(str_class_path)
-
-    assert Database(get_database_backend(BackendEnum.INMEMORY)) is not None
-
-def test_model_without_attributes():
-    with pytest.raises(AttributeError) as e:
-        Model(None, 'valid-uuid')
-    str_class_path = '{}.{}'.format(Database.__module__, Database.__name__)
-    assert str(e.value) == 'database must inherit from {}'.format(str_class_path)
-
-    database = Database(get_database_backend(BackendEnum.INMEMORY))
-
-    with pytest.raises(ValueError) as e:
-        Model(database, '')
-    msg = '{:s}() is out of range: allow_empty(False).'
-    assert str(e.value) == msg.format(DEFAULT_PRIMARY_KEY_NAME)
-
-    with pytest.raises(TypeError) as e:
-        Model(database, 23)
-    msg = '{:s}(23) is of a wrong type(int). Accepted type_or_types(<class \'str\'>).'
-    assert str(e.value) == msg.format(DEFAULT_PRIMARY_KEY_NAME)
-
-    with pytest.raises(TypeError) as e:
-        Model(database, 23.5)
-    msg = '{:s}(23.5) is of a wrong type(float). Accepted type_or_types(<class \'str\'>).'
-    assert str(e.value) == msg.format(DEFAULT_PRIMARY_KEY_NAME)
-    
-    with pytest.raises(TypeError) as e:
-        Model(database, True)
-    msg = '{:s}(True) is of a wrong type(bool). Accepted type_or_types(<class \'str\'>).'
-    assert str(e.value) == msg.format(DEFAULT_PRIMARY_KEY_NAME)
-
-    with pytest.raises(TypeError) as e:
-        Model(database, ['a'])
-    msg = '{:s}([\'a\']) is of a wrong type(list). Accepted type_or_types(<class \'str\'>).'
-    assert str(e.value) == msg.format(DEFAULT_PRIMARY_KEY_NAME)
-
-    Model(database, 'valid-primary-key')
-
-def test_model_with_primarykey():
-    database = Database(get_database_backend(BackendEnum.INMEMORY))
-
-    with pytest.raises(AttributeError) as e:
-        class WrongTestModel(Model): # pylint: disable=unused-variable
-            pk = PrimaryKeyField()
-            name = StringField(min_length=1)
-            age = IntegerField(min_value=0)
-            salary = FloatField(min_value=0.0)
-            active = BooleanField()
-            pk2 = PrimaryKeyField()
-    assert str(e.value) == 'PrimaryKeyField for Model(WrongTestModel) already set to attribute(pk)'
-
-    class GenderEnum(Enum):
-        FEMALE = 'female'
-        MALE   = 'male'
-
-    class TestModel(Model):
-        pk = PrimaryKeyField()
-        name = StringField(min_length=1)
-        age = IntegerField(min_value=0)
-        salary = FloatField(min_value=0.0)
-        active = BooleanField()
-        gender = EnumeratedField(GenderEnum)
-
-    backend_key_instances  = TestModel.get_backend_key_instances()
-    backend_key_instance   = TestModel.get_backend_key_instance('pk')
-    backend_key_references = TestModel.get_backend_key_references('pk')
-
-    assert backend_key_instances  == 'TestModel/instances'
-    assert backend_key_instance   == 'TestModel[pk]'
-    assert backend_key_references == 'TestModel[pk]/references'
-
-    assert TestModel.get_backend_key_lock(backend_key_instances ) == 'TestModel/instances/lock'
-    assert TestModel.get_backend_key_lock(backend_key_instance  ) == 'TestModel[pk]/lock'
-    assert TestModel.get_backend_key_lock(backend_key_references) == 'TestModel[pk]/references/lock'
-
-    with pytest.raises(ValueError) as e:
-        TestModel(database, None)
-    assert str(e.value) == 'pk(None) is required. It cannot be None.'
-
-    with pytest.raises(ValueError) as e:
-        TestModel(database, '')
-    assert str(e.value) == 'pk() is out of range: allow_empty(False).'
-
-    obj = TestModel(database, 'valid-pk')
-    assert obj is not None
-
-    with pytest.raises(ValueError) as e:
-        obj.pk = 'another-valid-pk'
-    assert str(e.value) == 'PrimaryKeyField cannot be modified'
-
-def test_model_with_primarykey_and_attributes():
-    database = Database(get_database_backend(BackendEnum.INMEMORY))
-
-    class GenderEnum(Enum):
-        FEMALE = 'female'
-        MALE   = 'male'
-
-    with pytest.raises(AttributeError) as e:
-        class BadTestModel(Model):
-            pk_auto = StringField() # field using default name of primary key
-            name = StringField(min_length=5, max_length=10)
-            age = IntegerField(min_value=0)
-            salary = FloatField(min_value=0.0)
-            active = BooleanField()
-            gender = EnumeratedField(GenderEnum)
-
-    msg = 'PrimaryKeyField for Model(BadTestModel) not defined and attribute "pk_auto" already used. '\
-          'Leave attribute name "pk_auto" for automatic PrimaryKeyField, or set a PrimaryKeyField.'
-    assert str(e.value) == msg
-
-    class TestModel(Model):
-        pk = PrimaryKeyField()
-        name = StringField(min_length=5, max_length=10)
-        age = IntegerField(min_value=0)
-        salary = FloatField(min_value=0.0)
-        active = BooleanField()
-        gender = EnumeratedField(GenderEnum)
-
-    obj = TestModel(database, 'valid-pk')
-    assert obj is not None
-
-    with pytest.raises(AttributeError) as e:
-        del obj.name
-    assert str(e.value) == 'Attribute "name" cannot be deleted'
-
-    with pytest.raises(TypeError) as e:
-        obj.name = 55
-    assert str(e.value) == "name(55) is of a wrong type(int). Accepted type_or_types(<class 'str'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.name = 55.5
-    assert str(e.value) == "name(55.5) is of a wrong type(float). Accepted type_or_types(<class 'str'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.name = True
-    assert str(e.value) == "name(True) is of a wrong type(bool). Accepted type_or_types(<class 'str'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.age = 'too old'
-    assert str(e.value) == "age(too old) is of a wrong type(str). Accepted type_or_types(<class 'int'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.age = 37.5
-    assert str(e.value) == "age(37.5) is of a wrong type(float). Accepted type_or_types(<class 'int'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.salary = 'too high'
-    msg = "salary(too high) is of a wrong type(str). Accepted type_or_types((<class 'int'>, <class 'float'>))."
-    assert str(e.value) == msg
-
-    with pytest.raises(TypeError) as e:
-        obj.active = 'active'
-    assert str(e.value) == "active(active) is of a wrong type(str). Accepted type_or_types(<class 'bool'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.active = 27
-    assert str(e.value) == "active(27) is of a wrong type(int). Accepted type_or_types(<class 'bool'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.active = 92.5
-    assert str(e.value) == "active(92.5) is of a wrong type(float). Accepted type_or_types(<class 'bool'>)."
-
-    with pytest.raises(ValueError) as e:
-        obj.name = ''
-    assert str(e.value) == 'name() is out of range: allow_empty(False).'
-
-    with pytest.raises(ValueError) as e:
-        obj.name = 'John'
-    assert str(e.value) == 'name(John) is out of range: min_length(5).'
-
-    with pytest.raises(ValueError) as e:
-        obj.name = 'John Smith Willson'
-    assert str(e.value) == 'name(John Smith Willson) is out of range: max_value(10).'
-
-    with pytest.raises(TypeError) as e:
-        obj.gender = 51
-    assert str(e.value) == "gender(51) is of a wrong type(int). Accepted type_or_types(<enum 'GenderEnum'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.gender = 55.5
-    assert str(e.value) == "gender(55.5) is of a wrong type(float). Accepted type_or_types(<enum 'GenderEnum'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.gender = False
-    assert str(e.value) == "gender(False) is of a wrong type(bool). Accepted type_or_types(<enum 'GenderEnum'>)."
-
-    with pytest.raises(TypeError) as e:
-        obj.gender = 'male'
-    assert str(e.value) == "gender(male) is of a wrong type(str). Accepted type_or_types(<enum 'GenderEnum'>)."
-
-    obj.name = 'John Smith'
-    obj.age = 37
-    obj.salary = 5023.52
-    obj.active = True
-    obj.gender = GenderEnum.MALE
-    assert repr(obj) == "TestModel(pk='valid-pk'(PK), name='John Smith', age=37, salary=5023.52, active=True, "\
-                        "gender=<GenderEnum.MALE: 'male'>)"
-
-def test_model_database_operations():
-    database = Database(get_database_backend(BackendEnum.INMEMORY))
-
-    class GenderEnum(Enum):
-        FEMALE = 'female'
-        MALE   = 'male'
-
-    class TestModel(Model):
-        pk = PrimaryKeyField()
-        name = StringField(min_length=5, max_length=30)
-        age = IntegerField(min_value=0, required=True)
-        salary = FloatField(min_value=0.0)
-        active = BooleanField()
-        gender = EnumeratedField(GenderEnum)
-
-    obj_john = TestModel(database, 'john')
-    assert obj_john is not None
-
-    obj_john.name = 'John Smith'
-    obj_john.salary = 5023.52
-    obj_john.active = True
-    assert repr(obj_john) == "TestModel(pk='john'(PK), name='John Smith', age=None, salary=5023.52, active=True, "\
-                             "gender=None)"
-
-    with pytest.raises(ValueError) as e:
-        obj_john.save()
-    assert str(e.value) == 'age(None) is required. It cannot be None.'
-
-    obj_john.age = 37
-    assert repr(obj_john) == "TestModel(pk='john'(PK), name='John Smith', age=37, salary=5023.52, active=True, "\
-                             "gender=None)"
-
-    with pytest.raises(ValueError) as e:
-        obj_john.save()
-    assert str(e.value) == 'gender(None) is required. It cannot be None.'
-
-    obj_john.gender = GenderEnum.MALE
-    obj_john.save()
-
-    db_entries = database.dump()
-    assert len(db_entries) == 2
-    assert db_entries[0] == (
-        'set', 'TestModel/instances',
-        "{'TestModel[john]'}")
-    assert db_entries[1] == (
-        'dict', 'TestModel[john]',
-        "{'active': 'True', 'age': '37', 'gender': 'MALE', 'name': 'John Smith', 'pk': 'john', "\
-        "'salary': '5023.52'}")
-
-    obj_john2 = TestModel(database, 'john', auto_load=False)
-    assert obj_john2 is not None
-    assert repr(obj_john2) == "TestModel(pk='john'(PK), name=None, age=None, salary=None, active=None, gender=None)"
-    obj_john2.load()
-    assert repr(obj_john2) == "TestModel(pk='john'(PK), name='John Smith', age=37, salary=5023.52, active=True, "\
-                              "gender=<GenderEnum.MALE: 'male'>)"
-
-    obj_john2 = TestModel(database, 'john', auto_load=True)
-    assert obj_john2 is not None
-    assert repr(obj_john2) == "TestModel(pk='john'(PK), name='John Smith', age=37, salary=5023.52, active=True, "\
-                              "gender=<GenderEnum.MALE: 'male'>)"
-
-    obj_john2.delete()
-    assert len(database.dump()) == 0
-
-    obj_john2.save()
-
-    db_entries = database.dump()
-    LOGGER.info('----- Database Dump [{:3d} entries] -------------------------'.format(len(db_entries)))
-    for db_entry in db_entries:
-        LOGGER.info('  [{:>4s}] {:40s} :: {:s}'.format(*db_entry))
-    LOGGER.info('-----------------------------------------------------------')
-    assert len(db_entries) == 2
-    assert db_entries[0] == (
-        'set', 'TestModel/instances',
-        "{'TestModel[john]'}")
-    assert db_entries[1] == (
-        'dict', 'TestModel[john]',
-        "{'active': 'True', 'age': '37', 'gender': 'MALE', 'name': 'John Smith', 'pk': 'john', "\
-        "'salary': '5023.52'}")
-
-
-    obj_jane = TestModel(database, 'jane', auto_load=True)
-    obj_jane.name = 'Jane Willson'
-    obj_jane.age = 26
-    obj_jane.salary = 6071.72
-    obj_jane.active = True
-    obj_jane.gender = GenderEnum.FEMALE
-    assert repr(obj_jane) == "TestModel(pk='jane'(PK), name='Jane Willson', age=26, salary=6071.72, active=True, "\
-                             "gender=<GenderEnum.FEMALE: 'female'>)"
-    obj_jane.save()
-
-    obj_julia = TestModel(database, 'julia', auto_load=True)
-    obj_julia.name = 'Julia Simons'
-    obj_julia.age = 42
-    obj_julia.salary = 5451.13
-    obj_julia.active = True
-    obj_julia.gender = GenderEnum.FEMALE
-    assert repr(obj_julia) == "TestModel(pk='julia'(PK), name='Julia Simons', age=42, salary=5451.13, active=True, "\
-                              "gender=<GenderEnum.FEMALE: 'female'>)"
-    obj_julia.save()
-
-    db_entries = database.dump()
-    LOGGER.info('----- Database Dump [{:3d} entries] -------------------------'.format(len(db_entries)))
-    for db_entry in db_entries:
-        LOGGER.info('  [{:>4s}] {:40s} :: {:s}'.format(*db_entry))
-    LOGGER.info('-----------------------------------------------------------')
-
-    test_model_pks = sorted(TestModel.get_primary_keys(database))
-    assert len(test_model_pks) == 3
-    assert test_model_pks[0] == 'TestModel[jane]'
-    assert test_model_pks[1] == 'TestModel[john]'
-    assert test_model_pks[2] == 'TestModel[julia]'
-
-    database.clear_all()
-    assert len(database.dump()) == 0
-
-def test_model_foreignkeys():
-    database = Database(get_database_backend(BackendEnum.INMEMORY))
-
-    class GenderEnum(Enum):
-        FEMALE = 'female'
-        MALE   = 'male'
-
-    class Team(Model):
-        pk = PrimaryKeyField()
-        name = StringField(max_length=10, required=True)
-
-    class Workplace(Model):
-        pk = PrimaryKeyField()
-        name = StringField(max_length=10, required=True)
-
-    class Member(Model):
-        pk = PrimaryKeyField()
-        team = ForeignKeyField(Team)
-        place = ForeignKeyField(Workplace, required=False)
-        name = StringField(max_length=10, required=True)
-        gender = EnumeratedField(GenderEnum)
-
-    team_dev_ops = Team(database, 'dev-ops')
-    team_dev_ops.name = 'Dev Ops'
-    assert team_dev_ops is not None
-    assert repr(team_dev_ops) == "Team(pk='dev-ops'(PK), name='Dev Ops')"
-
-    workplace_bcn = Workplace(database, 'bcn')
-    workplace_bcn.name = 'Barcelona'
-    assert workplace_bcn is not None
-    assert repr(workplace_bcn) == "Workplace(pk='bcn'(PK), name='Barcelona')"
-
-    member_john = Member(database, 'john')
-    member_john.name = 'John'
-    member_john.team = team_dev_ops
-    member_john.place = workplace_bcn
-    assert member_john is not None
-    assert repr(member_john) == "Member(pk='john'(PK), team='Team[dev-ops]', place='Workplace[bcn]', name='John', "\
-                                "gender=None)"
-
-    with pytest.raises(ValueError) as e:
-        member_john.save()
-    assert str(e.value) == 'gender(None) is required. It cannot be None.'
-
-    member_john.gender = GenderEnum.MALE
-
-    with pytest.raises(ConstraintException) as e:
-        member_john.save()
-    assert str(e.value) == 'Required Keys (Team[dev-ops], Workplace[bcn]) does not exist'
-
-    workplace_bcn.save()
-    assert repr(Workplace(database, workplace_bcn.pk)) == "Workplace(pk='bcn'(PK), name='Barcelona')"
-
-    with pytest.raises(ConstraintException) as e:
-        member_john.save()
-    assert str(e.value) == 'Required Keys (Team[dev-ops]) does not exist'
-
-    team_dev_ops.save()
-    assert repr(Team(database, team_dev_ops.pk)) == "Team(pk='dev-ops'(PK), name='Dev Ops')"
-
-    member_john.save()
-    assert repr(Member(database, member_john.pk)) == \
-        "Member(pk='john'(PK), team='Team[dev-ops]', place='Workplace[bcn]', name='John', "\
-        "gender=<GenderEnum.MALE: 'male'>)"
-
-    with pytest.raises(ConstraintException) as e:
-        workplace_bcn.delete()
-    assert str(e.value) == 'Instance is used by Keys (Member[john]:place)'
-
-    with pytest.raises(ConstraintException) as e:
-        team_dev_ops.delete()
-    assert str(e.value) == 'Instance is used by Keys (Member[john]:team)'
-
-    workplace_mad = Workplace(database, 'mad')
-    workplace_mad.name = 'Madrid'
-    assert workplace_mad is not None
-    assert repr(workplace_mad) == "Workplace(pk='mad'(PK), name='Madrid')"
-
-    member_john = Member(database, 'john')
-    member_john.name = 'John'
-    member_john.place = workplace_mad
-    assert member_john is not None
-    assert repr(member_john) == \
-        "Member(pk='john'(PK), team='Team[dev-ops]', place='Workplace[mad]', name='John', "\
-        "gender=<GenderEnum.MALE: 'male'>)"
-
-    with pytest.raises(ConstraintException) as e:
-        member_john.save()
-    assert str(e.value) == 'Required Keys (Workplace[mad]) does not exist'
-
-    workplace_mad.save()
-    assert repr(Workplace(database, workplace_mad.pk)) == "Workplace(pk='mad'(PK), name='Madrid')"
-
-    member_john.save()
-
-    member_john = Member(database, 'john')
-
-    with pytest.raises(ValueError) as e:
-        del member_john.place
-        del member_john.team
-    assert str(e.value) == 'team(None) is required. It cannot be None.'
-
-
-    member_jane = Member(database, 'jane')
-    member_jane.name = 'Jane'
-    member_jane.place = workplace_mad
-    assert member_jane is not None
-    assert repr(member_jane) == "Member(pk='jane'(PK), team=None, place='Workplace[mad]', name='Jane', gender=None)"
-
-    with pytest.raises(ValueError) as e:
-        member_jane.save()
-    assert str(e.value) == 'team(None) is required. It cannot be None.'
-
-    member_jane.team = team_dev_ops
-
-    with pytest.raises(ValueError) as e:
-        member_jane.save()
-    assert str(e.value) == 'gender(None) is required. It cannot be None.'
-
-    member_jane.gender = GenderEnum.FEMALE
-
-    member_jane.save()
-    assert repr(Member(database, member_jane.pk)) == \
-        "Member(pk='jane'(PK), team='Team[dev-ops]', place='Workplace[mad]', name='Jane', "\
-        "gender=<GenderEnum.FEMALE: 'female'>)"
-
-    member_brad = Member(database, 'brad')
-    assert member_brad is not None
-    assert repr(member_brad) == "Member(pk='brad'(PK), team=None, place=None, name=None, gender=None)"
-
-    with pytest.raises(ValueError) as e:
-        member_brad.save()
-    assert str(e.value) == 'team(None) is required. It cannot be None.'
-
-    member_brad.team = team_dev_ops
-
-    with pytest.raises(ValueError) as e:
-        member_brad.save()
-    assert str(e.value) == 'name(None) is required. It cannot be None.'
-
-    member_brad.name = 'Brad'
-    assert repr(member_brad) == "Member(pk='brad'(PK), team=\'Team[dev-ops]\', place=None, name='Brad', gender=None)"
-
-    with pytest.raises(ValueError) as e:
-        member_brad.save()
-    assert str(e.value) == 'gender(None) is required. It cannot be None.'
-
-    member_brad.gender = GenderEnum.MALE
-
-    member_brad.save()
-    assert repr(Member(database, member_brad.pk)) == \
-        "Member(pk='brad'(PK), team='Team[dev-ops]', place=None, name='Brad', gender=<GenderEnum.MALE: 'male'>)"
-
-    team_admin = Team(database, 'admin')
-    team_admin.name = 'Admin'
-    team_admin.save()
-    assert repr(Team(database, team_admin.pk)) == "Team(pk='admin'(PK), name='Admin')"
-
-    member_brad = Member(database, member_brad.pk)
-    assert repr(member_brad) == \
-        "Member(pk='brad'(PK), team='Team[dev-ops]', place=None, name='Brad', gender=<GenderEnum.MALE: 'male'>)"
-    member_brad.team = team_admin
-    assert repr(member_brad) == \
-        "Member(pk='brad'(PK), team='Team[admin]', place=None, name='Brad', gender=<GenderEnum.MALE: 'male'>)"
-    member_brad.save()
-    assert repr(Member(database, member_brad.pk)) == \
-        "Member(pk='brad'(PK), team='Team[admin]', place=None, name='Brad', gender=<GenderEnum.MALE: 'male'>)"
-
-    references = sorted(team_dev_ops.references())
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'team')
-    assert references[1] == ('Member[john]', 'team')
-
-    references = sorted(workplace_bcn.references())
-    assert len(references) == 0
-
-    references = sorted(workplace_mad.references())
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references('Member'))
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references({'Member'}))
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references(['Member']))
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references(('Member',)))
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references(Member))
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references({Member}))
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references([Member]))
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references((Member,)))
-    assert len(references) == 2
-    assert references[0] == ('Member[jane]', 'place')
-    assert references[1] == ('Member[john]', 'place')
-
-    references = sorted(workplace_mad.references({'non-existing-model'}))
-    assert len(references) == 0
-
-    with pytest.raises(AttributeError) as e:
-        references = sorted(workplace_mad.references(7))
-    assert str(e.value) == 'filter_by_models(7) unsupported. Expected a type or a list/set of types. '\
-                           'Optionally, keep it as None to retrieve all the references pointing to this instance.'
-
-    with pytest.raises(AttributeError) as e:
-        references = sorted(workplace_mad.references({7}))
-    assert str(e.value) == 'filter_by_models({7}) unsupported. Expected a type or a list/set of types. '\
-                           'Optionally, keep it as None to retrieve all the references pointing to this instance.'
-
-    db_entries = database.dump()
-    LOGGER.info('----- Database Dump [{:3d} entries] -------------------------'.format(len(db_entries)))
-    for db_entry in db_entries:
-        LOGGER.info('  [{:>4s}] {:40s} :: {:s}'.format(*db_entry))
-    LOGGER.info('-----------------------------------------------------------')
-
-    assert len(db_entries) == 13
-    assert db_entries[ 0] == ('set', "Member/instances",
-                              "{'Member[brad]', 'Member[jane]', 'Member[john]'}")
-    assert db_entries[ 1] == ('dict', "Member[brad]",
-                              "{'gender': 'MALE', 'name': 'Brad', 'pk': 'brad', 'team': 'Team[admin]'}")
-    assert db_entries[ 2] == ('dict', "Member[jane]",
-                              "{'gender': 'FEMALE', 'name': 'Jane', 'pk': 'jane', 'place': 'Workplace[mad]', "\
-                              "'team': 'Team[dev-ops]'}")
-    assert db_entries[ 3] == ('dict', "Member[john]",
-                              "{'gender': 'MALE', 'name': 'John', 'pk': 'john', 'place': 'Workplace[mad]', "\
-                              "'team': 'Team[dev-ops]'}")
-    assert db_entries[ 4] == ('set', "Team/instances",
-                              "{'Team[admin]', 'Team[dev-ops]'}")
-    assert db_entries[ 5] == ('dict', "Team[admin]",
-                              "{'name': 'Admin', 'pk': 'admin'}")
-    assert db_entries[ 6] == ('set' , "Team[admin]/references",
-                              "{'Member[brad]:team'}")
-    assert db_entries[ 7] == ('dict', "Team[dev-ops]",
-                              "{'name': 'Dev Ops', 'pk': 'dev-ops'}")
-    assert db_entries[ 8] == ('set' , "Team[dev-ops]/references",
-                              "{'Member[jane]:team', 'Member[john]:team'}")
-    assert db_entries[ 9] == ('set', "Workplace/instances",
-                              "{'Workplace[bcn]', 'Workplace[mad]'}")
-    assert db_entries[10] == ('dict', "Workplace[bcn]",
-                              "{'name': 'Barcelona', 'pk': 'bcn'}")
-    assert db_entries[11] == ('dict', "Workplace[mad]",
-                              "{'name': 'Madrid', 'pk': 'mad'}")
-    assert db_entries[12] == ('set' , "Workplace[mad]/references",
-                              "{'Member[jane]:place', 'Member[john]:place'}")
-
-    Member(database, member_john.pk).delete()
-
-    db_entries = database.dump()
-    LOGGER.info('----- Database Dump [{:3d} entries] -------------------------'.format(len(db_entries)))
-    for db_entry in db_entries:
-        LOGGER.info('  [{:>4s}] {:40s} :: {:s}'.format(*db_entry))
-    LOGGER.info('-----------------------------------------------------------')
-
-    assert len(db_entries) == 12
-    assert db_entries[ 0] == ('set', "Member/instances",
-                              "{'Member[brad]', 'Member[jane]'}")
-    assert db_entries[ 1] == ('dict', 'Member[brad]',
-                              "{'gender': 'MALE', 'name': 'Brad', 'pk': 'brad', 'team': 'Team[admin]'}")
-    assert db_entries[ 2] == ('dict', 'Member[jane]',
-                              "{'gender': 'FEMALE', 'name': 'Jane', 'pk': 'jane', 'place': 'Workplace[mad]', "\
-                              "'team': 'Team[dev-ops]'}")
-    assert db_entries[ 3] == ('set', "Team/instances",
-                              "{'Team[admin]', 'Team[dev-ops]'}")
-    assert db_entries[ 4] == ('dict', 'Team[admin]',
-                              "{'name': 'Admin', 'pk': 'admin'}")
-    assert db_entries[ 5] == ('set',  'Team[admin]/references',
-                              "{'Member[brad]:team'}")
-    assert db_entries[ 6] == ('dict', 'Team[dev-ops]',
-                              "{'name': 'Dev Ops', 'pk': 'dev-ops'}")
-    assert db_entries[ 7] == ('set',  'Team[dev-ops]/references',
-                              "{'Member[jane]:team'}")
-    assert db_entries[ 8] == ('set', "Workplace/instances",
-                              "{'Workplace[bcn]', 'Workplace[mad]'}")
-    assert db_entries[ 9] == ('dict', 'Workplace[bcn]',
-                              "{'name': 'Barcelona', 'pk': 'bcn'}")
-    assert db_entries[10] == ('dict', 'Workplace[mad]',
-                              "{'name': 'Madrid', 'pk': 'mad'}")
-    assert db_entries[11] == ('set',  'Workplace[mad]/references',
-                              "{'Member[jane]:place'}")
diff --git a/src/dlt/connector/tests/PrepareTestScenario.py b/src/dlt/connector/tests/PrepareTestScenario.py
index 5c5d1cb5c..0bddea071 100644
--- a/src/dlt/connector/tests/PrepareTestScenario.py
+++ b/src/dlt/connector/tests/PrepareTestScenario.py
@@ -12,98 +12,98 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os, pytest
-from typing import Tuple
-from common.Constants import ServiceNameEnum
-from common.Settings import (
-    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_service_port_grpc)
-from common.orm.Database import Database
-from common.orm.Factory import get_database_backend, BackendEnum as DatabaseBackendEnum
-from common.message_broker.Factory import get_messagebroker_backend, BackendEnum as MessageBrokerBackendEnum
-from common.message_broker.MessageBroker import MessageBroker
-from context.client.ContextClient import ContextClient
-from context.service.grpc_server.ContextService import ContextService
-from dlt.connector.client.DltConnectorClient import DltConnectorClient
-from dlt.connector.service.DltConnectorService import DltConnectorService
-from .MockService_Dependencies import MockService_Dependencies
-
-LOCAL_HOST = '127.0.0.1'
-MOCKSERVICE_PORT = 10000
-#GRPC_PORT = 10000 + get_service_port_grpc(ServiceNameEnum.CONTEXT) # avoid privileged ports
-#os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)
-#os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(GRPC_PORT)
-
-# ===== BlockChain Emulator (Mock DLT Gateway) =========================================================================
-# A single gateway is used for all the domains
-
-@pytest.fixture(scope='session')
-def dltgateway_service():
-    _service = MockService_Dependencies(MOCKSERVICE_PORT)
-    _service.configure_env_vars()
-    _service.start()
-    yield _service
-    _service.stop()
-
-# ===== Domain A (Real Context + Real DLT Connector) ===================================================================
-
-@pytest.fixture(scope='session')
-def context_service_a(): # pylint: disable=redefined-outer-name
-    _database = Database(get_database_backend(backend=DatabaseBackendEnum.INMEMORY))
-    _message_broker = MessageBroker(get_messagebroker_backend(backend=MessageBrokerBackendEnum.INMEMORY))
-    _service = ContextService(_database, _message_broker)
-    _service.start()
-    yield _service
-    _service.stop()
-    _message_broker.terminate()
-
-@pytest.fixture(scope='session')
-def context_client_a(context_service_a : ContextService): # pylint: disable=redefined-outer-name
-    _client = ContextClient(host=context_service_a.bind_address, port=context_service_a.bind_port)
-    yield _client
-    _client.close()
-
-@pytest.fixture(scope='session')
-def dltconnector_service_a():
-    _service = DltConnectorService()
-    _service.bind_port += 1
-    _service.start()
-    yield _service
-    _service.stop()
-
-@pytest.fixture(scope='session')
-def dltconnector_client_a(dltconnector_service_a : DltConnectorService): # pylint: disable=redefined-outer-name
-    _client = DltConnectorClient(host=dltconnector_service_a.bind_address, port=dltconnector_service_a.bind_port)
-    yield _client
-    _client.close()
-
-# ===== Domain B (Real Context + Real DLT Connector) ===================================================================
-
-@pytest.fixture(scope='session')
-def context_service_b(): # pylint: disable=redefined-outer-name
-    _database = Database(get_database_backend(backend=DatabaseBackendEnum.INMEMORY))
-    _message_broker = MessageBroker(get_messagebroker_backend(backend=MessageBrokerBackendEnum.INMEMORY))
-    _service = ContextService(_database, _message_broker)
-    _service.start()
-    yield _service
-    _service.stop()
-    _message_broker.terminate()
-
-@pytest.fixture(scope='session')
-def context_client_b(context_service_b : ContextService): # pylint: disable=redefined-outer-name
-    _client = ContextClient(host=context_service_b.bind_address, port=context_service_b.bind_port)
-    yield _client
-    _client.close()
-
-@pytest.fixture(scope='session')
-def dltconnector_service_b():
-    _service = DltConnectorService()
-    _service.bind_port += 2
-    _service.start()
-    yield _service
-    _service.stop()
-
-@pytest.fixture(scope='session')
-def dltconnector_client_b(dltconnector_service_b : DltConnectorService): # pylint: disable=redefined-outer-name
-    _client = DltConnectorClient(host=dltconnector_service_b.bind_address, port=dltconnector_service_b.bind_port)
-    yield _client
-    _client.close()
+#import os, pytest
+#from typing import Tuple
+#from common.Constants import ServiceNameEnum
+#from common.Settings import (
+#    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_service_port_grpc)
+#from common.orm.Database import Database
+#from common.orm.Factory import get_database_backend, BackendEnum as DatabaseBackendEnum
+#from common.message_broker.Factory import get_messagebroker_backend, BackendEnum as MessageBrokerBackendEnum
+#from common.message_broker.MessageBroker import MessageBroker
+#from context.client.ContextClient import ContextClient
+#from context.service.grpc_server.ContextService import ContextService
+#from dlt.connector.client.DltConnectorClient import DltConnectorClient
+#from dlt.connector.service.DltConnectorService import DltConnectorService
+#from .MockService_Dependencies import MockService_Dependencies
+#
+#LOCAL_HOST = '127.0.0.1'
+#MOCKSERVICE_PORT = 10000
+##GRPC_PORT = 10000 + get_service_port_grpc(ServiceNameEnum.CONTEXT) # avoid privileged ports
+##os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_HOST     )] = str(LOCAL_HOST)
+##os.environ[get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC)] = str(GRPC_PORT)
+#
+## ===== BlockChain Emulator (Mock DLT Gateway) =========================================================================
+## A single gateway is used for all the domains
+#
+#@pytest.fixture(scope='session')
+#def dltgateway_service():
+#    _service = MockService_Dependencies(MOCKSERVICE_PORT)
+#    _service.configure_env_vars()
+#    _service.start()
+#    yield _service
+#    _service.stop()
+#
+## ===== Domain A (Real Context + Real DLT Connector) ===================================================================
+#
+#@pytest.fixture(scope='session')
+#def context_service_a(): # pylint: disable=redefined-outer-name
+#    _database = Database(get_database_backend(backend=DatabaseBackendEnum.INMEMORY))
+#    _message_broker = MessageBroker(get_messagebroker_backend(backend=MessageBrokerBackendEnum.INMEMORY))
+#    _service = ContextService(_database, _message_broker)
+#    _service.start()
+#    yield _service
+#    _service.stop()
+#    _message_broker.terminate()
+#
+#@pytest.fixture(scope='session')
+#def context_client_a(context_service_a : ContextService): # pylint: disable=redefined-outer-name
+#    _client = ContextClient(host=context_service_a.bind_address, port=context_service_a.bind_port)
+#    yield _client
+#    _client.close()
+#
+#@pytest.fixture(scope='session')
+#def dltconnector_service_a():
+#    _service = DltConnectorService()
+#    _service.bind_port += 1
+#    _service.start()
+#    yield _service
+#    _service.stop()
+#
+#@pytest.fixture(scope='session')
+#def dltconnector_client_a(dltconnector_service_a : DltConnectorService): # pylint: disable=redefined-outer-name
+#    _client = DltConnectorClient(host=dltconnector_service_a.bind_address, port=dltconnector_service_a.bind_port)
+#    yield _client
+#    _client.close()
+#
+## ===== Domain B (Real Context + Real DLT Connector) ===================================================================
+#
+#@pytest.fixture(scope='session')
+#def context_service_b(): # pylint: disable=redefined-outer-name
+#    _database = Database(get_database_backend(backend=DatabaseBackendEnum.INMEMORY))
+#    _message_broker = MessageBroker(get_messagebroker_backend(backend=MessageBrokerBackendEnum.INMEMORY))
+#    _service = ContextService(_database, _message_broker)
+#    _service.start()
+#    yield _service
+#    _service.stop()
+#    _message_broker.terminate()
+#
+#@pytest.fixture(scope='session')
+#def context_client_b(context_service_b : ContextService): # pylint: disable=redefined-outer-name
+#    _client = ContextClient(host=context_service_b.bind_address, port=context_service_b.bind_port)
+#    yield _client
+#    _client.close()
+#
+#@pytest.fixture(scope='session')
+#def dltconnector_service_b():
+#    _service = DltConnectorService()
+#    _service.bind_port += 2
+#    _service.start()
+#    yield _service
+#    _service.stop()
+#
+#@pytest.fixture(scope='session')
+#def dltconnector_client_b(dltconnector_service_b : DltConnectorService): # pylint: disable=redefined-outer-name
+#    _client = DltConnectorClient(host=dltconnector_service_b.bind_address, port=dltconnector_service_b.bind_port)
+#    yield _client
+#    _client.close()
diff --git a/src/dlt/connector/tests/test_unitary.py b/src/dlt/connector/tests/test_unitary.py
index 00c1164e1..f1424847d 100644
--- a/src/dlt/connector/tests/test_unitary.py
+++ b/src/dlt/connector/tests/test_unitary.py
@@ -12,43 +12,44 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
-from typing import Tuple
-from common.orm.Database import Database
-from common.message_broker.MessageBroker import MessageBroker
-from common.proto.context_pb2 import Context, ContextId, Device, DeviceId, Link, LinkId, Topology, TopologyId
-from context.client.ContextClient import ContextClient
-from .PrepareTestScenario import (
-    # pylint: disable=unused-import
-    dltgateway_service,
-    context_service_a, context_client_a, dltconnector_service_a, dltconnector_client_a,
-    context_service_b, context_client_b, dltconnector_service_b, dltconnector_client_b)
-from .Objects import (
-    DA_CONTEXTS, DA_TOPOLOGIES, DA_DEVICES, DA_LINKS,
-    DB_CONTEXTS, DB_TOPOLOGIES, DB_DEVICES, DB_LINKS)
-
-LOGGER = logging.getLogger(__name__)
-LOGGER.setLevel(logging.DEBUG)
-
-def test_create_events(
-    context_client : ContextClient,                     # pylint: disable=redefined-outer-name
-    context_db_mb : Tuple[Database, MessageBroker]):    # pylint: disable=redefined-outer-name
-
-    for context  in CONTEXTS  : context_client.SetContext (Context (**context ))
-    for topology in TOPOLOGIES: context_client.SetTopology(Topology(**topology))
-    for device   in DEVICES   : context_client.SetDevice  (Device  (**device  ))
-    for link     in LINKS     : context_client.SetLink    (Link    (**link    ))
-
-
-    for link     in LINKS     : context_client.RemoveLink    (LinkId    (**link    ['link_id'    ]))
-    for device   in DEVICES   : context_client.RemoveDevice  (DeviceId  (**device  ['device_id'  ]))
-    for topology in TOPOLOGIES: context_client.RemoveTopology(TopologyId(**topology['topology_id']))
-    for context  in CONTEXTS  : context_client.RemoveContext (ContextId (**context ['context_id' ]))
-
-
-
-    dltgateway_client = DltGatewayClient(host='127.0.0.1', port=50051)
-    dltgateway_collector = DltEventsCollector(dltgateway_client, log_events_received=True)
-    dltgateway_collector.start()
-
-    dltgateway_collector.stop()
+#import logging
+#from typing import Tuple
+#from common.orm.Database import Database
+#from common.message_broker.MessageBroker import MessageBroker
+#from common.proto.context_pb2 import Context, ContextId, Device, DeviceId, Link, LinkId, Topology, TopologyId
+#from context.client.ContextClient import ContextClient
+#from .PrepareTestScenario import (
+#    # pylint: disable=unused-import
+#    dltgateway_service,
+#    context_service_a, context_client_a, dltconnector_service_a, dltconnector_client_a,
+#    context_service_b, context_client_b, dltconnector_service_b, dltconnector_client_b)
+#from .Objects import (
+#    DA_CONTEXTS, DA_TOPOLOGIES, DA_DEVICES, DA_LINKS,
+#    DB_CONTEXTS, DB_TOPOLOGIES, DB_DEVICES, DB_LINKS)
+#
+#LOGGER = logging.getLogger(__name__)
+#LOGGER.setLevel(logging.DEBUG)
+#
+#def test_create_events(
+#    context_client : ContextClient,                     # pylint: disable=redefined-outer-name
+#    context_db_mb : Tuple[Database, MessageBroker]):    # pylint: disable=redefined-outer-name
+#
+#    for context  in CONTEXTS  : context_client.SetContext (Context (**context ))
+#    for topology in TOPOLOGIES: context_client.SetTopology(Topology(**topology))
+#    for device   in DEVICES   : context_client.SetDevice  (Device  (**device  ))
+#    for link     in LINKS     : context_client.SetLink    (Link    (**link    ))
+#
+#
+#    for link     in LINKS     : context_client.RemoveLink    (LinkId    (**link    ['link_id'    ]))
+#    for device   in DEVICES   : context_client.RemoveDevice  (DeviceId  (**device  ['device_id'  ]))
+#    for topology in TOPOLOGIES: context_client.RemoveTopology(TopologyId(**topology['topology_id']))
+#    for context  in CONTEXTS  : context_client.RemoveContext (ContextId (**context ['context_id' ]))
+#
+#
+#
+#    dltgateway_client = DltGatewayClient(host='127.0.0.1', port=50051)
+#    dltgateway_collector = DltEventsCollector(dltgateway_client, log_events_received=True)
+#    dltgateway_collector.start()
+#
+#    dltgateway_collector.stop()
+#
\ No newline at end of file
diff --git a/tutorial/1-0-deployment.md b/tutorial/1-0-deployment.md
deleted file mode 100644
index 6aa46aab7..000000000
--- a/tutorial/1-0-deployment.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# 1. Deployment Guide
-
-This section walks you through the process of deploying TeraFlowSDN on top of a Virtual 
-Machine (VM) running [MicroK8s Kubernetes platform](https://microk8s.io).
-The guide includes the details on configuring and installing the VM, installing and 
-configuring MicroK8s, and deploying and reporting the status of the TeraFlowSDN 
-controller.
-
-## Table of Content:
-- [1.1. Create VM for the TeraFlowSDN controller](./1-1-create-vm.md)
-- [1.2. Install MicroK8s Kubernetes platform](./1-2-install-microk8s.md)
-- [1.3. Deploy TeraFlowSDN over MicroK8s](./1-3-deploy-tfs.md)
-- [1.4. Access TeraFlowSDN WebUI and Grafana Dashboards](./1-4-access-webui.md)
-- [1.5. Show Deployment and Log per Component](./1-5-deploy-logs-troubleshooting.md)
diff --git a/tutorial/1-1-1-create-vm-oracle-virtualbox.md b/tutorial/1-1-1-create-vm-oracle-virtualbox.md
deleted file mode 100644
index 0a074d56a..000000000
--- a/tutorial/1-1-1-create-vm-oracle-virtualbox.md
+++ /dev/null
@@ -1,94 +0,0 @@
-## 1.1.1. Oracle VirtualBox
-
-### 1.1.1.1. Create a NAT Network in VirtualBox
-In "Oracle VM VirtualBox Manager", Menu "File > Preferences... > Network", create a NAT 
-network with the following specifications:
-
-|Name       |CIDR       |DHCP    |IPv6    |
-|-----------|-----------|--------|--------|
-|TFS-NAT-Net|10.0.2.0/24|Disabled|Disabled|
-
-Within the newly created "TFS-NAT-Net" NAT network, configure the following IPv4 
-forwarding rules:
-
-|Name|Protocol|Host IP  |Host Port|Guest IP |Guest Port|
-|----|--------|---------|---------|---------|----------|
-|SSH |TCP     |127.0.0.1|2200     |10.0.2.10|22        |
-|HTTP|TCP     |127.0.0.1|8080     |10.0.2.10|80        |
-
-__Note__: IP address 10.0.2.10 is the one that will be assigned to the VM.
-
-
-### 1.1.1.2. Create VM in VirtualBox:
-
-- Name: TFS-VM
-- Type/Version: Linux / Ubuntu (64-bit)
-- CPU (*): 4 vCPUs @ 100% execution capacity
-- RAM: 8 GB
-- Disk: 40 GB, Virtual Disk Image (VDI), Dynamically allocated
-- Optical Drive ISO Image: "ubuntu-20.04.4-live-server-amd64.iso"
-  - Download the file "ubuntu-20.04.4-live-server-amd64.iso" from [Ubuntu 20.04 LTS](https://releases.ubuntu.com/20.04/).
-  - __Note__: use Ubuntu Server image instead of Ubuntu Desktop to create a lightweight VM.
-- Network Adapter 1 (*): enabled, attached to NAT Network "TFS-NAT-Net"
-- Minor adjustments (*):
-  - Audio: disabled
-  - Boot otder: disable "Floppy"
-
-__Note__: (*) settings to be editing after the VM is created.
-
-### 1.1.1.3. Install Ubuntu 20.04 LTS Operating System
-In "Oracle VM VirtualBox Manager", start the VM in normal mode, and follow the 
-installation procedure.
-Below we provide some installation guidelines:
-- Installation Language: English
-- Autodetect your keyboard
-- Configure static network specifications:
-
-|Interface|IPv4 Method|Subnet     |Address  |Gateway |Name servers   |Search domains|
-|---------|-----------|-----------|---------|--------|---------------|--------------|
-|enp0s3   |Manual     |10.0.2.0/24|10.0.2.10|10.0.2.1|8.8.8.8,8.8.4.4|<empty>       |
-
-- Leave proxy and mirror addresses as they are
-- Let the installer self-upgrade (if asked). At the time of writing this walkthrough, the version of the installer is 22.06.1. Anyway, Ubuntu 20.04 LTS OS will be installed.
-- Use an entire disk for the installation
-  - Disable setup of the disk as LVM group
-  - Double check that NO swap space is allocated in the partition table. Kubernetes does not work properly with SWAP.
-- Configure your user and system names:
-  - User name: TeraFlowSDN
-  - Server's name: tfs-vm
-  - Username: tfs
-  - Password: tfs123
-- Install Open SSH Server
-  - Import SSH keys, if any.
-- Featured Server Snaps
-  - Do not install featured server snaps. It will be done manually later to illustrate how to uninstall and reinstall
-    them in case of trouble with.
-- Let the system install and upgrade the packages.
-  - This operation might take some minutes depending on how old is the Optical Drive ISO image you use and your
-    Internet connection speed.
-- Restart the VM when the installation is completed.
-
-## 1.1.1.4. Upgrade the Ubuntu distribution
-```bash
-sudo apt-get update -y
-sudo apt-get dist-upgrade -y
-```
-
-## 1.1.1.5. Install VirtualBox Guest Additions
-On VirtualBox Manager, open the VM main screen. If you are running the VM in headless 
-mode, right click over the VM in the VirtualBox Manager window and click "Show".
-If a dialog informing about how to leave the interface of the VM is shown, confirm 
-pressing "Switch" button. The interface of the VM should appear.
-
-Click menu "Device > Insert Guest Additions CD image..."
-
-On the VM terminal, type:
-```bash
-sudo apt-get install -y linux-headers-$(uname -r) build-essential dkms
-  # This command might take some minutes depending on your VM specs and your Internet access speed.
-sudo mount /dev/cdrom /mnt/
-cd /mnt/
-sudo ./VBoxLinuxAdditions.run
-  # This command might take some minutes depending on your VM specs.
-sudo reboot
-```
diff --git a/tutorial/1-1-2-create-vm-vmware-fusion.md b/tutorial/1-1-2-create-vm-vmware-fusion.md
deleted file mode 100644
index 7147c24af..000000000
--- a/tutorial/1-1-2-create-vm-vmware-fusion.md
+++ /dev/null
@@ -1,54 +0,0 @@
-## 1.1.2. VMWare Fusion
-
-### 1.1.2.1. Create VM in VMWare Fusion:
-
-In "VMWare Fusion" manager, create a new network from the "Settings/Network" menu.
-
-- Unlock to make changes
-- Press the + icon and create a new network
-- Change the name to TFS-NAT-Net
-- Check "Allow virtual machines on this networkto connect to external network (NAT)"
-- Do not check "Enable IPv6"
-- Add port forwarding for HTTP and SSH
-- Uncheck "Provide address on this network via DHCP"
-
-Create a new VM an Ubuntu 20.04 iso:
-
-- Display Name: TeraFlowSDN
-- Username: tfs
-- Password: tfs123
-
-On the next screen press "Customize Settings", save the VM and in "Settings" change:
-- Change to use 4 CPUs
-- Change to access 8 GB of RAM
-- Change disk to size 40 GB
-- Change the network interface to use the previously created TFS-NAT-Net
-
-Run the VM to start the installation.
-
-### 1.1.2.2. Install Ubuntu 20.04 LTS Operating System
-
-The installation will be automatic, without any configuration required.
-
-- Configure the guest ip, gateway and DNS:
-
-  Using the Network Settings for the wired connection, set the IP to 10.0.2.10,
-  the mask to 255.255.255.0, the gatway to 10.0.2.2 and the DNS to 10.0.2.2.
-
-- Disable and remove swap file:
-
-  $ sudo swapoff -a
-  $ sudo rm /swapfile
-
-  Then you can remove or comment the /swapfile entry in /etc/fstab
-
-- Install Open SSH Server
-  - Import SSH keys, if any.
-
-- Restart the VM when the installation is completed.
-
-### 1.1.2.3. Upgrade the Ubuntu distribution
-```bash
-sudo apt-get update -y
-sudo apt-get dist-upgrade -y
-```
diff --git a/tutorial/1-1-create-vm.md b/tutorial/1-1-create-vm.md
deleted file mode 100644
index 6ebed2f19..000000000
--- a/tutorial/1-1-create-vm.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# 1.1. Create VM for the TeraFlowSDN controller
-
-In this section, we install a VM to be used as the deployment, execution, and 
-development environment for the ETSI TeraFlowSDN controller.
-If you already have a remote physical server fitting the requirements specified in this 
-section feel free to use it instead of deploying a local VM.
-Other virtualization environments can also be used; in that case, you will need to adapt 
-these instructions to your particular case.
-
-Different Hypervisors are considered for that.
-Check the table of contents for available options.
-If you want to contribute with other Hypervisors, [contact](./README.md#contact) the TFS 
-team through Slack.
-
-## Table of Content:
-- [1.1.1. Oracle VirtualBox](./1-1-1-create-vm-oracle-virtualbox.md)
-- [1.1.2. VMWare Fusion](./1-1-2-create-vm-vmware-fusion.md)
diff --git a/tutorial/1-2-install-microk8s.md b/tutorial/1-2-install-microk8s.md
deleted file mode 100644
index 1cd14ef6f..000000000
--- a/tutorial/1-2-install-microk8s.md
+++ /dev/null
@@ -1,165 +0,0 @@
-# 1.2. Install MicroK8s Kubernetes platform
-
-This section describes how to deploy the MicroK8s Kubernetes platform and configure it 
-to be used with ETSI TeraFlowSDN controller.
-Besides, Docker is installed to build docker images for the ETSI TeraFlowSDN controller.
-
-The steps described in this section might take some minutes depending on your internet 
-connection speed and the resources assigned to your VM, or the specifications of your 
-physical server.
-
-
-## 1.2.1. Upgrade the Ubuntu distribution
-Skip this step if you already did it during the creation of the VM.
-```bash
-sudo apt-get update -y
-sudo apt-get dist-upgrade -y
-```
-
-
-## 1.2.2. Install prerequisites
-```bash
-sudo apt-get install -y ca-certificates curl gnupg lsb-release snapd jq
-```
-
-
-## 1.2.3. Install Docker CE
-Install Docker CE
-```bash
-sudo apt-get install -y docker.io
-```
-
-Add key "insecure-registries" with the private repository to the daemon configuration. It is done in two commands since
-sometimes read from and write to same file might cause trouble.
-
-```bash
-if [ -s /etc/docker/daemon.json ]; then cat /etc/docker/daemon.json; else echo '{}'; fi \
-    | jq 'if has("insecure-registries") then . else .+ {"insecure-registries": []} end' -- \
-    | jq '."insecure-registries" |= (.+ ["localhost:32000"] | unique)' -- \
-    | tee tmp.daemon.json
-sudo mv tmp.daemon.json /etc/docker/daemon.json
-sudo chown root:root /etc/docker/daemon.json
-sudo chmod 600 /etc/docker/daemon.json
-```
-
-Restart the Docker daemon
-```bash
-sudo systemctl restart docker
-```
-
-
-## 1.2.4. Install MicroK8s
-Ref: https://ubuntu.com/tutorials/install-a-local-kubernetes-with-microk8s
-Ref: https://microk8s.io/#install-microk8s
-
-```bash
-# Install MicroK8s
-sudo snap install microk8s --classic --channel=1.24/stable
-
-# Create alias for command "microk8s.kubectl" to be usable as "kubectl"
-sudo snap alias microk8s.kubectl kubectl
-```
-
-It is important to make sure that `ufw` will not interfere with the internal pod-to-pod
-and pod-to-Internet traffic.
-To do so, first check the status.
-If `ufw` is active, use the following command to enable the communication.
-
-```bash
-
-# Verify status of ufw firewall
-sudo ufw status
-
-# If ufw is active, install following rules to enable access pod-to-pod and pod-to-internet
-sudo ufw allow in on cni0 && sudo ufw allow out on cni0
-sudo ufw default allow routed
-```
-
-
-## 1.2.5. Add user to the docker and microk8s groups
-
-It is important that your user has the permission to run `docker` and `microk8s` in the 
-terminal.
-To allow this, you need to add your user to the `docker` and `microk8s` groups with the 
-following commands:
-
-```bash
-sudo usermod -a -G docker $USER
-sudo usermod -a -G microk8s $USER
-sudo chown -f -R $USER $HOME/.kube
-sudo reboot
-```
-
-In case that the .kube file is not automatically provisioned into your home folder, you 
-may follow the steps below:
-
-```bash
-mkdir -p $HOME/.kube
-sudo chown -f -R $USER $HOME/.kube
-microk8s config > $HOME/.kube/config
-sudo reboot
-```
-
-## 1.2.6. Check status of Kubernetes and addons
-To retrieve the status of Kubernetes __once__, run the following command:
-```bash
-microk8s.status --wait-ready
-```
-
-To retrieve the status of Kubernetes __periodically__ (e.g., every 1 second), run the 
-following command:
-```bash
-watch -n 1 microk8s.status --wait-ready
-```
-
-## 1.2.7. Check all resources in Kubernetes
-To retrieve the status of the Kubernetes resources __once__, run the following command:
-```bash
-kubectl get all --all-namespaces
-```
-
-To retrieve the status of the Kubernetes resources __periodically__ (e.g., every 1 
-second), run the following command:
-```bash
-watch -n 1 kubectl get all --all-namespaces
-```
-
-## 1.2.8. Enable addons
-The Addons enabled are:
-- `dns`: enables resolving the pods and services by name
-- `hostpath-storage`: enables providing storage for the pods (required by `registry`)
-- `ingress`: deploys an ingress controller to expose the microservices outside Kubernetes
-- `registry`: deploys a private registry for the TFS controller images
-
-```bash
-microk8s.enable dns hostpath-storage ingress registry
-```
-
-__Important__: Enabling some of the addons might take few minutes.
-Do not proceed with next steps until the addons are ready.
-Otherwise, the deployment might fail.
-To confirm everything is up and running:
-1. Periodically
-   [Check the status of Kubernetes](./1-2-install-microk8s.md#126-check-status-of-kubernetes)
-   until you see the addons [dns, ha-cluster, hostpath-storage, ingress, registry, storage] in the enabled block.
-2. Periodically
-   [Check Kubernetes resources](./1-2-install-microk8s.md#127-check-all-resources-in-kubernetes)
-   until all pods are __Ready__ and __Running__.
-
-
-## 1.2.9. Stop, Restart, and Redeploy
-Find below some additional commands you might need while you work with MicroK8s:
-```bash
-microk8s.stop  # stop MicroK8s cluster (for instance, before power off your computer)
-microk8s.start # start MicroK8s cluster
-microk8s.reset # reset infrastructure to a clean state
-```
-
-If the following commands does not work to recover the MicroK8s cluster, you can redeploy it.
-First remove the current deployment as follows:
-```bash
-sudo snap remove microk8s
-sudo apt-get remove --purge docker.io
-```
-
-Then, redeploy as it is described in this section.
diff --git a/tutorial/1-3-deploy-tfs.md b/tutorial/1-3-deploy-tfs.md
deleted file mode 100644
index ffd9dfe49..000000000
--- a/tutorial/1-3-deploy-tfs.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# 1.3. Deploy TeraFlowSDN over MicroK8s
-
-This section describes how to deploy TeraFlowSDN controller on top of MicroK8s using the 
-environment configured in the previous sections.
-
-
-## 1.3.1. Install prerequisites
-```bash
-sudo apt-get install -y git curl jq
-```
-
-
-## 1.3.2. Clone the Git repository of the TeraFlowSDN controller
-Clone from ETSI-hosted GitLab code repository:
-```bash
-mkdir ~/tfs-ctrl
-git clone https://labs.etsi.org/rep/tfs/controller.git ~/tfs-ctrl
-```
-
-__Important__: The original H2020-TeraFlow project hosted on GitLab.com has been 
-archieved and will not receive further contributions/updates.
-Please, clone from [ETSI-hosted GitLab code repository](https://labs.etsi.org/rep/tfs/controller).
-
-
-## 1.3.3. Checkout the appropriate Git branch
-By default the *master* branch is checked out.
-If you want to deploy the *develop* branch, that incorporates the most up-to-date code
-contributions and features, run the following command:
-```bash
-cd ~/tfs-ctrl
-git checkout develop
-```
-
-
-## 1.3.4. Prepare a deployment script with the deployment settings
-Create a new deployment script, e.g., `my_deploy.sh`, adding the appropriate settings as 
-follows.
-This script, by default, makes use of the private Docker registry enabled in MicroK8s, 
-as specified in `TFS_REGISTRY_IMAGE`.
-It builds the Docker images for the subset of components defined in `TFS_COMPONENTS`, 
-tags them with the tag defined in `TFS_IMAGE_TAG`, deploys them in the namespace defined 
-in `TFS_K8S_NAMESPACE`, and (optionally) deploys the extra Kubernetes manifests listed 
-in `TFS_EXTRA_MANIFESTS`. 
-Besides, it lets you specify in `TFS_GRAFANA_PASSWORD` the password to be set for the 
-Grafana `admin` user.
-
-```bash
-cd ~/tfs-ctrl
-tee my_deploy.sh >/dev/null << EOF
-export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
-export TFS_COMPONENTS="context device automation pathcomp service slice compute monitoring webui"
-export TFS_IMAGE_TAG="dev"
-export TFS_K8S_NAMESPACE="tfs"
-export TFS_EXTRA_MANIFESTS="manifests/nginx_ingress_http.yaml"
-export TFS_GRAFANA_PASSWORD="admin123+"
-EOF
-```
-
-
-## 1.3.5. Deploy TFS controller
-First, source the deployment settings defined in the previous section.
-This way, you do not need to specify the environment variables in each and every command 
-you execute to operate the TFS controller.
-Be aware to re-source the file if you open new terminal sessions.
-Then, run the following command to deploy TeraFlowSDN controller on top of the MicroK8s 
-Kubernetes platform.
-
-```bash
-cd ~/tfs-ctrl
-source my_deploy.sh
-./deploy.sh
-```
-
-The script performs the following steps:
-1. Builds the Docker images for the components defined in `TFS_COMPONENTS`
-2. Tags the Docker images with the value of `TFS_IMAGE_TAG`
-3. Pushes the Docker images to the repository defined in `TFS_REGISTRY_IMAGE`
-4. Creates the namespace defined in `TFS_K8S_NAMESPACE`
-5. Deploys the components defined in `TFS_COMPONENTS`
-6. Creates the file `tfs_runtime_env_vars.sh` with the environment variables for the components defined in `TFS_COMPONENTS` defining their local host addresses and their port numbers.
-7. Create an ingress controller listening at port 80 for HTTP connections to enable external access to the TeraFlowSDN WebUI, Grafana Dashboards, Context Debug endpoints, and Compute NBI interfaces.
-8. Initialize and configure the Grafana dashboards
-9. Report a summary of the deployment (see 
-   [1.5. Show Deployment and Log per Component](./1-5-deploy-logs-troubleshooting.md))
diff --git a/tutorial/1-4-access-webui.md b/tutorial/1-4-access-webui.md
deleted file mode 100644
index aa66ef190..000000000
--- a/tutorial/1-4-access-webui.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# 1.4. Access TeraFlowSDN WebUI and Grafana Dashboards
-
-This section describes how to get access to the TeraFlowSDN controller WebUI and the 
-monitoring Grafana dashboards.
-
-
-## 1.4.1. Access the TeraFlowSDN WebUI
-If you followed the installation steps based on MicroK8s, you got an ingress controller 
-installed that exposes on TCP port 80.
-In the creation of the VM, a forward from local TCP port 8080 to VM's TCP port 80 is 
-configured, so the WebUIs and REST APIs of TeraFlowSDN should be exposed on the endpoint 
-`127.0.0.1:8080` of your local machine.
-Besides, the ingress controller defines the following reverse proxy paths 
-(on your local machine):
-- `http://127.0.0.1:8080/webui`: points to the WebUI of TeraFlowSDN.
-- `http://127.0.0.1:8080/grafana`: points to the Grafana dashboards.
-  This endpoint brings access to the monitoring dashboards of TeraFlowSDN.
-  The credentials for the `admin`user are those defined in the `my_deploy.sh` script, in 
-  the `TFS_GRAFANA_PASSWORD` variable.
-- `http://127.0.0.1:8080/context`: points to the REST API exposed by the TeraFlowSDN 
-  Context component.
-  This endpoint is mainly used for debugging purposes.
-  Note that this endpoint is designed to be accessed from the WebUI.
-- `http://127.0.0.1:8080/restconf`: points to the Compute component NBI based on RestCONF. 
-  This endpoint enables connecting external software, such as ETSI OpenSourceMANO NFV 
-  Orchestrator, to TeraFlowSDN.
diff --git a/tutorial/1-5-deploy-logs-troubleshooting.md b/tutorial/1-5-deploy-logs-troubleshooting.md
deleted file mode 100644
index 3aa7acaee..000000000
--- a/tutorial/1-5-deploy-logs-troubleshooting.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# 1.5. Show Deployment and Log per Component
-
-This section presents some helper scripts to inspect the status of the deployment and 
-the logs of the components.
-These scripts are particularly helpful for troubleshooting during execution of 
-experiments, development, and debugging.
-
-
-## 1.5.1. Report the deployment of the TFS controller
-
-The summary report given at the end of the [Deploy TFS controller](./1-3-deploy-tfs.md#135-deploy-tfs-controller)
-procedure can be generated manually at any time by running the following command.
-You can avoid sourcing `my_deploy.sh` if it has been already done.
-```bash
-cd ~/tfs-ctrl
-source my_deploy.sh
-./show_deploy.sh
-```
-
-Use this script to validate that all the pods, deployments, replica sets, ingress 
-controller, etc. are ready and have the appropriate state, e.g., *running* for Pods, and 
-the services are deployed and have appropriate IP addresses and port numbers.
-
-
-## 1.5.2. Report the log of a specific TFS controller component
-
-A number of scripts are pre-created in the `scripts` folder to facilitate the inspection 
-of the component logs.
-For instance, to dump the log of the Context component, run the following command.
-You can avoid sourcing `my_deploy.sh` if it has been already done.
-
-```bash
-source my_deploy.sh
-./scripts/show_logs_context.sh
-```
diff --git a/tutorial/2-0-run-experiments.md b/tutorial/2-0-run-experiments.md
deleted file mode 100644
index 8b5c8f6b8..000000000
--- a/tutorial/2-0-run-experiments.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# 2. Run Experiments Guide
-
-This section walks you through the process of running experiments in TeraFlowSDN on top 
-of a Oracle VirtualBox-based VM running MicroK8s Kubernetes platform.
-The guide includes the details on configuring the Python environment, some basic 
-commands you might need, configuring the network topology, and executing different experiments.
-
-Note that the steps followed here are likely to work regardless of the platform (VM) 
-where TeraFlowSDN is deployed over.
-
-Note also that this guide will keep growing with the new experiments and demonstrations
-that are being carried out involving the ETSI TeraFlowSDN controller.
-
-## Table of Content:
-- [2.1. Configure the Python environment](./2-1-python-environment.md)
-- [2.2. OFC'22 Demo - Bootstrap devices, Monitor device Endpoints, Manage L3VPN Services](./2-2-ofc22.md)
-- [2.3. OECC/PSC'22 Demo (PENDING)](./2-3-oeccpsc22.md)
-- [2.4. ECOC'22 Demo - Disjoint DC-2-DC L2VPN Service](./2-4-ecoc22.md)
-- [2.5. NFV-SDN'22 Demo (PENDING)](./2-5-nfvsdn22.md)
diff --git a/tutorial/2-1-python-environment.md b/tutorial/2-1-python-environment.md
deleted file mode 100644
index 940a1183a..000000000
--- a/tutorial/2-1-python-environment.md
+++ /dev/null
@@ -1,131 +0,0 @@
-# 2.1. Configure Python Environment
-
-This section describes how to configure the Python environment to run experiments and 
-develop code for the ETSI TeraFlowSDN controller.
-In particular, we use [PyEnv](https://github.com/pyenv/pyenv) to install the appropriate 
-version of Python and manage the virtual environments.
-
-
-## 2.1.1. Upgrade the Ubuntu distribution
-Skip this step if you already did it during the creation of the VM.
-```bash
-sudo apt-get update -y
-sudo apt-get dist-upgrade -y
-```
-
-
-## 2.1.2. Install PyEnv dependencies in the VM
-```bash
-sudo apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget \
-    curl llvm git libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
-```
-
-
-## 2.1.3. Install PyEnv
-
-We recommend installing PyEnv through  
-[PyEnv Installer](https://github.com/pyenv/pyenv-installer).
-Below you can find the instructions, but we refer you to the link for updated 
-instructions.
-
-```bash
-curl https://pyenv.run | bash
-# When finished, edit ~/.bash_profile // ~/.profile // ~/.bashrc as the installer proposes.
-# In general, it means to append the following lines to ~/.bashrc:
-export PYENV_ROOT="$HOME/.pyenv"
-command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init -)"
-eval "$(pyenv virtualenv-init -)"
-```
-
-In case .bashrc is not linked properly to your profile, you may need to append the 
-following line into your local .profile file:
-
-```bash
-# Open ~/.profile and append this line:
-+source "$HOME"/.bashrc
-```
-
-
-## 2.1.4. Restart the VM
-Restart the VM for all the changes to take effect.
-```bash
-sudo reboot
-```
-
-
-## 2.1.5. Install Python 3.9 over PyEnv
-
-ETSI TeraFlowSDN uses Python 3.9 by default.
-You should install the latest update of Python 3.9.
-To find the latest version available in PyEnv, you can run the following command:
-
-```bash
-pyenv install --list | grep " 3.9"
-```
-
-At the time of writing, this command will output the following list:
-
-```
-  3.9.0
-  3.9-dev
-  3.9.1
-  3.9.2
-  3.9.4
-  3.9.5
-  3.9.6
-  3.9.7
-  3.9.8
-  3.9.9
-  3.9.10
-  3.9.11
-  3.9.12
-  3.9.13
-  3.9.14 ** always select the latest version **
-```
-
-Therefore, the latest version is Python 3.9.14.
-To install this version, you should run:
-
-```bash
-pyenv install 3.9.14
-    # This command might take some minutes depending on your Internet connection speed 
-    # and the performance of your VM.
-```
-
-
-## 2.1.6. Create the Virtual Environment for TeraFlowSDN
-The following commands create a virtual environment named as `tfs` using Python 3.9 and 
-associate that environment with the current folder, i.e., `~/tfs-ctrl`.
-That way, when you are in that folder, the associated virtual environment will be used, 
-thus inheriting the Python interpreter, i.e., Python 3.9, and the Python packages 
-installed on it.
-
-```bash
-cd ~/tfs-ctrl
-pyenv virtualenv 3.9.14 tfs
-pyenv local 3.9.14/envs/tfs
-```
-
-In case that the correct pyenv does not get automatically activated when you change to 
-the tfs-ctrl/ folder, then execute the following command:
-
-```bash
-cd ~/tfs-ctrl
-pyenv activate 3.9.14/envs/tfs
-```
-
-After completing these commands, you should see in your prompt that now you're within 
-the virtual environment `3.9.14/envs/tfs` on folder `~/tfs-ctrl`:
-```
-(3.9.14/envs/tfs) tfs@tfs-vm:~/tfs-ctrl$
-```
-
-
-## 2.1.7. Install the basic Python packages within the virtual environment
-From within the `3.9.14/envs/tfs` environment on folder `~/tfs-ctrl`, run the following 
-commands to install the basic Python packages required to work with TeraFlowSDN.
-```bash
-cd ~/tfs-ctrl
-./install_requirements.sh
-```
diff --git a/tutorial/2-2-ofc22.md b/tutorial/2-2-ofc22.md
deleted file mode 100644
index 04d585d24..000000000
--- a/tutorial/2-2-ofc22.md
+++ /dev/null
@@ -1,200 +0,0 @@
-# 2.2. OFC'22 Demo - Bootstrap devices, Monitor device Endpoints, Manage L3VPN Services
-
-This functional test reproduces the live demonstration *Demonstration of Zero-touch 
-Device and L3-VPN Service Management Using the TeraFlow Cloud-native SDN Controller* 
-carried out at [OFC'22](https://ieeexplore.ieee.org/document/9748575) / 
-[Open access](https://research.chalmers.se/en/publication/c397ef36-837f-416d-a44d-6d3b561d582a).
-
-
-## 2.2.1. Functional test folder
-
-This functional test can be found in folder `./src/tests/ofc22/`.
-A convenience alias `./ofc22/` pointing to that folder has been defined.
-
-
-## 2.2.2. Execute with real devices
-
-This functional test is designed to operate both with real and emulated devices.
-By default, emulated devices are used; 
-however, if you have access to real devices, you can create/modify the files
-`./ofc22/tests/Objects.py` and `./ofc22/tests/Credentials.py` to point to your devices, 
-and map to your own network topology.
-Otherwise, you can modify the `./ofc22/tests/descriptors_emulated.json` that is designed 
-to be uploaded through the WebUI instead of using the command line scripts.
-Note that the default scenario assumes devices R2 and R4 are always emulated, while 
-devices R1, R3, and O1 can be configured as emulated or real devices.
-
-__Important__: The device drivers operating with real devices, e.g., OpenConfigDriver, 
-               P4Driver, and TransportApiDriver, have to be considered as experimental. 
-               The configuration and monitoring capabilities they support are
-               limited or partially implemented/tested. Use them with care.
-
-
-## 2.2.3. Deployment and Dependencies
-
-To run this functional test, it is assumed you have deployed a MicroK8s-based Kubernetes 
-environment and a TeraFlowSDN controller instance as described in the 
-[Tutorial: Deployment Guide](./1-0-deployment.md), and you configured the Python
-environment as described in
-[Tutorial: Run Experiments Guide > 2.1. Configure Python Environment](./2-1-python-environment.md).
-
-
-## 2.2.4. Access to the WebUI and Dashboard
-
-When the deployment completes, you can connect to the TeraFlowSDN WebUI and Dashboards 
-as described in
-[Tutorial: Deployment Guide > 1.4. Access TeraFlowSDN WebUI and Grafana Dashboards](./1-4-access-webui.md)
-
-Notes:
-- the default credentials for the Grafana Dashboiard is user/pass: `admin`/`admin123+`.
-- in Grafana, you will find the *L3-Monitorng* in the *Starred dashboards* section.
-
-
-## 2.2.5. Test execution
-
-Before executing the tests, we need to prepare a few things.
-
-First, you need to make sure that you have all the gRPC-generate code in your folder.
-To do so, run:
-
-```
-proto/generate_code_python.sh
-```
-
-Then, it is time to deploy TeraFlowSDN with the correct specification for this scenario.
-Make sure to load your deployment variables for this scenario by:
-
-```
-source ofc22/deploy_specs.sh
-```
-
-Then, you need to deploy the components by running:
-
-```
-./deploy.sh
-```
-
-After the deployment is finished, you need to load the environment variables to support 
-the execution of the tests by:
-
-```
-source tfs_runtime_env_vars.sh
-```
-
-To execute this functional test, four main steps needs to be carried out:
-1. Device bootstrapping
-2. L3VPN Service creation
-3. L3VPN Service removal
-4. Cleanup
-
-Upon the execution of each test progresses, a report will be generated indicating 
-*PASSED* / *FAILED* / *SKIPPED*.
-If there is some error during the execution, you should see a detailed report on the error. 
-See the troubleshooting section if needed.
-
-You can check the logs of the different components using the appropriate `scripts/show_logs_[component].sh` scripts
-after you execute each step.
-
-There are two ways to execute the functional tests, *running all the tests with a single script* or *running each test independently*.
-In the following we start with the first option, then we comment on how to run each test independently.
-
-
-### 2.2.5.1. Running all tests with a single script
-
-We have a script that executes all the steps at once.
-It is meant for being used to test if all components involved in this scenario are working correct.
-To run all the functional tests, you can run:
-
-```
-ofc22/run_tests_and_coverage.sh
-```
-
-The following sections explain each one of the steps.
-
-
-### 2.2.5.2. Device bootstrapping
-
-This step configures some basic entities (Context and Topology), the devices, and the 
-links in the topology.
-The expected results are:
-- The devices to be added into the Topology.
-- The devices to be pre-configured and initialized as ENABLED by the Automation component.
-- The monitoring for the device ports (named as endpoints in TeraFlowSDN) to be activated and data collection to automatically start.
-- The links to be added to the topology.
-
-To run this step, you can do it from the WebUI by uploading the file `./ofc22/tests/descriptors_emulated.json` that
-contains the descriptors of the contexts, topologies, devices, and links, or by 
-executing the script:
-
-```
-./ofc22/run_test_01_bootstrap.sh
-```
-
-When the bootstrapping finishes, check in the Grafana L3-Monitoring Dashboard and you 
-should see the monitoring data being plotted and updated every 5 seconds (by default). 
-Given that there is no service configured, you should see a 0-valued flat plot.
-
-In the WebUI, select the *admin* Context.
-Then, in the *Devices* tab you should see that 5 different emulated devices have been 
-created and activated: 4 packet routers, and 1 optical line system controller.
-Besides, in the *Services* tab you should see that there is no service created.
-Note here that the emulated devices produce synthetic randomly-generated monitoring data 
-and do not represent any particularservices configured.
-
-
-### 2.2.5.3. L3VPN Service creation
-
-This step configures a new service emulating the request an OSM WIM would make by means 
-of a Mock OSM instance.
-
-To run this step, execute the script:
-
-```
-./ofc22/run_test_02_create_service.sh
-```
-
-When the script finishes, check the WebUI *Services* tab. You should see that two 
-services have been created, one for the optical layer and another for the packet layer. 
-Besides, you can check the *Devices* tab to see the configuration rules that have been 
-configured in each device. 
-In the Grafana Dashboard, given that there is now a service configured, you should see 
-the plots with the monitored data for the device.
-By default, device R1-EMU is selected.
-
-
-### 2.2.5.4. L3VPN Service removal
-
-This step deconfigures the previously created services emulating the request an OSM WIM 
-would make by means of a Mock OSM instance.
-
-To run this step, execute the script:
-
-```
-./ofc22/run_test_03_delete_service.sh
-```
-
-or delete the L3NM service from the WebUI.
-
-When the script finishes, check the WebUI *Services* tab.
-You should see that the two services have been removed.
-Besides, in the *Devices* tab you can see that the appropriate configuration rules have 
-been deconfigured.
-In the Grafana Dashboard, given that there is no service configured, you should see a 
-0-valued flat plot again.
-
-
-### 2.2.5.5. Cleanup
-
-This last step performs a cleanup of the scenario removing all the TeraFlowSDN entities 
-for completeness.
-
-To run this step, execute the script:
-
-```
-./ofc22/run_test_04_cleanup.sh
-```
-
-When the script finishes, check the WebUI *Devices* tab, you should see that the devices 
-have been removed.
-Besides, in the *Services* tab you can see that the "admin" Context has no services 
-given that that context has been removed.
diff --git a/tutorial/2-3-oeccpsc22.md b/tutorial/2-3-oeccpsc22.md
deleted file mode 100644
index 2ea7261d8..000000000
--- a/tutorial/2-3-oeccpsc22.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# 2.3. OECC/PSC'22 Demo - Interdomain slices (WORK IN PROGRESS)
-
-This functional test reproduces the experiment in paper "... paper title ..." presented at OECC/PSC'22 conference
-[OECC/PSC'22](... demo link ...).
-
-## 2.3.1. Functional test folder
-This functional test can be found in folder `./src/tests/oeccpsc22/`. A convenience alias `./oeccpsc22/` pointing to
-that folder has been defined.
diff --git a/tutorial/2-4-ecoc22.md b/tutorial/2-4-ecoc22.md
deleted file mode 100644
index 87bc12be7..000000000
--- a/tutorial/2-4-ecoc22.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# 2.4. ECOC'22 Demo - Disjoint DC-2-DC L2VPN Service
-
-This functional test reproduces the experimental assessment of *Experimental 
-Demonstration of Transport Network Slicing with SLA Using the TeraFlowSDN Controller* 
-presented at [ECOC'22](https://www.optica.org/en-us/events/topical_meetings/ecoc/schedule/?day=Tuesday#Tuesday).
-
-## 2.4.1. Functional test folder
-
-This functional test can be found in folder `./src/tests/ecoc22/`.
-A convenience alias `./ecoc22/` pointing to that folder has been defined.
-
-## 2.4.2. Execute with real devices
-
-This functional test has only been tested with emulated devices; 
-however, if you have access to real devices, you can modify the files 
-`./ecoc22/tests/Objects.py` and `./ecoc22/tests/Credentials.py` to point to your devices, 
-and map to your network topology.
-Otherwise, you can modify the `./ecoc22/tests/descriptors_emulated.json` that is 
-designed to be uploaded through the WebUI instead of using the command line scripts.
-
-__Important__: The device drivers operating with real devices, e.g., OpenConfigDriver, 
-               P4Driver, and TransportApiDriver, have to be considered as experimental. 
-               The configuration and monitoring capabilities they support are
-               limited or partially implemented/tested. Use them with care.
-
-
-## 2.4.3. Deployment and Dependencies
-
-To run this functional test, it is assumed you have deployed a MicroK8s-based Kubernetes 
-environment and a TeraFlowSDN controller instance as described in the 
-[Tutorial: Deployment Guide](./1-0-deployment.md), and you configured the Python
-environment as described in
-[Tutorial: Run Experiments Guide > 2.1. Configure Python Environment](./2-1-python-environment.md).
-Remember to source the scenario settings, e.g., `cd ~/tfs-ctrl && source ecoc22/deploy_specs.sh`
-in each terminal you open.
-Then, re-build the protocol buffers code from the proto files:
-`./proto/generate_code_python.sh`
-
-
-
-## 2.4.4. Access to the WebUI
-
-When the deployment completes, you can connect to the TeraFlowSDN WebUI as described in
-[Tutorial: Deployment Guide > 1.4. Access TeraFlowSDN WebUI and Grafana Dashboards](./1-4-access-webui.md)
-
-Notes:
-- this experiment does not make use of Monitoring, so Grafana is not used.
-- the default credentials for the Grafana Dashboard is user/pass: `admin`/`admin123+`.
-- this functional test does not involve the Monitoring component, so no monitoring
-  data is plotted in Grafana.
-
-
-## 2.4.5. Test execution
-
-To execute this functional test, four main steps needs to be carried out:
-1. Device bootstrapping
-2. L2VPN Slice and Services creation
-3. L2VPN Slice and Services removal
-4. Cleanup
-
-Upon the execution of each test progresses, a report will be generated indicating 
-*PASSED* / *FAILED* / *SKIPPED*. 
-If there is some error during the execution, you should see a detailed report on the 
-error.
-See the troubleshooting section if needed.
-
-You can check the logs of the different components using the appropriate
-`scripts/show_logs_[component].sh` scripts after you execute each step.
-
-
-### 2.4.5.1. Device bootstrapping
-
-This step configures some basic entities (Context and Topology), the devices, and the 
-links in the topology. 
-The expected results are:
-- The devices to be added into the Topology.
-- The devices to be pre-configured and initialized as *ENABLED* by the Automation component.
-- The links to be added to the topology.
-
-To run this step, you can do it from the WebUI by uploading the file
-`./ecoc22/tests/descriptors_emulated.json` that contains the descriptors of the contexts,
-topologies, devices, and links, or by executing the `./ecoc22/run_test_01_bootstrap.sh` script.
-
-In the WebUI, select the *admin* Context. 
-Then, in the *Devices* tab you should see that 5 different emulated devices have been 
-created and activated: 4 packet routers, and 1 optical Open Line System (OLS) controller. 
-Besides, in the *Services* tab you should see that there is no service created. 
-
-
-### 2.4.5.2. L2VPN Slice and Services creation
-
-This step configures a new service emulating the request an OSM WIM would make by means 
-of a Mock OSM instance.
-
-To run this step, execute the `./ecoc22/run_test_02_create_service.sh` script.
-
-When the script finishes, check the WebUI *Slices* and *Services* tab.
-You should see that, for the connectivity service requested by MockOSM, one slice has
-been created, three services have been created (two for the optical layer and another
-for the packet layer).
-Note that the two services for the optical layer correspond to the primary (service_uuid
-ending with ":0") and the backup (service_uuid ending with ":1") services.
-Each of the services indicates the connections and sub-services that are supporting them.
-Besides, you can check the *Devices* tab to see the configuration rules that have been 
-configured in each device.
-
-
-### 2.4.5.3. L2VPN Slice and Services removal
-
-This step deconfigures the previously created slices and services emulating the request
-an OSM WIM would make by means of a Mock OSM instance.
-
-To run this step, execute the `./ecoc22/run_test_03_delete_service.sh` script, or delete 
-the slice from the WebUI.
-
-When the script finishes, check the WebUI *Slices* and *Services* tab. You should see
-that the slice and the services have been removed.
-Besides, in the *Devices* tab you can see that the appropriate configuration rules have 
-been deconfigured.
-
-
-### 2.4.5.4. Cleanup
-
-This last step performs a cleanup of the scenario removing all the TeraFlowSDN entities 
-for completeness.
-
-To run this step, execute the `./ecoc22/run_test_04_cleanup.sh` script.
-
-When the script finishes, check the WebUI *Devices* tab, you should see that the devices 
-have been removed. 
-Besides, in the *Slices* and *Services* tab you can see that the *admin* Context has no services 
-given that that context has been removed.
diff --git a/tutorial/2-5-nfvsdn22.md b/tutorial/2-5-nfvsdn22.md
deleted file mode 100644
index 35fae3af3..000000000
--- a/tutorial/2-5-nfvsdn22.md
+++ /dev/null
@@ -1 +0,0 @@
-# 2.5. NFV-SDN'22 Demo (PENDING)
diff --git a/tutorial/3-0-development.md b/tutorial/3-0-development.md
deleted file mode 100644
index 05e03ef8f..000000000
--- a/tutorial/3-0-development.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# 3. Development Guide (WORK IN PROGRESS)
-
-This section walks you through the process of developing new components for
-the TeraFlowSDN controller.
-In particular, the guide includes the details on how to configure VSCode IDE,
-develop a new component, and debug individual components.
-
-For convenience, this guide assumes you are using the Oracle VirtualBox-based
-VM running MicroK8s Kubernetes platform as described in the
-[Deployment Guide](./1-0-deployment.md).
-BEsides, it assumes you installed the appropriate Python and PyEnv as
-described in [2.1. Configure Python Environment](./2-1-python-environment.md).
-
-## Table of Content:
-- [3.1. Configure VSCode and Connect to the VM](./3-1-configure-vscode.md)
-- [3.2. Developing a new component: Forecaster (WORK IN PROGRESS)](./3-2-develop-new-component.md)
-- [3.3. Debugging individual components in VSCode](./3-3-debug-comp.md)
-- [3.4. Development Commands, Tricks, and Hints (WORK IN PROGRESS)](./3-4-develop-cth.md)
diff --git a/tutorial/3-1-configure-vscode.md b/tutorial/3-1-configure-vscode.md
deleted file mode 100644
index e7dbf3a6a..000000000
--- a/tutorial/3-1-configure-vscode.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# 3.1. Configure VSCode and Connect to the VM
-
-
-## 3.1.1. Install VSCode and the required extensions
-If not already done, install [VSCode](https://code.visualstudio.com/) and the "Remote SSH" extension on your local
-machine, not in the VM.
-
-__Note__: "Python" extension is not required here. It will be installed later on the VSCode server running on the VM.
-
-
-## 3.1.2. Configure the "Remote SSH" extension
-- Go to left icon "Remote Explorer"
-- Click the "gear" icon next to "SSH TARGETS" on top of "Remote Explorer" bar
-- Choose to edit "<...>/.ssh/config" file (or equivalent)
-- Add the following entry (assuming previous port forwarding configuration):
-```
-Host TFS-VM
-    HostName 127.0.0.1
-    Port 2200
-    ForwardX11 no
-    User tfs
-```
-- Save the file
-- An entry "TFS-VM" should appear on "SSH TARGETS".
-
-
-## 3.1.3. Connect VSCode to the VM through "Remote SSH" extension
-- Right-click on "TFS-VM"
-- Select "Connect to Host in Current Window"
-- Reply to the questions asked
-  - Platform of the remote host "TFS-VM": Linux
-  - "TFS-VM" has fingerprint "<fingerprint>". Do you want to continue?: Continue
-  - Type tfs user's password: tfs123
-- You should be now connected to the TFS-VM.
-
-__Note__: if you get a connection error message, the reason might be due to wrong SSH server fingerprint. Edit file
-          "<...>/.ssh/known_hosts" on your local user account, check if there is a line starting with
-          "[127.0.0.1]:2200" (assuming previous port forwarding configuration), remove the entire line, save the file,
-          and retry connection.
-
-
-## 3.1.4. Add SSH key to prevent typing the password every time
-This step creates an SSH key in the VM and installs it on the VSCode to prevent having to type the password every time.
-
-- In VSCode (connected to the VM), click menu "Terminal > New Terminal"
-- Run the following commands on the VM's terminal through VSCode
-```bash
-ssh-keygen -t rsa -b 4096 -f ~/.ssh/tfs-vm.key
-  # leave password empty
-ssh-copy-id -i ~/.ssh/tfs-vm.key.pub tfs@10.0.2.10
-  # tfs@10.0.2.10's password: <type tfs user's password: tfs123>
-rm .ssh/known_hosts 
-```
-
-- In VSCode, click left "Explorer" panel to expand, if not expanded, and click "Open Folder" button.
-  - Choose "/home/tfs/"
-  - Type tfs user's password when asked
-  - Trust authors of the "/home/tfs [SSH: TFS-VM]" folder when asked
-- Right click on the file "tfs-vm.key" in the file explorer
-  - Select "Download..." option
-  - Download the file into your user's accout ".ssh" folder
-- Delete files "tfs-vm.key" and "tfs-vm.key.pub" on the TFS-VM.
-
-- In VSCode, click left "Remote Explorer" panel to expand
-  - Click the "gear" icon next to "SSH TARGETS" on top of "Remote Explorer" bar
-  - Choose to edit "<...>/.ssh/config" file (or equivalent)
-  - Find entry "Host TFS-VM" and update it as follows:
-```
-Host TFS-VM
-    HostName 127.0.0.1
-    Port 2200
-    ForwardX11 no
-    User tfs
-    IdentityFile "<path to the downloaded identity private key file>"
-```
-  - Save the file
-- From now, VSCode will use the identity file to connect to the TFS-VM instead of the user's password.
-
-
-## 3.1.5. Install VSCode Python Extension (in VSCode server)
-This step installs Python extensions in VSCode server running in the VM.
-
-- In VSCode (connected to the VM), click left button "Extensions"
-- Search "Python" extension in the extension Marketplace.
-- Install official "Python" extension released by Microsoft.
-  - By default, since you're connected to the VM, it will be installed in the VSCode server running in the VM.
-
-- In VSCode (connected to the VM), click left button "Explorer"
-- Click "Ctrl+Alt+P" and type "Python: Select Interpreter". Select option "Python: 3.9.13 64-bit ('tfs')"
-
-
-## 3.1.6. Define environment variables for VSCode
-The source code in the TFS controller project is hosted in folder `src/`. To help VSCode find the Python modules and
-packages, add the following file into your working space root folder:
-
-```bash
-echo "PYTHONPATH=./src" >> ~/tfs-ctrl/.env
-```
diff --git a/tutorial/3-2-develop-new-component.md b/tutorial/3-2-develop-new-component.md
deleted file mode 100644
index 8d39b56a8..000000000
--- a/tutorial/3-2-develop-new-component.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# 3.2. Developing a new component: Forecaster (WORK IN PROGRESS)
-
-
-## 3.2.1. Preliminary requisites
-As any microservice-based architecture, the components of TeraFlowSDN can be implemented using different programming languages.
-For the sake of simplicity, and given it is the most widely used programming language in TeraFlow, this tutorial page assumes the reader will use Python.
-
-This tutorial assumes you hace successfully completed the steps in
-[2.1. Configure the Python Environment](./2-1-python-environment.md) and
-[3.1. Configure VSCode and Connect to the VM](./3-1-configure-vscode.md) to prepare your environment.
-
-
-## 3.2.2. Create the component folder structure
-The source code of each component of TeraFlowSDN is hosted in a particular folder within the `src` folder.
-Within that folder, typically, 3 subfolders are created:
-- Folder `client`: contains a client implementation that the rest of components can use to interact with the component.
-  See details in [3.2.4. Create the component client](./3-X-develop-new-component.md#3x4-create-the-component-client).
-- Folder `service`: contains the implementation of the service logic.
-  See details in [3.2.5. Create the component service](./3-X-develop-new-component.md#3x5-create-the-component-service).
-- Folder `tests`: contains the set of unitary tests to be executed over the component to ensure it is properly implemented.
-  See details in [3.2.6. Create the component tests](./3-X-develop-new-component.md#3x6-create-the-component-tests).
-- File `__init__.py`: defines the component as a sub-package of TeraFlowSDN to facilitate imports.
-- File `.gitlab-ci.yml`: defines the GitLab CI/CD settings to build, test, and deploy the component in an automated manner.
-- File `Config.py`: contains particular configuration settings and constants for the component.
-- File `Dockerfile`: defines the recipe to construct the Docker image for the component.
-- File `requirements.in`: defines the Python dependencies that are required by this component.
-
-You can automate the creation of this file structure running the following command.
-In this example, we create the `forecaster` component.
-```bash
-cd ~/tfs-ctrl
-scripts/create_component.sh forecaster
-```
-
-
-## 3.2.3. gRPC Proto messages and services
-The components, e.g., microservices, of the TeraFlowSDN controller, in general, use a gRPC-based open API to interoperate.
-All the protocol definitions can be found in sub-folder `proto` within the root project folder.
-For additional details on gRPC, visit the official web-page [gRPC](https://grpc.io/).
-
-In general, each component has an associated _proto_ file named as the name of the component in snake_case.proto.
-For instance, the _proto_ file for the `forecaster` component being developed in this tutorial is `proto/forecaster.proto` and implements 3 RPC methods:
-- `rpc GetForecastOfTopology (context.TopologyId) returns (Forecast) {}´:
-  Takes a topology identifier as parameter, and computes the aggregated forecast for the topology.
-- `rpc GetForecastOfLink(context.LinkId) returns (Forecast) {}´:
-  Takes a link identifier as parameter, and computes the aggregated forecast for that link.
-- `rpc CheckService (context.ServiceId) returns (ForecastPrediction) {}´:
-  Takes a service identifier as parameter, computes the forecast for the connections of that service, and retrieves a value indicating if the resources can support the demand.
-
-
-## 3.2.4. Create the component client
-Each component has, by default, a pre-defined client that other components can import to inter-communicate.
-The client module, by default, is named as the component's name concatenated with `client`, and written in CamelCase.
-For instance, the client for the `forecaster` component would be `ForecasterClient.py`.
-
-This file contains a class with the same name as the file, e.g., `ForecasterClient`, and implements 3 main methods, plus one method for each RPC method supported by the service. These methods are:
-- Main methods:
-  - `__init__(host=None, port=None)`: constructor of the client class.
-  - `connect(self)`: triggers the connection of the client to the service pointed by host and port class parameters.
-  - `close(self)`: disconnects the client from the service.
-- RPC methods: one for each RPC method defined in the associated service within the proto file, e.g., `proto/forecaster.proto`.
-
-Create file `` 
-
-
-
-## 3.2.3. Connect VSCode to the VM through "Remote SSH" extension
-- Right-click on "TFS-VM"
-- Select "Connect to Host in Current Window"
-- Reply to the questions asked
-  - Platform of the remote host "TFS-VM": Linux
-  - "TFS-VM" has fingerprint "<fingerprint>". Do you want to continue?: Continue
-  - Type tfs user's password: tfs123
-- You should be now connected to the TFS-VM.
-
-__Note__: if you get a connection error message, the reason might be due to wrong SSH server fingerprint. Edit file
-          "<...>/.ssh/known_hosts" on your local user account, check if there is a line starting with
-          "[127.0.0.1]:2200" (assuming previous port forwarding configuration), remove the entire line, save the file,
-          and retry connection.
-
-
-## 3.2.4. Add SSH key to prevent typing the password every time
-This step creates an SSH key in the VM and installs it on the VSCode to prevent having to type the password every time.
-
-- In VSCode (connected to the VM), click menu "Terminal > New Terminal"
-- Run the following commands on the VM's terminal through VSCode
-```bash
-ssh-keygen -t rsa -b 4096 -f ~/.ssh/tfs-vm.key
-  # leave password empty
-ssh-copy-id -i ~/.ssh/tfs-vm.key.pub tfs@10.0.2.10
-  # tfs@10.0.2.10's password: <type tfs user's password: tfs123>
-rm .ssh/known_hosts 
-```
-
-- In VSCode, click left "Explorer" panel to expand, if not expanded, and click "Open Folder" button.
-  - Choose "/home/tfs/"
-  - Type tfs user's password when asked
-  - Trust authors of the "/home/tfs [SSH: TFS-VM]" folder when asked
-- Right click on the file "tfs-vm.key" in the file explorer
-  - Select "Download..." option
-  - Download the file into your user's accout ".ssh" folder
-- Delete files "tfs-vm.key" and "tfs-vm.key.pub" on the TFS-VM.
-
-- In VSCode, click left "Remote Explorer" panel to expand
-  - Click the "gear" icon next to "SSH TARGETS" on top of "Remote Explorer" bar
-  - Choose to edit "<...>/.ssh/config" file (or equivalent)
-  - Find entry "Host TFS-VM" and update it as follows:
-```
-Host TFS-VM
-    HostName 127.0.0.1
-    Port 2200
-    ForwardX11 no
-    User tfs
-    IdentityFile "<path to the downloaded identity private key file>"
-```
-  - Save the file
-- From now, VSCode will use the identity file to connect to the TFS-VM instead of the user's password.
-
-
-## 3.2.5. Install VSCode Python Extension (in VSCode server)
-This step installs Python extensions in VSCode server running in the VM.
-
-- In VSCode (connected to the VM), click left button "Extensions"
-- Search "Python" extension in the extension Marketplace.
-- Install official "Python" extension released by Microsoft.
-  - By default, since you're connected to the VM, it will be installed in the VSCode server running in the VM.
-
-- In VSCode (connected to the VM), click left button "Explorer"
-- Click "Ctrl+Alt+P" and type "Python: Select Interpreter". Select option "Python: 3.9.13 64-bit ('tfs')"
-
-in terminal: set python path to be used by VSCode:
-`echo "PYTHONPATH=./src" > ~/tfs-ctrl/.env`
diff --git a/tutorial/3-3-debug-comp.md b/tutorial/3-3-debug-comp.md
deleted file mode 100644
index 380c5add2..000000000
--- a/tutorial/3-3-debug-comp.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# 3.3 Debugging individual components in VSCode
-
-## 3.3.1 Source TeraFlow environment variables into .bashrc
-
-With any text editor, open the file `~/.bashrc` and add the following line at the end:
-```bash
-source ~/tfs-ctrl/tfs_runtime_env_vars.sh
-```
-
-"tfs-ctrl" can be substituted by the appropriate path where the controller is deployed.
-
-## 3.3.2 Install VSCode Python extensions
-The following extensions are required to execute and debug TeraFlow components in VSCode:
-
-- *Python*. New versions of the extension are known to have some unsolved bugs, it is recommended to downgrade to version **v2022.10.0**. Go to the extension window, select Python, click the arrow next to the "Uninstall" button and select "Install Another Version..."
-- *Pylance*
-
-## 3.3.3 Configure VSCode workspace and launch settings
-Run VSCode and open the folder with the source code of TeraFlow, this will be the main workspace. Create (if it does not exist) the subfolder `.vscode`. Inside, create and edit the following files:
-
-- `settings.json` 
-    ```bash
-    {
-    "python.analysis.extraPaths": ["<HOME>/.pyenv/versions/3.9.7/envs/teraflow/lib/python3.9/site-packages"],
-    }
-    ```
-    `<HOME>` should be replaced by the path of your home folder. If in the future another version of Python is used, or the virtual environment changes, this file should be updated to reflect the new path of the installed pip packages.
-
-- `launch.json`
-    ```bash
-    {
-        // Use IntelliSense to learn about possible attributes.
-        // Hover to view descriptions of existing attributes.
-        // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-        "version": "0.2.0",
-        "configurations": [
-            {
-                "name": "TFS compute.service",
-                "module": "compute.service",
-                "python": "${command:python.interpreterPath}",
-                "type": "python",
-                "request": "launch",
-                "justMyCode": true,
-                "console": "internalConsole",
-                "env": {
-                    "PYTHONPATH": "${config:python.analysis.extraPaths}:${workspaceRoot}/src",
-                    "LOG_LEVEL": "DEBUG",
-                    }
-            }
-        ]
-    }
-    ```
-    This file contains the configuration necessary to execute the `"compute"` component from the TeraFlow controller, while providing debugging capabilities (e.g., breaking points, console log output etc.). After saving, the debugging can be started from the "Run and Debug" menu.
-
-    Additional profiles can be added to the JSON file under the `"configurations"` arrray. Copy & paste the existing one and change the `"name"` and  `"module"` fields.
\ No newline at end of file
diff --git a/tutorial/3-4-develop-cth.md b/tutorial/3-4-develop-cth.md
deleted file mode 100644
index bb842658b..000000000
--- a/tutorial/3-4-develop-cth.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# 3.4. Development Commands, Tricks, and Hints (WORK IN PROGRESS)
-
-## Building, running, testing and reporting code coverage locally
-
-The project runs a CI/CD loops that ensures that all tests are run whenever new code is committed to our reporitory.
-However, committing and waiting for the pipeline to run can take substantial time.
-For this reason, we prepared a script that runs in your local machine, builds the container image and executes the tests within the image.
-
-To use the script receives one argument that is the name of the component you want to run.
-For instance, if you want to build and run the tests of the `compute` component, you can run:
-
-```shell
-scripts/build_run_report_tests_locally.sh compute
-```
-
-
-
-## Items to be addressed:
-- pytest flags: --log-level=INFO --verbose -o log_cli=true -o log_file=my_log_file.log -o log_file_level=DEBUG
-- code coverage
-- nginx ingress grpc to enable access from external sources
-
-
-# interesting Docker commands
-
-Build by hand:
-cd src
-docker build -t "context:lgr-test" -f ./context/Dockerfile .
-
-Run by hand:
-docker run --rm --name lgr-test -it --env "DB_BACKEND=inmemory" --entrypoint /bin/bash context:lgr-test
-
-
-## Expose gRPC ports through Ingress Controller
-source `my_deploy.sh`
-run script `./expose_ingress_grpc.sh`
-
-to test:
-sudo apt-get install nmap
-nmap -p 1010 127.0.0.1  # test if context is reachable
-should retrieve something like:
-$ nmap -p 1010 127.0.0.1
-Starting Nmap 7.80 ( https://nmap.org ) at 2022-07-29 15:06 UTC
-Nmap scan report for localhost (127.0.0.1)
-Host is up (0.00035s latency).
-
-PORT     STATE SERVICE
-1010/tcp open  surf
-
-Nmap done: 1 IP address (1 host up) scanned in 0.07 seconds
diff --git a/tutorial/README.md b/tutorial/README.md
deleted file mode 100644
index f2fb3a219..000000000
--- a/tutorial/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# ETSI TeraFlowSDN Controller Tutorials
-
-
-## Abstract
-This document provides a walkthrough on how to prepare your environment for executing 
-and contributing to the [ETSI TeraFlowSDN OSG](https://tfs.etsi.org/).
-
-This walkthrough makes some reasonable assumptions to simplify the deployment of the 
-ETSI TeraFlowSDN controller, the execution of experiments and tests, and development of 
-new contributions.
-In particular, we assume:
-
-- [VirtualBox](https://www.virtualbox.org/) version 6.1.34 r150636
-- [VSCode](https://code.visualstudio.com/) with the 
-  [*Remote SSH*](https://code.visualstudio.com/docs/remote/ssh) extension
-- VM software:
-  - [Ubuntu Server 20.04 LTS](https://releases.ubuntu.com/20.04/)
-  - [MicroK8s](https://microk8s.io/)
-
-
-## Contact
-If your environment does not fit with the proposed assumptions and you experience issues 
-preparing it to work with the ETSI TeraFlowSDN controller, contact the ETSI TeraFlowSDN 
-OSG team through
-[Slack](https://join.slack.com/t/teraflowsdn/shared_invite/zt-18gc5jvkh-1_DEZHFhxeuOqzJZPq~U~A)
-
-
-## Table of Content:
-- [1. Deployment Guide](./1-0-deployment.md)
-  - [1.1. Create VM for the TeraFlowSDN controller](./1-1-create-vm.md)
-  - [1.2. Install MicroK8s Kubernetes platform](./1-2-install-microk8s.md)
-  - [1.3. Deploy TeraFlowSDN over MicroK8s](./1-3-deploy-tfs.md)
-  - [1.4. Access TeraFlowSDN WebUI and Grafana Dashboards](./1-4-access-webui.md)
-  - [1.5. Show Deployment and Log per Component](./1-5-deploy-logs-troubleshooting.md)
-- [2. Run Experiments Guide](./2-0-run-experiments.md)
-  - [2.1. Configure the Python environment](./2-1-python-environment.md)
-  - [2.2. OFC'22 Demo - Bootstrap devices, Monitor device Endpoints, Manage L3VPN Services](./2-2-ofc22.md)
-  - [2.3. OECC/PSC'22 Demo (PENDING)](./2-3-oeccpsc22.md)
-  - [2.4. ECOC'22 Demo - Disjoint DC-2-DC L2VPN Service](./2-4-ecoc22.md)
-  - [2.5. NFV-SDN'22 Demo (PENDING)](./2-5-nfvsdn22.md)
-- [3. Development Guide (WORK IN PROGRESS)](./3-0-development.md)
-  - [3.1. Configure VSCode and Connect to the VM](./3-1-configure-vscode.md)
-  - [3.2. Developing a new component: Forecaster (WORK IN PROGRESS)](./3-4-develop-new-component.md)
-  - [3.3. Debugging individual components in VSCode](./3-3-debug-comp.md)
-  - [3.4. Development Commands, Tricks, and Hints (WORK IN PROGRESS)](./3-2-develop-cth.md)
-- 
GitLab


From 99242d0562b7724e5ca7926ed9f2d013591b3078 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 1 Feb 2023 17:04:35 +0000
Subject: [PATCH 2/4] Headers:

- Added/Updated headers
- Added script to update copyright headers
---
 .gitlab-ci.yml                                |   2 +-
 clean_testing_environment.sh                  |   2 +-
 common_requirements.in                        |   2 +-
 coverage/.coveragerc.template                 |  14 +++
 deploy/all.sh                                 |   2 +-
 deploy/component.sh                           |   2 +-
 deploy/crdb.sh                                |   2 +-
 deploy/mock_blockchain.sh                     |   2 +-
 deploy/nats.sh                                |   2 +-
 deploy/qdb.sh                                 |   2 +-
 deploy/show.sh                                |   2 +-
 deploy/tfs.sh                                 |   2 +-
 expose_ingress_grpc.sh                        |   2 +-
 hackfest/gnmi/sonic.clab.yml                  |  14 +++
 hackfest/grpc/connection.proto                |  14 +++
 hackfest/grpc/connection/create.py            |  14 +++
 hackfest/grpc/connection/list.py              |  14 +++
 hackfest/grpc/connectionService.proto         |  14 +++
 .../connectionService_client.py               |  14 +++
 .../connectionService_server.py               |  14 +++
 .../grpc/connectionServiceWithNotif.proto     |  14 +++
 .../connectionServiceWithNotif_client.py      |  14 +++
 .../connectionServiceWithNotif_server.py      |  14 +++
 hackfest/grpc/topologyService.proto           |  14 +++
 .../topologyService/topologyService_client.py |  14 +++
 .../topologyService/topologyService_server.py |  14 +++
 hackfest/kafka/pub.py                         |  14 +++
 hackfest/kafka/sub.py                         |  14 +++
 hackfest/mock_osm/MockOSM.py                  |   2 +-
 hackfest/mock_osm/__init__.py                 |   2 +-
 hackfest/mock_osm/__main__.py                 |   2 +-
 hackfest/netconf-oc/device_definition.py      |  14 +++
 hackfest/netconf-oc/interfaces.xml            |  16 +++
 hackfest/netconf-oc/platform.xml              |  16 +++
 hackfest/netconf-oc/server_openconfig.py      |  14 +++
 hackfest/netconf/client_topology.py           |  14 +++
 .../netconf/connection/client_connection.py   |  14 +++
 .../connection/server_topology_connection.py  |  14 +++
 hackfest/netconf/connection/topology.xml      |  16 +++
 hackfest/netconf/server_topology.py           |  14 +++
 hackfest/netconf/topology.xml                 |  16 +++
 hackfest/onos_api/onos_flows.py               |  14 +++
 hackfest/onos_api/onos_topology.py            |  14 +++
 hackfest/openconfig/generated.go              |  14 +++
 hackfest/p4/__init__.py                       |   2 +-
 hackfest/p4/deploy_specs.sh                   |  14 +++
 hackfest/p4/mininet/topo-simple.py            |   0
 hackfest/p4/run_test_01_bootstrap.sh          |   2 +-
 hackfest/p4/run_test_02_create_service.sh     |   2 +-
 hackfest/p4/run_test_03_delete_service.sh     |   2 +-
 hackfest/p4/run_test_04_cleanup.sh            |   2 +-
 hackfest/p4/setup.sh                          |  14 +++
 hackfest/p4/tests/BuildDescriptors.py         |   2 +-
 hackfest/p4/tests/LoadDescriptors.py          |   2 +-
 hackfest/p4/tests/Objects.py                  |   2 +-
 hackfest/p4/tests/__init__.py                 |   2 +-
 .../p4/tests/test_functional_bootstrap.py     |   2 +-
 hackfest/p4/tests/test_functional_cleanup.py  |   2 +-
 .../tests/test_functional_create_service.py   |   2 +-
 .../tests/test_functional_delete_service.py   |   2 +-
 hackfest/restconf/connection.yaml             |  14 +++
 .../swagger_server/database.py                |  14 +++
 .../swagger_server/swagger/swagger.yaml       |  14 +++
 hackfest/restconf/topology.yaml               |  14 +++
 .../swagger_server/swagger/swagger.yaml       |  14 +++
 hackfest/tapi/client/tapi-client.sh           |  14 +++
 hackfest/tapi/server/run.sh                   |  14 +++
 hackfest/tapi/server/tapi_server/__main__.py  |  14 +++
 hackfest/tapi/server/tapi_server/database.py  |  14 +++
 .../server/tapi_server/swagger/swagger.yaml   |  14 +++
 hackfest/tapi/tapi-connectivity.yaml          |  14 +++
 hackfest/tapi/tapi_app/requirements.sh        |  14 +++
 hackfest/tapi/tapi_app/tapi_app.py            |  14 +++
 hackfest/yang/connection/connection.py        |  14 +++
 hackfest/yang/topology.py                     |  14 +++
 hackfest/yang/topology.xml                    |  16 +++
 install_requirements.sh                       |   2 +-
 manifests/.gitlab-ci.yml                      |   2 +-
 manifests/cockroachdb/single-node.yaml        |   2 +-
 manifests/computeservice.yaml                 |   2 +-
 manifests/contextservice.yaml                 |   2 +-
 manifests/dbscanservingservice.yaml           |   2 +-
 manifests/deviceservice.yaml                  |   2 +-
 manifests/dltservice.yaml                     |   2 +-
 manifests/interdomainservice.yaml             |   2 +-
 manifests/l3_attackmitigatorservice.yaml      |   2 +-
 .../l3_centralizedattackdetectorservice.yaml  |   2 +-
 .../l3_distributedattackdetectorservice.yaml  |   2 +-
 manifests/load_generatorservice.yaml          |   2 +-
 manifests/mock_blockchain.yaml                |   2 +-
 manifests/monitoringservice.yaml              |   2 +-
 manifests/nginx_ingress_http.yaml             |  14 +++
 manifests/opticalattackmitigatorservice.yaml  |   2 +-
 ...ticalcentralizedattackdetectorservice.yaml |   2 +-
 manifests/pathcompservice.yaml                |   2 +-
 manifests/prometheus.yaml                     |   2 +-
 manifests/questdb/manifest.yaml               |   2 +-
 manifests/servicemonitors.yaml                |  14 +++
 manifests/serviceservice.yaml                 |   2 +-
 manifests/sliceservice.yaml                   |   2 +-
 manifests/webuiservice.yaml                   |   2 +-
 my_deploy.sh                                  |   2 +-
 proto/acl.proto                               |   2 +-
 proto/attack_mitigator.proto                  |   2 +-
 proto/automation.proto                        |   2 +-
 proto/centralized_attack_detector.proto       |   2 +-
 proto/compute.proto                           |   2 +-
 proto/context.proto                           |   2 +-
 proto/context_policy.proto                    |   2 +-
 proto/dbscanserving.proto                     |   2 +-
 proto/device.proto                            |   2 +-
 proto/distributed_cybersecurity.proto         |   2 +-
 proto/dlt_connector.proto                     |   2 +-
 proto/dlt_gateway.proto                       |   2 +-
 proto/forecaster.proto                        |   2 +-
 proto/generate_code_python.sh                 |   4 +-
 proto/generate_uml.sh                         |   2 +-
 proto/health.proto                            |   2 +-
 proto/interdomain.proto                       |   2 +-
 proto/kpi_sample_types.proto                  |   2 +-
 proto/l3_attackmitigator.proto                |   2 +-
 proto/l3_centralizedattackdetector.proto      |   2 +-
 proto/load_generator.proto                    |   2 +-
 proto/monitoring.proto                        |   2 +-
 proto/optical_attack_mitigator.proto          |   2 +-
 .../optical_centralized_attack_detector.proto |   2 +-
 proto/pathcomp.proto                          |   2 +-
 proto/policy.proto                            |   2 +-
 proto/policy_action.proto                     |   2 +-
 proto/policy_condition.proto                  |   2 +-
 proto/service.proto                           |   2 +-
 proto/slice.proto                             |   2 +-
 proto/src/python/__init__.py                  |   2 +-
 proto/te.proto                                |   2 +-
 run_tests_docker.sh                           |  14 +++
 scripts/add_license_header_to_files.sh        |   3 +-
 scripts/build_run_report_tests_locally.sh     |   2 +-
 scripts/cockroachdb_client.sh                 |   2 +-
 scripts/create_component.sh                   |   2 +-
 scripts/dump_logs.sh                          |   2 +-
 .../old/configure_dashboards_in_kubernetes.sh |   2 +-
 scripts/old/deploy_in_kubernetes.sh           |   2 +-
 scripts/old/open_dashboard.sh                 |   2 +-
 scripts/old/open_webui.sh                     |   2 +-
 scripts/report_coverage_all.sh                |   2 +-
 scripts/report_coverage_common.sh             |   2 +-
 scripts/report_coverage_compute.sh            |   2 +-
 scripts/report_coverage_context.sh            |   2 +-
 scripts/report_coverage_device.sh             |   2 +-
 scripts/report_coverage_l3_attackmitigator.sh |   2 +-
 ...t_coverage_l3_centralizedattackdetector.sh |   2 +-
 ...t_coverage_l3_distributedattackdetector.sh |   2 +-
 scripts/report_coverage_pathcomp.sh           |   2 +-
 scripts/report_coverage_service.sh            |   2 +-
 scripts/report_coverage_slice.sh              |   2 +-
 scripts/run_tests_locally-compute.sh          |   2 +-
 scripts/run_tests_locally-context.sh          |   2 +-
 scripts/run_tests_locally-device-all.sh       |   2 +-
 scripts/run_tests_locally-device-emulated.sh  |   2 +-
 scripts/run_tests_locally-device-microwave.sh |   2 +-
 .../run_tests_locally-device-openconfig.sh    |   2 +-
 scripts/run_tests_locally-device-p4.sh        |   2 +-
 scripts/run_tests_locally-device-tapi.sh      |   2 +-
 .../run_tests_locally-pathcomp-frontend.sh    |   2 +-
 scripts/run_tests_locally-service.sh          |   2 +-
 scripts/run_tests_locally-slice.sh            |   2 +-
 scripts/run_tests_locally.sh                  |   2 +-
 scripts/show_logs_automation.sh               |   2 +-
 scripts/show_logs_compute.sh                  |   2 +-
 scripts/show_logs_context.sh                  |   2 +-
 scripts/show_logs_device.sh                   |   2 +-
 scripts/show_logs_dlt_connector.sh            |   2 +-
 scripts/show_logs_dlt_gateway.sh              |   2 +-
 scripts/show_logs_monitoring.sh               |   2 +-
 scripts/show_logs_pathcomp_backend.sh         |   2 +-
 scripts/show_logs_pathcomp_frontend.sh        |   2 +-
 scripts/show_logs_service.sh                  |   2 +-
 scripts/show_logs_slice.sh                    |   2 +-
 scripts/show_logs_webui.sh                    |   2 +-
 scripts/update_license_headers.py             | 114 ++++++++++++++++++
 src/__init__.py                               |   2 +-
 src/automation/.gitlab-ci.yml                 |   2 +-
 src/automation/mvnw                           |   0
 src/automation/pom.xml                        |   2 +-
 .../src/main/docker/Dockerfile.multistage.jvm |   2 +-
 .../automation/AutomationConfiguration.java   |   2 +-
 .../automation/AutomationGateway.java         |   2 +-
 .../automation/AutomationGatewayImpl.java     |   2 +-
 .../automation/AutomationService.java         |   2 +-
 .../automation/AutomationServiceImpl.java     |   2 +-
 .../automation/ContextSubscriber.java         |   2 +-
 .../eu/teraflow/automation/Serializer.java    |   2 +-
 .../automation/SimpleLivenessCheck.java       |   2 +-
 .../automation/SimpleReadinessCheck.java      |   2 +-
 .../eu/teraflow/automation/acl/AclAction.java |   2 +-
 .../eu/teraflow/automation/acl/AclEntry.java  |   2 +-
 .../automation/acl/AclForwardActionEnum.java  |   2 +-
 .../automation/acl/AclLogActionEnum.java      |   2 +-
 .../eu/teraflow/automation/acl/AclMatch.java  |   2 +-
 .../teraflow/automation/acl/AclRuleSet.java   |   2 +-
 .../automation/acl/AclRuleTypeEnum.java       |   2 +-
 .../eu/teraflow/automation/common/Util.java   |   2 +-
 .../automation/context/ContextGateway.java    |   2 +-
 .../context/ContextGatewayImpl.java           |   2 +-
 .../automation/context/ContextService.java    |   2 +-
 .../context/ContextServiceImpl.java           |   2 +-
 .../context/model/ConfigActionEnum.java       |   2 +-
 .../automation/context/model/ConfigRule.java  |   2 +-
 .../context/model/ConfigRuleAcl.java          |   2 +-
 .../context/model/ConfigRuleCustom.java       |   2 +-
 .../context/model/ConfigRuleType.java         |   2 +-
 .../context/model/ConfigRuleTypeAcl.java      |   2 +-
 .../context/model/ConfigRuleTypeCustom.java   |   2 +-
 .../automation/context/model/Device.java      |   2 +-
 .../context/model/DeviceConfig.java           |   2 +-
 .../context/model/DeviceDriverEnum.java       |   2 +-
 .../automation/context/model/DeviceEvent.java |   2 +-
 .../model/DeviceOperationalStatus.java        |   2 +-
 .../automation/context/model/Empty.java       |   2 +-
 .../automation/context/model/EndPoint.java    |   2 +-
 .../automation/context/model/EndPointId.java  |   2 +-
 .../automation/context/model/Event.java       |   2 +-
 .../context/model/EventTypeEnum.java          |   2 +-
 .../automation/context/model/GpsPosition.java |   2 +-
 .../automation/context/model/Location.java    |   2 +-
 .../context/model/LocationType.java           |   2 +-
 .../model/LocationTypeGpsPosition.java        |   2 +-
 .../context/model/LocationTypeRegion.java     |   2 +-
 .../automation/context/model/TopologyId.java  |   2 +-
 .../automation/device/DeviceGateway.java      |   2 +-
 .../automation/device/DeviceGatewayImpl.java  |   2 +-
 .../automation/device/DeviceService.java      |   2 +-
 .../automation/device/DeviceServiceImpl.java  |   2 +-
 .../kpi_sample_types/model/KpiSampleType.java |   2 +-
 .../teraflow/automation/model/DeviceRole.java |   2 +-
 .../automation/model/DeviceRoleConfig.java    |   2 +-
 .../automation/model/DeviceRoleId.java        |   2 +-
 .../automation/model/DeviceRoleType.java      |   2 +-
 .../automation/model/DeviceState.java         |   2 +-
 .../src/main/resources/application.yml        |   2 +-
 .../AutomationFunctionalServiceTest.java      |   2 +-
 .../automation/AutomationServiceTest.java     |   2 +-
 .../automation/ConfigRuleTypeTest.java        |   2 +-
 .../automation/ContextSubscriberTest.java     |  16 +++
 .../automation/EndPointCreationTest.java      |   2 +-
 .../teraflow/automation/LocationTypeTest.java |   2 +-
 .../MockAutomationConfiguration.java          |  16 +++
 .../teraflow/automation/SerializerTest.java   |   2 +-
 .../target/kubernetes/kubernetes.yml          |  14 +++
 src/automation/util/set_version.sh            |   2 +-
 src/build.sh                                  |   2 +-
 src/clean.sh                                  |   2 +-
 src/common/Constants.py                       |   2 +-
 src/common/DeviceTypes.py                     |   2 +-
 src/common/Settings.py                        |   2 +-
 src/common/__init__.py                        |   2 +-
 src/common/logger.py                          |   2 +-
 src/common/message_broker/Constants.py        |   2 +-
 src/common/message_broker/Factory.py          |   2 +-
 src/common/message_broker/Message.py          |   2 +-
 src/common/message_broker/MessageBroker.py    |   2 +-
 src/common/message_broker/__init__.py         |   2 +-
 .../message_broker/backend/BackendEnum.py     |   2 +-
 src/common/message_broker/backend/_Backend.py |   2 +-
 src/common/message_broker/backend/__init__.py |   2 +-
 .../backend/inmemory/InMemoryBackend.py       |   2 +-
 .../backend/inmemory/__init__.py              |   2 +-
 .../backend/nats/NatsBackend.py               |   2 +-
 .../backend/nats/NatsBackendThread.py         |   2 +-
 .../message_broker/backend/nats/__init__.py   |   2 +-
 .../backend/redis/RedisBackend.py             |   2 +-
 .../message_broker/backend/redis/__init__.py  |   2 +-
 src/common/message_broker/tests/__init__.py   |   2 +-
 .../message_broker/tests/test_unitary.py      |   2 +-
 src/common/method_wrappers/Decorator.py       |   2 +-
 .../method_wrappers/ServiceExceptions.py      |   2 +-
 src/common/method_wrappers/__init__.py        |   2 +-
 .../results-perf-eval/MW/generate.sh          |  14 +++
 .../results-perf-eval/MW/generate_plot.py     |  14 +++
 .../results-perf-eval/OpenConfig/generate.sh  |  14 +++
 .../OpenConfig/generate_plot.py               |  14 +++
 .../results-perf-eval/TE/te-cdf.py            |  14 +++
 .../results-perf-eval/XR/generate.sh          |  14 +++
 .../results-perf-eval/XR/generate_plot.py     |  14 +++
 .../results-perf-eval/emulated/generate.sh    |  14 +++
 .../emulated/generate_plot.py                 |  14 +++
 .../tests/DummyDeviceDriver.py                |   2 +-
 src/common/method_wrappers/tests/__init__.py  |   2 +-
 src/common/method_wrappers/tests/__main__.py  |   2 +-
 .../method_wrappers/tests/deploy_specs.sh     |  14 +++
 .../tests/old/docker_grafana.sh               |   2 +-
 .../method_wrappers/tests/old/prometheus.yml  |   2 +-
 .../method_wrappers/tests/test_unitary.py     |   2 +-
 src/common/tests/EventTools.py                |   2 +-
 src/common/tests/LoadScenario.py              |   2 +-
 src/common/tests/MockMessageBroker.py         |   2 +-
 src/common/tests/MockServicerImpl_Context.py  |   2 +-
 src/common/tests/MockServicerImpl_Device.py   |   2 +-
 .../tests/MockServicerImpl_DltGateway.py      |   2 +-
 .../tests/MockServicerImpl_Monitoring.py      |   2 +-
 src/common/tests/MockServicerImpl_Service.py  |   2 +-
 src/common/tests/MockServicerImpl_Slice.py    |   2 +-
 src/common/tests/PytestGenerateTests.py       |   2 +-
 src/common/tests/__init__.py                  |   2 +-
 src/common/tools/__init__.py                  |   2 +-
 src/common/tools/client/RetryDecorator.py     |   2 +-
 src/common/tools/client/__init__.py           |   2 +-
 src/common/tools/context_queries/CheckType.py |   2 +-
 src/common/tools/context_queries/Context.py   |   2 +-
 src/common/tools/context_queries/Device.py    |   2 +-
 src/common/tools/context_queries/EndPoint.py  |   2 +-
 .../tools/context_queries/InterDomain.py      |   2 +-
 src/common/tools/context_queries/Link.py      |   2 +-
 src/common/tools/context_queries/Service.py   |   2 +-
 src/common/tools/context_queries/Slice.py     |   2 +-
 src/common/tools/context_queries/Topology.py  |   2 +-
 src/common/tools/context_queries/__init__.py  |   2 +-
 src/common/tools/descriptor/Loader.py         |   2 +-
 src/common/tools/descriptor/Tools.py          |   2 +-
 src/common/tools/descriptor/__init__.py       |   2 +-
 .../tools/descriptor/old/BuildDescriptors.py  |   2 +-
 .../tools/descriptor/old/LoadDescriptors.py   |   2 +-
 src/common/tools/grpc/ConfigRules.py          |   2 +-
 src/common/tools/grpc/Constraints.py          |   2 +-
 src/common/tools/grpc/EndPointIds.py          |   2 +-
 src/common/tools/grpc/ServiceIds.py           |   2 +-
 src/common/tools/grpc/Tools.py                |   2 +-
 src/common/tools/grpc/__init__.py             |   2 +-
 src/common/tools/mutex_queues/MutexQueues.py  |   2 +-
 src/common/tools/mutex_queues/__init__.py     |   2 +-
 src/common/tools/object_factory/ConfigRule.py |   2 +-
 src/common/tools/object_factory/Connection.py |   2 +-
 src/common/tools/object_factory/Constraint.py |   2 +-
 src/common/tools/object_factory/Context.py    |   2 +-
 src/common/tools/object_factory/Device.py     |   2 +-
 src/common/tools/object_factory/EndPoint.py   |   2 +-
 src/common/tools/object_factory/Link.py       |   2 +-
 src/common/tools/object_factory/PolicyRule.py |   2 +-
 src/common/tools/object_factory/Service.py    |   2 +-
 src/common/tools/object_factory/Slice.py      |   2 +-
 src/common/tools/object_factory/Topology.py   |   2 +-
 src/common/tools/object_factory/__init__.py   |   2 +-
 .../tools/service/GenericGrpcService.py       |   2 +-
 src/common/tools/service/GenericRestServer.py |   2 +-
 src/common/tools/service/__init__.py          |   2 +-
 src/common/tools/timestamp/Converters.py      |   2 +-
 src/common/tools/timestamp/__init__.py        |   2 +-
 src/common/type_checkers/Assertions.py        |   2 +-
 src/common/type_checkers/Checkers.py          |   2 +-
 src/common/type_checkers/__init__.py          |   2 +-
 src/compute/.gitlab-ci.yml                    |   2 +-
 src/compute/Config.py                         |   2 +-
 src/compute/Dockerfile                        |   2 +-
 src/compute/__init__.py                       |   2 +-
 src/compute/client/ComputeClient.py           |   2 +-
 src/compute/client/__init__.py                |   2 +-
 src/compute/requirements.in                   |  14 +++
 src/compute/service/ComputeService.py         |   2 +-
 .../service/ComputeServiceServicerImpl.py     |   2 +-
 src/compute/service/__init__.py               |   2 +-
 src/compute/service/__main__.py               |   2 +-
 src/compute/service/rest_server/RestServer.py |   2 +-
 src/compute/service/rest_server/__init__.py   |   2 +-
 .../rest_server/nbi_plugins/__init__.py       |   2 +-
 .../nbi_plugins/debug_api/Resources.py        |   2 +-
 .../nbi_plugins/debug_api/__init__.py         |   2 +-
 .../nbi_plugins/ietf_l2vpn/Constants.py       |   2 +-
 .../nbi_plugins/ietf_l2vpn/L2VPN_Service.py   |   2 +-
 .../nbi_plugins/ietf_l2vpn/L2VPN_Services.py  |   2 +-
 .../ietf_l2vpn/L2VPN_SiteNetworkAccesses.py   |   2 +-
 .../nbi_plugins/ietf_l2vpn/__init__.py        |   2 +-
 .../nbi_plugins/ietf_l2vpn/schemas/Common.py  |   2 +-
 .../ietf_l2vpn/schemas/__init__.py            |   2 +-
 .../ietf_l2vpn/schemas/site_network_access.py |   2 +-
 .../ietf_l2vpn/schemas/vpn_service.py         |   2 +-
 .../ietf_l2vpn/tools/Authentication.py        |   2 +-
 .../ietf_l2vpn/tools/HttpStatusCodes.py       |   2 +-
 .../nbi_plugins/ietf_l2vpn/tools/Validator.py |   2 +-
 .../nbi_plugins/ietf_l2vpn/tools/__init__.py  |   2 +-
 src/compute/tests/Constants.py                |   2 +-
 src/compute/tests/MockService_Dependencies.py |   2 +-
 src/compute/tests/PrepareTestScenario.py      |   2 +-
 src/compute/tests/__init__.py                 |   2 +-
 src/compute/tests/test_debug_api.py           |   2 +-
 src/compute/tests/test_unitary.py             |   2 +-
 src/context/.gitlab-ci.yml                    |   2 +-
 src/context/Config.py                         |   2 +-
 src/context/Dockerfile                        |   2 +-
 src/context/__init__.py                       |   2 +-
 src/context/client/ContextClient.py           |   2 +-
 src/context/client/EventsCollector.py         |   2 +-
 src/context/client/__init__.py                |   2 +-
 src/context/data/cleanup_commands.sql         |  14 +++
 src/context/requirements.in                   |  14 +++
 src/context/service/ContextService.py         |   2 +-
 .../service/ContextServiceServicerImpl.py     |   2 +-
 src/context/service/Events.py                 |   2 +-
 src/context/service/__init__.py               |   2 +-
 src/context/service/__main__.py               |   2 +-
 src/context/service/database/ConfigRule.py    |   2 +-
 src/context/service/database/Connection.py    |   2 +-
 src/context/service/database/Constraint.py    |   2 +-
 src/context/service/database/Context.py       |   2 +-
 src/context/service/database/Device.py        |   2 +-
 src/context/service/database/EndPoint.py      |   2 +-
 src/context/service/database/Engine.py        |   2 +-
 src/context/service/database/Link.py          |   2 +-
 src/context/service/database/PolicyRule.py    |   2 +-
 src/context/service/database/Service.py       |   2 +-
 src/context/service/database/Slice.py         |   2 +-
 src/context/service/database/Topology.py      |   2 +-
 src/context/service/database/__init__.py      |   2 +-
 .../database/models/ConfigRuleModel.py        |   2 +-
 .../database/models/ConnectionModel.py        |   2 +-
 .../database/models/ConstraintModel.py        |   2 +-
 .../service/database/models/ContextModel.py   |   2 +-
 .../service/database/models/DeviceModel.py    |   2 +-
 .../service/database/models/EndPointModel.py  |   2 +-
 .../service/database/models/LinkModel.py      |   2 +-
 .../database/models/PolicyRuleModel.py        |   2 +-
 .../service/database/models/ServiceModel.py   |   2 +-
 .../service/database/models/SliceModel.py     |   2 +-
 .../service/database/models/TopologyModel.py  |   2 +-
 src/context/service/database/models/_Base.py  |   2 +-
 .../service/database/models/__init__.py       |   2 +-
 .../database/models/enums/ConfigAction.py     |   2 +-
 .../database/models/enums/DeviceDriver.py     |   2 +-
 .../models/enums/DeviceOperationalStatus.py   |   2 +-
 .../database/models/enums/KpiSampleType.py    |   2 +-
 .../database/models/enums/PolicyRuleState.py  |   2 +-
 .../database/models/enums/ServiceStatus.py    |   2 +-
 .../database/models/enums/ServiceType.py      |   2 +-
 .../database/models/enums/SliceStatus.py      |   2 +-
 .../database/models/enums/_GrpcToEnum.py      |   2 +-
 .../service/database/models/enums/__init__.py |   2 +-
 .../service/database/tools/FastHasher.py      |   2 +-
 .../service/database/tools/__init__.py        |   2 +-
 .../service/database/uuids/Connection.py      |   2 +-
 src/context/service/database/uuids/Context.py |   2 +-
 src/context/service/database/uuids/Device.py  |   2 +-
 .../service/database/uuids/EndPoint.py        |   2 +-
 src/context/service/database/uuids/Link.py    |   2 +-
 .../service/database/uuids/PolicuRule.py      |   2 +-
 src/context/service/database/uuids/Service.py |   2 +-
 src/context/service/database/uuids/Slice.py   |   2 +-
 .../service/database/uuids/Topology.py        |   2 +-
 .../service/database/uuids/_Builder.py        |   2 +-
 .../service/database/uuids/__init__.py        |   2 +-
 src/context/tests/Constants.py                |   2 +-
 src/context/tests/Objects.py                  |   2 +-
 src/context/tests/__init__.py                 |   2 +-
 src/context/tests/conftest.py                 |   2 +-
 src/context/tests/test_connection.py          |   2 +-
 src/context/tests/test_context.py             |   2 +-
 src/context/tests/test_device.py              |   2 +-
 src/context/tests/test_hasher.py              |   2 +-
 src/context/tests/test_link.py                |   2 +-
 src/context/tests/test_policy.py              |   2 +-
 src/context/tests/test_service.py             |   2 +-
 src/context/tests/test_slice.py               |   2 +-
 src/context/tests/test_topology.py            |   2 +-
 src/dbscanserving/.gitlab-ci.yml              |   2 +-
 src/dbscanserving/Config.py                   |   2 +-
 src/dbscanserving/Dockerfile                  |   2 +-
 src/dbscanserving/__init__.py                 |   2 +-
 .../client/DbscanServingClient.py             |   2 +-
 src/dbscanserving/client/__init__.py          |   2 +-
 src/dbscanserving/genproto.sh                 |   4 +-
 src/dbscanserving/proto/__init__.py           |   2 +-
 src/dbscanserving/requirements.in             |  15 +++
 src/dbscanserving/requirements.txt            |  15 +++
 src/dbscanserving/service/DbscanService.py    |   2 +-
 .../service/DbscanServiceServicerImpl.py      |   2 +-
 src/dbscanserving/service/__init__.py         |   2 +-
 src/dbscanserving/service/__main__.py         |   2 +-
 src/dbscanserving/tests/__init__.py           |   2 +-
 src/dbscanserving/tests/test_unitary.py       |   2 +-
 src/device/.gitlab-ci.yml                     |   2 +-
 src/device/Config.py                          |   2 +-
 src/device/Dockerfile                         |   2 +-
 src/device/__init__.py                        |   2 +-
 src/device/client/DeviceClient.py             |   2 +-
 src/device/client/__init__.py                 |   2 +-
 src/device/requirements.in                    |  15 +++
 src/device/service/DeviceService.py           |   2 +-
 .../service/DeviceServiceServicerImpl.py      |   2 +-
 src/device/service/Errors.py                  |   2 +-
 src/device/service/Tools.py                   |   2 +-
 src/device/service/__init__.py                |   2 +-
 src/device/service/__main__.py                |   2 +-
 src/device/service/driver_api/AnyTreeTools.py |   2 +-
 .../service/driver_api/DriverFactory.py       |   2 +-
 .../service/driver_api/DriverInstanceCache.py |   2 +-
 src/device/service/driver_api/Exceptions.py   |   2 +-
 src/device/service/driver_api/FilterFields.py |   2 +-
 src/device/service/driver_api/_Driver.py      |   2 +-
 src/device/service/driver_api/__init__.py     |   2 +-
 src/device/service/drivers/__init__.py        |   2 +-
 .../service/drivers/emulated/Constants.py     |   2 +-
 .../drivers/emulated/EmulatedDriver.py        |   2 +-
 .../emulated/SyntheticSamplingParameters.py   |   2 +-
 src/device/service/drivers/emulated/Tools.py  |   2 +-
 .../service/drivers/emulated/__init__.py      |   2 +-
 .../drivers/microwave/IETFApiDriver.py        |   2 +-
 src/device/service/drivers/microwave/Tools.py |   2 +-
 .../service/drivers/microwave/__init__.py     |   2 +-
 .../drivers/openconfig/OpenConfigDriver.py    |   2 +-
 .../drivers/openconfig/RetryDecorator.py      |   2 +-
 .../service/drivers/openconfig/Tools.py       |   2 +-
 .../service/drivers/openconfig/__init__.py    |   2 +-
 src/device/service/drivers/p4/__init__.py     |   2 +-
 src/device/service/drivers/p4/p4_client.py    |   2 +-
 src/device/service/drivers/p4/p4_common.py    |   2 +-
 src/device/service/drivers/p4/p4_context.py   |   2 +-
 src/device/service/drivers/p4/p4_driver.py    |   2 +-
 src/device/service/drivers/p4/p4_exception.py |   2 +-
 .../service/drivers/p4/p4_global_options.py   |   2 +-
 src/device/service/drivers/p4/p4_manager.py   |   2 +-
 .../service/drivers/transport_api/Tools.py    |   2 +-
 .../transport_api/TransportApiDriver.py       |   2 +-
 .../service/drivers/transport_api/__init__.py |   2 +-
 src/device/service/drivers/xr/XrDriver.py     |   2 +-
 src/device/service/drivers/xr/__init__.py     |   2 +-
 src/device/service/drivers/xr/cm-cli.py       |   2 +-
 src/device/service/drivers/xr/cm/__init__.py  |   2 +-
 .../service/drivers/xr/cm/cm_connection.py    |   2 +-
 .../service/drivers/xr/cm/connection.py       |   2 +-
 .../service/drivers/xr/cm/constellation.py    |   2 +-
 .../service/drivers/xr/cm/tests/__init__.py   |   2 +-
 .../drivers/xr/cm/tests/test_cm_connection.py |   2 +-
 .../drivers/xr/cm/tests/test_connection.py    |   2 +-
 .../drivers/xr/cm/tests/test_constellation.py |   2 +-
 .../xr/cm/tests/test_transport_capacitity.py  |   2 +-
 .../xr/cm/tests/test_xr_service_set_config.py |   2 +-
 src/device/service/drivers/xr/cm/tf.py        |   2 +-
 .../service/drivers/xr/cm/tf_service.py       |   2 +-
 .../drivers/xr/cm/transport_capacity.py       |   2 +-
 src/device/service/drivers/xr/cm/utils.py     |   2 +-
 .../service/drivers/xr/setup_test_env.sh      |  14 +++
 .../service/monitoring/MonitoringLoop.py      |   2 +-
 .../service/monitoring/MonitoringLoops.py     |   2 +-
 src/device/service/monitoring/__init__.py     |   2 +-
 src/device/tests/CommonObjects.py             |   2 +-
 src/device/tests/Device_Emulated.py           |   2 +-
 src/device/tests/Device_Microwave_Template.py |   2 +-
 .../tests/Device_OpenConfig_Template.py       |   2 +-
 .../tests/Device_Transport_Api_Template.py    |   2 +-
 src/device/tests/MockService_Dependencies.py  |   2 +-
 src/device/tests/PrepareTestScenario.py       |   2 +-
 src/device/tests/__init__.py                  |   2 +-
 src/device/tests/device_p4.py                 |   2 +-
 src/device/tests/mock_p4runtime_service.py    |   2 +-
 .../tests/mock_p4runtime_servicer_impl.py     |   2 +-
 src/device/tests/test_internal_p4.py          |   2 +-
 src/device/tests/test_unitary_emulated.py     |   2 +-
 src/device/tests/test_unitary_microwave.py    |   2 +-
 src/device/tests/test_unitary_openconfig.py   |   2 +-
 src/device/tests/test_unitary_p4.py           |   2 +-
 src/device/tests/test_unitary_tapi.py         |   2 +-
 src/dlt/.gitlab-ci.yml                        |   2 +-
 src/dlt/__init__.py                           |   2 +-
 src/dlt/connector/Config.py                   |   2 +-
 src/dlt/connector/Dockerfile                  |   2 +-
 src/dlt/connector/__init__.py                 |   2 +-
 .../connector/client/DltConnectorClient.py    |   2 +-
 .../connector/client/DltEventsCollector.py    |   2 +-
 src/dlt/connector/client/DltGatewayClient.py  |   2 +-
 src/dlt/connector/client/__init__.py          |   2 +-
 src/dlt/connector/main_test.py                |  14 +++
 src/dlt/connector/requirements.in             |  14 +++
 .../connector/service/DltConnectorService.py  |   2 +-
 .../DltConnectorServiceServicerImpl.py        |   2 +-
 src/dlt/connector/service/__init__.py         |   2 +-
 src/dlt/connector/service/__main__.py         |   2 +-
 .../event_dispatcher/DltEventDispatcher.py    |   2 +-
 .../service/event_dispatcher/__init__.py      |   2 +-
 src/dlt/connector/service/tools/Checkers.py   |   2 +-
 src/dlt/connector/service/tools/__init__.py   |   2 +-
 .../tests/MockService_Dependencies.py         |   2 +-
 src/dlt/connector/tests/Objects.py            |   2 +-
 .../connector/tests/PrepareTestScenario.py    |   2 +-
 src/dlt/connector/tests/__init__.py           |   2 +-
 src/dlt/connector/tests/test_unitary.py       |   2 +-
 src/dlt/gateway/settings.gradle.kts           |  16 +++
 src/dlt/mock_blockchain/Dockerfile            |   2 +-
 src/dlt/mock_blockchain/__init__.py           |   2 +-
 src/dlt/mock_blockchain/requirements.in       |  14 +++
 src/dlt/mock_blockchain/service/__init__.py   |   2 +-
 src/dlt/mock_blockchain/service/__main__.py   |   2 +-
 src/gitlab-ci.yml_generator.py                |   2 +-
 src/interdomain/.gitlab-ci.yml                |   2 +-
 src/interdomain/Config.py                     |   2 +-
 src/interdomain/Dockerfile                    |   2 +-
 src/interdomain/__init__.py                   |   2 +-
 src/interdomain/client/InterdomainClient.py   |   2 +-
 src/interdomain/client/__init__.py            |   2 +-
 src/interdomain/requirements.in               |  14 +++
 src/interdomain/service/InterdomainService.py |   2 +-
 .../service/InterdomainServiceServicerImpl.py |   2 +-
 .../service/RemoteDomainClients.py            |   2 +-
 src/interdomain/service/Tools.py              |   2 +-
 src/interdomain/service/__init__.py           |   2 +-
 src/interdomain/service/__main__.py           |   2 +-
 .../InterdomainServiceServicerImpl.py         |   2 +-
 .../topology_abstractor/AbstractDevice.py     |   2 +-
 .../topology_abstractor/AbstractLink.py       |   2 +-
 .../topology_abstractor/DltRecordSender.py    |   2 +-
 .../topology_abstractor/TopologyAbstractor.py |   2 +-
 .../service/topology_abstractor/Types.py      |   2 +-
 .../service/topology_abstractor/__init__.py   |   2 +-
 src/interdomain/tests/__init__.py             |   2 +-
 src/interdomain/tests/test_unitary.py         |   2 +-
 src/l3_attackmitigator/.gitlab-ci.yml         |   2 +-
 src/l3_attackmitigator/Config.py              |   2 +-
 src/l3_attackmitigator/Dockerfile             |   2 +-
 src/l3_attackmitigator/__init__.py            |   2 +-
 src/l3_attackmitigator/client/__init__.py     |   2 +-
 .../client/l3_attackmitigatorClient.py        |   2 +-
 src/l3_attackmitigator/requirements.in        |  14 +++
 src/l3_attackmitigator/service/__init__.py    |   2 +-
 src/l3_attackmitigator/service/__main__.py    |   2 +-
 .../service/l3_attackmitigatorService.py      |   2 +-
 .../l3_attackmitigatorServiceServicerImpl.py  |   2 +-
 src/l3_attackmitigator/tests/__init__.py      |   2 +-
 src/l3_attackmitigator/tests/test_unitary.py  |   2 +-
 .../.gitlab-ci.yml                            |   2 +-
 src/l3_centralizedattackdetector/Config.py    |   2 +-
 src/l3_centralizedattackdetector/Dockerfile   |   2 +-
 src/l3_centralizedattackdetector/__init__.py  |   2 +-
 .../client/__init__.py                        |   2 +-
 .../l3_centralizedattackdetectorClient.py     |   2 +-
 .../requirements.in                           |  14 +++
 .../service/__init__.py                       |   2 +-
 .../service/__main__.py                       |   2 +-
 .../l3_centralizedattackdetectorService.py    |   2 +-
 ...alizedattackdetectorServiceServicerImpl.py |   2 +-
 .../service/ml_model/teraflow_rf.onnx         | Bin 126743 -> 0 bytes
 .../tests/__init__.py                         |   2 +-
 .../tests/test_unitary.py                     |   2 +-
 .../.gitlab-ci.yml                            |   2 +-
 src/l3_distributedattackdetector/Config.py    |   2 +-
 src/l3_distributedattackdetector/Dockerfile   |   2 +-
 src/l3_distributedattackdetector/__init__.py  |   2 +-
 .../requirements.in                           |  14 +++
 .../service/__init__.py                       |   2 +-
 .../service/__main__.py                       |   2 +-
 .../tests/__init__.py                         |   2 +-
 .../tests/data_generator.py                   |   2 +-
 .../tests/test_unitary.py                     |   2 +-
 src/load_generator/.gitlab-ci.yml             |   2 +-
 src/load_generator/Config.py                  |   2 +-
 src/load_generator/Dockerfile                 |   2 +-
 src/load_generator/__init__.py                |   2 +-
 .../client/LoadGeneratorClient.py             |   2 +-
 src/load_generator/client/__init__.py         |   2 +-
 src/load_generator/command/__init__.py        |   2 +-
 src/load_generator/command/__main__.py        |   2 +-
 src/load_generator/load_gen/Constants.py      |   2 +-
 src/load_generator/load_gen/DltTools.py       |   2 +-
 src/load_generator/load_gen/Parameters.py     |   2 +-
 .../load_gen/RequestGenerator.py              |   2 +-
 .../load_gen/RequestScheduler.py              |   2 +-
 src/load_generator/load_gen/__init__.py       |   2 +-
 src/load_generator/requirements.in            |   2 +-
 src/load_generator/run.sh                     |   2 +-
 .../service/LoadGeneratorService.py           |   2 +-
 .../LoadGeneratorServiceServicerImpl.py       |   2 +-
 src/load_generator/service/__init__.py        |   2 +-
 src/load_generator/service/__main__.py        |   2 +-
 src/load_generator/tests/__init__.py          |   2 +-
 src/load_generator/tests/deploy_specs.sh      |  14 +++
 .../tests/test_dlt_functional.py              |   2 +-
 src/monitoring/.gitlab-ci.yml                 |   2 +-
 src/monitoring/Dockerfile                     |   2 +-
 src/monitoring/__init__.py                    |   2 +-
 src/monitoring/client/MonitoringClient.py     |   2 +-
 src/monitoring/client/__init__.py             |   2 +-
 src/monitoring/requirements.in                |  14 +++
 src/monitoring/service/AlarmManager.py        |  14 +++
 src/monitoring/service/EventTools.py          |   2 +-
 src/monitoring/service/InfluxTools.py         |   2 +-
 src/monitoring/service/ManagementDBTools.py   |   2 +-
 src/monitoring/service/MetricsDBTools.py      |   2 +-
 src/monitoring/service/MonitoringService.py   |   2 +-
 .../service/MonitoringServiceServicerImpl.py  |   2 +-
 src/monitoring/service/NameMapping.py         |   2 +-
 src/monitoring/service/SubscriptionManager.py |   2 +-
 src/monitoring/service/__init__.py            |   2 +-
 src/monitoring/service/__main__.py            |   2 +-
 src/monitoring/tests/Messages.py              |   2 +-
 src/monitoring/tests/Objects.py               |   2 +-
 src/monitoring/tests/__init__.py              |   2 +-
 src/monitoring/tests/test_unitary.py          |   2 +-
 src/opticalattackmitigator/.gitlab-ci.yml     |   2 +-
 src/opticalattackmitigator/Config.py          |   2 +-
 src/opticalattackmitigator/Dockerfile         |   2 +-
 src/opticalattackmitigator/__init__.py        |   2 +-
 .../client/OpticalAttackMitigatorClient.py    |   2 +-
 src/opticalattackmitigator/client/__init__.py |   2 +-
 src/opticalattackmitigator/genproto.sh        |   4 +-
 src/opticalattackmitigator/proto/__init__.py  |   2 +-
 src/opticalattackmitigator/requirements.in    |  14 +++
 .../service/OpticalAttackMitigatorService.py  |   2 +-
 ...ticalAttackMitigatorServiceServicerImpl.py |   2 +-
 .../service/__init__.py                       |   2 +-
 .../service/__main__.py                       |   2 +-
 src/opticalattackmitigator/tests/__init__.py  |   2 +-
 .../tests/test_unitary.py                     |   2 +-
 .../.gitlab-ci.yml                            |   2 +-
 .../Config.py                                 |   2 +-
 .../Dockerfile                                |   2 +-
 .../__init__.py                               |   2 +-
 .../OpticalCentralizedAttackDetectorClient.py |   2 +-
 .../client/__init__.py                        |   2 +-
 .../genproto.sh                               |   4 +-
 .../proto/__init__.py                         |   2 +-
 .../requirements.in                           |  14 +++
 .../requirements.txt                          |  14 +++
 ...OpticalCentralizedAttackDetectorService.py |   2 +-
 ...alizedAttackDetectorServiceServicerImpl.py |   2 +-
 .../service/__init__.py                       |   2 +-
 .../service/__main__.py                       |   2 +-
 .../tests/__init__.py                         |   2 +-
 .../tests/example_objects.py                  |   2 +-
 .../tests/test_unitary.py                     |   2 +-
 src/pathcomp/.gitlab-ci.yml                   |   2 +-
 src/pathcomp/__init__.py                      |   2 +-
 src/pathcomp/backend/Dockerfile               |   2 +-
 src/pathcomp/backend/Dockerfile-gdb           |   2 +-
 src/pathcomp/backend/Makefile                 |   7 +-
 src/pathcomp/backend/pathComp.c               |   8 +-
 src/pathcomp/backend/pathComp.h               |   7 +-
 src/pathcomp/backend/pathComp_RESTapi.c       |   9 +-
 src/pathcomp/backend/pathComp_RESTapi.h       |   7 +-
 src/pathcomp/backend/pathComp_cjson.c         |   8 +-
 src/pathcomp/backend/pathComp_cjson.h         |   8 +-
 src/pathcomp/backend/pathComp_ksp.c           |   9 +-
 src/pathcomp/backend/pathComp_ksp.h           |   7 +-
 src/pathcomp/backend/pathComp_log.c           |  17 ++-
 src/pathcomp/backend/pathComp_log.h           |   8 +-
 src/pathcomp/backend/pathComp_sp.c            |  19 ++-
 src/pathcomp/backend/pathComp_sp.h            |   7 +-
 src/pathcomp/backend/pathComp_tools.c         |   8 +-
 src/pathcomp/backend/pathComp_tools.h         |   8 +-
 src/pathcomp/backend/tests/run-test.sh        |  14 +++
 src/pathcomp/frontend/Config.py               |   2 +-
 src/pathcomp/frontend/Dockerfile              |   2 +-
 src/pathcomp/frontend/__init__.py             |   2 +-
 .../frontend/client/PathCompClient.py         |   2 +-
 src/pathcomp/frontend/client/__init__.py      |   2 +-
 src/pathcomp/frontend/requirements.in         |  15 +++
 .../frontend/service/PathCompService.py       |   2 +-
 .../service/PathCompServiceServicerImpl.py    |   2 +-
 src/pathcomp/frontend/service/__init__.py     |   2 +-
 src/pathcomp/frontend/service/__main__.py     |   2 +-
 .../frontend/service/algorithms/Factory.py    |   2 +-
 .../algorithms/KDisjointPathAlgorithm.py      |   2 +-
 .../algorithms/KShortestPathAlgorithm.py      |   2 +-
 .../algorithms/ShortestPathAlgorithm.py       |   2 +-
 .../frontend/service/algorithms/_Algorithm.py |   2 +-
 .../frontend/service/algorithms/__init__.py   |   2 +-
 .../algorithms/tools/ComposeRequest.py        |   2 +-
 .../algorithms/tools/ComputeSubServices.py    |   2 +-
 .../algorithms/tools/ConstantsMappings.py     |   2 +-
 .../service/algorithms/tools/EroPathToHops.py |   2 +-
 .../service/algorithms/tools/__init__.py      |   2 +-
 .../tests/MockService_Dependencies.py         |   2 +-
 src/pathcomp/frontend/tests/Objects_A_B_C.py  |   2 +-
 .../frontend/tests/Objects_DC_CSGW_TN.py      |   2 +-
 .../frontend/tests/Objects_DC_CSGW_TN_OLS.py  |   2 +-
 .../frontend/tests/PrepareTestScenario.py     |   2 +-
 src/pathcomp/frontend/tests/__init__.py       |   2 +-
 src/pathcomp/frontend/tests/test_unitary.py   |   2 +-
 src/pathcomp/misc/my_deploy-tests.sh          |  14 +++
 src/pathcomp/misc/test-commands.sh            |   2 +-
 src/policy/.gitlab-ci.yml                     |   2 +-
 src/policy/mvnw                               |   0
 src/policy/pom.xml                            |   2 +-
 .../src/main/docker/Dockerfile.multistage.jvm |   2 +-
 .../eu/teraflow/policy/PolicyGateway.java     |   2 +-
 .../eu/teraflow/policy/PolicyGatewayImpl.java |   2 +-
 .../PolicyRuleConditionFieldsGetter.java      |   2 +-
 .../policy/PolicyRuleConditionValidator.java  |   2 +-
 .../eu/teraflow/policy/PolicyService.java     |   2 +-
 .../eu/teraflow/policy/PolicyServiceImpl.java |   2 +-
 .../java/eu/teraflow/policy/Serializer.java   |   2 +-
 .../teraflow/policy/SimpleLivenessCheck.java  |   2 +-
 .../teraflow/policy/SimpleReadinessCheck.java |   2 +-
 .../eu/teraflow/policy/acl/AclAction.java     |   2 +-
 .../java/eu/teraflow/policy/acl/AclEntry.java |   2 +-
 .../policy/acl/AclForwardActionEnum.java      |   2 +-
 .../teraflow/policy/acl/AclLogActionEnum.java |   2 +-
 .../java/eu/teraflow/policy/acl/AclMatch.java |   2 +-
 .../eu/teraflow/policy/acl/AclRuleSet.java    |   2 +-
 .../teraflow/policy/acl/AclRuleTypeEnum.java  |   2 +-
 .../java/eu/teraflow/policy/common/Util.java  |  16 +++
 .../policy/context/ContextGateway.java        |   2 +-
 .../policy/context/ContextGatewayImpl.java    |   2 +-
 .../policy/context/ContextService.java        |   2 +-
 .../policy/context/ContextServiceImpl.java    |   2 +-
 .../context/model/ConfigActionEnum.java       |   2 +-
 .../policy/context/model/ConfigRule.java      |   2 +-
 .../policy/context/model/ConfigRuleAcl.java   |   2 +-
 .../context/model/ConfigRuleCustom.java       |   2 +-
 .../policy/context/model/ConfigRuleType.java  |   2 +-
 .../context/model/ConfigRuleTypeAcl.java      |   2 +-
 .../context/model/ConfigRuleTypeCustom.java   |   2 +-
 .../policy/context/model/Constraint.java      |   2 +-
 .../context/model/ConstraintCustom.java       |   2 +-
 .../model/ConstraintEndPointLocation.java     |   2 +-
 .../context/model/ConstraintSchedule.java     |   2 +-
 .../model/ConstraintSlaAvailability.java      |   2 +-
 .../context/model/ConstraintSlaCapacity.java  |   2 +-
 .../model/ConstraintSlaIsolationLevel.java    |   2 +-
 .../context/model/ConstraintSlaLatency.java   |   2 +-
 .../policy/context/model/ConstraintType.java  |   2 +-
 .../context/model/ConstraintTypeCustom.java   |   2 +-
 .../model/ConstraintTypeEndPointLocation.java |   2 +-
 .../context/model/ConstraintTypeSchedule.java |   2 +-
 .../model/ConstraintTypeSlaAvailability.java  |   2 +-
 .../model/ConstraintTypeSlaCapacity.java      |   2 +-
 .../ConstraintTypeSlaIsolationLevel.java      |   2 +-
 .../model/ConstraintTypeSlaLatency.java       |   2 +-
 .../teraflow/policy/context/model/Device.java |   2 +-
 .../policy/context/model/DeviceConfig.java    |   2 +-
 .../context/model/DeviceDriverEnum.java       |   2 +-
 .../model/DeviceOperationalStatus.java        |   2 +-
 .../teraflow/policy/context/model/Empty.java  |   2 +-
 .../policy/context/model/EndPoint.java        |   2 +-
 .../policy/context/model/EndPointId.java      |   2 +-
 .../teraflow/policy/context/model/Event.java  |   2 +-
 .../policy/context/model/EventTypeEnum.java   |   2 +-
 .../policy/context/model/GpsPosition.java     |   2 +-
 .../context/model/IsolationLevelEnum.java     |   2 +-
 .../policy/context/model/Location.java        |   2 +-
 .../policy/context/model/LocationType.java    |   2 +-
 .../model/LocationTypeGpsPosition.java        |  16 +++
 .../context/model/LocationTypeRegion.java     |   2 +-
 .../policy/context/model/Service.java         |   2 +-
 .../policy/context/model/ServiceConfig.java   |   2 +-
 .../policy/context/model/ServiceId.java       |   2 +-
 .../policy/context/model/ServiceStatus.java   |   2 +-
 .../context/model/ServiceStatusEnum.java      |   2 +-
 .../policy/context/model/ServiceTypeEnum.java |   2 +-
 .../policy/context/model/SliceId.java         |   2 +-
 .../policy/context/model/TopologyId.java      |   2 +-
 .../teraflow/policy/device/DeviceGateway.java |   2 +-
 .../policy/device/DeviceGatewayImpl.java      |   2 +-
 .../teraflow/policy/device/DeviceService.java |   2 +-
 .../policy/device/DeviceServiceImpl.java      |   2 +-
 .../kpi_sample_types/model/KpiSampleType.java |   2 +-
 .../policy/model/BooleanOperator.java         |   2 +-
 .../policy/model/NumericalOperator.java       |   2 +-
 .../eu/teraflow/policy/model/PolicyRule.java  |   2 +-
 .../policy/model/PolicyRuleAction.java        |   2 +-
 .../policy/model/PolicyRuleActionConfig.java  |  16 +++
 .../policy/model/PolicyRuleActionEnum.java    |   2 +-
 .../policy/model/PolicyRuleBasic.java         |   2 +-
 .../policy/model/PolicyRuleCondition.java     |   2 +-
 .../policy/model/PolicyRuleDevice.java        |   2 +-
 .../policy/model/PolicyRuleService.java       |   2 +-
 .../policy/model/PolicyRuleState.java         |   2 +-
 .../policy/model/PolicyRuleStateEnum.java     |   2 +-
 .../teraflow/policy/model/PolicyRuleType.java |   2 +-
 .../policy/model/PolicyRuleTypeDevice.java    |   2 +-
 .../policy/model/PolicyRuleTypeService.java   |   2 +-
 .../policy/monitoring/MonitoringGateway.java  |   2 +-
 .../monitoring/MonitoringGatewayImpl.java     |   2 +-
 .../policy/monitoring/MonitoringService.java  |   2 +-
 .../monitoring/MonitoringServiceImpl.java     |   2 +-
 .../monitoring/model/AlarmDescriptor.java     |   2 +-
 .../monitoring/model/AlarmResponse.java       |   2 +-
 .../monitoring/model/AlarmSubscription.java   |   2 +-
 .../monitoring/model/BooleanKpiValue.java     |   2 +-
 .../monitoring/model/FloatKpiValue.java       |   2 +-
 .../monitoring/model/IntegerKpiValue.java     |   2 +-
 .../teraflow/policy/monitoring/model/Kpi.java |   2 +-
 .../monitoring/model/KpiDescriptor.java       |   2 +-
 .../policy/monitoring/model/KpiValue.java     |   2 +-
 .../monitoring/model/KpiValueRange.java       |   2 +-
 .../policy/monitoring/model/LongKpiValue.java |   2 +-
 .../monitoring/model/MonitorKpiRequest.java   |   2 +-
 .../monitoring/model/StringKpiValue.java      |   2 +-
 .../monitoring/model/SubsDescriptor.java      |   2 +-
 .../policy/monitoring/model/SubsResponse.java |   2 +-
 .../policy/service/ServiceGateway.java        |   2 +-
 .../policy/service/ServiceGatewayImpl.java    |   2 +-
 .../policy/service/ServiceService.java        |   2 +-
 .../policy/service/ServiceServiceImpl.java    |   2 +-
 src/policy/src/main/resources/application.yml |   2 +-
 .../teraflow/policy/ConfigRuleTypeTest.java   |   2 +-
 .../teraflow/policy/ConstraintTypeTest.java   |   2 +-
 .../teraflow/policy/EndPointCreationTest.java |   2 +-
 .../eu/teraflow/policy/LocationTypeTest.java  |   2 +-
 .../policy/PolicyRuleBasicValidationTest.java |   2 +-
 .../PolicyRuleConditionValidationTest.java    |   2 +-
 .../PolicyRuleDeviceValidationTest.java       |   2 +-
 .../PolicyRuleServiceValidationTest.java      |   2 +-
 .../eu/teraflow/policy/PolicyServiceTest.java |   2 +-
 .../eu/teraflow/policy/SerializerTest.java    |   2 +-
 src/policy/target/kubernetes/kubernetes.yml   |  14 +++
 src/policy/util/set_version.sh                |   2 +-
 src/service/.gitlab-ci.yml                    |   2 +-
 src/service/Config.py                         |   2 +-
 src/service/Dockerfile                        |   2 +-
 src/service/__init__.py                       |   2 +-
 src/service/client/ServiceClient.py           |   2 +-
 src/service/client/__init__.py                |   2 +-
 src/service/requirements.in                   |  15 +++
 src/service/service/ServiceService.py         |   2 +-
 .../service/ServiceServiceServicerImpl.py     |   2 +-
 src/service/service/__init__.py               |   2 +-
 src/service/service/__main__.py               |   2 +-
 .../service_handler_api/AnyTreeTools.py       |   2 +-
 .../service/service_handler_api/Exceptions.py |   2 +-
 .../service_handler_api/FilterFields.py       |   2 +-
 .../ServiceHandlerFactory.py                  |   2 +-
 .../service_handler_api/SettingsHandler.py    |   2 +-
 .../service/service_handler_api/Tools.py      |   2 +-
 .../service_handler_api/_ServiceHandler.py    |   2 +-
 .../service/service_handler_api/__init__.py   |   2 +-
 .../service/service_handlers/__init__.py      |   2 +-
 .../l2nm_emulated/ConfigRules.py              |   2 +-
 .../L2NMEmulatedServiceHandler.py             |   2 +-
 .../l2nm_emulated/__init__.py                 |   2 +-
 .../l2nm_openconfig/ConfigRules.py            |   2 +-
 .../L2NMOpenConfigServiceHandler.py           |   2 +-
 .../l2nm_openconfig/__init__.py               |   2 +-
 .../l3nm_emulated/ConfigRules.py              |   2 +-
 .../L3NMEmulatedServiceHandler.py             |   2 +-
 .../l3nm_emulated/__init__.py                 |   2 +-
 .../l3nm_openconfig/ConfigRules.py            |   2 +-
 .../L3NMOpenConfigServiceHandler.py           |   2 +-
 .../l3nm_openconfig/__init__.py               |   2 +-
 .../microwave/MicrowaveServiceHandler.py      |   2 +-
 .../service_handlers/microwave/__init__.py    |   2 +-
 .../service/service_handlers/p4/__init__.py   |   2 +-
 .../service_handlers/p4/p4_service_handler.py |   2 +-
 .../tapi_tapi/TapiServiceHandler.py           |   2 +-
 .../service_handlers/tapi_tapi/__init__.py    |   2 +-
 .../task_scheduler/ConnectionExpander.py      |   2 +-
 .../service/task_scheduler/TaskExecutor.py    |   2 +-
 .../service/task_scheduler/TaskScheduler.py   |   2 +-
 .../service/task_scheduler/__init__.py        |   2 +-
 .../tasks/Task_ConnectionConfigure.py         |   2 +-
 .../tasks/Task_ConnectionDeconfigure.py       |   2 +-
 .../tasks/Task_ServiceDelete.py               |   2 +-
 .../tasks/Task_ServiceSetStatus.py            |   2 +-
 .../service/task_scheduler/tasks/_Task.py     |   2 +-
 .../service/task_scheduler/tasks/__init__.py  |   2 +-
 src/service/service/tools/ContextGetters.py   |   2 +-
 .../service/tools/EndpointIdFormatters.py     |   2 +-
 src/service/service/tools/ObjectKeys.py       |   2 +-
 src/service/service/tools/__init__.py         |   2 +-
 src/service/tests/CommonObjects.py            |   2 +-
 src/service/tests/MockService_Dependencies.py |   2 +-
 src/service/tests/PrepareTestScenario.py      |   2 +-
 src/service/tests/ServiceHandler_L3NM_EMU.py  |   2 +-
 src/service/tests/ServiceHandler_L3NM_OC.py   |   2 +-
 src/service/tests/ServiceHandlersToTest.py    |   2 +-
 src/service/tests/__init__.py                 |   2 +-
 src/service/tests/test_unitary.py             |   2 +-
 .../tests/test_unitary_task_scheduler.py      |   2 +-
 src/slice/.gitlab-ci.yml                      |   2 +-
 src/slice/Config.py                           |   2 +-
 src/slice/Dockerfile                          |   2 +-
 src/slice/__init__.py                         |   2 +-
 src/slice/client/SliceClient.py               |   2 +-
 src/slice/client/__init__.py                  |   2 +-
 src/slice/old_code/ConstraintsChecker.py      |   2 +-
 src/slice/old_code/SliceCheckers.py           |   2 +-
 src/slice/old_code/SliceStatus.py             |  14 +++
 src/slice/old_code/Tools.py                   |   2 +-
 src/slice/old_code/Tools_2.py                 |   2 +-
 src/slice/requirements.in                     |  15 +++
 src/slice/service/SliceService.py             |   2 +-
 src/slice/service/SliceServiceServicerImpl.py |   2 +-
 src/slice/service/__init__.py                 |   2 +-
 src/slice/service/__main__.py                 |   2 +-
 src/slice/tests/__init__.py                   |   2 +-
 src/slice/tests/test_unitary.py               |   2 +-
 src/start.sh                                  |   2 +-
 src/start_webui_dev_mode.sh                   |   2 +-
 src/tests/.gitlab-ci.yml                      |   2 +-
 src/tests/Fixtures.py                         |   2 +-
 src/tests/__init__.py                         |   2 +-
 src/tests/benchmark/automation/ZtpAdd.js      |  16 +++
 src/tests/benchmark/automation/ZtpDelete.js   |  16 +++
 src/tests/benchmark/automation/ZtpUpdate.js   |  16 +++
 src/tests/benchmark/automation/__init__.py    |   2 +-
 .../automation/run_test_01_bootstrap.sh       |   2 +-
 .../automation/run_test_02_cleanup.sh         |   2 +-
 .../benchmark/automation/tests/Fixtures.py    |   2 +-
 .../benchmark/automation/tests/Objects.py     |   2 +-
 .../benchmark/automation/tests/__init__.py    |   2 +-
 .../tests/test_functional_bootstrap.py        |   2 +-
 .../tests/test_functional_cleanup.py          |   2 +-
 .../benchmark/policy/PolicyAddService.js      |  16 +++
 src/tests/benchmark/policy/PolicyDelete.js    |  16 +++
 .../benchmark/policy/PolicyUpdateService.js   |  16 +++
 src/tests/benchmark/policy/__init__.py        |   2 +-
 src/tests/benchmark/policy/deploy_specs.sh    |  14 +++
 .../benchmark/policy/run_test_01_bootstrap.sh |   2 +-
 .../policy/run_test_02_create_service.sh      |   2 +-
 .../policy/run_test_03_delete_service.sh      |   2 +-
 .../benchmark/policy/run_test_04_cleanup.sh   |   2 +-
 src/tests/benchmark/policy/tests/Fixtures.py  |   2 +-
 src/tests/benchmark/policy/tests/Objects.py   |   2 +-
 src/tests/benchmark/policy/tests/__init__.py  |   2 +-
 .../policy/tests/test_functional_bootstrap.py |   2 +-
 .../policy/tests/test_functional_cleanup.py   |   2 +-
 .../tests/test_functional_create_service.py   |   2 +-
 .../tests/test_functional_delete_service.py   |   2 +-
 src/tests/ecoc22/__init__.py                  |   2 +-
 src/tests/ecoc22/deploy_specs.sh              |   2 +-
 src/tests/ecoc22/redeploy.sh                  |   2 +-
 src/tests/ecoc22/run_test_01_bootstrap.sh     |   2 +-
 .../ecoc22/run_test_02_create_service.sh      |   2 +-
 .../ecoc22/run_test_03_delete_service.sh      |   2 +-
 src/tests/ecoc22/run_test_04_cleanup.sh       |   2 +-
 src/tests/ecoc22/run_tests.sh                 |   2 +-
 src/tests/ecoc22/tests/Fixtures.py            |   2 +-
 src/tests/ecoc22/tests/Objects.py             |   2 +-
 src/tests/ecoc22/tests/Tools.py               |  14 +++
 src/tests/ecoc22/tests/__init__.py            |   2 +-
 .../ecoc22/tests/old_code/BuildDescriptors.py |   2 +-
 .../ecoc22/tests/old_code/LoadDescriptors.py  |   2 +-
 .../ecoc22/tests/old_code/Objects_BigNet.py   |   2 +-
 .../tests/old_code/Objects_DC_CSGW_OLS.py     |   2 +-
 .../tests/old_code/Objects_DC_CSGW_TN.py      |   2 +-
 .../tests/old_code/Objects_DC_CSGW_TN_OLS.py  |   2 +-
 .../ecoc22/tests/test_functional_bootstrap.py |   2 +-
 .../ecoc22/tests/test_functional_cleanup.py   |   2 +-
 .../tests/test_functional_create_service.py   |   2 +-
 .../tests/test_functional_delete_service.py   |   2 +-
 src/tests/oeccpsc22/__init__.py               |   2 +-
 src/tests/oeccpsc22/deploy_in_kubernetes.sh   |   2 +-
 src/tests/oeccpsc22/dump_logs.sh              |   2 +-
 .../oeccpsc22/expose_services_teraflow_1.yaml |   2 +-
 .../oeccpsc22/expose_services_teraflow_2.yaml |   2 +-
 src/tests/oeccpsc22/run_test_01_bootstrap.sh  |   2 +-
 .../run_test_02_create_interdomain_slice.sh   |   2 +-
 .../run_test_03_delete_interdomain_slice.sh   |   2 +-
 src/tests/oeccpsc22/run_test_04_cleanup.sh    |   2 +-
 src/tests/oeccpsc22/show_deploy.sh            |   2 +-
 src/tests/oeccpsc22/tests/Objects_Domain_1.py |   2 +-
 src/tests/oeccpsc22/tests/Objects_Domain_2.py |   2 +-
 src/tests/oeccpsc22/tests/Objects_Service.py  |  14 +++
 src/tests/oeccpsc22/tests/Tools.py            |   2 +-
 src/tests/oeccpsc22/tests/__init__.py         |   2 +-
 .../tests/test_functional_bootstrap.py        |   2 +-
 .../tests/test_functional_cleanup.py          |   2 +-
 ...est_functional_create_interdomain_slice.py |   2 +-
 ...est_functional_delete_interdomain_slice.py |   2 +-
 src/tests/ofc22/__init__.py                   |   2 +-
 src/tests/ofc22/deploy_specs.sh               |   2 +-
 src/tests/ofc22/redeploy.sh                   |   2 +-
 src/tests/ofc22/run_test_01_bootstrap.sh      |   2 +-
 src/tests/ofc22/run_test_02_create_service.sh |   2 +-
 src/tests/ofc22/run_test_03_delete_service.sh |   2 +-
 src/tests/ofc22/run_test_04_cleanup.sh        |   2 +-
 src/tests/ofc22/run_tests.sh                  |   2 +-
 src/tests/ofc22/tests/Fixtures.py             |   2 +-
 src/tests/ofc22/tests/Objects.py              |   2 +-
 src/tests/ofc22/tests/ObjectsXr.py            |   2 +-
 src/tests/ofc22/tests/__init__.py             |   2 +-
 .../ofc22/tests/test_functional_bootstrap.py  |   2 +-
 .../ofc22/tests/test_functional_cleanup.py    |   2 +-
 .../tests/test_functional_create_service.py   |   2 +-
 .../test_functional_create_service_xr.py      |   2 +-
 .../tests/test_functional_delete_service.py   |   2 +-
 .../test_functional_delete_service_xr.py      |   2 +-
 src/tests/p4/__init__.py                      |   2 +-
 src/tests/p4/deploy_specs.sh                  |  14 +++
 src/tests/p4/mininet/1switch1path.py          |   0
 src/tests/p4/mininet/2switch1path.py          |   0
 src/tests/p4/mininet/4switch2path.py          |   0
 src/tests/p4/mininet/6switch2path.py          |   0
 src/tests/p4/run_test_01_bootstrap.sh         |   2 +-
 src/tests/p4/run_test_02_create_service.sh    |   2 +-
 src/tests/p4/run_test_03_delete_service.sh    |   2 +-
 src/tests/p4/run_test_04_cleanup.sh           |   2 +-
 src/tests/p4/setup.sh                         |  14 +++
 src/tests/p4/tests/BuildDescriptors.py        |   2 +-
 src/tests/p4/tests/LoadDescriptors.py         |   2 +-
 src/tests/p4/tests/Objects.py                 |   2 +-
 src/tests/p4/tests/__init__.py                |   2 +-
 .../p4/tests/test_functional_bootstrap.py     |   2 +-
 src/tests/p4/tests/test_functional_cleanup.py |   2 +-
 .../tests/test_functional_create_service.py   |   2 +-
 .../tests/test_functional_delete_service.py   |   2 +-
 src/tests/scenario2/__init__.py               |   2 +-
 src/tests/scenario2/delete_all.sh             |  14 +++
 src/tests/scenario2/deploy_all.sh             |  14 +++
 src/tests/scenario2/deploy_specs_dom1.sh      |  14 +++
 src/tests/scenario2/deploy_specs_dom2.sh      |  14 +++
 src/tests/scenario2/deploy_specs_dom3.sh      |  14 +++
 src/tests/scenario2/deploy_specs_dom4.sh      |  14 +++
 src/tests/scenario2/dump_logs.sh              |  14 +++
 src/tests/scenario2/fast_redeploy.sh          |  14 +++
 .../nginx-ingress-controller-dom1.yaml        |  14 +++
 .../nginx-ingress-controller-dom2.yaml        |  14 +++
 .../nginx-ingress-controller-dom3.yaml        |  14 +++
 .../nginx-ingress-controller-dom4.yaml        |  14 +++
 src/tests/scenario2/reset.sh                  |  14 +++
 src/tests/scenario2/show_deploy.sh            |   2 +-
 src/tests/scenario2/tfs-ingress-dom1.yaml     |  14 +++
 src/tests/scenario2/tfs-ingress-dom2.yaml     |  14 +++
 src/tests/scenario2/tfs-ingress-dom3.yaml     |  14 +++
 src/tests/scenario2/tfs-ingress-dom4.yaml     |  14 +++
 src/tests/tools/__init__.py                   |   2 +-
 src/tests/tools/load_scenario/__init__.py     |   2 +-
 src/tests/tools/load_scenario/__main__.py     |   2 +-
 src/tests/tools/load_scenario/run.sh          |   2 +-
 src/tests/tools/mock_osm/Constants.py         |   2 +-
 src/tests/tools/mock_osm/MockOSM.py           |   2 +-
 src/tests/tools/mock_osm/Tools.py             |   2 +-
 src/tests/tools/mock_osm/__init__.py          |   2 +-
 .../tools/mock_sdn_ctrl/MockMWSdnCtrl.py      |   2 +-
 .../tools/mock_sdn_ctrl/microwave_deploy.sh   |  14 +++
 src/webui/.gitlab-ci.yml                      |   2 +-
 src/webui/Config.py                           |   2 +-
 src/webui/Dockerfile                          |   2 +-
 src/webui/__init__.py                         |   2 +-
 src/webui/requirements.in                     |  14 +++
 src/webui/service/__init__.py                 |   2 +-
 src/webui/service/__main__.py                 |   2 +-
 src/webui/service/context/__init__.py         |   2 +-
 src/webui/service/context/routes.py           |   2 +-
 src/webui/service/device/__init__.py          |   2 +-
 src/webui/service/device/forms.py             |   2 +-
 src/webui/service/device/routes.py            |   2 +-
 src/webui/service/js/__init__.py              |   2 +-
 src/webui/service/js/routes.py                |   2 +-
 src/webui/service/link/__init__.py            |  14 +++
 src/webui/service/link/routes.py              |   2 +-
 src/webui/service/load_gen/__init__.py        |   2 +-
 src/webui/service/load_gen/routes.py          |   2 +-
 src/webui/service/main/__init__.py            |   2 +-
 src/webui/service/main/forms.py               |   2 +-
 src/webui/service/main/routes.py              |   2 +-
 src/webui/service/service/__init__.py         |   2 +-
 src/webui/service/service/routes.py           |   2 +-
 src/webui/service/slice/__init__.py           |   2 +-
 src/webui/service/slice/routes.py             |   2 +-
 src/webui/service/templates/base.html         |   2 +-
 src/webui/service/templates/context/home.html |   2 +-
 src/webui/service/templates/device/add.html   |   2 +-
 .../service/templates/device/addconfig.html   |   2 +-
 .../service/templates/device/detail.html      |   2 +-
 src/webui/service/templates/device/home.html  |   2 +-
 .../service/templates/device/update.html      |  16 +++
 .../templates/device/updateconfig.html        |   2 +-
 src/webui/service/templates/js/site.js        |   2 +-
 src/webui/service/templates/js/topology.js    |   2 +-
 src/webui/service/templates/link/detail.html  |   2 +-
 src/webui/service/templates/link/home.html    |   2 +-
 src/webui/service/templates/main/about.html   |   2 +-
 src/webui/service/templates/main/debug.html   |   2 +-
 src/webui/service/templates/main/home.html    |   2 +-
 .../service/templates/service/detail.html     |   2 +-
 src/webui/service/templates/service/home.html |   2 +-
 src/webui/service/templates/slice/detail.html |   2 +-
 src/webui/service/templates/slice/home.html   |   2 +-
 src/webui/tests/__init__.py                   |   2 +-
 src/webui/tests/test_unitary.py               |   2 +-
 src/webui/utils/__init__.py                   |   2 +-
 src/webui/utils/form_validators.py            |   2 +-
 update_tfs_runtime_env_vars.sh                |   2 +-
 1169 files changed, 2986 insertions(+), 1118 deletions(-)
 mode change 100755 => 100644 clean_testing_environment.sh
 mode change 100755 => 100644 deploy/all.sh
 mode change 100755 => 100644 deploy/component.sh
 mode change 100755 => 100644 deploy/crdb.sh
 mode change 100755 => 100644 deploy/mock_blockchain.sh
 mode change 100755 => 100644 deploy/nats.sh
 mode change 100755 => 100644 deploy/qdb.sh
 mode change 100755 => 100644 deploy/show.sh
 mode change 100755 => 100644 deploy/tfs.sh
 mode change 100755 => 100644 expose_ingress_grpc.sh
 mode change 100755 => 100644 hackfest/grpc/connection/create.py
 mode change 100755 => 100644 hackfest/grpc/connection/list.py
 mode change 100755 => 100644 hackfest/p4/mininet/topo-simple.py
 mode change 100755 => 100644 hackfest/p4/run_test_01_bootstrap.sh
 mode change 100755 => 100644 hackfest/p4/run_test_02_create_service.sh
 mode change 100755 => 100644 hackfest/p4/run_test_03_delete_service.sh
 mode change 100755 => 100644 hackfest/p4/run_test_04_cleanup.sh
 mode change 100755 => 100644 hackfest/p4/setup.sh
 mode change 100755 => 100644 hackfest/tapi/client/tapi-client.sh
 mode change 100755 => 100644 hackfest/tapi/server/run.sh
 mode change 100755 => 100644 install_requirements.sh
 mode change 100755 => 100644 proto/generate_code_python.sh
 mode change 100755 => 100644 proto/generate_uml.sh
 mode change 100755 => 100644 run_tests_docker.sh
 mode change 100755 => 100644 scripts/add_license_header_to_files.sh
 mode change 100755 => 100644 scripts/build_run_report_tests_locally.sh
 mode change 100755 => 100644 scripts/cockroachdb_client.sh
 mode change 100755 => 100644 scripts/create_component.sh
 mode change 100755 => 100644 scripts/dump_logs.sh
 mode change 100755 => 100644 scripts/old/configure_dashboards_in_kubernetes.sh
 mode change 100755 => 100644 scripts/old/deploy_in_kubernetes.sh
 mode change 100755 => 100644 scripts/old/open_dashboard.sh
 mode change 100755 => 100644 scripts/old/open_webui.sh
 mode change 100755 => 100644 scripts/report_coverage_all.sh
 mode change 100755 => 100644 scripts/report_coverage_common.sh
 mode change 100755 => 100644 scripts/report_coverage_compute.sh
 mode change 100755 => 100644 scripts/report_coverage_context.sh
 mode change 100755 => 100644 scripts/report_coverage_device.sh
 mode change 100755 => 100644 scripts/report_coverage_l3_attackmitigator.sh
 mode change 100755 => 100644 scripts/report_coverage_l3_centralizedattackdetector.sh
 mode change 100755 => 100644 scripts/report_coverage_l3_distributedattackdetector.sh
 mode change 100755 => 100644 scripts/report_coverage_pathcomp.sh
 mode change 100755 => 100644 scripts/report_coverage_service.sh
 mode change 100755 => 100644 scripts/report_coverage_slice.sh
 mode change 100755 => 100644 scripts/run_tests_locally-compute.sh
 mode change 100755 => 100644 scripts/run_tests_locally-context.sh
 mode change 100755 => 100644 scripts/run_tests_locally-device-all.sh
 mode change 100755 => 100644 scripts/run_tests_locally-device-emulated.sh
 mode change 100755 => 100644 scripts/run_tests_locally-device-microwave.sh
 mode change 100755 => 100644 scripts/run_tests_locally-device-openconfig.sh
 mode change 100755 => 100644 scripts/run_tests_locally-device-p4.sh
 mode change 100755 => 100644 scripts/run_tests_locally-device-tapi.sh
 mode change 100755 => 100644 scripts/run_tests_locally-pathcomp-frontend.sh
 mode change 100755 => 100644 scripts/run_tests_locally-service.sh
 mode change 100755 => 100644 scripts/run_tests_locally-slice.sh
 mode change 100755 => 100644 scripts/run_tests_locally.sh
 mode change 100755 => 100644 scripts/show_logs_automation.sh
 mode change 100755 => 100644 scripts/show_logs_compute.sh
 mode change 100755 => 100644 scripts/show_logs_context.sh
 mode change 100755 => 100644 scripts/show_logs_device.sh
 mode change 100755 => 100644 scripts/show_logs_dlt_connector.sh
 mode change 100755 => 100644 scripts/show_logs_dlt_gateway.sh
 mode change 100755 => 100644 scripts/show_logs_monitoring.sh
 mode change 100755 => 100644 scripts/show_logs_pathcomp_backend.sh
 mode change 100755 => 100644 scripts/show_logs_pathcomp_frontend.sh
 mode change 100755 => 100644 scripts/show_logs_service.sh
 mode change 100755 => 100644 scripts/show_logs_slice.sh
 mode change 100755 => 100644 scripts/show_logs_webui.sh
 create mode 100644 scripts/update_license_headers.py
 mode change 100755 => 100644 src/automation/mvnw
 mode change 100755 => 100644 src/automation/util/set_version.sh
 mode change 100755 => 100644 src/build.sh
 mode change 100755 => 100644 src/clean.sh
 mode change 100755 => 100644 src/common/method_wrappers/results-perf-eval/MW/generate.sh
 mode change 100755 => 100644 src/common/method_wrappers/results-perf-eval/OpenConfig/generate.sh
 mode change 100755 => 100644 src/common/method_wrappers/results-perf-eval/XR/generate.sh
 mode change 100755 => 100644 src/common/method_wrappers/results-perf-eval/emulated/generate.sh
 mode change 100755 => 100644 src/dbscanserving/genproto.sh
 mode change 100755 => 100644 src/device/service/drivers/xr/cm-cli.py
 mode change 100755 => 100644 src/device/service/drivers/xr/setup_test_env.sh
 mode change 100755 => 100644 src/gitlab-ci.yml_generator.py
 mode change 100755 => 100644 src/load_generator/run.sh
 mode change 100755 => 100644 src/opticalattackmitigator/genproto.sh
 mode change 100755 => 100644 src/opticalcentralizedattackdetector/genproto.sh
 mode change 100755 => 100644 src/policy/mvnw
 mode change 100755 => 100644 src/policy/util/set_version.sh
 mode change 100755 => 100644 src/start.sh
 mode change 100755 => 100644 src/start_webui_dev_mode.sh
 mode change 100755 => 100644 src/tests/benchmark/automation/ZtpUpdate.js
 mode change 100755 => 100644 src/tests/benchmark/automation/run_test_01_bootstrap.sh
 mode change 100755 => 100644 src/tests/benchmark/automation/run_test_02_cleanup.sh
 mode change 100755 => 100644 src/tests/benchmark/policy/run_test_01_bootstrap.sh
 mode change 100755 => 100644 src/tests/benchmark/policy/run_test_02_create_service.sh
 mode change 100755 => 100644 src/tests/benchmark/policy/run_test_03_delete_service.sh
 mode change 100755 => 100644 src/tests/benchmark/policy/run_test_04_cleanup.sh
 mode change 100755 => 100644 src/tests/ecoc22/redeploy.sh
 mode change 100755 => 100644 src/tests/ecoc22/run_test_01_bootstrap.sh
 mode change 100755 => 100644 src/tests/ecoc22/run_test_02_create_service.sh
 mode change 100755 => 100644 src/tests/ecoc22/run_test_03_delete_service.sh
 mode change 100755 => 100644 src/tests/ecoc22/run_test_04_cleanup.sh
 mode change 100755 => 100644 src/tests/ecoc22/run_tests.sh
 mode change 100755 => 100644 src/tests/oeccpsc22/deploy_in_kubernetes.sh
 mode change 100755 => 100644 src/tests/oeccpsc22/dump_logs.sh
 mode change 100755 => 100644 src/tests/oeccpsc22/run_test_01_bootstrap.sh
 mode change 100755 => 100644 src/tests/oeccpsc22/run_test_02_create_interdomain_slice.sh
 mode change 100755 => 100644 src/tests/oeccpsc22/run_test_03_delete_interdomain_slice.sh
 mode change 100755 => 100644 src/tests/oeccpsc22/run_test_04_cleanup.sh
 mode change 100755 => 100644 src/tests/oeccpsc22/show_deploy.sh
 mode change 100755 => 100644 src/tests/ofc22/redeploy.sh
 mode change 100755 => 100644 src/tests/ofc22/run_test_01_bootstrap.sh
 mode change 100755 => 100644 src/tests/ofc22/run_test_02_create_service.sh
 mode change 100755 => 100644 src/tests/ofc22/run_test_03_delete_service.sh
 mode change 100755 => 100644 src/tests/ofc22/run_test_04_cleanup.sh
 mode change 100755 => 100644 src/tests/ofc22/run_tests.sh
 mode change 100755 => 100644 src/tests/p4/mininet/1switch1path.py
 mode change 100755 => 100644 src/tests/p4/mininet/2switch1path.py
 mode change 100755 => 100644 src/tests/p4/mininet/4switch2path.py
 mode change 100755 => 100644 src/tests/p4/mininet/6switch2path.py
 mode change 100755 => 100644 src/tests/p4/run_test_01_bootstrap.sh
 mode change 100755 => 100644 src/tests/p4/run_test_02_create_service.sh
 mode change 100755 => 100644 src/tests/p4/run_test_03_delete_service.sh
 mode change 100755 => 100644 src/tests/p4/run_test_04_cleanup.sh
 mode change 100755 => 100644 src/tests/p4/setup.sh
 mode change 100755 => 100644 src/tests/scenario2/delete_all.sh
 mode change 100755 => 100644 src/tests/scenario2/deploy_all.sh
 mode change 100755 => 100644 src/tests/scenario2/dump_logs.sh
 mode change 100755 => 100644 src/tests/scenario2/reset.sh
 mode change 100755 => 100644 src/tests/scenario2/show_deploy.sh
 mode change 100755 => 100644 src/tests/tools/load_scenario/run.sh
 mode change 100755 => 100644 update_tfs_runtime_env_vars.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45d4056c6..713d893cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/clean_testing_environment.sh b/clean_testing_environment.sh
old mode 100755
new mode 100644
index 09bff95d8..b9c502ade
--- a/clean_testing_environment.sh
+++ b/clean_testing_environment.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/common_requirements.in b/common_requirements.in
index cb06c3b65..cb418f019 100644
--- a/common_requirements.in
+++ b/common_requirements.in
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/coverage/.coveragerc.template b/coverage/.coveragerc.template
index 8863d4d6e..4421399ca 100644
--- a/coverage/.coveragerc.template
+++ b/coverage/.coveragerc.template
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 [run]
 data_file = ~/tfs-ctrl/coverage/.coverage
 source = .
diff --git a/deploy/all.sh b/deploy/all.sh
old mode 100755
new mode 100644
index 484640c67..a99607f5b
--- a/deploy/all.sh
+++ b/deploy/all.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/deploy/component.sh b/deploy/component.sh
old mode 100755
new mode 100644
index 443bee601..922aa5e0e
--- a/deploy/component.sh
+++ b/deploy/component.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/deploy/crdb.sh b/deploy/crdb.sh
old mode 100755
new mode 100644
index 90456773b..ebbe0a34e
--- a/deploy/crdb.sh
+++ b/deploy/crdb.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/deploy/mock_blockchain.sh b/deploy/mock_blockchain.sh
old mode 100755
new mode 100644
index f741f069f..ef7811c87
--- a/deploy/mock_blockchain.sh
+++ b/deploy/mock_blockchain.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/deploy/nats.sh b/deploy/nats.sh
old mode 100755
new mode 100644
index 544028996..115a18530
--- a/deploy/nats.sh
+++ b/deploy/nats.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/deploy/qdb.sh b/deploy/qdb.sh
old mode 100755
new mode 100644
index 1e9d4d8ee..d9a4de353
--- a/deploy/qdb.sh
+++ b/deploy/qdb.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/deploy/show.sh b/deploy/show.sh
old mode 100755
new mode 100644
index 68a5659aa..a4084ac65
--- a/deploy/show.sh
+++ b/deploy/show.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
old mode 100755
new mode 100644
index c0f376ee9..b9bcbab4d
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/expose_ingress_grpc.sh b/expose_ingress_grpc.sh
old mode 100755
new mode 100644
index e2667247a..945641c1f
--- a/expose_ingress_grpc.sh
+++ b/expose_ingress_grpc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/gnmi/sonic.clab.yml b/hackfest/gnmi/sonic.clab.yml
index dc4f74321..47c1e6464 100644
--- a/hackfest/gnmi/sonic.clab.yml
+++ b/hackfest/gnmi/sonic.clab.yml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # file: sonic.clab.yml
 name: sonic-vs
 
diff --git a/hackfest/grpc/connection.proto b/hackfest/grpc/connection.proto
index 42661cd5b..0e8522768 100644
--- a/hackfest/grpc/connection.proto
+++ b/hackfest/grpc/connection.proto
@@ -1,3 +1,17 @@
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 //Example of connection
 syntax = "proto3";
 package connection;
diff --git a/hackfest/grpc/connection/create.py b/hackfest/grpc/connection/create.py
old mode 100755
new mode 100644
index df5df77d6..7d134105d
--- a/hackfest/grpc/connection/create.py
+++ b/hackfest/grpc/connection/create.py
@@ -1,4 +1,18 @@
 #! /usr/bin/env python3
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import connection_pb2
 import sys
 
diff --git a/hackfest/grpc/connection/list.py b/hackfest/grpc/connection/list.py
old mode 100755
new mode 100644
index 47b92cc4a..5b1926d3c
--- a/hackfest/grpc/connection/list.py
+++ b/hackfest/grpc/connection/list.py
@@ -1,4 +1,18 @@
 #! /usr/bin/env python3
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from __future__ import print_function
 import connection_pb2
 import sys
diff --git a/hackfest/grpc/connectionService.proto b/hackfest/grpc/connectionService.proto
index aa3bcb4ef..8f6b5a6e7 100644
--- a/hackfest/grpc/connectionService.proto
+++ b/hackfest/grpc/connectionService.proto
@@ -1,3 +1,17 @@
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 //Example of connection
 syntax = "proto3";
 package connection;
diff --git a/hackfest/grpc/connectionService/connectionService_client.py b/hackfest/grpc/connectionService/connectionService_client.py
index c0f45f7a9..e5c1bf481 100644
--- a/hackfest/grpc/connectionService/connectionService_client.py
+++ b/hackfest/grpc/connectionService/connectionService_client.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from __future__ import print_function
 
 import grpc
diff --git a/hackfest/grpc/connectionService/connectionService_server.py b/hackfest/grpc/connectionService/connectionService_server.py
index 6fbd195cd..f1632db90 100644
--- a/hackfest/grpc/connectionService/connectionService_server.py
+++ b/hackfest/grpc/connectionService/connectionService_server.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from concurrent import futures
 import time
 import logging
diff --git a/hackfest/grpc/connectionServiceWithNotif.proto b/hackfest/grpc/connectionServiceWithNotif.proto
index 8430479c5..f2f5b17e3 100644
--- a/hackfest/grpc/connectionServiceWithNotif.proto
+++ b/hackfest/grpc/connectionServiceWithNotif.proto
@@ -1,3 +1,17 @@
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 //Example of connection
 syntax = "proto3";
 package connection;
diff --git a/hackfest/grpc/connectionServiceWithNotif/connectionServiceWithNotif_client.py b/hackfest/grpc/connectionServiceWithNotif/connectionServiceWithNotif_client.py
index e40e0a5fa..9518bf743 100644
--- a/hackfest/grpc/connectionServiceWithNotif/connectionServiceWithNotif_client.py
+++ b/hackfest/grpc/connectionServiceWithNotif/connectionServiceWithNotif_client.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from __future__ import print_function
 
 import grpc
diff --git a/hackfest/grpc/connectionServiceWithNotif/connectionServiceWithNotif_server.py b/hackfest/grpc/connectionServiceWithNotif/connectionServiceWithNotif_server.py
index a9970056d..922f91837 100644
--- a/hackfest/grpc/connectionServiceWithNotif/connectionServiceWithNotif_server.py
+++ b/hackfest/grpc/connectionServiceWithNotif/connectionServiceWithNotif_server.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from concurrent import futures
 import time
 import logging
diff --git a/hackfest/grpc/topologyService.proto b/hackfest/grpc/topologyService.proto
index cf9601a4b..775e45add 100644
--- a/hackfest/grpc/topologyService.proto
+++ b/hackfest/grpc/topologyService.proto
@@ -1,3 +1,17 @@
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 //Example of topology
 syntax = "proto3";
 package topology;
diff --git a/hackfest/grpc/topologyService/topologyService_client.py b/hackfest/grpc/topologyService/topologyService_client.py
index 24ce803b0..ef628183b 100644
--- a/hackfest/grpc/topologyService/topologyService_client.py
+++ b/hackfest/grpc/topologyService/topologyService_client.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from __future__ import print_function
 
 import grpc
diff --git a/hackfest/grpc/topologyService/topologyService_server.py b/hackfest/grpc/topologyService/topologyService_server.py
index bb72e2242..ff1c80e82 100644
--- a/hackfest/grpc/topologyService/topologyService_server.py
+++ b/hackfest/grpc/topologyService/topologyService_server.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from concurrent import futures
 import time
 import logging
diff --git a/hackfest/kafka/pub.py b/hackfest/kafka/pub.py
index 12d3dc2dd..e80dd5db8 100644
--- a/hackfest/kafka/pub.py
+++ b/hackfest/kafka/pub.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from time import sleep
 from json import dumps
 from kafka import KafkaProducer
diff --git a/hackfest/kafka/sub.py b/hackfest/kafka/sub.py
index f61ab4d47..233b9f9d0 100644
--- a/hackfest/kafka/sub.py
+++ b/hackfest/kafka/sub.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from kafka import KafkaConsumer
 from json import loads
 
diff --git a/hackfest/mock_osm/MockOSM.py b/hackfest/mock_osm/MockOSM.py
index b4e629d58..338db0e19 100644
--- a/hackfest/mock_osm/MockOSM.py
+++ b/hackfest/mock_osm/MockOSM.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/mock_osm/__init__.py b/hackfest/mock_osm/__init__.py
index 70a332512..1549d9811 100644
--- a/hackfest/mock_osm/__init__.py
+++ b/hackfest/mock_osm/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/mock_osm/__main__.py b/hackfest/mock_osm/__main__.py
index 410feda84..669da2b5e 100644
--- a/hackfest/mock_osm/__main__.py
+++ b/hackfest/mock_osm/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/netconf-oc/device_definition.py b/hackfest/netconf-oc/device_definition.py
index 15efdee42..6e737f556 100644
--- a/hackfest/netconf-oc/device_definition.py
+++ b/hackfest/netconf-oc/device_definition.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from lxml import etree
 from netconf import util
 from pyangbind.lib.serialise import pybindIETFXMLEncoder
diff --git a/hackfest/netconf-oc/interfaces.xml b/hackfest/netconf-oc/interfaces.xml
index 8358a0595..c47fc44e3 100644
--- a/hackfest/netconf-oc/interfaces.xml
+++ b/hackfest/netconf-oc/interfaces.xml
@@ -1,4 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+-->
+
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
   <interfaces xmlns="http://openconfig.net/yang/interfaces">
     <interface>
diff --git a/hackfest/netconf-oc/platform.xml b/hackfest/netconf-oc/platform.xml
index 434dc4c9b..04c53f559 100644
--- a/hackfest/netconf-oc/platform.xml
+++ b/hackfest/netconf-oc/platform.xml
@@ -1,4 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+-->
+
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
   <components xmlns="http://openconfig.net/yang/platform">
     <component>
diff --git a/hackfest/netconf-oc/server_openconfig.py b/hackfest/netconf-oc/server_openconfig.py
index 08a68d42f..fe4085e39 100644
--- a/hackfest/netconf-oc/server_openconfig.py
+++ b/hackfest/netconf-oc/server_openconfig.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import logging, os, sys, time
 from pyangbind.lib.serialise import pybindIETFXMLEncoder, pybindIETFXMLDecoder
 from lxml import etree
diff --git a/hackfest/netconf/client_topology.py b/hackfest/netconf/client_topology.py
index 5b1dd9a3e..138468e20 100644
--- a/hackfest/netconf/client_topology.py
+++ b/hackfest/netconf/client_topology.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from lxml import etree
 from netconf.client import NetconfSSHSession
 
diff --git a/hackfest/netconf/connection/client_connection.py b/hackfest/netconf/connection/client_connection.py
index 08c0eaae0..bba5e0ae9 100644
--- a/hackfest/netconf/connection/client_connection.py
+++ b/hackfest/netconf/connection/client_connection.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from lxml import etree
 from netconf.client import NetconfSSHSession
 
diff --git a/hackfest/netconf/connection/server_topology_connection.py b/hackfest/netconf/connection/server_topology_connection.py
index 928edfb87..67953e7ed 100644
--- a/hackfest/netconf/connection/server_topology_connection.py
+++ b/hackfest/netconf/connection/server_topology_connection.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import sys
 import time
 import logging
diff --git a/hackfest/netconf/connection/topology.xml b/hackfest/netconf/connection/topology.xml
index 93af48085..9baab0342 100644
--- a/hackfest/netconf/connection/topology.xml
+++ b/hackfest/netconf/connection/topology.xml
@@ -1,3 +1,19 @@
+<!--
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+-->
+
 <topology xmlns="urn:topology">
   <topology>
     <node>
diff --git a/hackfest/netconf/server_topology.py b/hackfest/netconf/server_topology.py
index 84460c84b..1320a7b00 100644
--- a/hackfest/netconf/server_topology.py
+++ b/hackfest/netconf/server_topology.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import sys
 import time
 import logging
diff --git a/hackfest/netconf/topology.xml b/hackfest/netconf/topology.xml
index 93af48085..9baab0342 100644
--- a/hackfest/netconf/topology.xml
+++ b/hackfest/netconf/topology.xml
@@ -1,3 +1,19 @@
+<!--
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+-->
+
 <topology xmlns="urn:topology">
   <topology>
     <node>
diff --git a/hackfest/onos_api/onos_flows.py b/hackfest/onos_api/onos_flows.py
index b2df4b5a2..da57506a1 100644
--- a/hackfest/onos_api/onos_flows.py
+++ b/hackfest/onos_api/onos_flows.py
@@ -1,4 +1,18 @@
 #!/usr/bin/python
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # -*- coding: utf-8 -*-
 
 import requests
diff --git a/hackfest/onos_api/onos_topology.py b/hackfest/onos_api/onos_topology.py
index c008263d2..eca3285bd 100644
--- a/hackfest/onos_api/onos_topology.py
+++ b/hackfest/onos_api/onos_topology.py
@@ -1,4 +1,18 @@
 #!/usr/bin/python
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # -*- coding: utf-8 -*-
 
 import requests
diff --git a/hackfest/openconfig/generated.go b/hackfest/openconfig/generated.go
index f4ab51ad2..51c51d41a 100644
--- a/hackfest/openconfig/generated.go
+++ b/hackfest/openconfig/generated.go
@@ -1,3 +1,17 @@
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 /*
 Package gostruct is a generated package which contains definitions
 of structs which represent a YANG schema. The generated schema can be
diff --git a/hackfest/p4/__init__.py b/hackfest/p4/__init__.py
index 70a332512..1549d9811 100644
--- a/hackfest/p4/__init__.py
+++ b/hackfest/p4/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/deploy_specs.sh b/hackfest/p4/deploy_specs.sh
index b486474e2..b988123d5 100644
--- a/hackfest/p4/deploy_specs.sh
+++ b/hackfest/p4/deploy_specs.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/hackfest/p4/mininet/topo-simple.py b/hackfest/p4/mininet/topo-simple.py
old mode 100755
new mode 100644
diff --git a/hackfest/p4/run_test_01_bootstrap.sh b/hackfest/p4/run_test_01_bootstrap.sh
old mode 100755
new mode 100644
index 42e647be1..af35fa3dc
--- a/hackfest/p4/run_test_01_bootstrap.sh
+++ b/hackfest/p4/run_test_01_bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/run_test_02_create_service.sh b/hackfest/p4/run_test_02_create_service.sh
old mode 100755
new mode 100644
index 8fb9038d8..1b5c55994
--- a/hackfest/p4/run_test_02_create_service.sh
+++ b/hackfest/p4/run_test_02_create_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/run_test_03_delete_service.sh b/hackfest/p4/run_test_03_delete_service.sh
old mode 100755
new mode 100644
index 96f79c071..d641d8c4f
--- a/hackfest/p4/run_test_03_delete_service.sh
+++ b/hackfest/p4/run_test_03_delete_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/run_test_04_cleanup.sh b/hackfest/p4/run_test_04_cleanup.sh
old mode 100755
new mode 100644
index 5cb265f6f..d87ef1a00
--- a/hackfest/p4/run_test_04_cleanup.sh
+++ b/hackfest/p4/run_test_04_cleanup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/setup.sh b/hackfest/p4/setup.sh
old mode 100755
new mode 100644
index 195327a03..3ab0faf9e
--- a/hackfest/p4/setup.sh
+++ b/hackfest/p4/setup.sh
@@ -1,4 +1,18 @@
 #! /bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 export POD_NAME=$(kubectl get pods -n=tfs | grep device | awk '{print $1}')
 
diff --git a/hackfest/p4/tests/BuildDescriptors.py b/hackfest/p4/tests/BuildDescriptors.py
index 5c5419190..98b788633 100644
--- a/hackfest/p4/tests/BuildDescriptors.py
+++ b/hackfest/p4/tests/BuildDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/tests/LoadDescriptors.py b/hackfest/p4/tests/LoadDescriptors.py
index 33bc699af..b232935f4 100644
--- a/hackfest/p4/tests/LoadDescriptors.py
+++ b/hackfest/p4/tests/LoadDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/tests/Objects.py b/hackfest/p4/tests/Objects.py
index dcef02552..97557d739 100644
--- a/hackfest/p4/tests/Objects.py
+++ b/hackfest/p4/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/tests/__init__.py b/hackfest/p4/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/hackfest/p4/tests/__init__.py
+++ b/hackfest/p4/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/tests/test_functional_bootstrap.py b/hackfest/p4/tests/test_functional_bootstrap.py
index 0254ffd26..8ad3c8a9c 100644
--- a/hackfest/p4/tests/test_functional_bootstrap.py
+++ b/hackfest/p4/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/tests/test_functional_cleanup.py b/hackfest/p4/tests/test_functional_cleanup.py
index ccbcb9843..5e84f47e2 100644
--- a/hackfest/p4/tests/test_functional_cleanup.py
+++ b/hackfest/p4/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/tests/test_functional_create_service.py b/hackfest/p4/tests/test_functional_create_service.py
index 501536bdb..73200b893 100644
--- a/hackfest/p4/tests/test_functional_create_service.py
+++ b/hackfest/p4/tests/test_functional_create_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/p4/tests/test_functional_delete_service.py b/hackfest/p4/tests/test_functional_delete_service.py
index 1be7e3240..4a03ed158 100644
--- a/hackfest/p4/tests/test_functional_delete_service.py
+++ b/hackfest/p4/tests/test_functional_delete_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/hackfest/restconf/connection.yaml b/hackfest/restconf/connection.yaml
index abc119f26..c704ed742 100644
--- a/hackfest/restconf/connection.yaml
+++ b/hackfest/restconf/connection.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 ---
 swagger: "2.0"
 info:
diff --git a/hackfest/restconf/connectionserver/swagger_server/database.py b/hackfest/restconf/connectionserver/swagger_server/database.py
index 9a5ea9fb2..8794f873f 100644
--- a/hackfest/restconf/connectionserver/swagger_server/database.py
+++ b/hackfest/restconf/connectionserver/swagger_server/database.py
@@ -1,4 +1,18 @@
 #!/usr/bin/env python3
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 from swagger_server.models.connection_connection import ConnectionConnection
 
diff --git a/hackfest/restconf/connectionserver/swagger_server/swagger/swagger.yaml b/hackfest/restconf/connectionserver/swagger_server/swagger/swagger.yaml
index 85af55204..0dc82659c 100644
--- a/hackfest/restconf/connectionserver/swagger_server/swagger/swagger.yaml
+++ b/hackfest/restconf/connectionserver/swagger_server/swagger/swagger.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 openapi: 3.0.1
 info:
   title: connection API
diff --git a/hackfest/restconf/topology.yaml b/hackfest/restconf/topology.yaml
index ebb0b7e3c..71f106744 100644
--- a/hackfest/restconf/topology.yaml
+++ b/hackfest/restconf/topology.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 ---
 swagger: "2.0"
 info:
diff --git a/hackfest/restconf/topologyserver/swagger_server/swagger/swagger.yaml b/hackfest/restconf/topologyserver/swagger_server/swagger/swagger.yaml
index c35919208..f8ed88ea8 100644
--- a/hackfest/restconf/topologyserver/swagger_server/swagger/swagger.yaml
+++ b/hackfest/restconf/topologyserver/swagger_server/swagger/swagger.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 openapi: 3.0.1
 info:
   title: topology API
diff --git a/hackfest/tapi/client/tapi-client.sh b/hackfest/tapi/client/tapi-client.sh
old mode 100755
new mode 100644
index a591a2006..084d63dee
--- a/hackfest/tapi/client/tapi-client.sh
+++ b/hackfest/tapi/client/tapi-client.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 #Example CURL for TAPI 2.0
 
 #Get Context
diff --git a/hackfest/tapi/server/run.sh b/hackfest/tapi/server/run.sh
old mode 100755
new mode 100644
index 6b6969217..9beaec828
--- a/hackfest/tapi/server/run.sh
+++ b/hackfest/tapi/server/run.sh
@@ -1,3 +1,17 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 python3 -m tapi_server 8080 database/mini-ols-context.json
diff --git a/hackfest/tapi/server/tapi_server/__main__.py b/hackfest/tapi/server/tapi_server/__main__.py
index 580c6f80f..14a73dae3 100644
--- a/hackfest/tapi/server/tapi_server/__main__.py
+++ b/hackfest/tapi/server/tapi_server/__main__.py
@@ -1,4 +1,18 @@
 #!/usr/bin/env python3
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 import connexion
 import json
diff --git a/hackfest/tapi/server/tapi_server/database.py b/hackfest/tapi/server/tapi_server/database.py
index 1e3e3da6a..f1450ab5a 100644
--- a/hackfest/tapi/server/tapi_server/database.py
+++ b/hackfest/tapi/server/tapi_server/database.py
@@ -1,4 +1,18 @@
 #!/usr/bin/env python3
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 from tapi_server.models.tapi_common_context import TapiCommonContext
 from tapi_server.models.tapi_connectivity_cep_list import TapiConnectivityCepList
diff --git a/hackfest/tapi/server/tapi_server/swagger/swagger.yaml b/hackfest/tapi/server/tapi_server/swagger/swagger.yaml
index abb88f1d1..99928b9dc 100644
--- a/hackfest/tapi/server/tapi_server/swagger/swagger.yaml
+++ b/hackfest/tapi/server/tapi_server/swagger/swagger.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 openapi: 3.0.1
 info:
   title: "tapi-notification,tapi-connectivity,tapi-topology,tapi-common,tapi-path-computation\
diff --git a/hackfest/tapi/tapi-connectivity.yaml b/hackfest/tapi/tapi-connectivity.yaml
index 6cc5d3903..f70ccbdc3 100644
--- a/hackfest/tapi/tapi-connectivity.yaml
+++ b/hackfest/tapi/tapi-connectivity.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 ---
 swagger: "2.0"
 info:
diff --git a/hackfest/tapi/tapi_app/requirements.sh b/hackfest/tapi/tapi_app/requirements.sh
index 95832bb66..56a5b20b4 100644
--- a/hackfest/tapi/tapi_app/requirements.sh
+++ b/hackfest/tapi/tapi_app/requirements.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 sudo apt install graphviz
 pip install -r requirements.txt
diff --git a/hackfest/tapi/tapi_app/tapi_app.py b/hackfest/tapi/tapi_app/tapi_app.py
index 195306c7b..d0306028c 100644
--- a/hackfest/tapi/tapi_app/tapi_app.py
+++ b/hackfest/tapi/tapi_app/tapi_app.py
@@ -1,4 +1,18 @@
 #!/usr/bin/python
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # -*- coding: utf-8 -*-
 
 import json, requests, networkx as nx
diff --git a/hackfest/yang/connection/connection.py b/hackfest/yang/connection/connection.py
index c404d2f5c..1b5effbd8 100644
--- a/hackfest/yang/connection/connection.py
+++ b/hackfest/yang/connection/connection.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from binding_connection import connection
 from pyangbind.lib.serialise import pybindIETFXMLEncoder
 import pyangbind.lib.pybindJSON as pybindJSON
diff --git a/hackfest/yang/topology.py b/hackfest/yang/topology.py
index 441300fb5..24f8f0d97 100644
--- a/hackfest/yang/topology.py
+++ b/hackfest/yang/topology.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from binding_topology import topology
 from pyangbind.lib.serialise import pybindIETFXMLEncoder
 import pyangbind.lib.pybindJSON as pybindJSON
diff --git a/hackfest/yang/topology.xml b/hackfest/yang/topology.xml
index 93af48085..9baab0342 100644
--- a/hackfest/yang/topology.xml
+++ b/hackfest/yang/topology.xml
@@ -1,3 +1,19 @@
+<!--
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+-->
+
 <topology xmlns="urn:topology">
   <topology>
     <node>
diff --git a/install_requirements.sh b/install_requirements.sh
old mode 100755
new mode 100644
index ea9385729..f2013d275
--- a/install_requirements.sh
+++ b/install_requirements.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/.gitlab-ci.yml b/manifests/.gitlab-ci.yml
index 9ce323c58..9444afea5 100644
--- a/manifests/.gitlab-ci.yml
+++ b/manifests/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/cockroachdb/single-node.yaml b/manifests/cockroachdb/single-node.yaml
index f207d2594..72454a090 100644
--- a/manifests/cockroachdb/single-node.yaml
+++ b/manifests/cockroachdb/single-node.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/computeservice.yaml b/manifests/computeservice.yaml
index 89a4a39e5..7e40ef988 100644
--- a/manifests/computeservice.yaml
+++ b/manifests/computeservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index 805808d5d..b1e6eb89d 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/dbscanservingservice.yaml b/manifests/dbscanservingservice.yaml
index e1f73a237..ae9201434 100644
--- a/manifests/dbscanservingservice.yaml
+++ b/manifests/dbscanservingservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index 3580df088..ca2c81f0f 100644
--- a/manifests/deviceservice.yaml
+++ b/manifests/deviceservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/dltservice.yaml b/manifests/dltservice.yaml
index c067960b7..5e8f745f7 100644
--- a/manifests/dltservice.yaml
+++ b/manifests/dltservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/interdomainservice.yaml b/manifests/interdomainservice.yaml
index b21434361..79acf96de 100644
--- a/manifests/interdomainservice.yaml
+++ b/manifests/interdomainservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/l3_attackmitigatorservice.yaml b/manifests/l3_attackmitigatorservice.yaml
index 592143089..dec1bc4d9 100644
--- a/manifests/l3_attackmitigatorservice.yaml
+++ b/manifests/l3_attackmitigatorservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/l3_centralizedattackdetectorservice.yaml b/manifests/l3_centralizedattackdetectorservice.yaml
index 8672cab95..0ef23ba51 100644
--- a/manifests/l3_centralizedattackdetectorservice.yaml
+++ b/manifests/l3_centralizedattackdetectorservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/l3_distributedattackdetectorservice.yaml b/manifests/l3_distributedattackdetectorservice.yaml
index 8765b7171..b363c1d5c 100644
--- a/manifests/l3_distributedattackdetectorservice.yaml
+++ b/manifests/l3_distributedattackdetectorservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/load_generatorservice.yaml b/manifests/load_generatorservice.yaml
index 4d7b32d1b..b94e11e72 100644
--- a/manifests/load_generatorservice.yaml
+++ b/manifests/load_generatorservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/mock_blockchain.yaml b/manifests/mock_blockchain.yaml
index 17b32a47e..1093610f8 100644
--- a/manifests/mock_blockchain.yaml
+++ b/manifests/mock_blockchain.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/monitoringservice.yaml b/manifests/monitoringservice.yaml
index 77e62518d..4447a1427 100644
--- a/manifests/monitoringservice.yaml
+++ b/manifests/monitoringservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/nginx_ingress_http.yaml b/manifests/nginx_ingress_http.yaml
index fe262d328..5db05d4af 100644
--- a/manifests/nginx_ingress_http.yaml
+++ b/manifests/nginx_ingress_http.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
diff --git a/manifests/opticalattackmitigatorservice.yaml b/manifests/opticalattackmitigatorservice.yaml
index 0252eec21..bfac05e40 100644
--- a/manifests/opticalattackmitigatorservice.yaml
+++ b/manifests/opticalattackmitigatorservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/opticalcentralizedattackdetectorservice.yaml b/manifests/opticalcentralizedattackdetectorservice.yaml
index 4a49f8b13..13d4d97c2 100644
--- a/manifests/opticalcentralizedattackdetectorservice.yaml
+++ b/manifests/opticalcentralizedattackdetectorservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml
index 4f7a65c45..fd3599f42 100644
--- a/manifests/pathcompservice.yaml
+++ b/manifests/pathcompservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/prometheus.yaml b/manifests/prometheus.yaml
index 221123eea..43a766b6e 100644
--- a/manifests/prometheus.yaml
+++ b/manifests/prometheus.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/questdb/manifest.yaml b/manifests/questdb/manifest.yaml
index 1da4bf2c5..50a2ce2c6 100644
--- a/manifests/questdb/manifest.yaml
+++ b/manifests/questdb/manifest.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/servicemonitors.yaml b/manifests/servicemonitors.yaml
index ad5f042ba..06c3390f4 100644
--- a/manifests/servicemonitors.yaml
+++ b/manifests/servicemonitors.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml
index 02c9e25db..3fa4a6e0d 100644
--- a/manifests/serviceservice.yaml
+++ b/manifests/serviceservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/sliceservice.yaml b/manifests/sliceservice.yaml
index 56c5eb1b5..447f6a1c7 100644
--- a/manifests/sliceservice.yaml
+++ b/manifests/sliceservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index d0a64871a..f25dbf6e5 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/my_deploy.sh b/my_deploy.sh
index f909e9ebd..6f0e64afe 100644
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/acl.proto b/proto/acl.proto
index d3717e9c4..3dba735dc 100644
--- a/proto/acl.proto
+++ b/proto/acl.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/attack_mitigator.proto b/proto/attack_mitigator.proto
index e538a9d2e..0ec503bda 100644
--- a/proto/attack_mitigator.proto
+++ b/proto/attack_mitigator.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/automation.proto b/proto/automation.proto
index 929723676..e2dbe3322 100644
--- a/proto/automation.proto
+++ b/proto/automation.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/centralized_attack_detector.proto b/proto/centralized_attack_detector.proto
index 4ce34cfa4..7b4fc35f0 100644
--- a/proto/centralized_attack_detector.proto
+++ b/proto/centralized_attack_detector.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/compute.proto b/proto/compute.proto
index 0e7c7a738..ecc9a075f 100644
--- a/proto/compute.proto
+++ b/proto/compute.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/context.proto b/proto/context.proto
index 3ab3597e4..e403c4a22 100644
--- a/proto/context.proto
+++ b/proto/context.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/context_policy.proto b/proto/context_policy.proto
index efad68df6..f6dae4830 100644
--- a/proto/context_policy.proto
+++ b/proto/context_policy.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/dbscanserving.proto b/proto/dbscanserving.proto
index d7d0512b6..21ff45dfa 100644
--- a/proto/dbscanserving.proto
+++ b/proto/dbscanserving.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/device.proto b/proto/device.proto
index f41e2891a..30e60079d 100644
--- a/proto/device.proto
+++ b/proto/device.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/distributed_cybersecurity.proto b/proto/distributed_cybersecurity.proto
index 664e1383f..bc95fcc3d 100644
--- a/proto/distributed_cybersecurity.proto
+++ b/proto/distributed_cybersecurity.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/dlt_connector.proto b/proto/dlt_connector.proto
index cee0c70bd..3a4d11dd9 100644
--- a/proto/dlt_connector.proto
+++ b/proto/dlt_connector.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/dlt_gateway.proto b/proto/dlt_gateway.proto
index 84fe0fef6..6ae4fbb75 100644
--- a/proto/dlt_gateway.proto
+++ b/proto/dlt_gateway.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/forecaster.proto b/proto/forecaster.proto
index 576afb101..5a4403b01 100644
--- a/proto/forecaster.proto
+++ b/proto/forecaster.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/generate_code_python.sh b/proto/generate_code_python.sh
old mode 100755
new mode 100644
index b0df357eb..5c5db5444
--- a/proto/generate_code_python.sh
+++ b/proto/generate_code_python.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -eu
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -20,7 +20,7 @@ mkdir -p src/python
 rm -rf src/python/*.py
 
 tee src/python/__init__.py << EOF > /dev/null
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/generate_uml.sh b/proto/generate_uml.sh
old mode 100755
new mode 100644
index 6f20b6f4c..8bdd76ac5
--- a/proto/generate_uml.sh
+++ b/proto/generate_uml.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/health.proto b/proto/health.proto
index 0252f5d87..f3057a7e7 100644
--- a/proto/health.proto
+++ b/proto/health.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/interdomain.proto b/proto/interdomain.proto
index b8a31c249..3e44fb447 100644
--- a/proto/interdomain.proto
+++ b/proto/interdomain.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/kpi_sample_types.proto b/proto/kpi_sample_types.proto
index 4419a8df4..1ade4d69b 100644
--- a/proto/kpi_sample_types.proto
+++ b/proto/kpi_sample_types.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/l3_attackmitigator.proto b/proto/l3_attackmitigator.proto
index 39333718a..5ce9428b6 100644
--- a/proto/l3_attackmitigator.proto
+++ b/proto/l3_attackmitigator.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/l3_centralizedattackdetector.proto b/proto/l3_centralizedattackdetector.proto
index 3cb1b0991..2aeb8826e 100644
--- a/proto/l3_centralizedattackdetector.proto
+++ b/proto/l3_centralizedattackdetector.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/load_generator.proto b/proto/load_generator.proto
index 00ddb254c..98f6eefda 100644
--- a/proto/load_generator.proto
+++ b/proto/load_generator.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/monitoring.proto b/proto/monitoring.proto
index f9c408c96..3862973e0 100644
--- a/proto/monitoring.proto
+++ b/proto/monitoring.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/optical_attack_mitigator.proto b/proto/optical_attack_mitigator.proto
index 881f9fde3..1dbb4e19a 100644
--- a/proto/optical_attack_mitigator.proto
+++ b/proto/optical_attack_mitigator.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/optical_centralized_attack_detector.proto b/proto/optical_centralized_attack_detector.proto
index d480054f2..98ffeddc8 100644
--- a/proto/optical_centralized_attack_detector.proto
+++ b/proto/optical_centralized_attack_detector.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/pathcomp.proto b/proto/pathcomp.proto
index 08f33efe9..181f05cc2 100644
--- a/proto/pathcomp.proto
+++ b/proto/pathcomp.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/policy.proto b/proto/policy.proto
index 9d0c34a33..a6f160150 100644
--- a/proto/policy.proto
+++ b/proto/policy.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/policy_action.proto b/proto/policy_action.proto
index 8f681adf3..17dd72119 100644
--- a/proto/policy_action.proto
+++ b/proto/policy_action.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/policy_condition.proto b/proto/policy_condition.proto
index 7cd657667..2037af93c 100644
--- a/proto/policy_condition.proto
+++ b/proto/policy_condition.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/service.proto b/proto/service.proto
index 90a2f2ecf..21e569941 100644
--- a/proto/service.proto
+++ b/proto/service.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/slice.proto b/proto/slice.proto
index 69fa242e2..cad483c0f 100644
--- a/proto/slice.proto
+++ b/proto/slice.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/src/python/__init__.py b/proto/src/python/__init__.py
index 9953c8205..38d04994f 100644
--- a/proto/src/python/__init__.py
+++ b/proto/src/python/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/proto/te.proto b/proto/te.proto
index d639cb7f4..983f6602b 100644
--- a/proto/te.proto
+++ b/proto/te.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/run_tests_docker.sh b/run_tests_docker.sh
old mode 100755
new mode 100644
index fd8851409..d27c4e7d8
--- a/run_tests_docker.sh
+++ b/run_tests_docker.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 ########################################################################################################################
 # Define your deployment settings here
diff --git a/scripts/add_license_header_to_files.sh b/scripts/add_license_header_to_files.sh
old mode 100755
new mode 100644
index 4da238944..4c11fc316
--- a/scripts/add_license_header_to_files.sh
+++ b/scripts/add_license_header_to_files.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -26,6 +26,5 @@ docker run -it -v ${PWD}:/src ghcr.io/google/addlicense \
     -ignore "src/**/target/generated-sources/grpc/*" -ignore "src/**/target/generated-sources/grpc/**" \
     -ignore "src/**/*_pb2.py" -ignore "src/**/*_pb2_grpc.py" \
     -ignore "src/device/service/drivers/openconfig/templates/**/*.xml" \
-    -ignore "src/dlt/*" -ignore "src/dlt/**" \
     -ignore "src/**/.mvn/*" -ignore "src/**/.mvn/**" \
     *
diff --git a/scripts/build_run_report_tests_locally.sh b/scripts/build_run_report_tests_locally.sh
old mode 100755
new mode 100644
index 9bdc81d98..7a44eef02
--- a/scripts/build_run_report_tests_locally.sh
+++ b/scripts/build_run_report_tests_locally.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/cockroachdb_client.sh b/scripts/cockroachdb_client.sh
old mode 100755
new mode 100644
index edd979446..0300bb294
--- a/scripts/cockroachdb_client.sh
+++ b/scripts/cockroachdb_client.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/create_component.sh b/scripts/create_component.sh
old mode 100755
new mode 100644
index 17f6abc64..549f09bf4
--- a/scripts/create_component.sh
+++ b/scripts/create_component.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/dump_logs.sh b/scripts/dump_logs.sh
old mode 100755
new mode 100644
index a6db945d2..f50f8b133
--- a/scripts/dump_logs.sh
+++ b/scripts/dump_logs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/old/configure_dashboards_in_kubernetes.sh b/scripts/old/configure_dashboards_in_kubernetes.sh
old mode 100755
new mode 100644
index 4a32d76de..545e13cff
--- a/scripts/old/configure_dashboards_in_kubernetes.sh
+++ b/scripts/old/configure_dashboards_in_kubernetes.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/old/deploy_in_kubernetes.sh b/scripts/old/deploy_in_kubernetes.sh
old mode 100755
new mode 100644
index c85354137..c13a23666
--- a/scripts/old/deploy_in_kubernetes.sh
+++ b/scripts/old/deploy_in_kubernetes.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/old/open_dashboard.sh b/scripts/old/open_dashboard.sh
old mode 100755
new mode 100644
index d0529a009..4ea206f45
--- a/scripts/old/open_dashboard.sh
+++ b/scripts/old/open_dashboard.sh
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/old/open_webui.sh b/scripts/old/open_webui.sh
old mode 100755
new mode 100644
index d539c1970..5bb0082e1
--- a/scripts/old/open_webui.sh
+++ b/scripts/old/open_webui.sh
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_all.sh b/scripts/report_coverage_all.sh
old mode 100755
new mode 100644
index 3b7df170c..cf3a05c03
--- a/scripts/report_coverage_all.sh
+++ b/scripts/report_coverage_all.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_common.sh b/scripts/report_coverage_common.sh
old mode 100755
new mode 100644
index f69c57a01..f7f1076bd
--- a/scripts/report_coverage_common.sh
+++ b/scripts/report_coverage_common.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_compute.sh b/scripts/report_coverage_compute.sh
old mode 100755
new mode 100644
index 15e9e3422..4d986b5c3
--- a/scripts/report_coverage_compute.sh
+++ b/scripts/report_coverage_compute.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_context.sh b/scripts/report_coverage_context.sh
old mode 100755
new mode 100644
index b39c45833..2784bdf10
--- a/scripts/report_coverage_context.sh
+++ b/scripts/report_coverage_context.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_device.sh b/scripts/report_coverage_device.sh
old mode 100755
new mode 100644
index d7a1dc084..c1bbb8473
--- a/scripts/report_coverage_device.sh
+++ b/scripts/report_coverage_device.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_l3_attackmitigator.sh b/scripts/report_coverage_l3_attackmitigator.sh
old mode 100755
new mode 100644
index c34283dbb..80496eaf8
--- a/scripts/report_coverage_l3_attackmitigator.sh
+++ b/scripts/report_coverage_l3_attackmitigator.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_l3_centralizedattackdetector.sh b/scripts/report_coverage_l3_centralizedattackdetector.sh
old mode 100755
new mode 100644
index 1060bae05..d662dadb7
--- a/scripts/report_coverage_l3_centralizedattackdetector.sh
+++ b/scripts/report_coverage_l3_centralizedattackdetector.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_l3_distributedattackdetector.sh b/scripts/report_coverage_l3_distributedattackdetector.sh
old mode 100755
new mode 100644
index 94c2a16f4..e83dd01e6
--- a/scripts/report_coverage_l3_distributedattackdetector.sh
+++ b/scripts/report_coverage_l3_distributedattackdetector.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_pathcomp.sh b/scripts/report_coverage_pathcomp.sh
old mode 100755
new mode 100644
index 3af2790f8..9e91fb258
--- a/scripts/report_coverage_pathcomp.sh
+++ b/scripts/report_coverage_pathcomp.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_service.sh b/scripts/report_coverage_service.sh
old mode 100755
new mode 100644
index 4a3c5cc06..41c25bfab
--- a/scripts/report_coverage_service.sh
+++ b/scripts/report_coverage_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/report_coverage_slice.sh b/scripts/report_coverage_slice.sh
old mode 100755
new mode 100644
index f9b17e8bd..64c68d492
--- a/scripts/report_coverage_slice.sh
+++ b/scripts/report_coverage_slice.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-compute.sh b/scripts/run_tests_locally-compute.sh
old mode 100755
new mode 100644
index d48fe4171..3fed523e5
--- a/scripts/run_tests_locally-compute.sh
+++ b/scripts/run_tests_locally-compute.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-context.sh b/scripts/run_tests_locally-context.sh
old mode 100755
new mode 100644
index 9d29ac587..79bac938a
--- a/scripts/run_tests_locally-context.sh
+++ b/scripts/run_tests_locally-context.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-device-all.sh b/scripts/run_tests_locally-device-all.sh
old mode 100755
new mode 100644
index a60eab0be..b44db77ce
--- a/scripts/run_tests_locally-device-all.sh
+++ b/scripts/run_tests_locally-device-all.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-device-emulated.sh b/scripts/run_tests_locally-device-emulated.sh
old mode 100755
new mode 100644
index 541017f7a..0f1c74df0
--- a/scripts/run_tests_locally-device-emulated.sh
+++ b/scripts/run_tests_locally-device-emulated.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-device-microwave.sh b/scripts/run_tests_locally-device-microwave.sh
old mode 100755
new mode 100644
index 21f3e5ab6..e4cab1796
--- a/scripts/run_tests_locally-device-microwave.sh
+++ b/scripts/run_tests_locally-device-microwave.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-device-openconfig.sh b/scripts/run_tests_locally-device-openconfig.sh
old mode 100755
new mode 100644
index f87346fed..06a8c8e10
--- a/scripts/run_tests_locally-device-openconfig.sh
+++ b/scripts/run_tests_locally-device-openconfig.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-device-p4.sh b/scripts/run_tests_locally-device-p4.sh
old mode 100755
new mode 100644
index 4e6754e4d..0d73e3564
--- a/scripts/run_tests_locally-device-p4.sh
+++ b/scripts/run_tests_locally-device-p4.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-device-tapi.sh b/scripts/run_tests_locally-device-tapi.sh
old mode 100755
new mode 100644
index d37e4e2b7..3a00f5857
--- a/scripts/run_tests_locally-device-tapi.sh
+++ b/scripts/run_tests_locally-device-tapi.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-pathcomp-frontend.sh b/scripts/run_tests_locally-pathcomp-frontend.sh
old mode 100755
new mode 100644
index 1bcf5e7f3..4318b2f47
--- a/scripts/run_tests_locally-pathcomp-frontend.sh
+++ b/scripts/run_tests_locally-pathcomp-frontend.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-service.sh b/scripts/run_tests_locally-service.sh
old mode 100755
new mode 100644
index 8816b9faa..e671b0fc8
--- a/scripts/run_tests_locally-service.sh
+++ b/scripts/run_tests_locally-service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally-slice.sh b/scripts/run_tests_locally-slice.sh
old mode 100755
new mode 100644
index fa3af4eba..9e5f47c18
--- a/scripts/run_tests_locally-slice.sh
+++ b/scripts/run_tests_locally-slice.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/run_tests_locally.sh b/scripts/run_tests_locally.sh
old mode 100755
new mode 100644
index 486107994..b609fbb39
--- a/scripts/run_tests_locally.sh
+++ b/scripts/run_tests_locally.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_automation.sh b/scripts/show_logs_automation.sh
old mode 100755
new mode 100644
index 0c0615d99..46c0dbba9
--- a/scripts/show_logs_automation.sh
+++ b/scripts/show_logs_automation.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_compute.sh b/scripts/show_logs_compute.sh
old mode 100755
new mode 100644
index 759918f11..fc992eb43
--- a/scripts/show_logs_compute.sh
+++ b/scripts/show_logs_compute.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_context.sh b/scripts/show_logs_context.sh
old mode 100755
new mode 100644
index f4b6c620b..1051e6fd5
--- a/scripts/show_logs_context.sh
+++ b/scripts/show_logs_context.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_device.sh b/scripts/show_logs_device.sh
old mode 100755
new mode 100644
index d3ef781c9..6a77c3815
--- a/scripts/show_logs_device.sh
+++ b/scripts/show_logs_device.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_dlt_connector.sh b/scripts/show_logs_dlt_connector.sh
old mode 100755
new mode 100644
index db4c388c2..9e1f21ab9
--- a/scripts/show_logs_dlt_connector.sh
+++ b/scripts/show_logs_dlt_connector.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_dlt_gateway.sh b/scripts/show_logs_dlt_gateway.sh
old mode 100755
new mode 100644
index c00be2df1..db29eebfa
--- a/scripts/show_logs_dlt_gateway.sh
+++ b/scripts/show_logs_dlt_gateway.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_monitoring.sh b/scripts/show_logs_monitoring.sh
old mode 100755
new mode 100644
index faa825fdf..1a152a322
--- a/scripts/show_logs_monitoring.sh
+++ b/scripts/show_logs_monitoring.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_pathcomp_backend.sh b/scripts/show_logs_pathcomp_backend.sh
old mode 100755
new mode 100644
index cee99ee4b..b60b4e06c
--- a/scripts/show_logs_pathcomp_backend.sh
+++ b/scripts/show_logs_pathcomp_backend.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_pathcomp_frontend.sh b/scripts/show_logs_pathcomp_frontend.sh
old mode 100755
new mode 100644
index 32f92b59d..a08a67886
--- a/scripts/show_logs_pathcomp_frontend.sh
+++ b/scripts/show_logs_pathcomp_frontend.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_service.sh b/scripts/show_logs_service.sh
old mode 100755
new mode 100644
index 6089d0ac6..7ca1c1c2f
--- a/scripts/show_logs_service.sh
+++ b/scripts/show_logs_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_slice.sh b/scripts/show_logs_slice.sh
old mode 100755
new mode 100644
index c7bc0b695..c71bc92ea
--- a/scripts/show_logs_slice.sh
+++ b/scripts/show_logs_slice.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/show_logs_webui.sh b/scripts/show_logs_webui.sh
old mode 100755
new mode 100644
index 38cffd624..450527be6
--- a/scripts/show_logs_webui.sh
+++ b/scripts/show_logs_webui.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/scripts/update_license_headers.py b/scripts/update_license_headers.py
new file mode 100644
index 000000000..f721425f8
--- /dev/null
+++ b/scripts/update_license_headers.py
@@ -0,0 +1,114 @@
+#!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
+# Run from ~/tfs-ctrl as:
+# python scripts/update_license_headers.py
+
+import logging, os, re, sys
+from io import TextIOWrapper
+
+logging.basicConfig(level=logging.INFO)
+LOGGER = logging.getLogger(__name__)
+
+ROOT_PATH = '.'
+FILE_PATH_SKIPPED    = 'out-skipped.txt'
+FILE_PATH_NO_HEADER  = 'out-no-header.txt'
+FILE_PATH_UPDATED    = 'out-updated.txt'
+
+RE_OLD_COPYRIGHT  = re.compile(r'Copyright\ 2021\-2023\ H2020\ TeraFlow\ \(https\:\/\/www\.teraflow\-h2020\.eu\/\)')
+STR_NEW_COPYRIGHT = 'Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)'
+
+def skip_file(file_path : str) -> bool:
+    if file_path.endswith('.pyc'): return True
+    if file_path.endswith('_pb2_grpc.py'): return True
+    if file_path.endswith('_pb2.py'): return True
+    if file_path.endswith('.md'): return True
+    if file_path.endswith('.png'): return True
+    if file_path.endswith('.json'): return True
+    if file_path.endswith('.zip'): return True
+    if file_path.endswith('.zip'): return True
+    if file_path.endswith('.jar'): return True
+    if file_path.endswith('/tstat'): return True
+    if file_path.endswith('/.gitignore'): return True
+    if file_path.endswith('/.gitkeep'): return True
+    if file_path.endswith('/coverage/.coverage'): return True
+    if file_path.startswith('./netconf_openconfig/'): return True
+    if file_path.startswith('./tmp/'): return True
+    if '/manifests/cttc-ols/' in file_path: return True
+    if '/hackfest/netconf-oc/openconfig/' in file_path: return True
+    if '/.git/' in file_path: return True
+    if '/.vscode/' in file_path: return True
+    if '/.pytest_cache/' in file_path: return True
+    if '/__pycache__/' in file_path: return True
+    if '/.mvn/' in file_path: return True
+    if '/hackfest/kafka/kafka_2.13-2.8.0' in file_path: return True
+    if '/src/device/service/drivers/openconfig/templates/' in file_path: return True
+    if '/automation/target/generated-sources/grpc/' in file_path: return True
+    if '/automation/target/kubernetes/' in file_path: return True
+    if '/policy/target/generated-sources/grpc/' in file_path: return True
+    if '/policy/target/kubernetes/' in file_path: return True
+    if '/src/dlt/gateway/' in file_path: return True
+    if FILE_PATH_SKIPPED in file_path: return True
+    if FILE_PATH_NO_HEADER in file_path: return True
+    if FILE_PATH_UPDATED in file_path: return True
+    if file_path in {'./LICENSE', './.python-version', './.env'}: return True
+    return False
+
+def process_line(line_in : str) -> str:
+    line_out = RE_OLD_COPYRIGHT.sub(STR_NEW_COPYRIGHT, line_in)
+    if line_out != line_in: return line_out
+    return line_in
+
+def process_file(
+    file_path : str, file_no_header : TextIOWrapper, file_skipped : TextIOWrapper, file_updated : TextIOWrapper
+) -> None:
+    if skip_file(file_path):
+        file_skipped.write(file_path + '\n')
+        return
+
+    LOGGER.info('  File {:s}...'.format(str(file_path)))
+
+    temp_file_path = file_path + '.temp'
+    replaced = False
+    try:
+        with open(file_path, encoding='UTF-8') as source:
+            with open(temp_file_path, 'w', encoding='UTF-8') as target:
+                for line_in in source:
+                    line_out = process_line(line_in)
+                    target.write(line_out)
+                    replaced = replaced or (line_out != line_in)
+    except: # pylint: disable=bare-except
+        replaced = False
+
+    if not replaced:
+        file_no_header.write(file_path + '\n')
+    else:
+        file_updated.write(file_path + '\n')
+
+    os.rename(temp_file_path, file_path)
+
+def main() -> int:
+    with open(FILE_PATH_NO_HEADER, 'w', encoding='UTF-8') as file_no_header:
+        with open(FILE_PATH_SKIPPED, 'w', encoding='UTF-8') as file_skipped:
+            with open(FILE_PATH_UPDATED, 'w', encoding='UTF-8') as file_updated:
+                for dirpath, _, filenames in os.walk(ROOT_PATH):
+                    LOGGER.info('Folder {:s}...'.format(str(dirpath)))
+                    for filename in filenames:
+                        file_path = os.path.join(dirpath, filename)
+                        process_file(file_path, file_no_header, file_skipped, file_updated)
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/__init__.py b/src/__init__.py
index 70a332512..1549d9811 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/.gitlab-ci.yml b/src/automation/.gitlab-ci.yml
index 9c66a1798..0dc6284a4 100644
--- a/src/automation/.gitlab-ci.yml
+++ b/src/automation/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/mvnw b/src/automation/mvnw
old mode 100755
new mode 100644
diff --git a/src/automation/pom.xml b/src/automation/pom.xml
index 4609c2c8d..2fd5fd263 100644
--- a/src/automation/pom.xml
+++ b/src/automation/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/docker/Dockerfile.multistage.jvm b/src/automation/src/main/docker/Dockerfile.multistage.jvm
index 426e154ba..43fef96b4 100644
--- a/src/automation/src/main/docker/Dockerfile.multistage.jvm
+++ b/src/automation/src/main/docker/Dockerfile.multistage.jvm
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/AutomationConfiguration.java b/src/automation/src/main/java/eu/teraflow/automation/AutomationConfiguration.java
index 91b6e159d..071e8f152 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/AutomationConfiguration.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/AutomationConfiguration.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/AutomationGateway.java b/src/automation/src/main/java/eu/teraflow/automation/AutomationGateway.java
index 2d8194c69..53803f516 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/AutomationGateway.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/AutomationGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java b/src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java
index 466ebf7fe..51857bb3d 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/AutomationService.java b/src/automation/src/main/java/eu/teraflow/automation/AutomationService.java
index b9f34d8e4..9e3874eb2 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/AutomationService.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/AutomationService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java b/src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java
index 98acfccb3..f25e0e298 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java b/src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java
index 76e536d9b..4813da7bf 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/Serializer.java b/src/automation/src/main/java/eu/teraflow/automation/Serializer.java
index 5f5c8999e..08691b526 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/Serializer.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/Serializer.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/SimpleLivenessCheck.java b/src/automation/src/main/java/eu/teraflow/automation/SimpleLivenessCheck.java
index 7c3a2ccb5..7b7a3b075 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/SimpleLivenessCheck.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/SimpleLivenessCheck.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/SimpleReadinessCheck.java b/src/automation/src/main/java/eu/teraflow/automation/SimpleReadinessCheck.java
index c863a6c28..c9fd4855b 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/SimpleReadinessCheck.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/SimpleReadinessCheck.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/acl/AclAction.java b/src/automation/src/main/java/eu/teraflow/automation/acl/AclAction.java
index 7e3621bb4..29109f15b 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/acl/AclAction.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/acl/AclAction.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/acl/AclEntry.java b/src/automation/src/main/java/eu/teraflow/automation/acl/AclEntry.java
index 3324a55cd..6cecdd553 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/acl/AclEntry.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/acl/AclEntry.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/acl/AclForwardActionEnum.java b/src/automation/src/main/java/eu/teraflow/automation/acl/AclForwardActionEnum.java
index 9afaabcd9..e136a52fe 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/acl/AclForwardActionEnum.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/acl/AclForwardActionEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/acl/AclLogActionEnum.java b/src/automation/src/main/java/eu/teraflow/automation/acl/AclLogActionEnum.java
index cb9a75b43..1baf1c4a9 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/acl/AclLogActionEnum.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/acl/AclLogActionEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/acl/AclMatch.java b/src/automation/src/main/java/eu/teraflow/automation/acl/AclMatch.java
index ca679ea36..fa9eecf9f 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/acl/AclMatch.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/acl/AclMatch.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/acl/AclRuleSet.java b/src/automation/src/main/java/eu/teraflow/automation/acl/AclRuleSet.java
index 6dacab048..9cf3a08f0 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/acl/AclRuleSet.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/acl/AclRuleSet.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/acl/AclRuleTypeEnum.java b/src/automation/src/main/java/eu/teraflow/automation/acl/AclRuleTypeEnum.java
index 2361e21c1..f57372147 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/acl/AclRuleTypeEnum.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/acl/AclRuleTypeEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/common/Util.java b/src/automation/src/main/java/eu/teraflow/automation/common/Util.java
index aeb5a14f4..aca465457 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/common/Util.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/common/Util.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/ContextGateway.java b/src/automation/src/main/java/eu/teraflow/automation/context/ContextGateway.java
index 2b96acece..8171b2225 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/ContextGateway.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/ContextGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/ContextGatewayImpl.java b/src/automation/src/main/java/eu/teraflow/automation/context/ContextGatewayImpl.java
index 7a5050037..6868f9175 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/ContextGatewayImpl.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/ContextGatewayImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/ContextService.java b/src/automation/src/main/java/eu/teraflow/automation/context/ContextService.java
index f5316dc41..8c3caf27a 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/ContextService.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/ContextService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/ContextServiceImpl.java b/src/automation/src/main/java/eu/teraflow/automation/context/ContextServiceImpl.java
index fc65296b7..4ec973ac7 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/ContextServiceImpl.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/ContextServiceImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigActionEnum.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigActionEnum.java
index f79562d0d..7ec48e889 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigActionEnum.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigActionEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRule.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRule.java
index 334bb8964..5825bd498 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRule.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRule.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleAcl.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleAcl.java
index c749519fd..774427abd 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleAcl.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleAcl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleCustom.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleCustom.java
index d60411fb4..316ebc74b 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleCustom.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleCustom.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleType.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleType.java
index 874c633d0..255470925 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleType.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleTypeAcl.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleTypeAcl.java
index f80254913..f10d17bc8 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleTypeAcl.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleTypeAcl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleTypeCustom.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleTypeCustom.java
index 86137244d..759bb92c7 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleTypeCustom.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/ConfigRuleTypeCustom.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/Device.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/Device.java
index f1d2d097d..b3d1836e3 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/Device.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/Device.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceConfig.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceConfig.java
index edf2dbc6f..0341ab072 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceConfig.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceConfig.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java
index fc0521927..a364bb0e3 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceEvent.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceEvent.java
index 526b9b7b2..891d69162 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceEvent.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceEvent.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceOperationalStatus.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceOperationalStatus.java
index 50486469f..0a5afaf24 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceOperationalStatus.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceOperationalStatus.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/Empty.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/Empty.java
index 67649243b..e503665e4 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/Empty.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/Empty.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/EndPoint.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/EndPoint.java
index 25b3864c5..c91f1d9c5 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/EndPoint.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/EndPoint.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/EndPointId.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/EndPointId.java
index c94bcb0b1..516c82892 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/EndPointId.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/EndPointId.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/Event.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/Event.java
index 2b4a4bab6..9e4ca9abc 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/Event.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/Event.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/EventTypeEnum.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/EventTypeEnum.java
index 38c2cd3f0..c20f9dfd5 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/EventTypeEnum.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/EventTypeEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/GpsPosition.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/GpsPosition.java
index 9ee65b706..38a111f89 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/GpsPosition.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/GpsPosition.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/Location.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/Location.java
index bd056e80c..a16715e13 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/Location.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/Location.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationType.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationType.java
index e5e23ab62..a50594a51 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationType.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationTypeGpsPosition.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationTypeGpsPosition.java
index a9af77dea..e512444aa 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationTypeGpsPosition.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationTypeGpsPosition.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationTypeRegion.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationTypeRegion.java
index 5b12ee016..28b448ca3 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationTypeRegion.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/LocationTypeRegion.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/TopologyId.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/TopologyId.java
index ce9f7836f..07e8daed7 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/TopologyId.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/TopologyId.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGateway.java b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGateway.java
index 5244f8ea6..c25c96c97 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGateway.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java
index f045833eb..5e3d63f86 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceService.java b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceService.java
index d9f03d612..b41257d4a 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceService.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceServiceImpl.java b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceServiceImpl.java
index e6a8fc675..97b142427 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/device/DeviceServiceImpl.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/device/DeviceServiceImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/kpi_sample_types/model/KpiSampleType.java b/src/automation/src/main/java/eu/teraflow/automation/kpi_sample_types/model/KpiSampleType.java
index 9a46e8ffd..49c7e0559 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/kpi_sample_types/model/KpiSampleType.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/kpi_sample_types/model/KpiSampleType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRole.java b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRole.java
index da2f1c80e..8398d5a27 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRole.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRole.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleConfig.java b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleConfig.java
index aae556fff..8b9e5e9f6 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleConfig.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleConfig.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleId.java b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleId.java
index 064c4f1e6..6a57ae0aa 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleId.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleId.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleType.java b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleType.java
index 8d55e0cb4..2d9ba6684 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleType.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceRoleType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceState.java b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceState.java
index 48bc37ef7..01e5a131b 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/model/DeviceState.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/model/DeviceState.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/main/resources/application.yml b/src/automation/src/main/resources/application.yml
index 62cf8fc8e..f7b767e98 100644
--- a/src/automation/src/main/resources/application.yml
+++ b/src/automation/src/main/resources/application.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java b/src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java
index a75cbc883..d7e3917fc 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java b/src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java
index ad2d37bbc..7cdca9aed 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/test/java/eu/teraflow/automation/ConfigRuleTypeTest.java b/src/automation/src/test/java/eu/teraflow/automation/ConfigRuleTypeTest.java
index ec1da0ccb..67d4b2044 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/ConfigRuleTypeTest.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/ConfigRuleTypeTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/test/java/eu/teraflow/automation/ContextSubscriberTest.java b/src/automation/src/test/java/eu/teraflow/automation/ContextSubscriberTest.java
index b062148f3..84acd8b5d 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/ContextSubscriberTest.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/ContextSubscriberTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 package eu.teraflow.automation;
 
 import static org.mockito.Mockito.times;
diff --git a/src/automation/src/test/java/eu/teraflow/automation/EndPointCreationTest.java b/src/automation/src/test/java/eu/teraflow/automation/EndPointCreationTest.java
index d2094efaf..7f3d749d1 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/EndPointCreationTest.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/EndPointCreationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/test/java/eu/teraflow/automation/LocationTypeTest.java b/src/automation/src/test/java/eu/teraflow/automation/LocationTypeTest.java
index f89830e42..8cc2c0612 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/LocationTypeTest.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/LocationTypeTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/src/test/java/eu/teraflow/automation/MockAutomationConfiguration.java b/src/automation/src/test/java/eu/teraflow/automation/MockAutomationConfiguration.java
index 24c0433e0..b3653edc8 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/MockAutomationConfiguration.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/MockAutomationConfiguration.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 package eu.teraflow.automation;
 
 import io.smallrye.config.SmallRyeConfig;
diff --git a/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java b/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java
index b8fad3376..494e608a1 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/automation/target/kubernetes/kubernetes.yml b/src/automation/target/kubernetes/kubernetes.yml
index f4f1c7dae..c6c61db72 100644
--- a/src/automation/target/kubernetes/kubernetes.yml
+++ b/src/automation/target/kubernetes/kubernetes.yml
@@ -1,3 +1,17 @@
+# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+#
+# 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.
+
 ---
 apiVersion: v1
 kind: Service
diff --git a/src/automation/util/set_version.sh b/src/automation/util/set_version.sh
old mode 100755
new mode 100644
index 9022286a9..578d2cd25
--- a/src/automation/util/set_version.sh
+++ b/src/automation/util/set_version.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/build.sh b/src/build.sh
old mode 100755
new mode 100644
index 297ab196f..b1a7d299e
--- a/src/build.sh
+++ b/src/build.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/clean.sh b/src/clean.sh
old mode 100755
new mode 100644
index fa0dce2b2..21e887190
--- a/src/clean.sh
+++ b/src/clean.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/Constants.py b/src/common/Constants.py
index c26409f27..c0b4cbf05 100644
--- a/src/common/Constants.py
+++ b/src/common/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/DeviceTypes.py b/src/common/DeviceTypes.py
index c35370899..99255defd 100644
--- a/src/common/DeviceTypes.py
+++ b/src/common/DeviceTypes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/Settings.py b/src/common/Settings.py
index e9d5f406d..ea161e555 100644
--- a/src/common/Settings.py
+++ b/src/common/Settings.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/__init__.py b/src/common/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/__init__.py
+++ b/src/common/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/logger.py b/src/common/logger.py
index c90e0bcf3..f5e9d2a77 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/Constants.py b/src/common/message_broker/Constants.py
index d3f519074..8011ae417 100644
--- a/src/common/message_broker/Constants.py
+++ b/src/common/message_broker/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/Factory.py b/src/common/message_broker/Factory.py
index e60118706..7d5a469a2 100644
--- a/src/common/message_broker/Factory.py
+++ b/src/common/message_broker/Factory.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/Message.py b/src/common/message_broker/Message.py
index 484c795e7..6e43cf80e 100644
--- a/src/common/message_broker/Message.py
+++ b/src/common/message_broker/Message.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/MessageBroker.py b/src/common/message_broker/MessageBroker.py
index 2a5617275..dded94dc1 100644
--- a/src/common/message_broker/MessageBroker.py
+++ b/src/common/message_broker/MessageBroker.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/__init__.py b/src/common/message_broker/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/message_broker/__init__.py
+++ b/src/common/message_broker/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/BackendEnum.py b/src/common/message_broker/backend/BackendEnum.py
index 05dde8197..0a4cf865e 100644
--- a/src/common/message_broker/backend/BackendEnum.py
+++ b/src/common/message_broker/backend/BackendEnum.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/_Backend.py b/src/common/message_broker/backend/_Backend.py
index 1e03b2bd2..dd2337b17 100644
--- a/src/common/message_broker/backend/_Backend.py
+++ b/src/common/message_broker/backend/_Backend.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/__init__.py b/src/common/message_broker/backend/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/message_broker/backend/__init__.py
+++ b/src/common/message_broker/backend/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/inmemory/InMemoryBackend.py b/src/common/message_broker/backend/inmemory/InMemoryBackend.py
index c0a87c667..600581a7f 100644
--- a/src/common/message_broker/backend/inmemory/InMemoryBackend.py
+++ b/src/common/message_broker/backend/inmemory/InMemoryBackend.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/inmemory/__init__.py b/src/common/message_broker/backend/inmemory/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/message_broker/backend/inmemory/__init__.py
+++ b/src/common/message_broker/backend/inmemory/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/nats/NatsBackend.py b/src/common/message_broker/backend/nats/NatsBackend.py
index 4a6d5e9cd..35de3acb3 100644
--- a/src/common/message_broker/backend/nats/NatsBackend.py
+++ b/src/common/message_broker/backend/nats/NatsBackend.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/nats/NatsBackendThread.py b/src/common/message_broker/backend/nats/NatsBackendThread.py
index 801cc361e..e59e4d683 100644
--- a/src/common/message_broker/backend/nats/NatsBackendThread.py
+++ b/src/common/message_broker/backend/nats/NatsBackendThread.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/nats/__init__.py b/src/common/message_broker/backend/nats/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/message_broker/backend/nats/__init__.py
+++ b/src/common/message_broker/backend/nats/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/redis/RedisBackend.py b/src/common/message_broker/backend/redis/RedisBackend.py
index 41490913c..703860513 100644
--- a/src/common/message_broker/backend/redis/RedisBackend.py
+++ b/src/common/message_broker/backend/redis/RedisBackend.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/backend/redis/__init__.py b/src/common/message_broker/backend/redis/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/message_broker/backend/redis/__init__.py
+++ b/src/common/message_broker/backend/redis/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/tests/__init__.py b/src/common/message_broker/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/message_broker/tests/__init__.py
+++ b/src/common/message_broker/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/message_broker/tests/test_unitary.py b/src/common/message_broker/tests/test_unitary.py
index 925fcc83e..9cbb757f1 100644
--- a/src/common/message_broker/tests/test_unitary.py
+++ b/src/common/message_broker/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/Decorator.py b/src/common/method_wrappers/Decorator.py
index 558e5c17a..c5cbfb565 100644
--- a/src/common/method_wrappers/Decorator.py
+++ b/src/common/method_wrappers/Decorator.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/ServiceExceptions.py b/src/common/method_wrappers/ServiceExceptions.py
index 369565cf8..8a0862a0e 100644
--- a/src/common/method_wrappers/ServiceExceptions.py
+++ b/src/common/method_wrappers/ServiceExceptions.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/__init__.py b/src/common/method_wrappers/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/method_wrappers/__init__.py
+++ b/src/common/method_wrappers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/results-perf-eval/MW/generate.sh b/src/common/method_wrappers/results-perf-eval/MW/generate.sh
old mode 100755
new mode 100644
index bb86e7475..a7fd03b2f
--- a/src/common/method_wrappers/results-perf-eval/MW/generate.sh
+++ b/src/common/method_wrappers/results-perf-eval/MW/generate.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 python generate_plot.py "DEVICE_DRIVER_MW"
 python generate_plot.py "SERVICE_HANDLER_MW"
diff --git a/src/common/method_wrappers/results-perf-eval/MW/generate_plot.py b/src/common/method_wrappers/results-perf-eval/MW/generate_plot.py
index beae663f6..3d2d3a77c 100644
--- a/src/common/method_wrappers/results-perf-eval/MW/generate_plot.py
+++ b/src/common/method_wrappers/results-perf-eval/MW/generate_plot.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import enum, sys
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/src/common/method_wrappers/results-perf-eval/OpenConfig/generate.sh b/src/common/method_wrappers/results-perf-eval/OpenConfig/generate.sh
old mode 100755
new mode 100644
index 0ecd000fd..6a6123bab
--- a/src/common/method_wrappers/results-perf-eval/OpenConfig/generate.sh
+++ b/src/common/method_wrappers/results-perf-eval/OpenConfig/generate.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 python generate_plot.py "DEVICE_DRIVER_OPENCONFIG"
 python generate_plot.py "SERVICE_HANDLER_OPENCONFIG_L2NM"
diff --git a/src/common/method_wrappers/results-perf-eval/OpenConfig/generate_plot.py b/src/common/method_wrappers/results-perf-eval/OpenConfig/generate_plot.py
index c6fda331d..63166d7ac 100644
--- a/src/common/method_wrappers/results-perf-eval/OpenConfig/generate_plot.py
+++ b/src/common/method_wrappers/results-perf-eval/OpenConfig/generate_plot.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import enum, sys
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/src/common/method_wrappers/results-perf-eval/TE/te-cdf.py b/src/common/method_wrappers/results-perf-eval/TE/te-cdf.py
index 60919ba8b..fdcc1f679 100644
--- a/src/common/method_wrappers/results-perf-eval/TE/te-cdf.py
+++ b/src/common/method_wrappers/results-perf-eval/TE/te-cdf.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import matplotlib.pyplot as plt
 
 flow_creation_us = [
diff --git a/src/common/method_wrappers/results-perf-eval/XR/generate.sh b/src/common/method_wrappers/results-perf-eval/XR/generate.sh
old mode 100755
new mode 100644
index eae3eb6d6..a26632959
--- a/src/common/method_wrappers/results-perf-eval/XR/generate.sh
+++ b/src/common/method_wrappers/results-perf-eval/XR/generate.sh
@@ -1,3 +1,17 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 python generate_plot.py "DEVICE_DRIVER_XR"
diff --git a/src/common/method_wrappers/results-perf-eval/XR/generate_plot.py b/src/common/method_wrappers/results-perf-eval/XR/generate_plot.py
index 66110b444..d9cf628a1 100644
--- a/src/common/method_wrappers/results-perf-eval/XR/generate_plot.py
+++ b/src/common/method_wrappers/results-perf-eval/XR/generate_plot.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import enum, sys
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/src/common/method_wrappers/results-perf-eval/emulated/generate.sh b/src/common/method_wrappers/results-perf-eval/emulated/generate.sh
old mode 100755
new mode 100644
index f7ed1e31f..c61406525
--- a/src/common/method_wrappers/results-perf-eval/emulated/generate.sh
+++ b/src/common/method_wrappers/results-perf-eval/emulated/generate.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 #python generate_plot.py "EXP1_DEVICE_DRIVER_EMU_L2NM"
 #python generate_plot.py "EXP1_DEVICE_DRIVER_EMU_L3NM"
diff --git a/src/common/method_wrappers/results-perf-eval/emulated/generate_plot.py b/src/common/method_wrappers/results-perf-eval/emulated/generate_plot.py
index 74ae49c26..0f74bc401 100644
--- a/src/common/method_wrappers/results-perf-eval/emulated/generate_plot.py
+++ b/src/common/method_wrappers/results-perf-eval/emulated/generate_plot.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import enum, sys
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/src/common/method_wrappers/tests/DummyDeviceDriver.py b/src/common/method_wrappers/tests/DummyDeviceDriver.py
index f4fe1169e..ace7ce795 100644
--- a/src/common/method_wrappers/tests/DummyDeviceDriver.py
+++ b/src/common/method_wrappers/tests/DummyDeviceDriver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/tests/__init__.py b/src/common/method_wrappers/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/method_wrappers/tests/__init__.py
+++ b/src/common/method_wrappers/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/tests/__main__.py b/src/common/method_wrappers/tests/__main__.py
index 505991f61..b17d1cc31 100644
--- a/src/common/method_wrappers/tests/__main__.py
+++ b/src/common/method_wrappers/tests/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/tests/deploy_specs.sh b/src/common/method_wrappers/tests/deploy_specs.sh
index a5af70b04..571990eca 100644
--- a/src/common/method_wrappers/tests/deploy_specs.sh
+++ b/src/common/method_wrappers/tests/deploy_specs.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/common/method_wrappers/tests/old/docker_grafana.sh b/src/common/method_wrappers/tests/old/docker_grafana.sh
index 2a1484d55..14a01ed6e 100644
--- a/src/common/method_wrappers/tests/old/docker_grafana.sh
+++ b/src/common/method_wrappers/tests/old/docker_grafana.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/tests/old/prometheus.yml b/src/common/method_wrappers/tests/old/prometheus.yml
index af2849209..ede59acb5 100644
--- a/src/common/method_wrappers/tests/old/prometheus.yml
+++ b/src/common/method_wrappers/tests/old/prometheus.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/method_wrappers/tests/test_unitary.py b/src/common/method_wrappers/tests/test_unitary.py
index 95e40f641..7e3cb6b03 100644
--- a/src/common/method_wrappers/tests/test_unitary.py
+++ b/src/common/method_wrappers/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/EventTools.py b/src/common/tests/EventTools.py
index d0f828413..f90808fc3 100644
--- a/src/common/tests/EventTools.py
+++ b/src/common/tests/EventTools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/LoadScenario.py b/src/common/tests/LoadScenario.py
index 3c3940e67..93cf3708c 100644
--- a/src/common/tests/LoadScenario.py
+++ b/src/common/tests/LoadScenario.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/MockMessageBroker.py b/src/common/tests/MockMessageBroker.py
index 563903b98..2eeea74cf 100644
--- a/src/common/tests/MockMessageBroker.py
+++ b/src/common/tests/MockMessageBroker.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/MockServicerImpl_Context.py b/src/common/tests/MockServicerImpl_Context.py
index f33f25dc1..0e6f819d8 100644
--- a/src/common/tests/MockServicerImpl_Context.py
+++ b/src/common/tests/MockServicerImpl_Context.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/MockServicerImpl_Device.py b/src/common/tests/MockServicerImpl_Device.py
index efb809b3c..ca1c8893d 100644
--- a/src/common/tests/MockServicerImpl_Device.py
+++ b/src/common/tests/MockServicerImpl_Device.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/MockServicerImpl_DltGateway.py b/src/common/tests/MockServicerImpl_DltGateway.py
index f106519b2..3dfeb02cf 100644
--- a/src/common/tests/MockServicerImpl_DltGateway.py
+++ b/src/common/tests/MockServicerImpl_DltGateway.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/MockServicerImpl_Monitoring.py b/src/common/tests/MockServicerImpl_Monitoring.py
index 3f82f22e3..7bebf8732 100644
--- a/src/common/tests/MockServicerImpl_Monitoring.py
+++ b/src/common/tests/MockServicerImpl_Monitoring.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/MockServicerImpl_Service.py b/src/common/tests/MockServicerImpl_Service.py
index 39ddc1119..454a0c5f0 100644
--- a/src/common/tests/MockServicerImpl_Service.py
+++ b/src/common/tests/MockServicerImpl_Service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/MockServicerImpl_Slice.py b/src/common/tests/MockServicerImpl_Slice.py
index f6be3dd62..d2278c73e 100644
--- a/src/common/tests/MockServicerImpl_Slice.py
+++ b/src/common/tests/MockServicerImpl_Slice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/PytestGenerateTests.py b/src/common/tests/PytestGenerateTests.py
index 240570565..43b3fa284 100644
--- a/src/common/tests/PytestGenerateTests.py
+++ b/src/common/tests/PytestGenerateTests.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tests/__init__.py b/src/common/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tests/__init__.py
+++ b/src/common/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/__init__.py b/src/common/tools/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/__init__.py
+++ b/src/common/tools/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/client/RetryDecorator.py b/src/common/tools/client/RetryDecorator.py
index 9a1c0d69f..554b6d17e 100644
--- a/src/common/tools/client/RetryDecorator.py
+++ b/src/common/tools/client/RetryDecorator.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/client/__init__.py b/src/common/tools/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/client/__init__.py
+++ b/src/common/tools/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/CheckType.py b/src/common/tools/context_queries/CheckType.py
index f53ad1690..7121d2583 100644
--- a/src/common/tools/context_queries/CheckType.py
+++ b/src/common/tools/context_queries/CheckType.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/Context.py b/src/common/tools/context_queries/Context.py
index cf0d3be2b..d28ca3991 100644
--- a/src/common/tools/context_queries/Context.py
+++ b/src/common/tools/context_queries/Context.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/Device.py b/src/common/tools/context_queries/Device.py
index ed8772cf6..166882f2f 100644
--- a/src/common/tools/context_queries/Device.py
+++ b/src/common/tools/context_queries/Device.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/EndPoint.py b/src/common/tools/context_queries/EndPoint.py
index c5114d124..b54ef8f2d 100644
--- a/src/common/tools/context_queries/EndPoint.py
+++ b/src/common/tools/context_queries/EndPoint.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/InterDomain.py b/src/common/tools/context_queries/InterDomain.py
index f2d9aa26d..7317cc793 100644
--- a/src/common/tools/context_queries/InterDomain.py
+++ b/src/common/tools/context_queries/InterDomain.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/Link.py b/src/common/tools/context_queries/Link.py
index abc5fa91a..83a878bde 100644
--- a/src/common/tools/context_queries/Link.py
+++ b/src/common/tools/context_queries/Link.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/Service.py b/src/common/tools/context_queries/Service.py
index b7ff4117b..25716152c 100644
--- a/src/common/tools/context_queries/Service.py
+++ b/src/common/tools/context_queries/Service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/Slice.py b/src/common/tools/context_queries/Slice.py
index 550b2edaa..e5fb86d7a 100644
--- a/src/common/tools/context_queries/Slice.py
+++ b/src/common/tools/context_queries/Slice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/Topology.py b/src/common/tools/context_queries/Topology.py
index 619babffd..15217b8d1 100644
--- a/src/common/tools/context_queries/Topology.py
+++ b/src/common/tools/context_queries/Topology.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/context_queries/__init__.py b/src/common/tools/context_queries/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/context_queries/__init__.py
+++ b/src/common/tools/context_queries/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/descriptor/Loader.py b/src/common/tools/descriptor/Loader.py
index e3fc86c05..fc3b008b4 100644
--- a/src/common/tools/descriptor/Loader.py
+++ b/src/common/tools/descriptor/Loader.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/descriptor/Tools.py b/src/common/tools/descriptor/Tools.py
index cc7fa3757..9d6275748 100644
--- a/src/common/tools/descriptor/Tools.py
+++ b/src/common/tools/descriptor/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/descriptor/__init__.py b/src/common/tools/descriptor/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/descriptor/__init__.py
+++ b/src/common/tools/descriptor/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/descriptor/old/BuildDescriptors.py b/src/common/tools/descriptor/old/BuildDescriptors.py
index 5c5419190..98b788633 100644
--- a/src/common/tools/descriptor/old/BuildDescriptors.py
+++ b/src/common/tools/descriptor/old/BuildDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/descriptor/old/LoadDescriptors.py b/src/common/tools/descriptor/old/LoadDescriptors.py
index f0b19196a..b63d32e7a 100644
--- a/src/common/tools/descriptor/old/LoadDescriptors.py
+++ b/src/common/tools/descriptor/old/LoadDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/grpc/ConfigRules.py b/src/common/tools/grpc/ConfigRules.py
index 4a7e588e4..8eaf138fd 100644
--- a/src/common/tools/grpc/ConfigRules.py
+++ b/src/common/tools/grpc/ConfigRules.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/grpc/Constraints.py b/src/common/tools/grpc/Constraints.py
index aa95767ab..53f7dfd98 100644
--- a/src/common/tools/grpc/Constraints.py
+++ b/src/common/tools/grpc/Constraints.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/grpc/EndPointIds.py b/src/common/tools/grpc/EndPointIds.py
index e4c67ee32..5aafaaf71 100644
--- a/src/common/tools/grpc/EndPointIds.py
+++ b/src/common/tools/grpc/EndPointIds.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/grpc/ServiceIds.py b/src/common/tools/grpc/ServiceIds.py
index 0e1073cab..6264a8311 100644
--- a/src/common/tools/grpc/ServiceIds.py
+++ b/src/common/tools/grpc/ServiceIds.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/grpc/Tools.py b/src/common/tools/grpc/Tools.py
index f0c72a36f..04775bbb4 100644
--- a/src/common/tools/grpc/Tools.py
+++ b/src/common/tools/grpc/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/grpc/__init__.py b/src/common/tools/grpc/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/grpc/__init__.py
+++ b/src/common/tools/grpc/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/mutex_queues/MutexQueues.py b/src/common/tools/mutex_queues/MutexQueues.py
index c3ab760f2..b9fc567d5 100644
--- a/src/common/tools/mutex_queues/MutexQueues.py
+++ b/src/common/tools/mutex_queues/MutexQueues.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/mutex_queues/__init__.py b/src/common/tools/mutex_queues/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/mutex_queues/__init__.py
+++ b/src/common/tools/mutex_queues/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/ConfigRule.py b/src/common/tools/object_factory/ConfigRule.py
index 5d889ee7e..a83931e80 100644
--- a/src/common/tools/object_factory/ConfigRule.py
+++ b/src/common/tools/object_factory/ConfigRule.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/Connection.py b/src/common/tools/object_factory/Connection.py
index 3f0207ae5..f1fb98306 100644
--- a/src/common/tools/object_factory/Connection.py
+++ b/src/common/tools/object_factory/Connection.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/Constraint.py b/src/common/tools/object_factory/Constraint.py
index 757531daf..e3c5129fd 100644
--- a/src/common/tools/object_factory/Constraint.py
+++ b/src/common/tools/object_factory/Constraint.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/Context.py b/src/common/tools/object_factory/Context.py
index 58f35b929..6bf2281cb 100644
--- a/src/common/tools/object_factory/Context.py
+++ b/src/common/tools/object_factory/Context.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/Device.py b/src/common/tools/object_factory/Device.py
index 666d65f1e..0cc4555d4 100644
--- a/src/common/tools/object_factory/Device.py
+++ b/src/common/tools/object_factory/Device.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/EndPoint.py b/src/common/tools/object_factory/EndPoint.py
index 9eca5e963..326c67e1e 100644
--- a/src/common/tools/object_factory/EndPoint.py
+++ b/src/common/tools/object_factory/EndPoint.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/Link.py b/src/common/tools/object_factory/Link.py
index 12c233464..dbb3d7fb1 100644
--- a/src/common/tools/object_factory/Link.py
+++ b/src/common/tools/object_factory/Link.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/PolicyRule.py b/src/common/tools/object_factory/PolicyRule.py
index 5094db2ee..75dedc415 100644
--- a/src/common/tools/object_factory/PolicyRule.py
+++ b/src/common/tools/object_factory/PolicyRule.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/Service.py b/src/common/tools/object_factory/Service.py
index 5c0a60776..a4ec3cd76 100644
--- a/src/common/tools/object_factory/Service.py
+++ b/src/common/tools/object_factory/Service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/Slice.py b/src/common/tools/object_factory/Slice.py
index 970b12ad9..9f2cf56fd 100644
--- a/src/common/tools/object_factory/Slice.py
+++ b/src/common/tools/object_factory/Slice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/Topology.py b/src/common/tools/object_factory/Topology.py
index 5f7a42d7a..e847d58e7 100644
--- a/src/common/tools/object_factory/Topology.py
+++ b/src/common/tools/object_factory/Topology.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/object_factory/__init__.py b/src/common/tools/object_factory/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/object_factory/__init__.py
+++ b/src/common/tools/object_factory/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/service/GenericGrpcService.py b/src/common/tools/service/GenericGrpcService.py
index 61fccdb02..286c85643 100644
--- a/src/common/tools/service/GenericGrpcService.py
+++ b/src/common/tools/service/GenericGrpcService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/service/GenericRestServer.py b/src/common/tools/service/GenericRestServer.py
index 4325fe1db..51d3f828f 100644
--- a/src/common/tools/service/GenericRestServer.py
+++ b/src/common/tools/service/GenericRestServer.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/service/__init__.py b/src/common/tools/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/service/__init__.py
+++ b/src/common/tools/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/timestamp/Converters.py b/src/common/tools/timestamp/Converters.py
index 46a1bcb01..0ef8e0863 100644
--- a/src/common/tools/timestamp/Converters.py
+++ b/src/common/tools/timestamp/Converters.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/tools/timestamp/__init__.py b/src/common/tools/timestamp/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/tools/timestamp/__init__.py
+++ b/src/common/tools/timestamp/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/type_checkers/Assertions.py b/src/common/type_checkers/Assertions.py
index aa9ede333..c0442d877 100644
--- a/src/common/type_checkers/Assertions.py
+++ b/src/common/type_checkers/Assertions.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/type_checkers/Checkers.py b/src/common/type_checkers/Checkers.py
index 0bf36cb79..085ba572c 100644
--- a/src/common/type_checkers/Checkers.py
+++ b/src/common/type_checkers/Checkers.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/common/type_checkers/__init__.py b/src/common/type_checkers/__init__.py
index 70a332512..1549d9811 100644
--- a/src/common/type_checkers/__init__.py
+++ b/src/common/type_checkers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/.gitlab-ci.yml b/src/compute/.gitlab-ci.yml
index d8614cd1c..865fd89c4 100644
--- a/src/compute/.gitlab-ci.yml
+++ b/src/compute/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/Config.py b/src/compute/Config.py
index 341ae77f5..3fae9e3a7 100644
--- a/src/compute/Config.py
+++ b/src/compute/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/Dockerfile b/src/compute/Dockerfile
index 90a69c0f5..7a0c9bf6d 100644
--- a/src/compute/Dockerfile
+++ b/src/compute/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/__init__.py b/src/compute/__init__.py
index 70a332512..1549d9811 100644
--- a/src/compute/__init__.py
+++ b/src/compute/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/client/ComputeClient.py b/src/compute/client/ComputeClient.py
index 2ee1ecd97..6a6c3fc17 100644
--- a/src/compute/client/ComputeClient.py
+++ b/src/compute/client/ComputeClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/client/__init__.py b/src/compute/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/compute/client/__init__.py
+++ b/src/compute/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/requirements.in b/src/compute/requirements.in
index 906615e54..08bbf281a 100644
--- a/src/compute/requirements.in
+++ b/src/compute/requirements.in
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 Flask==2.1.3
 Flask-HTTPAuth==4.5.0
 Flask-RESTful==0.3.9
diff --git a/src/compute/service/ComputeService.py b/src/compute/service/ComputeService.py
index e8d038c43..5970e987e 100644
--- a/src/compute/service/ComputeService.py
+++ b/src/compute/service/ComputeService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/ComputeServiceServicerImpl.py b/src/compute/service/ComputeServiceServicerImpl.py
index a47a1db6c..3de1f635c 100644
--- a/src/compute/service/ComputeServiceServicerImpl.py
+++ b/src/compute/service/ComputeServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/__init__.py b/src/compute/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/compute/service/__init__.py
+++ b/src/compute/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/__main__.py b/src/compute/service/__main__.py
index 71db89c65..998c4c98f 100644
--- a/src/compute/service/__main__.py
+++ b/src/compute/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/RestServer.py b/src/compute/service/rest_server/RestServer.py
index d9b6cd915..f6472fbdb 100644
--- a/src/compute/service/rest_server/RestServer.py
+++ b/src/compute/service/rest_server/RestServer.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/__init__.py b/src/compute/service/rest_server/__init__.py
index 70a332512..1549d9811 100644
--- a/src/compute/service/rest_server/__init__.py
+++ b/src/compute/service/rest_server/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/__init__.py b/src/compute/service/rest_server/nbi_plugins/__init__.py
index 70a332512..1549d9811 100644
--- a/src/compute/service/rest_server/nbi_plugins/__init__.py
+++ b/src/compute/service/rest_server/nbi_plugins/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/debug_api/Resources.py b/src/compute/service/rest_server/nbi_plugins/debug_api/Resources.py
index dcbc600de..0c66254d9 100644
--- a/src/compute/service/rest_server/nbi_plugins/debug_api/Resources.py
+++ b/src/compute/service/rest_server/nbi_plugins/debug_api/Resources.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/debug_api/__init__.py b/src/compute/service/rest_server/nbi_plugins/debug_api/__init__.py
index 4fca3b534..d9243cca7 100644
--- a/src/compute/service/rest_server/nbi_plugins/debug_api/__init__.py
+++ b/src/compute/service/rest_server/nbi_plugins/debug_api/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py
index a6c8f2772..f95b532af 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
index e3d120881..2db231221 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py
index d27e55047..dcdecb70f 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py
index 0b8305ed7..1a8936ed4 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/__init__.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/__init__.py
index c8b23bcee..1b9027b1f 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/__init__.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/Common.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/Common.py
index 30755bbce..d708953ec 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/Common.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/Common.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/__init__.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/__init__.py
index 70a332512..1549d9811 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/__init__.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/site_network_access.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/site_network_access.py
index 165973190..ec39e30ca 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/site_network_access.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/site_network_access.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/vpn_service.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/vpn_service.py
index 9dd8eea3d..bccc2319b 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/vpn_service.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/schemas/vpn_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/Authentication.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/Authentication.py
index ebeeda4c8..4577f4f0f 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/Authentication.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/Authentication.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/HttpStatusCodes.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/HttpStatusCodes.py
index 0a98b9e76..fe22d9ee8 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/HttpStatusCodes.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/HttpStatusCodes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/Validator.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/Validator.py
index b83a0f929..942609ed2 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/Validator.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/Validator.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/__init__.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/__init__.py
index 70a332512..1549d9811 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/__init__.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/tools/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/tests/Constants.py b/src/compute/tests/Constants.py
index cb1331c74..d177a219a 100644
--- a/src/compute/tests/Constants.py
+++ b/src/compute/tests/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/tests/MockService_Dependencies.py b/src/compute/tests/MockService_Dependencies.py
index fbc4bd1a4..b009e6a85 100644
--- a/src/compute/tests/MockService_Dependencies.py
+++ b/src/compute/tests/MockService_Dependencies.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/tests/PrepareTestScenario.py b/src/compute/tests/PrepareTestScenario.py
index 7ef99f4b1..fbfdb91ee 100644
--- a/src/compute/tests/PrepareTestScenario.py
+++ b/src/compute/tests/PrepareTestScenario.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/tests/__init__.py b/src/compute/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/compute/tests/__init__.py
+++ b/src/compute/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/tests/test_debug_api.py b/src/compute/tests/test_debug_api.py
index 6265c3751..06ad8cedc 100644
--- a/src/compute/tests/test_debug_api.py
+++ b/src/compute/tests/test_debug_api.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/compute/tests/test_unitary.py b/src/compute/tests/test_unitary.py
index acef6d4a6..5d98507c8 100644
--- a/src/compute/tests/test_unitary.py
+++ b/src/compute/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/.gitlab-ci.yml b/src/context/.gitlab-ci.yml
index 044600bc5..63fc2d943 100644
--- a/src/context/.gitlab-ci.yml
+++ b/src/context/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/Config.py b/src/context/Config.py
index 70a332512..1549d9811 100644
--- a/src/context/Config.py
+++ b/src/context/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/Dockerfile b/src/context/Dockerfile
index 97aa46964..d6fa045c2 100644
--- a/src/context/Dockerfile
+++ b/src/context/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/__init__.py b/src/context/__init__.py
index 70a332512..1549d9811 100644
--- a/src/context/__init__.py
+++ b/src/context/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/client/ContextClient.py b/src/context/client/ContextClient.py
index 7559dde0f..7c3832d6b 100644
--- a/src/context/client/ContextClient.py
+++ b/src/context/client/ContextClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/client/EventsCollector.py b/src/context/client/EventsCollector.py
index 9ad6e101b..a8783fa8e 100644
--- a/src/context/client/EventsCollector.py
+++ b/src/context/client/EventsCollector.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/client/__init__.py b/src/context/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/context/client/__init__.py
+++ b/src/context/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/data/cleanup_commands.sql b/src/context/data/cleanup_commands.sql
index 00a522d85..d72950276 100644
--- a/src/context/data/cleanup_commands.sql
+++ b/src/context/data/cleanup_commands.sql
@@ -1,3 +1,17 @@
+-- Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 USE tfs;
 
 DELETE FROM policyrule WHERE 1=1;
diff --git a/src/context/requirements.in b/src/context/requirements.in
index e4bb209c7..44794c14f 100644
--- a/src/context/requirements.in
+++ b/src/context/requirements.in
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 nats-py==2.2.0
 psycopg2-binary==2.9.3
 SQLAlchemy==1.4.40
diff --git a/src/context/service/ContextService.py b/src/context/service/ContextService.py
index c4881ccf5..eeac981ea 100644
--- a/src/context/service/ContextService.py
+++ b/src/context/service/ContextService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/ContextServiceServicerImpl.py b/src/context/service/ContextServiceServicerImpl.py
index 41126b8d4..6fe00f917 100644
--- a/src/context/service/ContextServiceServicerImpl.py
+++ b/src/context/service/ContextServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/Events.py b/src/context/service/Events.py
index 77401314b..5d20f144c 100644
--- a/src/context/service/Events.py
+++ b/src/context/service/Events.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/__init__.py b/src/context/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/context/service/__init__.py
+++ b/src/context/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/__main__.py b/src/context/service/__main__.py
index 63e9c611c..92d4c8827 100644
--- a/src/context/service/__main__.py
+++ b/src/context/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/ConfigRule.py b/src/context/service/database/ConfigRule.py
index 7e4a383c7..dd60441ca 100644
--- a/src/context/service/database/ConfigRule.py
+++ b/src/context/service/database/ConfigRule.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Connection.py b/src/context/service/database/Connection.py
index 6d6d941cb..a3edb8ea2 100644
--- a/src/context/service/database/Connection.py
+++ b/src/context/service/database/Connection.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Constraint.py b/src/context/service/database/Constraint.py
index cf6e11ac9..0540841c3 100644
--- a/src/context/service/database/Constraint.py
+++ b/src/context/service/database/Constraint.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Context.py b/src/context/service/database/Context.py
index e4fd13b22..9e05e54b3 100644
--- a/src/context/service/database/Context.py
+++ b/src/context/service/database/Context.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Device.py b/src/context/service/database/Device.py
index 9138da7c4..c5a19c9c4 100644
--- a/src/context/service/database/Device.py
+++ b/src/context/service/database/Device.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/EndPoint.py b/src/context/service/database/EndPoint.py
index a26ed902c..e2f86893a 100644
--- a/src/context/service/database/EndPoint.py
+++ b/src/context/service/database/EndPoint.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Engine.py b/src/context/service/database/Engine.py
index 46c1b8c25..5cfe7cd4b 100644
--- a/src/context/service/database/Engine.py
+++ b/src/context/service/database/Engine.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Link.py b/src/context/service/database/Link.py
index 2d9e80894..8d195cb1d 100644
--- a/src/context/service/database/Link.py
+++ b/src/context/service/database/Link.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/PolicyRule.py b/src/context/service/database/PolicyRule.py
index 70a37c7d8..a10010389 100644
--- a/src/context/service/database/PolicyRule.py
+++ b/src/context/service/database/PolicyRule.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Service.py b/src/context/service/database/Service.py
index 9b9e9a621..4b63a4ae5 100644
--- a/src/context/service/database/Service.py
+++ b/src/context/service/database/Service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Slice.py b/src/context/service/database/Slice.py
index 113af9aa4..7c291e33d 100644
--- a/src/context/service/database/Slice.py
+++ b/src/context/service/database/Slice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/Topology.py b/src/context/service/database/Topology.py
index 81170d0a1..e2c6e2e99 100644
--- a/src/context/service/database/Topology.py
+++ b/src/context/service/database/Topology.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/__init__.py b/src/context/service/database/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/context/service/database/__init__.py
+++ b/src/context/service/database/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/ConfigRuleModel.py b/src/context/service/database/models/ConfigRuleModel.py
index fa8b9c2d2..363611105 100644
--- a/src/context/service/database/models/ConfigRuleModel.py
+++ b/src/context/service/database/models/ConfigRuleModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/ConnectionModel.py b/src/context/service/database/models/ConnectionModel.py
index 966dcab4d..c2b20de20 100644
--- a/src/context/service/database/models/ConnectionModel.py
+++ b/src/context/service/database/models/ConnectionModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/ConstraintModel.py b/src/context/service/database/models/ConstraintModel.py
index e7767b4b2..01c7bcb76 100644
--- a/src/context/service/database/models/ConstraintModel.py
+++ b/src/context/service/database/models/ConstraintModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/ContextModel.py b/src/context/service/database/models/ContextModel.py
index 26ccd8c60..25f8a37c4 100644
--- a/src/context/service/database/models/ContextModel.py
+++ b/src/context/service/database/models/ContextModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/DeviceModel.py b/src/context/service/database/models/DeviceModel.py
index d73cec75d..2124386d1 100644
--- a/src/context/service/database/models/DeviceModel.py
+++ b/src/context/service/database/models/DeviceModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/EndPointModel.py b/src/context/service/database/models/EndPointModel.py
index 65d867f3f..e591bc718 100644
--- a/src/context/service/database/models/EndPointModel.py
+++ b/src/context/service/database/models/EndPointModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/LinkModel.py b/src/context/service/database/models/LinkModel.py
index abf37a28a..49c62d376 100644
--- a/src/context/service/database/models/LinkModel.py
+++ b/src/context/service/database/models/LinkModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/PolicyRuleModel.py b/src/context/service/database/models/PolicyRuleModel.py
index 4ccec8dd8..4059991e1 100644
--- a/src/context/service/database/models/PolicyRuleModel.py
+++ b/src/context/service/database/models/PolicyRuleModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/ServiceModel.py b/src/context/service/database/models/ServiceModel.py
index 1a28dbce2..b581bf900 100644
--- a/src/context/service/database/models/ServiceModel.py
+++ b/src/context/service/database/models/ServiceModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/SliceModel.py b/src/context/service/database/models/SliceModel.py
index 5c9ebafa4..1a562bcd9 100644
--- a/src/context/service/database/models/SliceModel.py
+++ b/src/context/service/database/models/SliceModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/TopologyModel.py b/src/context/service/database/models/TopologyModel.py
index cf730b168..92802e5b2 100644
--- a/src/context/service/database/models/TopologyModel.py
+++ b/src/context/service/database/models/TopologyModel.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/_Base.py b/src/context/service/database/models/_Base.py
index 49269be08..4323fb713 100644
--- a/src/context/service/database/models/_Base.py
+++ b/src/context/service/database/models/_Base.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/__init__.py b/src/context/service/database/models/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/context/service/database/models/__init__.py
+++ b/src/context/service/database/models/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/ConfigAction.py b/src/context/service/database/models/enums/ConfigAction.py
index 6bbcdea99..5d7aa6b44 100644
--- a/src/context/service/database/models/enums/ConfigAction.py
+++ b/src/context/service/database/models/enums/ConfigAction.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/DeviceDriver.py b/src/context/service/database/models/enums/DeviceDriver.py
index 21338ddb8..6997e7dfb 100644
--- a/src/context/service/database/models/enums/DeviceDriver.py
+++ b/src/context/service/database/models/enums/DeviceDriver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/DeviceOperationalStatus.py b/src/context/service/database/models/enums/DeviceOperationalStatus.py
index 2bfe60779..a121fab86 100644
--- a/src/context/service/database/models/enums/DeviceOperationalStatus.py
+++ b/src/context/service/database/models/enums/DeviceOperationalStatus.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/KpiSampleType.py b/src/context/service/database/models/enums/KpiSampleType.py
index 4126e90b2..3bf5d06f0 100644
--- a/src/context/service/database/models/enums/KpiSampleType.py
+++ b/src/context/service/database/models/enums/KpiSampleType.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/PolicyRuleState.py b/src/context/service/database/models/enums/PolicyRuleState.py
index 9917b1819..c4aa950a1 100644
--- a/src/context/service/database/models/enums/PolicyRuleState.py
+++ b/src/context/service/database/models/enums/PolicyRuleState.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/ServiceStatus.py b/src/context/service/database/models/enums/ServiceStatus.py
index 5afd5da8f..00ae71f74 100644
--- a/src/context/service/database/models/enums/ServiceStatus.py
+++ b/src/context/service/database/models/enums/ServiceStatus.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/ServiceType.py b/src/context/service/database/models/enums/ServiceType.py
index e36cbc389..668133abf 100644
--- a/src/context/service/database/models/enums/ServiceType.py
+++ b/src/context/service/database/models/enums/ServiceType.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/SliceStatus.py b/src/context/service/database/models/enums/SliceStatus.py
index 440f5ba2a..5d77578b4 100644
--- a/src/context/service/database/models/enums/SliceStatus.py
+++ b/src/context/service/database/models/enums/SliceStatus.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/_GrpcToEnum.py b/src/context/service/database/models/enums/_GrpcToEnum.py
index f4fe6c1cc..0cde8ac5e 100644
--- a/src/context/service/database/models/enums/_GrpcToEnum.py
+++ b/src/context/service/database/models/enums/_GrpcToEnum.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/models/enums/__init__.py b/src/context/service/database/models/enums/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/context/service/database/models/enums/__init__.py
+++ b/src/context/service/database/models/enums/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/tools/FastHasher.py b/src/context/service/database/tools/FastHasher.py
index 6632a1c79..167f36dba 100644
--- a/src/context/service/database/tools/FastHasher.py
+++ b/src/context/service/database/tools/FastHasher.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/tools/__init__.py b/src/context/service/database/tools/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/context/service/database/tools/__init__.py
+++ b/src/context/service/database/tools/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/Connection.py b/src/context/service/database/uuids/Connection.py
index eea3b7214..1ecced6b4 100644
--- a/src/context/service/database/uuids/Connection.py
+++ b/src/context/service/database/uuids/Connection.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/Context.py b/src/context/service/database/uuids/Context.py
index 16876d686..a45241574 100644
--- a/src/context/service/database/uuids/Context.py
+++ b/src/context/service/database/uuids/Context.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/Device.py b/src/context/service/database/uuids/Device.py
index 41391c8fa..bea1d888d 100644
--- a/src/context/service/database/uuids/Device.py
+++ b/src/context/service/database/uuids/Device.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/EndPoint.py b/src/context/service/database/uuids/EndPoint.py
index 3ceb39c4b..bf5f30ec3 100644
--- a/src/context/service/database/uuids/EndPoint.py
+++ b/src/context/service/database/uuids/EndPoint.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/Link.py b/src/context/service/database/uuids/Link.py
index 2d68ed76f..77babc7d9 100644
--- a/src/context/service/database/uuids/Link.py
+++ b/src/context/service/database/uuids/Link.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/PolicuRule.py b/src/context/service/database/uuids/PolicuRule.py
index dbe691a2d..e020d5697 100644
--- a/src/context/service/database/uuids/PolicuRule.py
+++ b/src/context/service/database/uuids/PolicuRule.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/Service.py b/src/context/service/database/uuids/Service.py
index f3d205909..bbddc08ea 100644
--- a/src/context/service/database/uuids/Service.py
+++ b/src/context/service/database/uuids/Service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/Slice.py b/src/context/service/database/uuids/Slice.py
index b7d1465dd..bbe36a906 100644
--- a/src/context/service/database/uuids/Slice.py
+++ b/src/context/service/database/uuids/Slice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/Topology.py b/src/context/service/database/uuids/Topology.py
index 15387c9d6..c17485eff 100644
--- a/src/context/service/database/uuids/Topology.py
+++ b/src/context/service/database/uuids/Topology.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/_Builder.py b/src/context/service/database/uuids/_Builder.py
index 55384433b..75fe51bc0 100644
--- a/src/context/service/database/uuids/_Builder.py
+++ b/src/context/service/database/uuids/_Builder.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/service/database/uuids/__init__.py b/src/context/service/database/uuids/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/context/service/database/uuids/__init__.py
+++ b/src/context/service/database/uuids/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/Constants.py b/src/context/tests/Constants.py
index b29584a7b..470a72445 100644
--- a/src/context/tests/Constants.py
+++ b/src/context/tests/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/Objects.py b/src/context/tests/Objects.py
index 19d53619c..8634c1f30 100644
--- a/src/context/tests/Objects.py
+++ b/src/context/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/__init__.py b/src/context/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/context/tests/__init__.py
+++ b/src/context/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/conftest.py b/src/context/tests/conftest.py
index 93b8c66be..0f0082076 100644
--- a/src/context/tests/conftest.py
+++ b/src/context/tests/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_connection.py b/src/context/tests/test_connection.py
index f4b9e4824..92a4db23c 100644
--- a/src/context/tests/test_connection.py
+++ b/src/context/tests/test_connection.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_context.py b/src/context/tests/test_context.py
index 29d4442f9..552eb7853 100644
--- a/src/context/tests/test_context.py
+++ b/src/context/tests/test_context.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_device.py b/src/context/tests/test_device.py
index 9afe64f57..ee9e743d7 100644
--- a/src/context/tests/test_device.py
+++ b/src/context/tests/test_device.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_hasher.py b/src/context/tests/test_hasher.py
index f9a52f5d0..3eab3198c 100644
--- a/src/context/tests/test_hasher.py
+++ b/src/context/tests/test_hasher.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_link.py b/src/context/tests/test_link.py
index 96021a449..894ef8ef1 100644
--- a/src/context/tests/test_link.py
+++ b/src/context/tests/test_link.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_policy.py b/src/context/tests/test_policy.py
index 1cc0b9557..42289b484 100644
--- a/src/context/tests/test_policy.py
+++ b/src/context/tests/test_policy.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_service.py b/src/context/tests/test_service.py
index 0de7b49f2..ac6db33a7 100644
--- a/src/context/tests/test_service.py
+++ b/src/context/tests/test_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_slice.py b/src/context/tests/test_slice.py
index 22b2eeb89..ea52fa487 100644
--- a/src/context/tests/test_slice.py
+++ b/src/context/tests/test_slice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/context/tests/test_topology.py b/src/context/tests/test_topology.py
index a2afd9643..8785cabde 100644
--- a/src/context/tests/test_topology.py
+++ b/src/context/tests/test_topology.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/.gitlab-ci.yml b/src/dbscanserving/.gitlab-ci.yml
index fd0d66bac..0acb3e0a7 100644
--- a/src/dbscanserving/.gitlab-ci.yml
+++ b/src/dbscanserving/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/Config.py b/src/dbscanserving/Config.py
index 6604abe6c..e7f7904b0 100644
--- a/src/dbscanserving/Config.py
+++ b/src/dbscanserving/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/Dockerfile b/src/dbscanserving/Dockerfile
index 31cf21b0e..8328ff4d5 100644
--- a/src/dbscanserving/Dockerfile
+++ b/src/dbscanserving/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/__init__.py b/src/dbscanserving/__init__.py
index 70a332512..1549d9811 100644
--- a/src/dbscanserving/__init__.py
+++ b/src/dbscanserving/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/client/DbscanServingClient.py b/src/dbscanserving/client/DbscanServingClient.py
index 286b3318e..ce259d0f2 100644
--- a/src/dbscanserving/client/DbscanServingClient.py
+++ b/src/dbscanserving/client/DbscanServingClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/client/__init__.py b/src/dbscanserving/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/dbscanserving/client/__init__.py
+++ b/src/dbscanserving/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/genproto.sh b/src/dbscanserving/genproto.sh
old mode 100755
new mode 100644
index 6c480c673..449cffdeb
--- a/src/dbscanserving/genproto.sh
+++ b/src/dbscanserving/genproto.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 #
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -20,7 +20,7 @@ cd $(dirname $0)
 rm -rf proto/*.py
 rm -rf proto/__pycache__
 tee proto/__init__.py << EOF > /dev/null
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/proto/__init__.py b/src/dbscanserving/proto/__init__.py
index 70a332512..1549d9811 100644
--- a/src/dbscanserving/proto/__init__.py
+++ b/src/dbscanserving/proto/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/requirements.in b/src/dbscanserving/requirements.in
index 56f9e0673..4499fc694 100644
--- a/src/dbscanserving/requirements.in
+++ b/src/dbscanserving/requirements.in
@@ -1,3 +1,18 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
+
 grpcio-health-checking
 prometheus-client
 pytest
diff --git a/src/dbscanserving/requirements.txt b/src/dbscanserving/requirements.txt
index 4f9bee989..067cdbc26 100644
--- a/src/dbscanserving/requirements.txt
+++ b/src/dbscanserving/requirements.txt
@@ -1,3 +1,18 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
+
 #
 # This file is autogenerated by pip-compile with python 3.9
 # To update, run:
diff --git a/src/dbscanserving/service/DbscanService.py b/src/dbscanserving/service/DbscanService.py
index 97654fa30..632e40560 100644
--- a/src/dbscanserving/service/DbscanService.py
+++ b/src/dbscanserving/service/DbscanService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/service/DbscanServiceServicerImpl.py b/src/dbscanserving/service/DbscanServiceServicerImpl.py
index b14729d36..e71aac7b4 100644
--- a/src/dbscanserving/service/DbscanServiceServicerImpl.py
+++ b/src/dbscanserving/service/DbscanServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/service/__init__.py b/src/dbscanserving/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/dbscanserving/service/__init__.py
+++ b/src/dbscanserving/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/service/__main__.py b/src/dbscanserving/service/__main__.py
index cad074a40..391229969 100644
--- a/src/dbscanserving/service/__main__.py
+++ b/src/dbscanserving/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/tests/__init__.py b/src/dbscanserving/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/dbscanserving/tests/__init__.py
+++ b/src/dbscanserving/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dbscanserving/tests/test_unitary.py b/src/dbscanserving/tests/test_unitary.py
index 8198c9e21..b23a1a726 100644
--- a/src/dbscanserving/tests/test_unitary.py
+++ b/src/dbscanserving/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/.gitlab-ci.yml b/src/device/.gitlab-ci.yml
index b0b32ab15..5fed57be6 100644
--- a/src/device/.gitlab-ci.yml
+++ b/src/device/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/Config.py b/src/device/Config.py
index 70a332512..1549d9811 100644
--- a/src/device/Config.py
+++ b/src/device/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/Dockerfile b/src/device/Dockerfile
index ad513d965..7ddf719a3 100644
--- a/src/device/Dockerfile
+++ b/src/device/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/__init__.py b/src/device/__init__.py
index 70a332512..1549d9811 100644
--- a/src/device/__init__.py
+++ b/src/device/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/client/DeviceClient.py b/src/device/client/DeviceClient.py
index 875496cbb..b88727983 100644
--- a/src/device/client/DeviceClient.py
+++ b/src/device/client/DeviceClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/client/__init__.py b/src/device/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/device/client/__init__.py
+++ b/src/device/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/requirements.in b/src/device/requirements.in
index 96faa95c5..ec29fc7a3 100644
--- a/src/device/requirements.in
+++ b/src/device/requirements.in
@@ -1,3 +1,18 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
+
 anytree==2.8.0
 APScheduler==3.8.1
 #fastcache==1.1.0
diff --git a/src/device/service/DeviceService.py b/src/device/service/DeviceService.py
index ca165a200..6d27ef96e 100644
--- a/src/device/service/DeviceService.py
+++ b/src/device/service/DeviceService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/DeviceServiceServicerImpl.py b/src/device/service/DeviceServiceServicerImpl.py
index 1cf7c264e..1987be15d 100644
--- a/src/device/service/DeviceServiceServicerImpl.py
+++ b/src/device/service/DeviceServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/Errors.py b/src/device/service/Errors.py
index 5f2fc4996..a29a70f05 100644
--- a/src/device/service/Errors.py
+++ b/src/device/service/Errors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/Tools.py b/src/device/service/Tools.py
index e4abd557c..7dd61085b 100644
--- a/src/device/service/Tools.py
+++ b/src/device/service/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/__init__.py b/src/device/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/device/service/__init__.py
+++ b/src/device/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/__main__.py b/src/device/service/__main__.py
index c69393fc3..35b548fe9 100644
--- a/src/device/service/__main__.py
+++ b/src/device/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/driver_api/AnyTreeTools.py b/src/device/service/driver_api/AnyTreeTools.py
index f4999b64b..61fcc090d 100644
--- a/src/device/service/driver_api/AnyTreeTools.py
+++ b/src/device/service/driver_api/AnyTreeTools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/driver_api/DriverFactory.py b/src/device/service/driver_api/DriverFactory.py
index b2b6c467a..2e89bd4c5 100644
--- a/src/device/service/driver_api/DriverFactory.py
+++ b/src/device/service/driver_api/DriverFactory.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/driver_api/DriverInstanceCache.py b/src/device/service/driver_api/DriverInstanceCache.py
index 29fecf36f..1f92059a6 100644
--- a/src/device/service/driver_api/DriverInstanceCache.py
+++ b/src/device/service/driver_api/DriverInstanceCache.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/driver_api/Exceptions.py b/src/device/service/driver_api/Exceptions.py
index 1a03da97f..4b4d5760e 100644
--- a/src/device/service/driver_api/Exceptions.py
+++ b/src/device/service/driver_api/Exceptions.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/driver_api/FilterFields.py b/src/device/service/driver_api/FilterFields.py
index ba277e523..4084a78da 100644
--- a/src/device/service/driver_api/FilterFields.py
+++ b/src/device/service/driver_api/FilterFields.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/driver_api/_Driver.py b/src/device/service/driver_api/_Driver.py
index 371f4cccb..cc9f7a2c6 100644
--- a/src/device/service/driver_api/_Driver.py
+++ b/src/device/service/driver_api/_Driver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/driver_api/__init__.py b/src/device/service/driver_api/__init__.py
index 70a332512..1549d9811 100644
--- a/src/device/service/driver_api/__init__.py
+++ b/src/device/service/driver_api/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/__init__.py b/src/device/service/drivers/__init__.py
index bde5c93a5..469abcad3 100644
--- a/src/device/service/drivers/__init__.py
+++ b/src/device/service/drivers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/emulated/Constants.py b/src/device/service/drivers/emulated/Constants.py
index 1c148c02b..b2b42de01 100644
--- a/src/device/service/drivers/emulated/Constants.py
+++ b/src/device/service/drivers/emulated/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/emulated/EmulatedDriver.py b/src/device/service/drivers/emulated/EmulatedDriver.py
index 546527de0..14925f9f7 100644
--- a/src/device/service/drivers/emulated/EmulatedDriver.py
+++ b/src/device/service/drivers/emulated/EmulatedDriver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/emulated/SyntheticSamplingParameters.py b/src/device/service/drivers/emulated/SyntheticSamplingParameters.py
index 65feb9d16..ea5cf2cb7 100644
--- a/src/device/service/drivers/emulated/SyntheticSamplingParameters.py
+++ b/src/device/service/drivers/emulated/SyntheticSamplingParameters.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/emulated/Tools.py b/src/device/service/drivers/emulated/Tools.py
index 14672c203..4770cc6e6 100644
--- a/src/device/service/drivers/emulated/Tools.py
+++ b/src/device/service/drivers/emulated/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/emulated/__init__.py b/src/device/service/drivers/emulated/__init__.py
index 70a332512..1549d9811 100644
--- a/src/device/service/drivers/emulated/__init__.py
+++ b/src/device/service/drivers/emulated/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/microwave/IETFApiDriver.py b/src/device/service/drivers/microwave/IETFApiDriver.py
index 3660eb719..fad7cd073 100644
--- a/src/device/service/drivers/microwave/IETFApiDriver.py
+++ b/src/device/service/drivers/microwave/IETFApiDriver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/microwave/Tools.py b/src/device/service/drivers/microwave/Tools.py
index a91c60af5..711fb55fd 100644
--- a/src/device/service/drivers/microwave/Tools.py
+++ b/src/device/service/drivers/microwave/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/microwave/__init__.py b/src/device/service/drivers/microwave/__init__.py
index 925746998..2d3f6df32 100644
--- a/src/device/service/drivers/microwave/__init__.py
+++ b/src/device/service/drivers/microwave/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/openconfig/OpenConfigDriver.py b/src/device/service/drivers/openconfig/OpenConfigDriver.py
index 4aa42b180..ef3d0728d 100644
--- a/src/device/service/drivers/openconfig/OpenConfigDriver.py
+++ b/src/device/service/drivers/openconfig/OpenConfigDriver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/openconfig/RetryDecorator.py b/src/device/service/drivers/openconfig/RetryDecorator.py
index d8ccddb4d..deb1b4ed8 100644
--- a/src/device/service/drivers/openconfig/RetryDecorator.py
+++ b/src/device/service/drivers/openconfig/RetryDecorator.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/openconfig/Tools.py b/src/device/service/drivers/openconfig/Tools.py
index 73d46145c..a736bd1ae 100644
--- a/src/device/service/drivers/openconfig/Tools.py
+++ b/src/device/service/drivers/openconfig/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/openconfig/__init__.py b/src/device/service/drivers/openconfig/__init__.py
index 70a332512..1549d9811 100644
--- a/src/device/service/drivers/openconfig/__init__.py
+++ b/src/device/service/drivers/openconfig/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/p4/__init__.py b/src/device/service/drivers/p4/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/device/service/drivers/p4/__init__.py
+++ b/src/device/service/drivers/p4/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/p4/p4_client.py b/src/device/service/drivers/p4/p4_client.py
index 600d08880..28f5d9613 100644
--- a/src/device/service/drivers/p4/p4_client.py
+++ b/src/device/service/drivers/p4/p4_client.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/p4/p4_common.py b/src/device/service/drivers/p4/p4_common.py
index bcafedc1f..92612e354 100644
--- a/src/device/service/drivers/p4/p4_common.py
+++ b/src/device/service/drivers/p4/p4_common.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/p4/p4_context.py b/src/device/service/drivers/p4/p4_context.py
index ab01c422f..8bc4f08a9 100644
--- a/src/device/service/drivers/p4/p4_context.py
+++ b/src/device/service/drivers/p4/p4_context.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/p4/p4_driver.py b/src/device/service/drivers/p4/p4_driver.py
index 6057c07ba..de47f49c0 100644
--- a/src/device/service/drivers/p4/p4_driver.py
+++ b/src/device/service/drivers/p4/p4_driver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/p4/p4_exception.py b/src/device/service/drivers/p4/p4_exception.py
index 3e3afb723..450dac941 100644
--- a/src/device/service/drivers/p4/p4_exception.py
+++ b/src/device/service/drivers/p4/p4_exception.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/p4/p4_global_options.py b/src/device/service/drivers/p4/p4_global_options.py
index 3457c8d55..9fea3c25c 100644
--- a/src/device/service/drivers/p4/p4_global_options.py
+++ b/src/device/service/drivers/p4/p4_global_options.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/p4/p4_manager.py b/src/device/service/drivers/p4/p4_manager.py
index 178487250..b93c86b5f 100644
--- a/src/device/service/drivers/p4/p4_manager.py
+++ b/src/device/service/drivers/p4/p4_manager.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/transport_api/Tools.py b/src/device/service/drivers/transport_api/Tools.py
index e54e6497a..4943648dc 100644
--- a/src/device/service/drivers/transport_api/Tools.py
+++ b/src/device/service/drivers/transport_api/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/transport_api/TransportApiDriver.py b/src/device/service/drivers/transport_api/TransportApiDriver.py
index 874d4aeb6..8b84274e0 100644
--- a/src/device/service/drivers/transport_api/TransportApiDriver.py
+++ b/src/device/service/drivers/transport_api/TransportApiDriver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/transport_api/__init__.py b/src/device/service/drivers/transport_api/__init__.py
index 925746998..2d3f6df32 100644
--- a/src/device/service/drivers/transport_api/__init__.py
+++ b/src/device/service/drivers/transport_api/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/XrDriver.py b/src/device/service/drivers/xr/XrDriver.py
index bb589258a..565e3692f 100644
--- a/src/device/service/drivers/xr/XrDriver.py
+++ b/src/device/service/drivers/xr/XrDriver.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/__init__.py b/src/device/service/drivers/xr/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/device/service/drivers/xr/__init__.py
+++ b/src/device/service/drivers/xr/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm-cli.py b/src/device/service/drivers/xr/cm-cli.py
old mode 100755
new mode 100644
index f86ab0c8d..924ca0c96
--- a/src/device/service/drivers/xr/cm-cli.py
+++ b/src/device/service/drivers/xr/cm-cli.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/__init__.py b/src/device/service/drivers/xr/cm/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/device/service/drivers/xr/cm/__init__.py
+++ b/src/device/service/drivers/xr/cm/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/cm_connection.py b/src/device/service/drivers/xr/cm/cm_connection.py
index 11c659384..8ee9ee236 100644
--- a/src/device/service/drivers/xr/cm/cm_connection.py
+++ b/src/device/service/drivers/xr/cm/cm_connection.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/connection.py b/src/device/service/drivers/xr/cm/connection.py
index 51e94db4a..98736cce5 100644
--- a/src/device/service/drivers/xr/cm/connection.py
+++ b/src/device/service/drivers/xr/cm/connection.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/constellation.py b/src/device/service/drivers/xr/cm/constellation.py
index 468cf70b6..f93be0eae 100644
--- a/src/device/service/drivers/xr/cm/constellation.py
+++ b/src/device/service/drivers/xr/cm/constellation.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring, wildcard-import, unused-wildcard-import
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/tests/__init__.py b/src/device/service/drivers/xr/cm/tests/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/device/service/drivers/xr/cm/tests/__init__.py
+++ b/src/device/service/drivers/xr/cm/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/tests/test_cm_connection.py b/src/device/service/drivers/xr/cm/tests/test_cm_connection.py
index 60cbeac06..4f45be686 100644
--- a/src/device/service/drivers/xr/cm/tests/test_cm_connection.py
+++ b/src/device/service/drivers/xr/cm/tests/test_cm_connection.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/tests/test_connection.py b/src/device/service/drivers/xr/cm/tests/test_connection.py
index bf3887dec..dc330a1e0 100644
--- a/src/device/service/drivers/xr/cm/tests/test_connection.py
+++ b/src/device/service/drivers/xr/cm/tests/test_connection.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/tests/test_constellation.py b/src/device/service/drivers/xr/cm/tests/test_constellation.py
index 82848b57e..b0f5803ca 100644
--- a/src/device/service/drivers/xr/cm/tests/test_constellation.py
+++ b/src/device/service/drivers/xr/cm/tests/test_constellation.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/tests/test_transport_capacitity.py b/src/device/service/drivers/xr/cm/tests/test_transport_capacitity.py
index 7ed085337..1897b1111 100644
--- a/src/device/service/drivers/xr/cm/tests/test_transport_capacitity.py
+++ b/src/device/service/drivers/xr/cm/tests/test_transport_capacitity.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/tests/test_xr_service_set_config.py b/src/device/service/drivers/xr/cm/tests/test_xr_service_set_config.py
index 4fa89d8b7..3bfd63def 100644
--- a/src/device/service/drivers/xr/cm/tests/test_xr_service_set_config.py
+++ b/src/device/service/drivers/xr/cm/tests/test_xr_service_set_config.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/tf.py b/src/device/service/drivers/xr/cm/tf.py
index 1872bfe6c..c44cb0c9f 100644
--- a/src/device/service/drivers/xr/cm/tf.py
+++ b/src/device/service/drivers/xr/cm/tf.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/tf_service.py b/src/device/service/drivers/xr/cm/tf_service.py
index 7ba8d9ee4..98b122fa5 100644
--- a/src/device/service/drivers/xr/cm/tf_service.py
+++ b/src/device/service/drivers/xr/cm/tf_service.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring, wildcard-import, unused-wildcard-import
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/transport_capacity.py b/src/device/service/drivers/xr/cm/transport_capacity.py
index d28d5b137..a13073d00 100644
--- a/src/device/service/drivers/xr/cm/transport_capacity.py
+++ b/src/device/service/drivers/xr/cm/transport_capacity.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/cm/utils.py b/src/device/service/drivers/xr/cm/utils.py
index ad59dc661..9bfdc9385 100644
--- a/src/device/service/drivers/xr/cm/utils.py
+++ b/src/device/service/drivers/xr/cm/utils.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name, missing-function-docstring, line-too-long, logging-fstring-interpolation, missing-class-docstring, missing-module-docstring
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/drivers/xr/setup_test_env.sh b/src/device/service/drivers/xr/setup_test_env.sh
old mode 100755
new mode 100644
index 1f8b0a5a7..92ff4a031
--- a/src/device/service/drivers/xr/setup_test_env.sh
+++ b/src/device/service/drivers/xr/setup_test_env.sh
@@ -1,4 +1,18 @@
 #!/bin/sh
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 export CONTEXTSERVICE_SERVICE_HOST=$(kubectl get service/contextservice --namespace tfs  --template '{{.spec.clusterIP}}')
 export CONTEXTSERVICE_SERVICE_PORT_GRPC=$(kubectl get service/contextservice --namespace tfs  -o jsonpath='{.spec.ports[?(@.name=="grpc")].port}')
 export COMPUTESERVICE_SERVICE_HOST=$(kubectl get service/computeservice --namespace tfs  --template '{{.spec.clusterIP}}')
diff --git a/src/device/service/monitoring/MonitoringLoop.py b/src/device/service/monitoring/MonitoringLoop.py
index ec17a3ef6..296ff8f7e 100644
--- a/src/device/service/monitoring/MonitoringLoop.py
+++ b/src/device/service/monitoring/MonitoringLoop.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/monitoring/MonitoringLoops.py b/src/device/service/monitoring/MonitoringLoops.py
index d18f0dc7e..2acbfdf53 100644
--- a/src/device/service/monitoring/MonitoringLoops.py
+++ b/src/device/service/monitoring/MonitoringLoops.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/service/monitoring/__init__.py b/src/device/service/monitoring/__init__.py
index 70a332512..1549d9811 100644
--- a/src/device/service/monitoring/__init__.py
+++ b/src/device/service/monitoring/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/CommonObjects.py b/src/device/tests/CommonObjects.py
index 5613d22b2..ce41c4a2a 100644
--- a/src/device/tests/CommonObjects.py
+++ b/src/device/tests/CommonObjects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/Device_Emulated.py b/src/device/tests/Device_Emulated.py
index cf564b0bf..bb5dfa5f3 100644
--- a/src/device/tests/Device_Emulated.py
+++ b/src/device/tests/Device_Emulated.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/Device_Microwave_Template.py b/src/device/tests/Device_Microwave_Template.py
index 710d28bec..38e96e2b0 100644
--- a/src/device/tests/Device_Microwave_Template.py
+++ b/src/device/tests/Device_Microwave_Template.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/Device_OpenConfig_Template.py b/src/device/tests/Device_OpenConfig_Template.py
index af339cce4..8ab453375 100644
--- a/src/device/tests/Device_OpenConfig_Template.py
+++ b/src/device/tests/Device_OpenConfig_Template.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/Device_Transport_Api_Template.py b/src/device/tests/Device_Transport_Api_Template.py
index ef4fa4d57..73408ebc0 100644
--- a/src/device/tests/Device_Transport_Api_Template.py
+++ b/src/device/tests/Device_Transport_Api_Template.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/MockService_Dependencies.py b/src/device/tests/MockService_Dependencies.py
index ba8d0ac56..8216b0f8e 100644
--- a/src/device/tests/MockService_Dependencies.py
+++ b/src/device/tests/MockService_Dependencies.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/PrepareTestScenario.py b/src/device/tests/PrepareTestScenario.py
index 440bdac41..c8e72dd77 100644
--- a/src/device/tests/PrepareTestScenario.py
+++ b/src/device/tests/PrepareTestScenario.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/__init__.py b/src/device/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/device/tests/__init__.py
+++ b/src/device/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/device_p4.py b/src/device/tests/device_p4.py
index ccc62c219..de796c2f7 100644
--- a/src/device/tests/device_p4.py
+++ b/src/device/tests/device_p4.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/mock_p4runtime_service.py b/src/device/tests/mock_p4runtime_service.py
index c1b2dcb45..f06a43bb8 100644
--- a/src/device/tests/mock_p4runtime_service.py
+++ b/src/device/tests/mock_p4runtime_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/mock_p4runtime_servicer_impl.py b/src/device/tests/mock_p4runtime_servicer_impl.py
index 8a516303d..65bcfab50 100644
--- a/src/device/tests/mock_p4runtime_servicer_impl.py
+++ b/src/device/tests/mock_p4runtime_servicer_impl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/test_internal_p4.py b/src/device/tests/test_internal_p4.py
index 4907e5388..a09ec79ef 100644
--- a/src/device/tests/test_internal_p4.py
+++ b/src/device/tests/test_internal_p4.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/test_unitary_emulated.py b/src/device/tests/test_unitary_emulated.py
index 0e5f8e22d..cbad108a8 100644
--- a/src/device/tests/test_unitary_emulated.py
+++ b/src/device/tests/test_unitary_emulated.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/test_unitary_microwave.py b/src/device/tests/test_unitary_microwave.py
index 189984703..0d1ff61cf 100644
--- a/src/device/tests/test_unitary_microwave.py
+++ b/src/device/tests/test_unitary_microwave.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/test_unitary_openconfig.py b/src/device/tests/test_unitary_openconfig.py
index 6144a95d9..e61442a4a 100644
--- a/src/device/tests/test_unitary_openconfig.py
+++ b/src/device/tests/test_unitary_openconfig.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/test_unitary_p4.py b/src/device/tests/test_unitary_p4.py
index 43313caff..9370824cf 100644
--- a/src/device/tests/test_unitary_p4.py
+++ b/src/device/tests/test_unitary_p4.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/device/tests/test_unitary_tapi.py b/src/device/tests/test_unitary_tapi.py
index 993c0c413..46962b2d9 100644
--- a/src/device/tests/test_unitary_tapi.py
+++ b/src/device/tests/test_unitary_tapi.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/.gitlab-ci.yml b/src/dlt/.gitlab-ci.yml
index 5d9875ef9..df30a7b1d 100644
--- a/src/dlt/.gitlab-ci.yml
+++ b/src/dlt/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/__init__.py b/src/dlt/__init__.py
index 70a332512..1549d9811 100644
--- a/src/dlt/__init__.py
+++ b/src/dlt/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/Config.py b/src/dlt/connector/Config.py
index bdf9f3069..d89eda5d8 100644
--- a/src/dlt/connector/Config.py
+++ b/src/dlt/connector/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/Dockerfile b/src/dlt/connector/Dockerfile
index c5d600ee0..f4d85ec8c 100644
--- a/src/dlt/connector/Dockerfile
+++ b/src/dlt/connector/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/__init__.py b/src/dlt/connector/__init__.py
index 70a332512..1549d9811 100644
--- a/src/dlt/connector/__init__.py
+++ b/src/dlt/connector/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/client/DltConnectorClient.py b/src/dlt/connector/client/DltConnectorClient.py
index 1ca511d04..55322ab58 100644
--- a/src/dlt/connector/client/DltConnectorClient.py
+++ b/src/dlt/connector/client/DltConnectorClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/client/DltEventsCollector.py b/src/dlt/connector/client/DltEventsCollector.py
index d022ac0f0..9f929d7cc 100644
--- a/src/dlt/connector/client/DltEventsCollector.py
+++ b/src/dlt/connector/client/DltEventsCollector.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/client/DltGatewayClient.py b/src/dlt/connector/client/DltGatewayClient.py
index e2f5530f9..4654f470e 100644
--- a/src/dlt/connector/client/DltGatewayClient.py
+++ b/src/dlt/connector/client/DltGatewayClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/client/__init__.py b/src/dlt/connector/client/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/dlt/connector/client/__init__.py
+++ b/src/dlt/connector/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/main_test.py b/src/dlt/connector/main_test.py
index a877a5ce3..679be7287 100644
--- a/src/dlt/connector/main_test.py
+++ b/src/dlt/connector/main_test.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # pip install grpcio==1.47.0 grpcio-tools==1.47.0 protobuf==3.20.1
 # PYTHONPATH=./src python
 # PYTHONPATH=/home/cttc/teraflow/src python -m dlt.connector.main_test
diff --git a/src/dlt/connector/requirements.in b/src/dlt/connector/requirements.in
index e69de29bb..1549d9811 100644
--- a/src/dlt/connector/requirements.in
+++ b/src/dlt/connector/requirements.in
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
diff --git a/src/dlt/connector/service/DltConnectorService.py b/src/dlt/connector/service/DltConnectorService.py
index 40237b628..b3e822530 100644
--- a/src/dlt/connector/service/DltConnectorService.py
+++ b/src/dlt/connector/service/DltConnectorService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/service/DltConnectorServiceServicerImpl.py b/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
index 9af1ae6ea..4e628a2ae 100644
--- a/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
+++ b/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/service/__init__.py b/src/dlt/connector/service/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/dlt/connector/service/__init__.py
+++ b/src/dlt/connector/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/service/__main__.py b/src/dlt/connector/service/__main__.py
index 76e7bc6f1..c9812f90a 100644
--- a/src/dlt/connector/service/__main__.py
+++ b/src/dlt/connector/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py b/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
index c569d75c3..78d375efa 100644
--- a/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
+++ b/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/service/event_dispatcher/__init__.py b/src/dlt/connector/service/event_dispatcher/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/dlt/connector/service/event_dispatcher/__init__.py
+++ b/src/dlt/connector/service/event_dispatcher/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/service/tools/Checkers.py b/src/dlt/connector/service/tools/Checkers.py
index e25d8d5a5..17a44c2fa 100644
--- a/src/dlt/connector/service/tools/Checkers.py
+++ b/src/dlt/connector/service/tools/Checkers.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/service/tools/__init__.py b/src/dlt/connector/service/tools/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/dlt/connector/service/tools/__init__.py
+++ b/src/dlt/connector/service/tools/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/tests/MockService_Dependencies.py b/src/dlt/connector/tests/MockService_Dependencies.py
index 65ddc3cb4..36e1ca551 100644
--- a/src/dlt/connector/tests/MockService_Dependencies.py
+++ b/src/dlt/connector/tests/MockService_Dependencies.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/tests/Objects.py b/src/dlt/connector/tests/Objects.py
index f797e93e6..2ff850000 100644
--- a/src/dlt/connector/tests/Objects.py
+++ b/src/dlt/connector/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/tests/PrepareTestScenario.py b/src/dlt/connector/tests/PrepareTestScenario.py
index 0bddea071..755d2f1ff 100644
--- a/src/dlt/connector/tests/PrepareTestScenario.py
+++ b/src/dlt/connector/tests/PrepareTestScenario.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/tests/__init__.py b/src/dlt/connector/tests/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/dlt/connector/tests/__init__.py
+++ b/src/dlt/connector/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/connector/tests/test_unitary.py b/src/dlt/connector/tests/test_unitary.py
index f1424847d..edd96b4ec 100644
--- a/src/dlt/connector/tests/test_unitary.py
+++ b/src/dlt/connector/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/gateway/settings.gradle.kts b/src/dlt/gateway/settings.gradle.kts
index 67683a744..9c09bb933 100644
--- a/src/dlt/gateway/settings.gradle.kts
+++ b/src/dlt/gateway/settings.gradle.kts
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ *
+ * 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.
+ */
+
 
 rootProject.name = "gateway"
 
diff --git a/src/dlt/mock_blockchain/Dockerfile b/src/dlt/mock_blockchain/Dockerfile
index 22199b5f8..09fe5d399 100644
--- a/src/dlt/mock_blockchain/Dockerfile
+++ b/src/dlt/mock_blockchain/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/mock_blockchain/__init__.py b/src/dlt/mock_blockchain/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/dlt/mock_blockchain/__init__.py
+++ b/src/dlt/mock_blockchain/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/mock_blockchain/requirements.in b/src/dlt/mock_blockchain/requirements.in
index e69de29bb..1549d9811 100644
--- a/src/dlt/mock_blockchain/requirements.in
+++ b/src/dlt/mock_blockchain/requirements.in
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
diff --git a/src/dlt/mock_blockchain/service/__init__.py b/src/dlt/mock_blockchain/service/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/dlt/mock_blockchain/service/__init__.py
+++ b/src/dlt/mock_blockchain/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/dlt/mock_blockchain/service/__main__.py b/src/dlt/mock_blockchain/service/__main__.py
index 359c6990a..e4cffac51 100644
--- a/src/dlt/mock_blockchain/service/__main__.py
+++ b/src/dlt/mock_blockchain/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/gitlab-ci.yml_generator.py b/src/gitlab-ci.yml_generator.py
old mode 100755
new mode 100644
index 8e367eb02..4a4ac389e
--- a/src/gitlab-ci.yml_generator.py
+++ b/src/gitlab-ci.yml_generator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/.gitlab-ci.yml b/src/interdomain/.gitlab-ci.yml
index 23bad6cf3..486c6d0a9 100644
--- a/src/interdomain/.gitlab-ci.yml
+++ b/src/interdomain/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/Config.py b/src/interdomain/Config.py
index 9953c8205..38d04994f 100644
--- a/src/interdomain/Config.py
+++ b/src/interdomain/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/Dockerfile b/src/interdomain/Dockerfile
index ee1071896..69fcf3d9c 100644
--- a/src/interdomain/Dockerfile
+++ b/src/interdomain/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/__init__.py b/src/interdomain/__init__.py
index 70a332512..1549d9811 100644
--- a/src/interdomain/__init__.py
+++ b/src/interdomain/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/client/InterdomainClient.py b/src/interdomain/client/InterdomainClient.py
index 1f1ca924a..f5631de61 100644
--- a/src/interdomain/client/InterdomainClient.py
+++ b/src/interdomain/client/InterdomainClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/client/__init__.py b/src/interdomain/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/interdomain/client/__init__.py
+++ b/src/interdomain/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/requirements.in b/src/interdomain/requirements.in
index e69de29bb..1549d9811 100644
--- a/src/interdomain/requirements.in
+++ b/src/interdomain/requirements.in
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
diff --git a/src/interdomain/service/InterdomainService.py b/src/interdomain/service/InterdomainService.py
index 28b57d64b..59b6cd820 100644
--- a/src/interdomain/service/InterdomainService.py
+++ b/src/interdomain/service/InterdomainService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/InterdomainServiceServicerImpl.py b/src/interdomain/service/InterdomainServiceServicerImpl.py
index 6844393fe..b72fc1b31 100644
--- a/src/interdomain/service/InterdomainServiceServicerImpl.py
+++ b/src/interdomain/service/InterdomainServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/RemoteDomainClients.py b/src/interdomain/service/RemoteDomainClients.py
index 6eb2a9c06..297c9a60d 100644
--- a/src/interdomain/service/RemoteDomainClients.py
+++ b/src/interdomain/service/RemoteDomainClients.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/Tools.py b/src/interdomain/service/Tools.py
index 472132adb..609dc6e07 100644
--- a/src/interdomain/service/Tools.py
+++ b/src/interdomain/service/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/__init__.py b/src/interdomain/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/interdomain/service/__init__.py
+++ b/src/interdomain/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/__main__.py b/src/interdomain/service/__main__.py
index bcbda8dfd..f4bdbb7b8 100644
--- a/src/interdomain/service/__main__.py
+++ b/src/interdomain/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/_old_code/InterdomainServiceServicerImpl.py b/src/interdomain/service/_old_code/InterdomainServiceServicerImpl.py
index 00c0b8d77..e80f5c712 100644
--- a/src/interdomain/service/_old_code/InterdomainServiceServicerImpl.py
+++ b/src/interdomain/service/_old_code/InterdomainServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/topology_abstractor/AbstractDevice.py b/src/interdomain/service/topology_abstractor/AbstractDevice.py
index 4bb9683b0..0de93daa8 100644
--- a/src/interdomain/service/topology_abstractor/AbstractDevice.py
+++ b/src/interdomain/service/topology_abstractor/AbstractDevice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/topology_abstractor/AbstractLink.py b/src/interdomain/service/topology_abstractor/AbstractLink.py
index 552d40d41..bdab62476 100644
--- a/src/interdomain/service/topology_abstractor/AbstractLink.py
+++ b/src/interdomain/service/topology_abstractor/AbstractLink.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/topology_abstractor/DltRecordSender.py b/src/interdomain/service/topology_abstractor/DltRecordSender.py
index f7e3d81dd..d6efbc809 100644
--- a/src/interdomain/service/topology_abstractor/DltRecordSender.py
+++ b/src/interdomain/service/topology_abstractor/DltRecordSender.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
index db104144e..bdbf016f8 100644
--- a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
+++ b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/topology_abstractor/Types.py b/src/interdomain/service/topology_abstractor/Types.py
index f6a0fa7a1..fa1d135da 100644
--- a/src/interdomain/service/topology_abstractor/Types.py
+++ b/src/interdomain/service/topology_abstractor/Types.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/service/topology_abstractor/__init__.py b/src/interdomain/service/topology_abstractor/__init__.py
index 70a332512..1549d9811 100644
--- a/src/interdomain/service/topology_abstractor/__init__.py
+++ b/src/interdomain/service/topology_abstractor/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/tests/__init__.py b/src/interdomain/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/interdomain/tests/__init__.py
+++ b/src/interdomain/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/interdomain/tests/test_unitary.py b/src/interdomain/tests/test_unitary.py
index 7fe1acc7c..403dea543 100644
--- a/src/interdomain/tests/test_unitary.py
+++ b/src/interdomain/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/.gitlab-ci.yml b/src/l3_attackmitigator/.gitlab-ci.yml
index bcad35c74..c43b553a4 100644
--- a/src/l3_attackmitigator/.gitlab-ci.yml
+++ b/src/l3_attackmitigator/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/Config.py b/src/l3_attackmitigator/Config.py
index 429977bc5..fafeb8d11 100644
--- a/src/l3_attackmitigator/Config.py
+++ b/src/l3_attackmitigator/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/Dockerfile b/src/l3_attackmitigator/Dockerfile
index 2b814f0ee..da9ed75ad 100644
--- a/src/l3_attackmitigator/Dockerfile
+++ b/src/l3_attackmitigator/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/__init__.py b/src/l3_attackmitigator/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_attackmitigator/__init__.py
+++ b/src/l3_attackmitigator/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/client/__init__.py b/src/l3_attackmitigator/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_attackmitigator/client/__init__.py
+++ b/src/l3_attackmitigator/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/client/l3_attackmitigatorClient.py b/src/l3_attackmitigator/client/l3_attackmitigatorClient.py
index 77e09a2f7..fad553cc2 100644
--- a/src/l3_attackmitigator/client/l3_attackmitigatorClient.py
+++ b/src/l3_attackmitigator/client/l3_attackmitigatorClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/requirements.in b/src/l3_attackmitigator/requirements.in
index 772ae9239..a8aba8497 100644
--- a/src/l3_attackmitigator/requirements.in
+++ b/src/l3_attackmitigator/requirements.in
@@ -1 +1,15 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # no extra dependency
diff --git a/src/l3_attackmitigator/service/__init__.py b/src/l3_attackmitigator/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_attackmitigator/service/__init__.py
+++ b/src/l3_attackmitigator/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/service/__main__.py b/src/l3_attackmitigator/service/__main__.py
index ac2ff528a..1e91d5e97 100644
--- a/src/l3_attackmitigator/service/__main__.py
+++ b/src/l3_attackmitigator/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/service/l3_attackmitigatorService.py b/src/l3_attackmitigator/service/l3_attackmitigatorService.py
index 2ce7f9316..84ab811ef 100644
--- a/src/l3_attackmitigator/service/l3_attackmitigatorService.py
+++ b/src/l3_attackmitigator/service/l3_attackmitigatorService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/service/l3_attackmitigatorServiceServicerImpl.py b/src/l3_attackmitigator/service/l3_attackmitigatorServiceServicerImpl.py
index 866470452..b697a83ff 100644
--- a/src/l3_attackmitigator/service/l3_attackmitigatorServiceServicerImpl.py
+++ b/src/l3_attackmitigator/service/l3_attackmitigatorServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/tests/__init__.py b/src/l3_attackmitigator/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_attackmitigator/tests/__init__.py
+++ b/src/l3_attackmitigator/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_attackmitigator/tests/test_unitary.py b/src/l3_attackmitigator/tests/test_unitary.py
index 14d43edaf..8f048f876 100644
--- a/src/l3_attackmitigator/tests/test_unitary.py
+++ b/src/l3_attackmitigator/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/.gitlab-ci.yml b/src/l3_centralizedattackdetector/.gitlab-ci.yml
index 073b7925c..791b91752 100644
--- a/src/l3_centralizedattackdetector/.gitlab-ci.yml
+++ b/src/l3_centralizedattackdetector/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/Config.py b/src/l3_centralizedattackdetector/Config.py
index 2b7ec70f1..f6c7e3355 100644
--- a/src/l3_centralizedattackdetector/Config.py
+++ b/src/l3_centralizedattackdetector/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/Dockerfile b/src/l3_centralizedattackdetector/Dockerfile
index 3db5c2b4d..e5b9aa33b 100644
--- a/src/l3_centralizedattackdetector/Dockerfile
+++ b/src/l3_centralizedattackdetector/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/__init__.py b/src/l3_centralizedattackdetector/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_centralizedattackdetector/__init__.py
+++ b/src/l3_centralizedattackdetector/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/client/__init__.py b/src/l3_centralizedattackdetector/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_centralizedattackdetector/client/__init__.py
+++ b/src/l3_centralizedattackdetector/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/client/l3_centralizedattackdetectorClient.py b/src/l3_centralizedattackdetector/client/l3_centralizedattackdetectorClient.py
index 3a159503c..f84bd8421 100644
--- a/src/l3_centralizedattackdetector/client/l3_centralizedattackdetectorClient.py
+++ b/src/l3_centralizedattackdetector/client/l3_centralizedattackdetectorClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/requirements.in b/src/l3_centralizedattackdetector/requirements.in
index 9e25a1c28..130abd942 100644
--- a/src/l3_centralizedattackdetector/requirements.in
+++ b/src/l3_centralizedattackdetector/requirements.in
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 numpy==1.23.*
 onnxruntime==1.12.*
 scikit-learn==1.1.*
diff --git a/src/l3_centralizedattackdetector/service/__init__.py b/src/l3_centralizedattackdetector/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_centralizedattackdetector/service/__init__.py
+++ b/src/l3_centralizedattackdetector/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/service/__main__.py b/src/l3_centralizedattackdetector/service/__main__.py
index 42c7412cb..340812724 100644
--- a/src/l3_centralizedattackdetector/service/__main__.py
+++ b/src/l3_centralizedattackdetector/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorService.py b/src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorService.py
index bad8cee7e..bf58247d3 100644
--- a/src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorService.py
+++ b/src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorServiceServicerImpl.py b/src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorServiceServicerImpl.py
index ad05b0ee6..dfe67813f 100644
--- a/src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorServiceServicerImpl.py
+++ b/src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/service/ml_model/teraflow_rf.onnx b/src/l3_centralizedattackdetector/service/ml_model/teraflow_rf.onnx
index e2bd04b7be0b6f0d60e1172448952388bb9edb6b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 126743
zcmeHw378&5(f^w}*(Bs52RWC`Nq~@(Y)ED^xqui&If8N-64*d6B#{k=D5n=H9)Ca)
z5r_%`LF5nt0TmQMl%S%Bh!=d~Eh;Jke(Jw}Ra09v)6<iA_kE*&&-2nxW^20Z>gww1
z>YkaGzI})G?ReA1*_$_QI%{<ASu<wMoH4Vd&)N+$P%*7CyK=yfe%z<&k*E7K4P4*8
zcI)Y<wXfN*Y0K$bhxXdIc3u0%p#!&^wt3y!bsIKr*t(&;WAun4PHS&pv8ki|)O8!%
zmu+0z(XnCuhW6810`=2>F{Y{C2|!!3;lz%((kKlJG%V1tK*ItJ3p6ayut38C4GT0Z
z(6B(m0{@pSu&rC4>AxA%G>|uXn>L@=j?G@LxOdzq?iV-31LA@4(0Ew9dpsiEBOV=(
ziN_|b{o~!@LGj>th-)A2T1UE;aq;+gLflN$eTjac!(#g34r5f@Bkt*1`#G*!586E(
zXHYX$f07IC!-(@JYHN=7j9cP~@#J`FJk9CHxU2(si+<ys2Ed#YPjQ%g#nVY<AJ?1y
zPA+Ra%;^jY^hY?MM`(pUXyg8X7jv4HSOwal@7yod9hegxE^OD=NfPTwA0P|%VJz+G
zAhPf9PW{Iv`cHQHL;HQ>{o<MNtax6$e>^{KrGBsm(02Dk+tG=>%pE<S9`7CRlV}5c
zj1)$aM*`ZgBv^C`jTU+atSnFHJjr2AbNYbi45!hoc((Bq<qhkxpY){mzKPvo4fvJZ
ziv`s$U^O0j)X8YFPeHnjCdLtdiP1ujcqAc{y$?Pzg>;>s^uCG43*N+@I?8E?-osa+
z6Fi-HvUk8s+4rF(Yz#W?6{y(8+`m3V32$aB@v82QM=#QmZ6jXAcDJ*Ht**MsJYt(q
z$&9y*AlnDlf!&}#>&j!yb80m8j@w}`^hLZ;{g3O#GVJ%zkLQaWS)OA&BCs+>1v3mj
z!7&3|;cKiV_qm5_vpPbOYOj`%QG$-JB}U24PiW7*V?EH8o#{N1n0tb&z9ex$ypSy-
z_L6Z!s~vmjBGydX48DR<L$qMu<@muqDKzO>#<F1}L?ZSW(8CHG-8k0lOLJ^aJeOvD
zYrG&nfMjq?*4U|*fWNVR5_iB|<|4-=kqg`GPBD&WO-nMnFuxHkF<uz`JWevs15B&*
zRp*gL8;+$sGtooFvA)U{lodcUZA!+F>Dd#&h5e3amy8pSghXuEl6_O78jm$B4qcfW
z@OV9$LUE#BXOCo#FkaTjI8v}}n4kC#_fqBsuNN{mp(D>RwFNK{)utsj??<sj@ZkSE
z*CY~1{1rdcHHPO4uV*?3IGVwO*@_%lB-UXJ5JA}sWk$j(h=08P_wQ^62aa9ilex|@
zn0dfr(#rPIapW1seOD>)1@<NGHP0FyZOm2~MaC14lh`7>coZik+_-l#|8;(F<^juL
z{Cd(~wg5*8)(;~Nn~V04X(I%$8|Wc)<Jl|{#cR|L*;jeAU@eJB(o2mElg#YajEnJX
zyzTDB2IDKyoJS9MGB0`F%9_O<F|ISV=nUnxKq3%yX1|nZ%@Io1R>WF~`MkO!>SG=v
z_Hkr^FCcozii&jrcIA15en^aC8jOVapY~Oxa5UP7@*iXy%$e6Yq2locXBm^UceBMY
z=i!~)L$;Je1YT_<BLD`*7TJba6k6I9O(GTRBl8=QB$AEpv;xNp$&kfk$GcHv53?gF
zHJsb=2+Ev-R<Mgk3t;nllb*k93C@?)i_zO*NfglN$6hR08t-*3jHOs0HkFu%cA;uA
z>lpgSF-FF43eh9$V-MLaWmQ?HttE#TE!p!WMoR8E)A_<2S{K#xcqVgXP;UcYUdc2P
zVvNKWU{f9;?itT?rN?T+mgLBbymuyzEwVoLAoWDc6}uetS-ea<fUScVtM&s9^y7R-
z`po$*<`{AT$pq$8CZM#EamYH<E6D-SEA&ZYztb+g+1u(K2k!jIUblE>rMn9P`K5;&
z{G!s+nX+8z<p#2B>FrD#E`6Lslq-FmDR*A_xk27}X>uXEYo)()wDM(u8}>3~pmWS>
z%Wlq1!)1_jw{#io+%LZjan4@040U0(Y#HX<y}0b|lAUZB?!xxY%Lo_p!eyijD#c}#
zo8D#09&T$?R7SfH8!BU5V9PIKU05zI<6PQPzKnNEX?~gD7SQ6-?1Epo?CBP|vZcj^
z=be>_ZqW>vNiMvH%4C-W<d-RK87@<%y41d_Wt!U*gv(xTqZTgH-6pPV+1qX2!(|`0
z{DjKBZeiM4nc<eMqOzY`P<LKtx<$84ndJ_p%9PnIfhb$%xTUvTnd>&|<;pylyp%8d
zyJNp_neUDSi%P3IFf1+$TuM<?4sb^gJ1Yz0otH&%xe~=?N?Tl17RR>4JNa)(T&66I
z%amntnX)`CQ&z;Ga$sDh92D=Y92{3uR>s-#s<=#96<1$g9hWJuiFZ~GiOZGO#>M4z
zakv~B7nj3gzZ@QyEl0%V%IdgGIWjIPuaEP~8{%^1s5o7Yj{R~>+_iFSTwIQecV6BY
zS6kM^J1@t_J1cABu9tOjsGJZN6m0fByF#Aqo!P$Oq?5OHM0b2)>Hbm0{bw#sPflFK
zw|NjDYlGg-`M|&C87|5+gRB%mNE_by*7H23$}a<DZi&mwAG*MHFb_rRh$3^*R)Wr$
zbb+Uks+)oIHp4|52+G_N^5O3}e`kU+WXeh*m77<WX)Sw8c#52XMvqTfNLw@NW*RcB
z#p)96=|`n}SNY{Z$}b~`kn<?sJ-%W+CqowGmxq@p<8MFr*=J}~t4u>#;dyd1tW?Gc
zn=iBurwt0J+)SO`Dx`w)>ZtV}e@odQh^KP%m?{}TncF+>zt9^-<&uF^kaEe?Wg7IB
zAiY)2*9>25HONCz85u~C3A*&`ZkCnG$b;T=?>38^VU<Ur!U=iKu}eG#d0dKF6}KwC
z8MjEl)4Gg8#jLcI7-YEUEkWI9q%4_f&6BI_^ID0)|8A5n<RNG3h~lY}&$A}ZpyUY(
zqGTF~{rYRpx9l^$%-pK9JXYFTOqQX|+!C!a=>1f=oIxp+UtV2CNkX}<XCSUAvNFx9
zQ$Ym1>7Q){HZ5kQtq=51g+6V_Ky<4Y(ts|b_x-00*NT$IK)aA>)dqrwZZ1l<GBSd!
zG7XvAjL3Ueb+_g$My6K1D670WZ7qiKMBdUfki;mfJhHsH&%G`c6jaj;a^9^X7t7Vw
z`4{%^%$dhoDT-SOk1qE-U&V5gr?`ro_?<vfUQDJ82)cF0x!w%OpeVmgFA49q!&2*;
zA}g1?x=gFyDx}hWH@e1kCd0HUg@VZEJzQiu)jp3wUY#nbP*q%rZ23?9=#$}+VV~Ek
zC<<kCriR|%Nd=w^a`09g2%^h7hwOAGqM9mMMyubAPQ@Ih$l&R12^5lc?Z;CYsFG1@
zhM(T%wNl-_m-(71nX=D7B~VnPLP0KsQWj5z6Gd^hnI|$&S_UtJa{1@VC3ksTf_0e&
zy`6BqpG#F`oD8yZ&Omn_8So~;%OGc%7T+o@;r;ZyRF0&yc~G(NAVpq-*5xr(C5xfY
ze<Kz7gUCS{N<j)e_4jiMmb)OA;?BJIom6t7$O@?%DkHCsD5m{36;$)^lnYU)AcZny
z)Np5eV6o01D|>~CId3?&iiwk9r7{#!6opQ`%wO8Hm1r}!CF+!7(941KTv5tGPhJy9
z^YRqRW2%P8qsY_|gN1ioU~^Vwnn7018I%m3wi5K#;ma(0Mb6-9Lr@S=WXNXSQ{?iB
zoX0f7Pc=}ogAYmt!5|l<&7df&43xReFvx4oLwV;>pS0F3L6*_4_;$ke{=`v=JcTl?
z#VD$722Z(UP_#iQ6osJ7tx{xKGY!h`j(z-Cmq)9DlvbJM)e*(<-F=rT!AdzRvO;;%
z^6H3U$O)1#D+7h{1Z7xdkoA_Jk=Gq)eKNyOk%LSXg&?}T`kX+FRrU%ggR*r*@%$bC
z^wxM)Qkg2G>=jR;mgmIIikC;LbqXn$6*GiOUaN9eimIR>vNlY;*`E;FN|0VuNrm!S
zGYkm%M}1N|8)c9OWf&CS5(B#AC5B2H6qG^9!=t*EEvb}F$udyht=18%=YEtjyNXmi
zg7l&&pIBFvRVkj*W|%69LW)9l>uxBg-|^jxOrjd7pu<PR1ra2VLhDq?;yRU<q0k0`
zMqE*?_C%&!R1K;-_@MJ`-!gcaTUAXPf>8GvsoA5nszIhsS!GayctoLOdi%`j-EFrr
z43xdn2I~~1EEHswrv@=~NpF6r&rqla+K{Q!27>Z#gAK}xpt;k&yfY&zMMhAtArCJP
znd&+lwsq@0eN59(`VyUfz|8&d*ru)f&&6+#b;H{%|C-k{6kn)!tXaQyV@JDutiGFj
zKfbSfr@wdd9exx29Z1))?#=Gq-8<p@>t!R|-!bm(Y56U)QLe>O4s~y(4{)u6-J9%!
zQ*rNgk4WyC-J8wh-CNSyHp0nna_|3xi`EWu@5$rN%C5M#zfp$|wR#c+ijj`G;`rxN
z03X_pb^pe@e--zx@({;+pwp7&qE5<Sg7$Fzg%tD^WukjS8d?M1ldgcKxPQ~=ZW>`o
zFPNs{`UqPvN63fO_DFglI1?PbaGdPmsl;zOU19USuBVm6F3=ZrunRZ~4_FqQagSbB
zNL%S$U#el;p)@8;$+}1nVH+6})@Pb~Z(H;M$KkFg13SkE7RM-8l2KOwm_R*DTbwyg
zBK&5j>F%k~9!9-Euf$g1tJWWv^a{3uCKy3Lvz^t)=Z@nz;xvMM2bf}ghH-7_wE9#U
z$BKJ@o2@>}y=z@@Z%Q+6t9vha{{+Tp!wbeF<H{byc<Sq;ozzNdoW-t_jqW_o`#7mg
zKi*M{NLdAbkNF4Aun^<n%5y-hqJ4o?;FHjPU-xwYbQLcbYWSdV3+c%=o<ieaaaP%j
zc<w{j{pdQIuA_2e24*_XS*tVTV+ODu11QqKvr+oFf9l!n1Bf1s<zt{m{0+X(_P|GR
z91{>pfP=o{ZzZt>EH;MX5GXW)G0rqM_oUCLVQ-k^`~+0HJAEW(Fg~uBNgNmL97GGO
z&v+B*?{u2kY)Q;D!~q-e(0{}V@uQJWB4V1zg5}tcnyHR;k$8>BBbYWe;3H$U$w=aj
zC=a^`E=CBW#rJF<X=`@1I@dVD%ZR~xVqIvAF^3(5lZ{2a-PdasieemN5O*+oHWopq
z&UcAoup(NToviHoz#|JQj-<JfwpMzDK`(S<*$0Lf&S7w4ozzb_`j1L{djO3daM*KY
z<kaUmva**APR3eRSEiEn3L^%Owl;v35N{=lvp%@8hkycoR}aw$-t5}A$IZ@jM-$d?
z;)Hs{S++m!r0|GUI#)TwSoU0CV3oss;20odp}m1F602nX3upX=wcv-K;JKN$8fMGb
z&faKt!8Qj6c<Io>8N(I??pS9#<S4AcG&gU?x=~`SxlXbQ#2OtjUY`YnSN+i1EM5dl
z@)$9ltYXR)woxxa9-%8f){4QMS(n5?^$Uq|m|<8`AcI$U_@PpQ!k^jf#nulw9|?OE
z_{&V<sEXANe#R>{+R<NF4Stx;LD0(n&XG#iSY4N<xjr<d`U`*Lcr=Q*vG;%zm&xRZ
z;MCk%hZbHx4{)pVO!w^*R&130-4{V~6S(5O$KhHYtE>lzzozp`$)lKZL}%<`YOdvc
zMROI7daxHHiOgYM%#xmJ?gq-V*G(t?*vrj0%s$CYm?vhzFgJ%d3S%BgMriX)iNa}p
zWVO*bi(bG6nxQhK^%wZ3UHR-Plg>&sujR3l)eoA(rjirbx#Gu6o-3fyY`wX2?jqNh
zf;m0R%>bFdY(@52!C@UVj@gw6{+pgN?91@}DdcSv$d@%M23L5aaK|nJJ&>#*Z5v>X
zb2A4c%obJO5MSo_I)ylLl-eVeUvreU<HIqZH4sn3-Xs*IxF_Ri1mGjAE7ObrS{>2C
z@kPc@dyF*zE5T%n=DJtoNN(eSU6){e-y^_@XE4^4fhnJc9eH)1>gN0&6rU|ej_k4<
zOXsSURIZBIf?j9WP>IoO2cEq$@45Hv_m-M*)0C)FzgJJ;l`QQYOfOfPE2USvX2%o#
zm%I(T@`{TjOv!m;HrqlQ<^$s(f)61-lDRHkD(#Z9wvcCXuB6oBOS)#-dB>}P%x2{%
zksnzI=WWQk;7z<|6kT+5dB(~Lr+GZ{oYJ{Yst1DG$W+fbD@aE%UiH8wZCPaUSksw5
z_Ez@PLLw<_qfrGCSx=_IwW)J#U>B^};;+0;B096@NM9w+2@lEHBqDH@gOye?E5SsT
zji?Nb#8NgFkUfD!0FF+`m-F^c$nL-iz78uvUy-EVYcoISgt>r73EdbQI<Y>Q<>)-f
z*9kI(3ul1f!JH(gX6~vJvO>uKHH!D7HJR7K!K4@HG-qO+bWO(S@J>s7P;&P1uKzOD
z@FbRxXem*UZNZ+5R*plkhvZO9gR5{-|KmB)O#3#8r_-G-=}dSkaRY}bZr<`t=3T19
zB$k1BU_BVMyq}b;yoalS_sRZOb1UcuJ7B*kdpL|JbDl)G9BgfOo$1{mXTywNarxHX
z&PuW?<64f{ydz8R2Du$Gnnx2ok$I@+3l(=}0nC~1-)w?fQu@LZN4h@f$zobcb_c_8
zjAw+dq`F>9U+iC*5g4=dI@s*|!^R8FxYX;wg-0H}l>LXC{OC@aS9?DjgFk_X?52@-
zsb=DlY`^q4%B}(425Q6}P$K8jd<wo`M;~J+af_oI&T)As&vH4F=XegAv)`uIeeFNX
z#JI{{m$}HUM0c$+(|C4^of%tZ8qQ+4hHWlB3p?^o(dHY%F&pt^pQU^M7H6SsjFqfh
zW*+R0nU~HbC1;bfM_4P%2_u-!#C3lzu^t$*wo5+785H`<^VFWnOv%lD;bT~d5iim^
zCcFRQd{t*!{@SJe-_47Y;*}cRvQb36Z*Fqt2v3kz)7nrXInEQ)XUlS~u%Dxx<^Iia
z|FD<Cb%g69)=#!I`-EzYdz~p*!_>}9J-jpG+5M8l1Lnt9=$f7P?2kCR!~7R2j{Zy~
zBgS_am#hwm>llN{?jMTAZ0uaQuGx*EL}uuT9>bfEZ=(2-PUa1-E37B{0oe&ZFTlt!
zC*i_*pZcWCK$d~)&|GhmS<XA8R;M*6?J0|lZT1XxhVzMiNDpwwNxI#iSKKdRpdRPQ
z*}24V3{iunVw^ei0R^8v_IEaePjgREue(|C3Z2Ik&+!E8AM=_9Cr`lmfB3_{--X}U
z>P8&F2WzxmHFKyW*+&m*2M&G`5hq*Sk{awXfsbGOLOYk9op(KB{QRKO^P1hAD6E`r
zi4LGgD;JK0;HJ3T+N)Cnbg{De+zmBM&G^Wpx*NSkPyFphnD|*jt_20}p3%m2tQGGK
zy1TW7A*&Z_B>26YG}c7u@fUUwTZlBN>Eq<HR39VTL*_0c*2l?$Cg3RYA<c5@MRK)O
z&eGLNpypnou8+f4yMvBtc^q{7Il7}3TC>Gjf3ZF|fm%io6qXm;N9u6LTCjaUm9{$g
zs(j#!C0QbB6k_f=w%R8A!CiENk6_${3S)v%;oq}MOJy9EWXDJ7*)q}&Y}G=nt5$(F
zVrBe@r05{Mmp(#&hD8qe!Xx1W7zL}Poq1@reA5zmL{P^XTfJExd#7^eQSRgL+4qzK
zbB5&v%8nS<qX$d{J8L{b9oMrAU;~$RW3HI9+#9hfW;gSN=Rzy>U#_=TSWNngdg%@7
zp$pb09(AQsy|UWLm<TTG#5zL?c!HZ~2zpqOtt|4jx2U(H4BMl>ESIk$%i38aa7>0p
z?U>_^>zI~jCd1H7v_nlgRw8<^KF|@p!(Y*Z=cnAEMP@8VU0!Rz)k<Kw_R9V5<M@JJ
z`T`7*4U2*Y?4!0rEMr>1<yee6L`t?EVCX1%%3sw099eVu3tGrj+cUO|M4DEpFxKgL
z$g)IZ=*qnid%!=yi(9N_+%LW|j>?2)VjK2aSQ@_1F$=AbAX1c)`9WWiW!GQGVctvu
z*p7zCWd71C<qilmXknd&8{ffW;fEqyD3ud>1Krflz{Pw~8iB+!nTtk3rG*99vO4;C
zV=7uQC)Smva2A7lXka<BbwwA(;GQ!KF3d^hjaU*i{7<QMTtri@L6o&)ikwO?AV)cf
zg;C3q0aj(LQO8B(sP=4otRl#5G!{du@K-4^QtVmMKd!}<Yj_TbEUxS3B(QGGjU$!l
zC3a3*SmZ-HjJE2bF<&A$WOHoyqd)h=&IaYgI*A^<cJQ4)_fd~tLLbJ#yvxQc&d1O$
z_5lV)LM(zi!0>fwWi?|ujUv!gVmI?)$<l9bmvP}S5KjXpuSl%7P(pjQ0BZ!>ibb=%
z2933rNJ8JblQo1ZdIN9exvC?X?VaVw)<g~XSzl+aobRf9YeSLCky~tyTGVhYXA63-
z^^l0ZiXW;B;Hb{*dAusZS{6@q<n^32(0+3)6fa;p&N9*-iXTx2mgNjfO8?}qu61Z*
zZ0;qmR?J6wWVwMumLJ~>R@SbZ4Ra)xUh-c^<ep+i3q7<KONzdV4+vf%c7^|;u=l~j
z(huQ>R@C9QnH5+4jq#bDy$)RXp7FD@O4?X9_W*X26$z58bPHo7MGxe3ECG~E4NCA&
z)36327nn>3dgh@vlYOOfhCG&Px!TN)*FV)7-Yk9RzdXhqYtV0ad>Vtt5_VNSz(5V;
z%4v;Ki8kmB{;?&oT0pvOWmxvZ(xN!v$sPed_?dE%qGKX8JpVKjN<H&PTNZaB4Uv<h
z3R6fl6up%XW~T5#t$HhKhdSviJPy4DXOWckH=S|tOy-CyXgTN7(c*FDv5{C0T;(Y<
zj&b-7nBdKPczl_PwE`}*v%OLqOK(Ic9zo66MSn=KePr37VqIVZ)s*);sIhC1NaYB{
zI;vKZ8K7RrNAgn4H^do{D^^2)r4Pa%zGnTHaU{BcQZQjzXuufYqZzT>p&kD$NA5N3
zA$myPIW9;oGzM?ji0fcS?gNibZ))f95h}I}%TxQLM^Nlw^^#f2Bf_hZ@Z_9GZN*U%
za(Ps36bBa9vL=`jGXBDk<%{2;)>5#pY-O~mw%QA>gRa60mJ$A(>#-(MXC-hS(auts
z2gAI3KpXcmJ#yS9zOr?3WqzV(UL2E*M(CLWo+kRKPJl4(%%4Zv&IB1L^a#{;l*Ln|
z7UQV2;L7q?SDBR@(^Ui1t2J3i=^d|E=!Z~?EU_l$A9RwK#eL4MyI3{B8NMM_QBGVV
z5;(_FEDMQVs7udWtcTEnC9o8Y6JmGqJ?5iY!fv4DxXKbWvY=k(pl}eaG(L!T!5ZkT
z?J2Nr4Rb@SWH_Lav4fq`<1BZI-JPVQxx%9G7uE!j>cHbI_RFr`dHQNb2`bn%Yenvr
zcmmcx#ev2w6Z%L*g<SPKwxQ?<ZCR%DRynZM852E+KJ0hUNjPYB2@LE|SOPGm=Ul_9
zj`l~!hSx^n$GEt{H<=sr;Xbg(ArImFgE5&Z%>%TY0Vq#s2tLwV)lfYzyT6eYK{V$q
zQtt3qvLcqxo&f7}jE6jyBT`u()a%%xUlKc{H*9akK|RI`f5j%?iMax9+``o0m7V$4
zKEMTy7Uqa6bdk~FcJXTAz*4!5cT4PJI>*q){l{P7!ZMP6;`!H;@9NgH8$SR$dBfJz
z)^2U@h$@xy7dI{q8#Mf&F%24_pb-fhk+2a78<DUP2^*2H5eXZSun`Fxk+2a78<DUP
z2^*2H5eXZSun`Fxk+2a78<DUP2^*2H5eXZSun`Fxk+2a78<DUP2^*2H5eXZSun`Fx
zk+2a78<DUP2^*2H5eXZSun`Fxk+2a78<DUP2^*2H5eXZSun`Fxk+2a78<DUP2^*2H
z5eXZSun`Fxk+2a78<DUP3I7jALj0eXFW$dt0{^ncsT(>vHf%a+%^7Pqp5DI3{mRA(
zZ|ZP=PH#8A{=vV{(YQ7&(6B(m0u2i^EYPq(!vYNpG%V1tK*ItJ3p6ayut38C4GT0Z
z(6B(m0u2i^EYPq(!vYNpG%WCczykQC`Ir9Ct*L+VJZ$rc?H#XbT6)-$LzW%9=G7|>
zts3t6>J>{4e3iXgZq?RX+7N7cGHfyZ8o#xegT*fcca2-u^sJVujQ$qK?~ARmn6<!`
zrw@lXTg(uSt+)6V4&m7P5M0csm@3q2>qGo4j)g6L2=?*I)G#-Txhvq1&bHpl4b}TN
zw#LGi1H-np3~V`Ad|Pi}AIGohnkJS{2)3G7ID{Xnx3slu>vQvKtR}w1TJU|&K7Wf7
zf_*BhRWVhFwhUEBiqF$>E2b)@wS20Dty~`tar5=Dv>~ccy`{Bqd3=jmo<oR=IoQ@(
z;E+DPlwwRD-)d!P%V7GnWomrRR<6&%$G14u!d6z-IQvvSPg@hx(Bk+!EtSPAUtb2(
z;?xVa+WK%vO0fkjRe7GpRF;p$w6Mh~*3e>F4i+wt6QU~Cp_r;Xt>sfM*!JDm#BcR+
ztR`hzeV#rCi(^|Y?8^#Kh3b87WiTyO8QAh<xIC4`ET;9P*czWtwcIQR3l~c%gK2Sg
z1#C66aJ8~Rv|JzJW~nS}@ol|@eH>e3;Sg0BoDglb^;T9H*z#xCQrT8pUkhw`7Q-Pa
zK2-=aRA0=2TP>}{_v`%{pM%9I1J^FmawyivVp`pNst~57vTzyvYH@t6ti)PipL3|j
z>KuZr)uap`i&HKCdf{6geAr6iR=*}xZ!s<GOYu1r<A+*py@h@Lz77_@7Py$RuSrN&
zF&|6i^Ym#$I6j{creAMq%fMEv5WdCn;qp`=Oj~dH+xlu@=3}WWXAAo{w#LGi%I9w}
zE$mbIwB>7jOe-q{m(igNt;H#?iI3^)<8v;iviKJ68kOZx3tTMS_BtfR;#k<?+j@pW
zt+u`v*q2yexgl;==Q282d<&PM^>rxbU|av4u-_Le-EZ~#<>UAq{2EIYYPI$Cf@_gm
zhPDij?Mn#X;*^0c9}8PruD3N7wp2c5nVRz4EM~o6Uw>O;r4-j&%n)oj_;492i(@(1
z`hO=J(t+#CXks~pV9UqHv8@)a1(RugZe?nGT1!<1_BFRPAr8J=za~U$>#eL1Z1F>|
zFFjOKzTV2Ry4m__;WB(IPO-KYvsz6;_?Bl#dWhE6`+P#&ET-jP;aX@dpK4*Nn}xf^
z$5L5t7PdGc*y8(eh|1O%Q*mnuzf8Tw*%fft^tYP$9Bhq`>DPqteN4Zm46UUK!680e
zZ>jtmzcs|IJf<%t#4}WHWtD-e<x{L-h+8q0)w7s`&&Sf%3${A=u$AJs`Wlw6@iDEe
zT41YZh)=O}zt!@zu;p*-i#dd-Y`ujoXTRRB@ugdwGH|iPV*VjoE4P?~k7;>Y*kaZK
zTb?1<^0zp)zFOGwVYmzjpUS88amsM67RQ$o(!_H1acrxF%kVFQUo6pY^=qsY3;P<{
z)-tfq!Iy4vEKeWPZw=8}%xYoF)50M>)#5O|<>uGeRtsBM7PdGRu9mZ<wXl^Hf-Qa-
z*z&RX#X5(mEC&l)d<%zg{CZnsVattS+gdH`b1ToY7_$s#pM#~ceF@cDoLvE1xgj_t
zw|4vx=TLn}BG-qgc169fNl1#tv^cijhl?@&R=<XM+WJ~xUqf3{EoWc1+PPT{K5R9#
zt+w967KdTmYGJ?C(pt<ia51;yR?FYVw5?^}Vh-FIx`y~yiyz`sOMOU(P<<I$OlvVM
zH(PIEi{o<$Vb)S_X{&{;wwAV7bBh^*EoUDtPh~O7^C?f|_tZ)W@v-&)DcI^++zY?e
z>g>1roQrXMZkB^>wXnr0&);&W7Oq`l?RpmLP;HMazRx*SQ%q%B%fMEO#pn7mH9n@L
z3c=;6tcDi0oQt_xDj(CY@i|)#q1H0>7N=gY)y=||zu!lTX<?trr!9jM;%RAj1#IQ|
znult9Dq9oM)8hD?Eme6;OSLOtUz1RcmG1Y>r?U7KF2*e8Z25#>%fA@MwpuD*2a8!P
z>~r&F*_sf4i(}ysewlj9hv70*7RTpcYeJZ|-oo|O!RH*(&0<yyTb@2#Ew?iGz7)U4
z@+s5m<NGzt$JSR1cTJP}%C$QCoP7;#jit44h>yjwu;poCi&HIZ`S|*j;Z{sl%-?UV
zom)s}pR+GLL|dl5Jhy5wt@QG=mde6D2U}w?LvRS6>n&9=rjKuFLvX#QiuqX0L$KA*
z$FZ#zwwPt=El#ztm1W@&AI7PrH6+F7Y%z;li}mRmZHT9>w;KBOeoYA9$Fwye*zcFc
zw6ZL0aV%_cENpQsY;hR2t-As)mS|hcNVoVF4$)d13tRk9eHolGw3bh`u;p)I%O_NC
zaYC@AW!Pf+tv-&$x3EuZTP@r*Ov|BK*h&o1S{#NgrfsdI-qMzVty~LR+EBg4u`uHo
z*Z8evq=Yz^p)Ho^bGG=q0=7E)u$AcR7OL_2gfK0C3y1J6XNw<#LwqcL*LeDzeV(?a
z3|xk%)z-pY<8L|mu;po6%hdZg#Wj9wNMZ=HOufYk!B#HA^}-DC3Dx`3t!^PITW|4w
z*kW4P$K)D|Q!m(;WjWhcTVE~g>u))S;4)GyZMFDiXe|!IR*G%)>-`#^gT)EKR!S`#
z%J477v8}~g6}N`?)KYJ0cQx$yu6#{MH_IV}W9visww_^2RV}=$xmo^Jw@|&sv9RCM
zP>tmr!YRYqr?pgNU|*ABo)+KoFQ&4X7Pj1c*vBkWQ!h<wmsPBZ?XQ((VV{GgvaqEp
z16x{Oisj(9mZ!CREbR02TdkC?wOXnWT)QU4oXhkg#G%@HE6eX!`I<7ARyQlx)>jK#
zK0a)@6}NT`(^6U3m&G*}rxw`fW+jF=TO6N*r7Fg>tsyE~Z(&PYtb?U01N)qd`TO`~
zq*$C{{ywHJ(biae3tJptqHVQQwZN9Ag)L8C6WeNG%fZ4H$HEq;SW0=!5Pw@=E$mD8
zwe@jAQp#h7IE3nb&bB5*Ri>W#l*hDkeOlXUdD?oP%3@mBr?NE`GX#h5eH}uWmb1n2
zIatgxu+OcSr;l%?__P+^VwQm|ZHTkwWASZ$wXiR%YaFaT7Pj1Meb?mrR6fsQ9ABR@
zHRX9)ZneOEze3!6Oj}c)DufxTw^DpKL=~#H94rpk+Zqdps4PwhwzMJG(iUstWBT}3
zN*R2M^Y4VMp2fZJF@5}MH4pK$^&y_VbW2s-YI*vYeyindTg$*9+G4quvyW+c`mMFl
zmf_~(SbcoyKEA~X!9G=}#;-5t$@una@r$`xs$xvb)51OnTVpY6fh|uT4so`a7AI71
zajJ!xr=<!>vGqQc<q(2>4(0jOLTmL2@$ogWn3h8=u;uB)WjGh>8EUnhyC&Ciu&^)D
zZ}laXr?T8EY<b#x3tJptqG{dMt?%?#<~0rE|Mf4f8&2$qD{;5Dd)y=L8TX2N$9>|y
zalg1J?jH|`2gbX_gW|#Qka%c3EZ#jH9*>Ae#-rjr;?eP#cx(-n<Kpr0gt)m29J;P8
zWY$IvjrWXO;)(I3cyc@?o*GZv1swN^r`N#szqyC?)2)7-WE^4jz2kl2ed8JNe(}tB
zRy;eN6VHw3#rwze<JKBRM0`E#IU=#XeW@=uc(~|kEz@-=JEz<^Mm8Q*PazSkXl(vl
zxt7zb99CXb&)THxoVrdaI@Hd=&br#Tb&a}us_H4S-dsBeYc(4Ks^?riMg4kHyX-tW
z)Q4-=xpa-PdaCLvvLk1$S6^<{C+)gqSL_Ax0X3}JUDvnkloIu<-K3{o=h`*Ou2ErE
zV0%#;m)fXpwq8F@$QS>cxz+A3cKmkjPN%+hl%6At?>gtMQ^IbwQFm=eY@=@N@)3Lf
zo4AMv)<-9B>pG_}Ww>Q$XDIdY8d))F(__~}%>SfL|4G?)Ue-Rd?bu|`EOy?@onvJ8
z)LHH8?_t?q*gWpPN#FYEQhV;uHC?(!CAnNV>T+0R&Ktxp>dUcy+`7)GI?C#>?YVqj
z23O3jxK*A3l*6iKjPuSGWe-=IwA!d8+SZ4Q<S;fvm1tKV3AJ;norA0pGJlK47ANXm
z+n;w?&u!iMn1^3mPis#eepOsT*p<@FJvOVYba#*4sw+L*W4f-Fp6(G}eM>L*$guvU
zw|flPwbI8uzN~NQ>mG;Jr}T4=RqIol+~e7QZ|UzI2k)9Pz&&QJUm55gS?~I?n|mzY
zwKB*(PA@Kl-Q)J^$`JQ>zW!yXd*omLGR(b3P+QsEy@s&!GTgnYP@giwz4FktGSa;&
zQCk`1UbU!S*~7iI(e*Ogz4B3g8RK3PsjiH52gtRRaqa+m*Oc+@fUmkT!M)^CTWNN$
zoOG@1>0VW-e`#^YgSD55?iHG@l}YXZulh3Cy{=PTnc|N5>sO|_SB3ulWtw|=qiba^
z_tHn#%5?V{P5sN>?$w;Gm3`d9fa=S>?lqv=%MAA_QP<0U?lq+Pl$q{zruvmx?$xOJ
zmD%n!tNNEY?$xdOmbva#u=<vH?$xqgQ}%bStaYu-cdxp2y|lVbeQjldI~3@8Ilw*e
zue~gc>rocP^(;|buhJHGwJeT9C9dheC2_sV(zsq_SzNEOJg!$+5m#FdjO$enifb(g
z$GfVmjCWRE71yh*ivJzu)p5PbYvNkVA#pv+YvWqV>*B7IL*rV?VR4yqcwFytL|o6Z
zI<8kaGVW@5eOyg>LtM{tR9sY!j?0u|;(up3Hm;={7uTb_G2Yc>O<a$1d|Yc;8~-QD
zy13eMLfplIhhP7k*EEE`{Mvfj>Fx6Mmwx-j55fA;!>|E#)#tuw8{z)p+b?-o=2POU
zu?l@PCO8%PYK-sXjS_8B4!t|MR_MDk;P7{6f<2Njm;!a6z?W*3<V!W50yWTfjQcmv
z{qvt3qE5;ng7BSNg}!s+dj8Ihshc}-Cp%~=-Ps=W>1>xT=a`2+4;NYZi+2TuBi>2F
zTcs6u=z^<o<z80kdpy(+bpJ3WfKi6Ke|YW>7`;?V{*sTeaK&3_uqa^BM_TzyKHN1^
zJHI2x`lLAmhb;~W94qu~ApXKXFh*&MH&e?*x=OF08&k+vhUgX7;EJyd`3}|x1Y1?y
zVP?f08UnJM@Vz2q<BIPUStpDm3cnYj82ly{?(q#D{^AQK{KdCl6?f#qxcn9Z!@fj(
zA<1oQ1;DVYSb^K{g(M2T8Wi1SobinxitP*6uvOT;m;+pkE6)M3N+tP%k~wo<EI0m=
zQ>f)jPTYs|6dS`I;o<nYvEmNiaGgQdS#(t?Xknk=d26L`8?Ko7d?%EAhmm7DvS*`K
zFnSS18UyWkPYr+B_mu(=zFx&&jzfSXg0auD1vP>J1AXQ%I{7X;2kkepg26M%>cMjm
z?fgC`AiPIgq3=ZDV@#{P(>WlPV+@Hvd{-gMu^&w!9?Ah2903JaV*_KMUccyt9KnQF
zvA?2*zvz`V$Web4dD6<?2IGz+3Xcao3MCthD(-~?)MvjcmRN)~o$nIG;Mr&q*%~nr
z?a`us#_<|;DDqu0-*GS4o73DxAI7tDm}?}G;Vy6OK)rY_Q|mnC=*3>9Jz%~}h4q2&
zc^s?_l!8Z2=-A%ye~IAQA`#rTn(e2o9;zugi09(F4d#gXAiS~4Av$slP~D`RS6}N3
z5_cJcDJt$I5%>V=vR0EX%h9IUh3JwVHRcHpyu$K5?7<MPh1pn>UJG??Ry*)l?ZOS~
zja?=3*Jh0iOeYacxu&BH$A#uZ)3hZe%2~hQ=ptDcWMo%()bY3a{>(;Oz8~g$74T&y
z*-T4*69DZtyG!RFXk~wwNY(6W^4BHQqrc)glF_gqpq`6lUKk6h!(UxL`D<-%<FB;^
zuQj1iE6d6N3`9X2yO>JyD82(F$1ZCx^&Q6IsK>D)&+8Z~+f&ra3M{iv)(vC|n0=C)
z2nXp2?lF%f|KP6+1glsd!P5Lfvo6*L7}>bR{YTcP#bza(^`TAQ7Zyy>+Mg@gm?^mp
zd$}KRg`>=T&hk(zze=GPnlDNm)6vwGNau`X#T<ntUzC{2e32oDgix=fy^{P|hR#6o
z4e@2x%g@-rf%EIEr`Z+4a%)bs3hf}&@-`=8O(kCyy=|_I>_vKvH6Rp+^L7@@Pj-8n
z4~ZO}!O9W!?9+LxJH}Ti(Q~^_A;QS&&KXvAowBo6_D{l1W=l3_N&gZGV@q@wTASyq
zr}&=1tDRCIs<YheYG>DO;B&;1d1t>OQVzh=-GEw@b7zhc_#KzDeDNju9T#bBPVj6m
zq)q2tdRLBi$)_=E(F<f<dAejr*XGYEN7qU9z&vh#6q78#w`{Z1$HoF4VU{V8lygeX
zuh1gDb)%ZGU2u=wUDhz%i^VkC=DzZ-TRDg)%YG;v=Xlg~H_JTu1cqUMrByw$dnfIi
z>@H-7%~4x4)XYzMB=LhW?5U8@X#B_AM6Kjb96!>WgvxTVnGUz}O2TkjC)9~fJU494
zgjSi=fK@j0ve~DsAn9F@WLew`_T)4te?3%AB8BG!#|1vS5M9!lu*^-~w`nGv&P5~}
z6%U4#Y_!u{g>_KQR(o#KJ)@io@wZ>_d0?b>gK~Pov}#d~PpD1r$ZUjT8XZl^Zn$2~
z7jW`|n*H3rSp<m`#^W3pQe-~m?KyR2XeJ(c-Y3~I^R-vmgYv3{mh`wG4`zJc|Ekxa
zmLresB6yV&?y{54uJ+O{>#}B~8pp(svU^abMFg_DDap!s#pEm=n7%b-%=CPO^C;$P
z<GE1ttmAgsfAJmfcSHu}rp4k+TX(H!;|$BLTe4=zX$i1|BXiTWOnesg*}024j;YNK
zve|)fQ~h8ASs8gv<Nc3~XW$_@8}DXRuQVt2O+*4Nnzcx*7fQ5C4AJaBD78m<8rxM^
zvrLv~_g_3`ZM<M^EL+zu>A%WiUb5H2okTa$pU-ochk75Mv+;=V$|;;=L@>s3&L$b4
zoGZ+5a%Q@Jv)#XndnpQ6)yYO0(HI!KmH`rv0?b9Iap&)sboYvO*}vKRH=D!gh;g)I
zyNEQ-2D5RKdyKst<7v#sw_jYBrzb}`ZucXd%o{xuS6ihs6C0yAD%<=+vsOqFJ*-!=
zx1m*bNV3;L#>~4Ao^5t)S#SRKi(!mydVgMVFL@P9<!H$Cx;M3Y@=i`9NQR?cq4Su=
z6%W9kcvrWk0sI8)jI|q2Z|{iCJ^b<3=z+GwqiEQ3tx@#NS(E2Sl}cqXE){#Z^%u*{
z?fL`zuQ0cj!HZTzTffuGk=_6GMN#WJ+$F={>is^ygzGL|c<rKS%z<*7!Ta7XM=p(a
z{CwbwXywua5?y}v`^o`XekASw#WydER<C}dEor^~;K&Jgmkd+AT|IB!im3e;gBExw
z-yXCgI{DVO#nI&-T(C4c?e2L?Jru`=>$XqdwmkamQ=e*$j(>Py8*AGC(C-sd-*la1
z554?nXP0=HHQhz)hD6cWmF{x=?6>8M-2RG_X1eg)kQKQDb@cB)m6-j?k+&_5M!h1p
zmCDzbMtko5=|$0?d#<x1vwHP#4B1YtM#6VIIw0xW-F**~@i_nU%ZzGo@3?F!yVPqR
z`c7-K`ib5vqO*@YeqnUf!#`N)@Xl|G-u{yh3vH)ev~LWZ+|OF5V{%VN(fsDb2A>{v
z?&4_uFD6<PBD?O_?_U&M@?Gb8_uYGMTeRrn0oI&Bx0p8Jwgm6e-hZ_e*B<oIrP2OZ
z3||&~=6z2uj-tn%ImsuBN4lkD;qvJH|Ksd@$LDVJES_}rT}z`wuD>9T-t`rlDe>am
zIg_!=wV$~$nL-a8)y-;3cr<4Sy8fB5*2LF7xXmKJ^v0>nqLr7-U%_TNW%1rg>*vo|
zZ1KKy#T(rSu71V3-g}=HmwM}O|GFqz^%-}`C`q?1-?+9_8Wt^&e%s>uYw$*mvV*tw
z2YW4x$k^na7d9WfnDuM>%5n3fyt%KeXrzN(s8pQrMen+MF^|W&&!wDSxx8)K#MoJ5
zp*MAx_dMTr|F=hcIEhU}`{0WMZ7bDLWZ36qXJU#VtLN>WKUc?mP@>egKP(V2Snz=p
ztQyq8v+w(s7t&@8nCpa3b8(W$?mBf$LiWlZe<{f4f7wpXUqAk&#7RdIWui(n)J<LT
z_U-$)(0uOCj+h?>9sQ>5vzJC6yW-bwvcsk}s@!k2C)M<_e*KY4qy7gC5dEMAwXXcj
zRjtv9|MO|9ZYECt_{Ya3oL|$U&Ek>bWO35|x;`|>+m@L1L;8_g&^m>aR!5Ey-+0}l
z1kGHQ>Xv9)sW?~u;<IknUVV|j$Z1#KKYe{$bpKEO<vGX{OpQ&Op0!<AKV@IHblgAL
z&WdaPvT|{B`Nn+`yagXv<{9?pn=e`#efiz@FO43*O=6g8K#&@TX8iWE$0qCarb%Z-
z(VzD_BUvwZJo;$VIov5TVLi_<rCV|V9e4_Ow|(=PeB_Tme5-XmVsPT(Im>yWr`u<r
z8EI|xkp~CZ7<Tn5KX(!2bv>+wi0s}~i<U)SSvGiSwEoBuE23{d=OWTyHyoRv#L!4n
zhO%kUi;1RoU2tPgYZP(LyL@eWcROws<P5)l!xz0yKf88<>&*QJS#>}5wwsd?JpANK
zEyYvAzp|9$A35;Uy-r*h{bR?OQAE*}QXHpCTmJC4mT2Z7w=9X){^0zW!<-HZbwN9r
ztoDHcy}R{3tCe>DtlzpNkZ!NO=P{Qf4!XKCwmads?)WZl|7`7Y#TVXW$FkqNOYMx`
z{@%aYR$8|x%)MjwbQfMjo|svlXictE4qnQgu2en*>kbXgTAjZF(S)c}X4)~LUY1Bc
zHPf<5mgD^GRi8};`PRKJw&rX;bd0kQ(&S-7TxOY<XY082dO(5^Db#Vp{;B2DRYnv>
zDETB5y1f3BiDKBFxp}S)7vIohK{S89^U0gGPq!2C4IPKO+fm&u^6~vo0?PSbxH<P{
zpL6L4XRlk9M6_<v8bBVle*OA{Li<5MLDdLCW7|HoH2UeL6>;?EiFYn?NyjYdha)ll
z*z(ZptsyAr>$*h|>6E?P;&s~CKG4Oj0XJU1GKp|s+wpemwi#Vi=Yii%*<M$xFU`1p
zQ8aCdi!>Qpy1nyf8<$5b*QF90YB+4lGVA=?4ojsFTL%Bqvooa-loXMRp7I5!knV*t
z!qru13cdKTiy~*gCeMC{z2Gu8TG@#~aQii7%J_tK{rGOyEtVb^+n&=T;T<3BOnb1)
zzdtdxt>S$}Al#4|v>OY~!MsUAUC^B-MMsTr!RW2yyW}KE2Q!xJ@eQ{vJ?P7SjH8ja
zKak|v85G?Copsh($+(@`^R0HCZ@$NE3P<d4n?ed?!QBoG@}y&s#v>@Gp#S}tr1mr`
zZrbh^2i=T5dEAB8n~3a)VPCT&^TNVMtwJXp<2LxTw<qK+=SwiBTarO@nq-{t;Tso5
zG=={0x)T=h6xTe5*AGW$)Fm#xKXu!p==EQby#dwf<t<-&%qm0;l)5Mi&E!?j|7j6t
zpe1%$k2j|dAolF*g6fISp0hL}M{j9q>6}(>3qXQy+P=)271Z!Q?|FPF?}ai;jOw=<
zTW-3gH04vzUGMdX2K0AtcB4f}c``L1oHHmlN#?FRD2l$eqep9W&#$kv*$r{NWzxCc
z&{D&v9z4^N_TX0^P8QtRuWhnRFHu}JJLM6-|HB6ptthuh5?rTRo{Q>CAyyPsj{3!L
ztJ($4@9`8O<Ojd{9jnX4B|o%|+49MuE20@^yWP$We?1VV0WPNr?(W)dm0i(A&)l`h
zty}k5&LnN+gfAp&Ty#<2WVmT~R<EAdIr`$P<Y5#~4}0U9*615=Ij)t}(8yZ6OZeMY
zPqsGDP)f&Hlz9Ya0I5qWHbn-y<x6_*tCBPu>BwyTg&U)2`zg-<D0`&^*U@_Epsv4e
z;Y&8WnXxo-9mxJX{;j|B#*$WIUHFvjj8D3(lp>PWDWnGwU%SSgmr%p&uUTW+w|&b+
z$1@&s(eXR2?r=}0fj3&pl%nH-SOTeT%NGT@WKutn;a~w1Z0^d3tsuj|flPbNViyUY
ze!!heY2IWuV(BbscE?(qDABHRQorRkQdd4S9=A>d8ZAn84!%P4BMs<yM+2y8MTbOs
zs}SvH$WOoikGacuKSR?rZ>HSULv}IAbaA?T;4+yw%9NnPKeXLTfNpv8s3m3(Ht~{6
zys)JC)ii8O$faoT9Mi?&JqfwvvD=#B=zSM{10&;({zwhGSj)&HnjVBH?#>U2)5Zfw
zM(!|f^R;c!fsg&n>(S`vI!~U`=d3Taoo(kY1tSWFv#z|ut@iMtWT0H6mWh)eppJOA
z4sx9MZn4ff+$}Ay_Ew?$?!{4#?nKf-fs8{3tF*9CP{_-SMCVGRlZ4zN&m%@|4xGU+
z>OUw6wC0f4sSssWZ1PiD^VUB!U`6h(ZT0GX7e}{0c2$y5P(OOU=pX)2!?LESiR)eR
z&>?mvKl<@8cG78(Au?K+De+I1S+}Z9`w*p^ZWuMT6LQ|=m%r*|*C<8NT<^rq2PSFl
zjz{;fgSWih&CvT#dShGk?3+d<r^G#0&0U%+mjd_p?WZLEa`wKd)A)bQeYfqjs-d2v
zb-S-PG!-$^jz0ODZbNS3nxk{hB`1|Tj-77JdCTCNmqbs!=ETL(g(tZ^;?rMt`+J$)
zN!X-Ad=>ueS!)(V_Z;~H8yzVy>WL-|#gY|6kwnY1R|W>c>E$P%xNKqcqmAxF<dnBM
zlhER&u56GU=vw76{OkSfUgN$;`!9>G{H{9+J1cS<Kr;3j=PtA}o@nn~?WXR@FHFaA
zuX{$I{1nO@ms11nQ>IQkpe;J|3Ac}@)quS2kx6IgA2ku#mKhQ#bahSwg$r}RUcUU)
zovqQ1OD^_;n<`16;Kbib#vQ*b5Y2t+ejfWlZIt!7=Qy-6o_WXD^1bfttACj?PUk@~
zWt&%j(w+VqT^tyVde$8dT>0y-MLZWuEbkP@cMN#h&L}=iO0UEuh_=H7(b>|WNBm(y
zG~}T>Qc6M%LfQX{E0;%O|Ax~F)ZKHp%R4Ej(QN^xi07=Vcn(4odZBPbCpLNKQnWQE
zWQxifcd3p<($**m@S>lx&z$UNq<M1BIZpd+tE_Q|j6yE$>FC%dZy`|j@#XHhA7xPL
z43tIEvp~gD=z{;nIjj3GnsUZxtZ{mL>F0?#sr4wtjXA?cu87u7K51dZaSdx|^61wc
z%Q?LK<&zlbg(6`lZ_?H$NB(L-^x#*o@v?u)zDBNc6YR!SQ!$-s4fRb-tY{dM6GJxx
zk|f%#5Oj$3_fPXQ^>XS&4Y$T;(#zu2zHQ`F-n7!K5p6fMgQQyWT+N-TC93)Py;2aw
zGkJk~%uBlH_|CmhVh-VbeT6#!yKBbVlShqtPv$e6$!$&D-3wMkuliUY8*QnT-W;HX
zk8Yp7Zo3^LQs{~W?x8I`&-?HLOOn=A_r2QU5$!kbpJ40EJVJ_1U8QuN@=1N%|IA32
zS<<H3sOvy>V5$o~*`rp<swimDWI7kFOoE;n`Kl<|{f*rcf1dP_vx;JIS|oM);=j5l
zD`y;cWHNszy=RJDb!qJx^r?5+2}TNy`+rjxMC~)bW#ihUD`r{R4e>iHnLgm5QyhB0
zlNS{9#QK0Ik?(ds#=2?y(q%g_ViG&uV{KAWFK;=w;<*Kda5^4)&m(=TrbPDW(}yQq
zZm0~idyUMjc;*H7G?ErM%F&YpFgJB6x1jS~8Xj_ntsO_V=I%uDynW>*CoYX-##i{Q
z2<?$VEiJL_Z{ES%+%3}&h|YWdZf~+5_SM(gp3|uiowU)Mp(D6pYMRO1DAmx_FY{28
zX3CrI*)KLd(k@V_rzc5^9-D|KD|mmy1nJaFQ8I-xFGNrSEkNHJ{(Ngh{m48}c<>{`
z6W^ud4x+ez&~=_Q=!qS5E6LWKE<-2WvN)n03%$glYA7_L=kz2{(Bsj(hob#A$O%2Y
z%#)WtA8?`UaftJe*QZ_-p+gwz<@Tdp;y}CJ3$Al>=A%vbFU)<5M)lJK<1KsBCd4=K
zo^8+Bg_O*6^W*MBM7d;6gz41?S|%=;w8v6bgVrrNOOwp9t@AX+#y?#bikB=BP7km2
zWLp*5{>lfJM=$(*tPRrCN?Ot6)Q2ym8qH7&&2&OP=_4=c+XPlWm7$Ot@vr0Ww6-D?
zS|G33K0irQluRQ?=Dm!A-{!UobON4n*4utOXBm4jahdRi&-+mxdvQwcs7E(m|Hz_f
z`MQ%AMNi-P`((%p4m8~8Q|vsu+3yF5Tv%~w6d6%AU7;ftmm2Vi*Uk^SGEdT5AG>OK
z^yo|{h(yw1@Uhtb)0t&3Z_30lwlg+tl&jFJpeJmuA(S_X^V8dCB#3;24#kpZ3GT=z
zlUlJLcQq3tFQL-7`_zV^vK>yJoRDE@tzEtP!)?(|N9~rsOz8VV-itQQ?ELB)%uWN4
z8E#!kD38t4p6Yfy;100$0g7t>hv#Q3jxN1>nK!qX3@<{G|Itj&TiFSZY&z{K_sYoX
z)vJ-Nx+e|P@Z<R{OQO4ec%_ZN)DVmZL66l5MxA-_@<EB&dmj8YZwaIg!c|Z9ToCnp
z1Kx!|zLA-Jq{iPTtakG#XU9h?orW)y6FNHX+mRoYw<byF&p$rG3koEIF2mv<<}X=0
zZW)yr=gc$TEsjJo(%wYbi0&aY0MJVa6qd-nRcC8rw};5fMpQq7?z^|mCLL5qkBHS@
zs4nwzfi79|pZ<O;KP{jaxEyk-NA8|YHyp=ut5;9%Y;~!XDo*<atG$rTz5XM~NawvR
zSJ}3g%~bcj`{~x`*=L5OdX%;)J+}MFjqc>>#hXuUi_ZFoJATS|$*7-7MseTYds_Bn
z2wEz28%{6$QHrC_#qVr#X+_={JTagR!cRxv>Nzm8#|u8!zVail^{%~FEQ=^fptE{<
z+DDOwV#!4_-mxe;{Pgd6$#Le%Jf*Po`t8g+R(La%G&sKJfs3OdLw56f?wYgj@Nwi%
zzjicf<t3ei>?rgR6TK?6{WmVfDSp?F)R=o&FB_nq_?`=guiQ>2EN)`wdG`4ocX?|!
zvHJb<?tJotJw~@hSH15Y-h$hH=9O*|r%yDAZ0I`o^d=K1XaKq$`PyX>W!KcB46XM#
zSX}vsFW#Jr7HP-qd)5QCb>V&Pxz)=}GnPjW9XmLAv>$w2xX+`hY>tjtUm9|teKYCI
zGtW#0<pZC7ES8f`QH}aLXO4Rhbg!cyNV1IRXX9g@y41=S?2hS;h4=sFpPq{n3N3*Y
zw6=c5J-cgNw%=0oTA7|+20KGs^o1N<iE{&h!|qfv=^**!qfeffxX=3a&YxNPPGs7{
z&bj`_t<hdTAC~l2&r321DP^1O|G;@f^VHO=fYWFUyZw<Viz8YQDQVMXyTrjXEjFh<
zea7PGkq6}s=lj^(O$W8Bm1x|^R6?3bp6DrszB^4mNj3-`1W;CR-@WPgpwjQ!PydA5
zgV9S}nmc9;+v8L7+M*Y?jJH#lQQ+;W5G5E-Jbq4cn4~$)G5^?M{fgGNCvQJDb~8Tk
zl#$qfYn6L0nLHQw4MvZS*3Wm_wD&B$D~hH*<(90OAGx%(^TC7XAepaCjyw9!h0*dm
z_DV7`iuZadRID25M-T7!|JyzbqHoRK!y4z=XO=9E{(k>9=UnNxan-QYt+!o}^YseW
z3dQ4BK;3<`zO7;#$lHf)#p4U4J(=Z>7|_P}!Iy7Z$WN9ZyhV=mk~P^qJWxT@eNFg=
z|Hgk1o|ohgxXK+howaVZ?SAF~cV_#qO9y8`NQr6pPKg)oj`dU{?{T%!8FtCLJ?Nrq
zTBB_ny4%I@)WugXiRh`;>L<FTl8KyUf~FcR$CUH`<?H{<|AgR>7pAxXk1pJ_{dR<U
zcNkpkIT<6;xzvEK&P2v7Y1Ch~%VU_#La$xb&DnQ*9GXP*j(!K(rIH>^Qy`;>-RshB
z^s-E9%scIuY;RI8{Aun(I~Iz6baWbg-b4E7?&O%WTa(n~%I9ZW)egE^Vvdfq_Kl#G
zpOAbl6Syf=)0jgaki7JWgjb@a11mkT$$M5#co#qW`_|~vp1(^Hg1jko-t#9dj$S%v
zjaV)HNfB|;x9=$aX^Kc;&OFX^*zBx}U*k`E-4zj2n%(-Kp6cc|y9_k%EMrjH9*LbF
z!+XOIzxn%iHWF=yJ+0?-)}s5``}+T6QSR~QeVeaHqPOmFuRo{B&Mh4e3N0G>NjMD!
z9UHDW=o7JfX6Q~o@^U>wrb}KXO&N0D6NJCqn|fC=n1fLAbY0H@%c5DsuSnjup&`@6
zUtONmparPgpWI_!RgECB+R8zDTN_ZrH=lc#ty@1ObzuLi>)Z><?$zm3^l@~&1z3K+
z^TbPrFNn;yZZ~b;o@6o^4QNeX@{@mhtjHa=HM?}0QdmxAA%lVp<qZ1OLWZf{Qp`SR
z;SF}#rq;|mf#gWE4jzApTV3d6G4Bzla@HL<9X60#1S2NR<h)nN=mD}u8f8y&ChvTM
zUL&D*Qt2qM*a>HU&Yz)Q?8#r2NGNbJ*)8b93;K$aR$@(~f}Tj~(if_K`s4A7BYM<x
z>PL=WChwd$&dGZt?!oK(E_4r(Ob0vVe(Z`T>^z@yY3jotqS$`Q70dY*g)_f;Yd#mk
zqvbB|{V;vrquC}=(AiDp{P$Z8sDYLpTF>eA%)Fr>Ji1VbJmF5ad}<v*I<#W;#MrAo
z>vs9{$l#2DZTas^^!m8l{u38nCFz#-d6X2<a|230{`X;7YiVIl%#PWEMg21eKj^8Z
zn(8h_>+Tx&uH_NE;Mnr|55{g$m)x87Op2$_UhjRcoy4;S%ujCh(bnjv&a-M9_tFxi
z8sdN7{+8Q7(+HBqDFV}R{>#@~m494*3_hbh=5k2~m6byDs><~7xBJltyG43Ch93E?
zf28Q;2a2||V(0lm@{OJA2gOtR=s-0Xc>Md26w#N(ZYY8=LMilf(GPU{qkBK+#$^kl
zzCCYAbs?SW&6%^iwLN{)O4FI%)tEScwtJFv`H*EUxpS|oP-;rYEOgdP4<qvO)2IIA
zLbz&`2T|6SWa02NylSg^&O8dP<Glf%U%LOYyG5$I_vzH<7Wy9J*53zCL}*q}9H#(~
z`P4vHb_(2dK4~>g?;)TSWn}yQke&{^+q}1^lUe3kDY?r`@rNF~%zAs~423=)qCLbz
z-*Y>@XZJoPvBt6A5a^y??O}IH<N7?ekiU@D+>C6c7u{uDzN+bfXu|35^`bmwP?Unv
zyEq!4l#4=N{*B8lldmP*_|l3KOm&s)=Pz8=8oj-rdk0PHGMiQ!EwTZP!lL-=ZPAA(
ze0;I{aPK{dA^!TrZk9o%g74nlf9661aM(|uLNZ2QHu({lD0DObz415LK~a8`DXcr*
z#S;25V(=mKNGK&ukx%_?>Mcx4>7F_KqSolT7u-jaM@)4uPUNjZ${>N<^Awsr>WLd}
z`-G<-C3i$Y@hZdRqYt^){OD6j3Q&|E@WHP`<hSJiuqt$*3zT<!?|$zM$%%J7)f#>7
zhSU>4de!Vtt7luEBwbosE;Meoty}Nudo=B~Wpl^YHCs<xyQyRS=F?7X>3PU&4_UFT
zTaN>p)^3=wdDEt|W}LdQX+~48jceDnZyY*c^XXf+oW6Ap-Hq<KY;DKZ7P?OF*VKLM
z=23mNb?bgWrRmtFfm=@7yl(Bf4I4LX-O%1KbZA1SwQm{S`{)f@UbA*fOY(R6n5Lm8
zY+T#XLA*QGY}mAQ|G6Fbg%kG+AXb~9&1+}wf5QB^YiG8upSgZ+`<&Lb?F(kMw$D9r
z{k%EtbJot9bM&~Tf$Q7XZaw|9cE`r)J9I!(Q{QewdpA{@y7%q7Zd6mMA4B^#_3qne
pX!oYdx=BqrnhxEq#nDgi>u`EH`ff{mHdO}qTe@45G11^|{~rlpd<6gi

diff --git a/src/l3_centralizedattackdetector/tests/__init__.py b/src/l3_centralizedattackdetector/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_centralizedattackdetector/tests/__init__.py
+++ b/src/l3_centralizedattackdetector/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_centralizedattackdetector/tests/test_unitary.py b/src/l3_centralizedattackdetector/tests/test_unitary.py
index a939b9efa..4d28755c0 100644
--- a/src/l3_centralizedattackdetector/tests/test_unitary.py
+++ b/src/l3_centralizedattackdetector/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/.gitlab-ci.yml b/src/l3_distributedattackdetector/.gitlab-ci.yml
index c373d2237..226cb6421 100644
--- a/src/l3_distributedattackdetector/.gitlab-ci.yml
+++ b/src/l3_distributedattackdetector/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/Config.py b/src/l3_distributedattackdetector/Config.py
index 73d3e471a..e04de0b26 100644
--- a/src/l3_distributedattackdetector/Config.py
+++ b/src/l3_distributedattackdetector/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/Dockerfile b/src/l3_distributedattackdetector/Dockerfile
index 4bdbcf03c..e78c41803 100644
--- a/src/l3_distributedattackdetector/Dockerfile
+++ b/src/l3_distributedattackdetector/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/__init__.py b/src/l3_distributedattackdetector/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_distributedattackdetector/__init__.py
+++ b/src/l3_distributedattackdetector/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/requirements.in b/src/l3_distributedattackdetector/requirements.in
index 772ae9239..a8aba8497 100644
--- a/src/l3_distributedattackdetector/requirements.in
+++ b/src/l3_distributedattackdetector/requirements.in
@@ -1 +1,15 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # no extra dependency
diff --git a/src/l3_distributedattackdetector/service/__init__.py b/src/l3_distributedattackdetector/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_distributedattackdetector/service/__init__.py
+++ b/src/l3_distributedattackdetector/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/service/__main__.py b/src/l3_distributedattackdetector/service/__main__.py
index 1ce6831f2..1f558dfb6 100644
--- a/src/l3_distributedattackdetector/service/__main__.py
+++ b/src/l3_distributedattackdetector/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/tests/__init__.py b/src/l3_distributedattackdetector/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/l3_distributedattackdetector/tests/__init__.py
+++ b/src/l3_distributedattackdetector/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/tests/data_generator.py b/src/l3_distributedattackdetector/tests/data_generator.py
index 43c3d707c..bd6556638 100644
--- a/src/l3_distributedattackdetector/tests/data_generator.py
+++ b/src/l3_distributedattackdetector/tests/data_generator.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/l3_distributedattackdetector/tests/test_unitary.py b/src/l3_distributedattackdetector/tests/test_unitary.py
index 0e868d781..88e3dda98 100644
--- a/src/l3_distributedattackdetector/tests/test_unitary.py
+++ b/src/l3_distributedattackdetector/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/.gitlab-ci.yml b/src/load_generator/.gitlab-ci.yml
index a63bd8d0d..5f2ee0d76 100644
--- a/src/load_generator/.gitlab-ci.yml
+++ b/src/load_generator/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/Config.py b/src/load_generator/Config.py
index 70a332512..1549d9811 100644
--- a/src/load_generator/Config.py
+++ b/src/load_generator/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/Dockerfile b/src/load_generator/Dockerfile
index 8f59bb4db..c9297eb2f 100644
--- a/src/load_generator/Dockerfile
+++ b/src/load_generator/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/__init__.py b/src/load_generator/__init__.py
index 70a332512..1549d9811 100644
--- a/src/load_generator/__init__.py
+++ b/src/load_generator/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/client/LoadGeneratorClient.py b/src/load_generator/client/LoadGeneratorClient.py
index d7e215802..99626bbbb 100644
--- a/src/load_generator/client/LoadGeneratorClient.py
+++ b/src/load_generator/client/LoadGeneratorClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/client/__init__.py b/src/load_generator/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/load_generator/client/__init__.py
+++ b/src/load_generator/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/command/__init__.py b/src/load_generator/command/__init__.py
index 70a332512..1549d9811 100644
--- a/src/load_generator/command/__init__.py
+++ b/src/load_generator/command/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/command/__main__.py b/src/load_generator/command/__main__.py
index 9f61fc080..7504eb6da 100644
--- a/src/load_generator/command/__main__.py
+++ b/src/load_generator/command/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/load_gen/Constants.py b/src/load_generator/load_gen/Constants.py
index 32b457bae..b71dd9a35 100644
--- a/src/load_generator/load_gen/Constants.py
+++ b/src/load_generator/load_gen/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/load_gen/DltTools.py b/src/load_generator/load_gen/DltTools.py
index 34d195ad7..8799f7d8a 100644
--- a/src/load_generator/load_gen/DltTools.py
+++ b/src/load_generator/load_gen/DltTools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/load_gen/Parameters.py b/src/load_generator/load_gen/Parameters.py
index abe297039..f0de3ea1a 100644
--- a/src/load_generator/load_gen/Parameters.py
+++ b/src/load_generator/load_gen/Parameters.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/load_gen/RequestGenerator.py b/src/load_generator/load_gen/RequestGenerator.py
index b7b1432f4..906c26e98 100644
--- a/src/load_generator/load_gen/RequestGenerator.py
+++ b/src/load_generator/load_gen/RequestGenerator.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/load_gen/RequestScheduler.py b/src/load_generator/load_gen/RequestScheduler.py
index e2a804d7f..775da1580 100644
--- a/src/load_generator/load_gen/RequestScheduler.py
+++ b/src/load_generator/load_gen/RequestScheduler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/load_gen/__init__.py b/src/load_generator/load_gen/__init__.py
index 70a332512..1549d9811 100644
--- a/src/load_generator/load_gen/__init__.py
+++ b/src/load_generator/load_gen/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/requirements.in b/src/load_generator/requirements.in
index 61a0a0efb..03a61d7a3 100644
--- a/src/load_generator/requirements.in
+++ b/src/load_generator/requirements.in
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/run.sh b/src/load_generator/run.sh
old mode 100755
new mode 100644
index 35db1ad4d..0ef004598
--- a/src/load_generator/run.sh
+++ b/src/load_generator/run.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/service/LoadGeneratorService.py b/src/load_generator/service/LoadGeneratorService.py
index 0127e5f86..bdcd33a11 100644
--- a/src/load_generator/service/LoadGeneratorService.py
+++ b/src/load_generator/service/LoadGeneratorService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/service/LoadGeneratorServiceServicerImpl.py b/src/load_generator/service/LoadGeneratorServiceServicerImpl.py
index 67158f1bf..c280581dd 100644
--- a/src/load_generator/service/LoadGeneratorServiceServicerImpl.py
+++ b/src/load_generator/service/LoadGeneratorServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/service/__init__.py b/src/load_generator/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/load_generator/service/__init__.py
+++ b/src/load_generator/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/service/__main__.py b/src/load_generator/service/__main__.py
index 0f49ee244..227099c59 100644
--- a/src/load_generator/service/__main__.py
+++ b/src/load_generator/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/tests/__init__.py b/src/load_generator/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/load_generator/tests/__init__.py
+++ b/src/load_generator/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/load_generator/tests/deploy_specs.sh b/src/load_generator/tests/deploy_specs.sh
index a5af70b04..571990eca 100644
--- a/src/load_generator/tests/deploy_specs.sh
+++ b/src/load_generator/tests/deploy_specs.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/load_generator/tests/test_dlt_functional.py b/src/load_generator/tests/test_dlt_functional.py
index 9c6c3d5ba..764b04320 100644
--- a/src/load_generator/tests/test_dlt_functional.py
+++ b/src/load_generator/tests/test_dlt_functional.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/.gitlab-ci.yml b/src/monitoring/.gitlab-ci.yml
index 4a981cba2..ff620c534 100644
--- a/src/monitoring/.gitlab-ci.yml
+++ b/src/monitoring/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/Dockerfile b/src/monitoring/Dockerfile
index f26741df0..946f2cd1b 100644
--- a/src/monitoring/Dockerfile
+++ b/src/monitoring/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/__init__.py b/src/monitoring/__init__.py
index 70a332512..1549d9811 100644
--- a/src/monitoring/__init__.py
+++ b/src/monitoring/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/client/MonitoringClient.py b/src/monitoring/client/MonitoringClient.py
index 5641b9cf3..751ff6e38 100644
--- a/src/monitoring/client/MonitoringClient.py
+++ b/src/monitoring/client/MonitoringClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/client/__init__.py b/src/monitoring/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/monitoring/client/__init__.py
+++ b/src/monitoring/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/requirements.in b/src/monitoring/requirements.in
index fd7a555cf..981b4cdf2 100644
--- a/src/monitoring/requirements.in
+++ b/src/monitoring/requirements.in
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 anytree==2.8.0
 APScheduler==3.8.1
 #fastcache==1.1.0
diff --git a/src/monitoring/service/AlarmManager.py b/src/monitoring/service/AlarmManager.py
index 873a65d2c..495a5f365 100644
--- a/src/monitoring/service/AlarmManager.py
+++ b/src/monitoring/service/AlarmManager.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 import pytz
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.executors.pool import ProcessPoolExecutor
diff --git a/src/monitoring/service/EventTools.py b/src/monitoring/service/EventTools.py
index cdf8afc04..0d351eee9 100644
--- a/src/monitoring/service/EventTools.py
+++ b/src/monitoring/service/EventTools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/InfluxTools.py b/src/monitoring/service/InfluxTools.py
index f19555437..f2f877d92 100644
--- a/src/monitoring/service/InfluxTools.py
+++ b/src/monitoring/service/InfluxTools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py
index 2185a3986..a2beddccd 100644
--- a/src/monitoring/service/ManagementDBTools.py
+++ b/src/monitoring/service/ManagementDBTools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/MetricsDBTools.py b/src/monitoring/service/MetricsDBTools.py
index a386d5f18..6b9825541 100644
--- a/src/monitoring/service/MetricsDBTools.py
+++ b/src/monitoring/service/MetricsDBTools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/MonitoringService.py b/src/monitoring/service/MonitoringService.py
index 10611768a..5680a8094 100644
--- a/src/monitoring/service/MonitoringService.py
+++ b/src/monitoring/service/MonitoringService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index 08fb69c38..0bbce1509 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/NameMapping.py b/src/monitoring/service/NameMapping.py
index 57d7bfd4e..17a48b3cd 100644
--- a/src/monitoring/service/NameMapping.py
+++ b/src/monitoring/service/NameMapping.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/SubscriptionManager.py b/src/monitoring/service/SubscriptionManager.py
index 3d1da36b7..7c2b930ce 100644
--- a/src/monitoring/service/SubscriptionManager.py
+++ b/src/monitoring/service/SubscriptionManager.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/__init__.py b/src/monitoring/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/monitoring/service/__init__.py
+++ b/src/monitoring/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/service/__main__.py b/src/monitoring/service/__main__.py
index 5483bf563..fc460151b 100644
--- a/src/monitoring/service/__main__.py
+++ b/src/monitoring/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py
index 5530c720c..a56207d9a 100644
--- a/src/monitoring/tests/Messages.py
+++ b/src/monitoring/tests/Messages.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/tests/Objects.py b/src/monitoring/tests/Objects.py
index 699e9e991..447ed0d60 100644
--- a/src/monitoring/tests/Objects.py
+++ b/src/monitoring/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/tests/__init__.py b/src/monitoring/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/monitoring/tests/__init__.py
+++ b/src/monitoring/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index ed8f18558..1428b0ed5 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/.gitlab-ci.yml b/src/opticalattackmitigator/.gitlab-ci.yml
index 5b9a133bd..92968348b 100644
--- a/src/opticalattackmitigator/.gitlab-ci.yml
+++ b/src/opticalattackmitigator/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/Config.py b/src/opticalattackmitigator/Config.py
index 130381d8b..09ae554ad 100644
--- a/src/opticalattackmitigator/Config.py
+++ b/src/opticalattackmitigator/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/Dockerfile b/src/opticalattackmitigator/Dockerfile
index 404698054..e3ba175b7 100644
--- a/src/opticalattackmitigator/Dockerfile
+++ b/src/opticalattackmitigator/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/__init__.py b/src/opticalattackmitigator/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalattackmitigator/__init__.py
+++ b/src/opticalattackmitigator/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/client/OpticalAttackMitigatorClient.py b/src/opticalattackmitigator/client/OpticalAttackMitigatorClient.py
index d0c53e57e..9aa24c696 100644
--- a/src/opticalattackmitigator/client/OpticalAttackMitigatorClient.py
+++ b/src/opticalattackmitigator/client/OpticalAttackMitigatorClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/client/__init__.py b/src/opticalattackmitigator/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalattackmitigator/client/__init__.py
+++ b/src/opticalattackmitigator/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/genproto.sh b/src/opticalattackmitigator/genproto.sh
old mode 100755
new mode 100644
index 500fd1930..4cb0103b2
--- a/src/opticalattackmitigator/genproto.sh
+++ b/src/opticalattackmitigator/genproto.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 #
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -20,7 +20,7 @@ cd $(dirname $0)
 rm -rf proto/*.py
 rm -rf proto/__pycache__
 tee proto/__init__.py << EOF > /dev/null
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/proto/__init__.py b/src/opticalattackmitigator/proto/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalattackmitigator/proto/__init__.py
+++ b/src/opticalattackmitigator/proto/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/requirements.in b/src/opticalattackmitigator/requirements.in
index ea6b450c9..378e9a10a 100644
--- a/src/opticalattackmitigator/requirements.in
+++ b/src/opticalattackmitigator/requirements.in
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 grpcio-health-checking
 grpcio
 prometheus-client
diff --git a/src/opticalattackmitigator/service/OpticalAttackMitigatorService.py b/src/opticalattackmitigator/service/OpticalAttackMitigatorService.py
index 875276b4c..e2783e6ca 100644
--- a/src/opticalattackmitigator/service/OpticalAttackMitigatorService.py
+++ b/src/opticalattackmitigator/service/OpticalAttackMitigatorService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/service/OpticalAttackMitigatorServiceServicerImpl.py b/src/opticalattackmitigator/service/OpticalAttackMitigatorServiceServicerImpl.py
index 39a783ac4..16777e799 100644
--- a/src/opticalattackmitigator/service/OpticalAttackMitigatorServiceServicerImpl.py
+++ b/src/opticalattackmitigator/service/OpticalAttackMitigatorServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/service/__init__.py b/src/opticalattackmitigator/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalattackmitigator/service/__init__.py
+++ b/src/opticalattackmitigator/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/service/__main__.py b/src/opticalattackmitigator/service/__main__.py
index 10b50ac8b..649d079c0 100644
--- a/src/opticalattackmitigator/service/__main__.py
+++ b/src/opticalattackmitigator/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/tests/__init__.py b/src/opticalattackmitigator/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalattackmitigator/tests/__init__.py
+++ b/src/opticalattackmitigator/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalattackmitigator/tests/test_unitary.py b/src/opticalattackmitigator/tests/test_unitary.py
index 74f91a837..24d0853b9 100644
--- a/src/opticalattackmitigator/tests/test_unitary.py
+++ b/src/opticalattackmitigator/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/.gitlab-ci.yml b/src/opticalcentralizedattackdetector/.gitlab-ci.yml
index c3d91aec6..3db4de3f1 100644
--- a/src/opticalcentralizedattackdetector/.gitlab-ci.yml
+++ b/src/opticalcentralizedattackdetector/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/Config.py b/src/opticalcentralizedattackdetector/Config.py
index 5fd3e97e9..c9bfe106b 100644
--- a/src/opticalcentralizedattackdetector/Config.py
+++ b/src/opticalcentralizedattackdetector/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/Dockerfile b/src/opticalcentralizedattackdetector/Dockerfile
index 190df9bea..a7b32ccc6 100644
--- a/src/opticalcentralizedattackdetector/Dockerfile
+++ b/src/opticalcentralizedattackdetector/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/__init__.py b/src/opticalcentralizedattackdetector/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalcentralizedattackdetector/__init__.py
+++ b/src/opticalcentralizedattackdetector/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/client/OpticalCentralizedAttackDetectorClient.py b/src/opticalcentralizedattackdetector/client/OpticalCentralizedAttackDetectorClient.py
index cfb78b41e..3dc2f3ae8 100644
--- a/src/opticalcentralizedattackdetector/client/OpticalCentralizedAttackDetectorClient.py
+++ b/src/opticalcentralizedattackdetector/client/OpticalCentralizedAttackDetectorClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/client/__init__.py b/src/opticalcentralizedattackdetector/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalcentralizedattackdetector/client/__init__.py
+++ b/src/opticalcentralizedattackdetector/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/genproto.sh b/src/opticalcentralizedattackdetector/genproto.sh
old mode 100755
new mode 100644
index 855231cce..85941a266
--- a/src/opticalcentralizedattackdetector/genproto.sh
+++ b/src/opticalcentralizedattackdetector/genproto.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 #
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -20,7 +20,7 @@ cd $(dirname $0)
 rm -rf proto/*.py
 rm -rf proto/__pycache__
 tee proto/__init__.py << EOF > /dev/null
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/proto/__init__.py b/src/opticalcentralizedattackdetector/proto/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalcentralizedattackdetector/proto/__init__.py
+++ b/src/opticalcentralizedattackdetector/proto/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/requirements.in b/src/opticalcentralizedattackdetector/requirements.in
index ea6b450c9..378e9a10a 100644
--- a/src/opticalcentralizedattackdetector/requirements.in
+++ b/src/opticalcentralizedattackdetector/requirements.in
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 grpcio-health-checking
 grpcio
 prometheus-client
diff --git a/src/opticalcentralizedattackdetector/requirements.txt b/src/opticalcentralizedattackdetector/requirements.txt
index fca44cbb1..5d13e7bc5 100644
--- a/src/opticalcentralizedattackdetector/requirements.txt
+++ b/src/opticalcentralizedattackdetector/requirements.txt
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 #
 # This file is autogenerated by pip-compile with python 3.9
 # To update, run:
diff --git a/src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorService.py b/src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorService.py
index e29566833..f281063f4 100644
--- a/src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorService.py
+++ b/src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorServiceServicerImpl.py b/src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorServiceServicerImpl.py
index 0009f8d91..c3ca1c1cf 100644
--- a/src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorServiceServicerImpl.py
+++ b/src/opticalcentralizedattackdetector/service/OpticalCentralizedAttackDetectorServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/service/__init__.py b/src/opticalcentralizedattackdetector/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalcentralizedattackdetector/service/__init__.py
+++ b/src/opticalcentralizedattackdetector/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/service/__main__.py b/src/opticalcentralizedattackdetector/service/__main__.py
index d21b96cf8..89dfe277d 100644
--- a/src/opticalcentralizedattackdetector/service/__main__.py
+++ b/src/opticalcentralizedattackdetector/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/tests/__init__.py b/src/opticalcentralizedattackdetector/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/opticalcentralizedattackdetector/tests/__init__.py
+++ b/src/opticalcentralizedattackdetector/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/tests/example_objects.py b/src/opticalcentralizedattackdetector/tests/example_objects.py
index 09320f1c3..a6859bfb4 100644
--- a/src/opticalcentralizedattackdetector/tests/example_objects.py
+++ b/src/opticalcentralizedattackdetector/tests/example_objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/opticalcentralizedattackdetector/tests/test_unitary.py b/src/opticalcentralizedattackdetector/tests/test_unitary.py
index da0f4ca9f..d89ef2fe2 100644
--- a/src/opticalcentralizedattackdetector/tests/test_unitary.py
+++ b/src/opticalcentralizedattackdetector/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/.gitlab-ci.yml b/src/pathcomp/.gitlab-ci.yml
index 787913539..20ec4e728 100644
--- a/src/pathcomp/.gitlab-ci.yml
+++ b/src/pathcomp/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/__init__.py b/src/pathcomp/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/pathcomp/__init__.py
+++ b/src/pathcomp/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/backend/Dockerfile b/src/pathcomp/backend/Dockerfile
index b351d4715..bbe5adc26 100644
--- a/src/pathcomp/backend/Dockerfile
+++ b/src/pathcomp/backend/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/backend/Dockerfile-gdb b/src/pathcomp/backend/Dockerfile-gdb
index dcf2dbd2f..c505022e3 100644
--- a/src/pathcomp/backend/Dockerfile-gdb
+++ b/src/pathcomp/backend/Dockerfile-gdb
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/backend/Makefile b/src/pathcomp/backend/Makefile
index f4fc1996b..058701098 100644
--- a/src/pathcomp/backend/Makefile
+++ b/src/pathcomp/backend/Makefile
@@ -1,19 +1,16 @@
-#
-# 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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
+#      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.
-#
-# Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
 
 CC       = gcc
 CFLAGS   = -I. -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include/
diff --git a/src/pathcomp/backend/pathComp.c b/src/pathcomp/backend/pathComp.c
index 2a719c924..aa6c2b734 100644
--- a/src/pathcomp/backend/pathComp.c
+++ b/src/pathcomp/backend/pathComp.c
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,7 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
-/////////////////////////////////////////////////////////////////////////////////////////
 
 #include <stdio.h>
 #include <stdlib.h> 
diff --git a/src/pathcomp/backend/pathComp.h b/src/pathcomp/backend/pathComp.h
index 76b97fd60..decded67e 100644
--- a/src/pathcomp/backend/pathComp.h
+++ b/src/pathcomp/backend/pathComp.h
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,8 +12,6 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
 
 #ifndef _PATHCOMP_H
diff --git a/src/pathcomp/backend/pathComp_RESTapi.c b/src/pathcomp/backend/pathComp_RESTapi.c
index 709d3dc00..8ee7f6d82 100644
--- a/src/pathcomp/backend/pathComp_RESTapi.c
+++ b/src/pathcomp/backend/pathComp_RESTapi.c
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,8 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
-/////////////////////////////////////////////////////////////////////////////////////////
+
 #include <stdio.h>
 #include <stdlib.h> 
 #include <sys/types.h>
diff --git a/src/pathcomp/backend/pathComp_RESTapi.h b/src/pathcomp/backend/pathComp_RESTapi.h
index 80e63da7c..3b6629559 100644
--- a/src/pathcomp/backend/pathComp_RESTapi.h
+++ b/src/pathcomp/backend/pathComp_RESTapi.h
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,8 +12,6 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
 
 #ifndef _PATH_COMP_REST_API_H
diff --git a/src/pathcomp/backend/pathComp_cjson.c b/src/pathcomp/backend/pathComp_cjson.c
index 093d80a6d..f030da9df 100644
--- a/src/pathcomp/backend/pathComp_cjson.c
+++ b/src/pathcomp/backend/pathComp_cjson.c
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,7 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
- ////////////////////////////////////////////////////////////////////////////////////////
 
 #include <stdio.h>
 #include <stdlib.h> 
diff --git a/src/pathcomp/backend/pathComp_cjson.h b/src/pathcomp/backend/pathComp_cjson.h
index 47c2830ef..dbd233889 100644
--- a/src/pathcomp/backend/pathComp_cjson.h
+++ b/src/pathcomp/backend/pathComp_cjson.h
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,7 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
- ////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef _PATHCOMP_CJSON_H
 #define _PATHCOMP_CJSON_H
diff --git a/src/pathcomp/backend/pathComp_ksp.c b/src/pathcomp/backend/pathComp_ksp.c
index 85c5e7505..4ea413d5e 100644
--- a/src/pathcomp/backend/pathComp_ksp.c
+++ b/src/pathcomp/backend/pathComp_ksp.c
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,8 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
- ////////////////////////////////////////////////////////////////////////////////////////
+
 #include <stdio.h>
 #include <stdlib.h> 
 #include <sys/types.h>
diff --git a/src/pathcomp/backend/pathComp_ksp.h b/src/pathcomp/backend/pathComp_ksp.h
index d542c4931..ef52d3159 100644
--- a/src/pathcomp/backend/pathComp_ksp.h
+++ b/src/pathcomp/backend/pathComp_ksp.h
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,8 +12,6 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
 
 #ifndef  _PATHCOMP_KSP_H
diff --git a/src/pathcomp/backend/pathComp_log.c b/src/pathcomp/backend/pathComp_log.c
index 5f66e5a1e..1f78ce098 100644
--- a/src/pathcomp/backend/pathComp_log.c
+++ b/src/pathcomp/backend/pathComp_log.c
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,8 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
- /////////////////////////////////////////////////////////////////////////////////////////
+
 #include <stdio.h>
 #include <stdlib.h> 
 #include <sys/types.h>
@@ -40,7 +37,7 @@
   *
   * 	@param size
   *
-  *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+  *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
   *	@date 2022
   */
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -77,7 +74,7 @@ struct stream* stream_new(size_t size)
  *
  * 	@param stream
  *
- *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+ *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
  *	@date 2022
  */
   /////////////////////////////////////////////////////////////////////////////////////////
@@ -100,7 +97,7 @@ void stream_free(struct stream* s)
  *
  * 	@param stream
  *
- *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+ *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
  *	@date 2022
  */
  /////////////////////////////////////////////////////////////////////////////////////////
@@ -128,7 +125,7 @@ void stream_reset(struct stream* s)
  *  @param ptr
  *  @nbytes
  *
- *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+ *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
  *	@date 2022
  */
  /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/pathcomp/backend/pathComp_log.h b/src/pathcomp/backend/pathComp_log.h
index d9a14209c..e9f12a5f1 100644
--- a/src/pathcomp/backend/pathComp_log.h
+++ b/src/pathcomp/backend/pathComp_log.h
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,7 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
- ////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef _PATHCOMP_LOG_H
 #define _PATHCOMP_LOG_H
diff --git a/src/pathcomp/backend/pathComp_sp.c b/src/pathcomp/backend/pathComp_sp.c
index 735027faf..447b0d2a6 100644
--- a/src/pathcomp/backend/pathComp_sp.c
+++ b/src/pathcomp/backend/pathComp_sp.c
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,8 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
- ////////////////////////////////////////////////////////////////////////////////////////
+
 #include <stdio.h>
 #include <stdlib.h> 
 #include <sys/types.h>
@@ -53,7 +50,7 @@ struct contextSet_t* contextSet;
  *	@param g
  *	@param s
  *
- *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+ *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
  *	@date 2022
  */
  /////////////////////////////////////////////////////////////////////////////////////////
@@ -117,7 +114,7 @@ void dijkstra(gint srcMapIndex, gint dstMapIndex, struct graph_t* g, struct serv
  *  @param g
  *	@param s
  *
- *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+ *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
  *	@date 2022
  */
  /////////////////////////////////////////////////////////////////////////////////////////
@@ -172,7 +169,7 @@ gint computation(struct pred_t* pred, struct graph_t* g, struct service_t* s) {
  *  @param path
  *  @param g
  *
- *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+ *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
  *	@date 2022
  */
  /////////////////////////////////////////////////////////////////////////////////////////
@@ -257,7 +254,7 @@ void computation_shortest_path(struct service_t* s, struct compRouteOutput_t* pa
  *
  *  @param outputList
  *
- *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+ *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
  *	@date 2022
  */
 void sp_execution_services(struct compRouteOutputList_t* oPathList)
@@ -313,7 +310,7 @@ void sp_execution_services(struct compRouteOutputList_t* oPathList)
  *
  *  @param compRouteOutput
  *
- *	@author Ricardo Martínez <ricardo.martinez@cttc.es>
+ *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>
  *	@date 2022
  */
  /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/pathcomp/backend/pathComp_sp.h b/src/pathcomp/backend/pathComp_sp.h
index fd0807fea..5b2d31d43 100644
--- a/src/pathcomp/backend/pathComp_sp.h
+++ b/src/pathcomp/backend/pathComp_sp.h
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,8 +12,6 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
 
 #ifndef  _PATHCOMP_SP_H
diff --git a/src/pathcomp/backend/pathComp_tools.c b/src/pathcomp/backend/pathComp_tools.c
index 84cf63994..5f1748b1a 100644
--- a/src/pathcomp/backend/pathComp_tools.c
+++ b/src/pathcomp/backend/pathComp_tools.c
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,7 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)
  */
-/////////////////////////////////////////////////////////////////////////////////////////
 
 #include <stdio.h>
 #include <stdlib.h> 
diff --git a/src/pathcomp/backend/pathComp_tools.h b/src/pathcomp/backend/pathComp_tools.h
index 118781eb0..b6bcea04c 100644
--- a/src/pathcomp/backend/pathComp_tools.h
+++ b/src/pathcomp/backend/pathComp_tools.h
@@ -1,6 +1,5 @@
-////////////////////////////////////////////////////////////////////////////////////////
-/**
- * 	# Copyright 2022 Centre Tecnol�gic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
@@ -13,10 +12,7 @@
  * 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.
-
- * Author: CTTC/CERCA PONS RU Ricardo Mart�nez (ricardo.martinez@cttc.es)
  */
-/////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef _PATHCOMP_TOOLS_H
 #define _PATHCOMP_TOOLS_H
diff --git a/src/pathcomp/backend/tests/run-test.sh b/src/pathcomp/backend/tests/run-test.sh
index 214acdf1b..1f6a4bd45 100644
--- a/src/pathcomp/backend/tests/run-test.sh
+++ b/src/pathcomp/backend/tests/run-test.sh
@@ -1 +1,15 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 curl -0 -v -X POST -H "Expect:" -H "Content-Type: application/json" http://172.17.0.2:8081/pathComp/api/v1/compRoute -d @inter_domain_test.txt
\ No newline at end of file
diff --git a/src/pathcomp/frontend/Config.py b/src/pathcomp/frontend/Config.py
index f59ca4503..f17a9f537 100644
--- a/src/pathcomp/frontend/Config.py
+++ b/src/pathcomp/frontend/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/Dockerfile b/src/pathcomp/frontend/Dockerfile
index 2c511bc07..352de75f3 100644
--- a/src/pathcomp/frontend/Dockerfile
+++ b/src/pathcomp/frontend/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/__init__.py b/src/pathcomp/frontend/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/pathcomp/frontend/__init__.py
+++ b/src/pathcomp/frontend/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/client/PathCompClient.py b/src/pathcomp/frontend/client/PathCompClient.py
index b5a85b533..3ce5b2f33 100644
--- a/src/pathcomp/frontend/client/PathCompClient.py
+++ b/src/pathcomp/frontend/client/PathCompClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/client/__init__.py b/src/pathcomp/frontend/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/pathcomp/frontend/client/__init__.py
+++ b/src/pathcomp/frontend/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/requirements.in b/src/pathcomp/frontend/requirements.in
index a743bbe34..d99d4cd02 100644
--- a/src/pathcomp/frontend/requirements.in
+++ b/src/pathcomp/frontend/requirements.in
@@ -1 +1,16 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
+
 requests==2.27.1
diff --git a/src/pathcomp/frontend/service/PathCompService.py b/src/pathcomp/frontend/service/PathCompService.py
index 88dc51347..d86cea755 100644
--- a/src/pathcomp/frontend/service/PathCompService.py
+++ b/src/pathcomp/frontend/service/PathCompService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/PathCompServiceServicerImpl.py b/src/pathcomp/frontend/service/PathCompServiceServicerImpl.py
index 9f4cd7333..6fc33dbd4 100644
--- a/src/pathcomp/frontend/service/PathCompServiceServicerImpl.py
+++ b/src/pathcomp/frontend/service/PathCompServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/__init__.py b/src/pathcomp/frontend/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/pathcomp/frontend/service/__init__.py
+++ b/src/pathcomp/frontend/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/__main__.py b/src/pathcomp/frontend/service/__main__.py
index 24a5b7741..e3f7d3619 100644
--- a/src/pathcomp/frontend/service/__main__.py
+++ b/src/pathcomp/frontend/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/Factory.py b/src/pathcomp/frontend/service/algorithms/Factory.py
index 80d329a9d..0e00dc11b 100644
--- a/src/pathcomp/frontend/service/algorithms/Factory.py
+++ b/src/pathcomp/frontend/service/algorithms/Factory.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py b/src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py
index f8021338e..a9fc4fa3d 100644
--- a/src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py
+++ b/src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/KShortestPathAlgorithm.py b/src/pathcomp/frontend/service/algorithms/KShortestPathAlgorithm.py
index 11da9daa5..920d72e82 100644
--- a/src/pathcomp/frontend/service/algorithms/KShortestPathAlgorithm.py
+++ b/src/pathcomp/frontend/service/algorithms/KShortestPathAlgorithm.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/ShortestPathAlgorithm.py b/src/pathcomp/frontend/service/algorithms/ShortestPathAlgorithm.py
index e0a244182..4719b8703 100644
--- a/src/pathcomp/frontend/service/algorithms/ShortestPathAlgorithm.py
+++ b/src/pathcomp/frontend/service/algorithms/ShortestPathAlgorithm.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/_Algorithm.py b/src/pathcomp/frontend/service/algorithms/_Algorithm.py
index c4c8efcd7..b63167749 100644
--- a/src/pathcomp/frontend/service/algorithms/_Algorithm.py
+++ b/src/pathcomp/frontend/service/algorithms/_Algorithm.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/__init__.py b/src/pathcomp/frontend/service/algorithms/__init__.py
index 70a332512..1549d9811 100644
--- a/src/pathcomp/frontend/service/algorithms/__init__.py
+++ b/src/pathcomp/frontend/service/algorithms/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/tools/ComposeRequest.py b/src/pathcomp/frontend/service/algorithms/tools/ComposeRequest.py
index 0832615a1..bfb4da05f 100644
--- a/src/pathcomp/frontend/service/algorithms/tools/ComposeRequest.py
+++ b/src/pathcomp/frontend/service/algorithms/tools/ComposeRequest.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/tools/ComputeSubServices.py b/src/pathcomp/frontend/service/algorithms/tools/ComputeSubServices.py
index 7c7b62e2d..b92a19b52 100644
--- a/src/pathcomp/frontend/service/algorithms/tools/ComputeSubServices.py
+++ b/src/pathcomp/frontend/service/algorithms/tools/ComputeSubServices.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/tools/ConstantsMappings.py b/src/pathcomp/frontend/service/algorithms/tools/ConstantsMappings.py
index 56e11b1b4..cd1956a87 100644
--- a/src/pathcomp/frontend/service/algorithms/tools/ConstantsMappings.py
+++ b/src/pathcomp/frontend/service/algorithms/tools/ConstantsMappings.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/tools/EroPathToHops.py b/src/pathcomp/frontend/service/algorithms/tools/EroPathToHops.py
index a885ddb29..c8a902999 100644
--- a/src/pathcomp/frontend/service/algorithms/tools/EroPathToHops.py
+++ b/src/pathcomp/frontend/service/algorithms/tools/EroPathToHops.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/service/algorithms/tools/__init__.py b/src/pathcomp/frontend/service/algorithms/tools/__init__.py
index 70a332512..1549d9811 100644
--- a/src/pathcomp/frontend/service/algorithms/tools/__init__.py
+++ b/src/pathcomp/frontend/service/algorithms/tools/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/tests/MockService_Dependencies.py b/src/pathcomp/frontend/tests/MockService_Dependencies.py
index 16ff9a5ef..e903bc0e0 100644
--- a/src/pathcomp/frontend/tests/MockService_Dependencies.py
+++ b/src/pathcomp/frontend/tests/MockService_Dependencies.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/tests/Objects_A_B_C.py b/src/pathcomp/frontend/tests/Objects_A_B_C.py
index 2deab06f4..ca9764a34 100644
--- a/src/pathcomp/frontend/tests/Objects_A_B_C.py
+++ b/src/pathcomp/frontend/tests/Objects_A_B_C.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN.py b/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN.py
index 33483267b..1d057c10e 100644
--- a/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN.py
+++ b/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN_OLS.py b/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN_OLS.py
index 1ff3ff595..8f6e88719 100644
--- a/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN_OLS.py
+++ b/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN_OLS.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/tests/PrepareTestScenario.py b/src/pathcomp/frontend/tests/PrepareTestScenario.py
index 2e7002b0f..387f6aede 100644
--- a/src/pathcomp/frontend/tests/PrepareTestScenario.py
+++ b/src/pathcomp/frontend/tests/PrepareTestScenario.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/tests/__init__.py b/src/pathcomp/frontend/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/pathcomp/frontend/tests/__init__.py
+++ b/src/pathcomp/frontend/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/frontend/tests/test_unitary.py b/src/pathcomp/frontend/tests/test_unitary.py
index 53f4d7065..fd14c8a7a 100644
--- a/src/pathcomp/frontend/tests/test_unitary.py
+++ b/src/pathcomp/frontend/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/pathcomp/misc/my_deploy-tests.sh b/src/pathcomp/misc/my_deploy-tests.sh
index d744dd5ab..66564e9a0 100644
--- a/src/pathcomp/misc/my_deploy-tests.sh
+++ b/src/pathcomp/misc/my_deploy-tests.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/pathcomp/misc/test-commands.sh b/src/pathcomp/misc/test-commands.sh
index 262cb8ed0..c52b6ce50 100644
--- a/src/pathcomp/misc/test-commands.sh
+++ b/src/pathcomp/misc/test-commands.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/.gitlab-ci.yml b/src/policy/.gitlab-ci.yml
index f257c554c..8c326ff16 100644
--- a/src/policy/.gitlab-ci.yml
+++ b/src/policy/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/mvnw b/src/policy/mvnw
old mode 100755
new mode 100644
diff --git a/src/policy/pom.xml b/src/policy/pom.xml
index 24b1bf200..6ea28421a 100644
--- a/src/policy/pom.xml
+++ b/src/policy/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/docker/Dockerfile.multistage.jvm b/src/policy/src/main/docker/Dockerfile.multistage.jvm
index 38920f65e..2c6412d07 100644
--- a/src/policy/src/main/docker/Dockerfile.multistage.jvm
+++ b/src/policy/src/main/docker/Dockerfile.multistage.jvm
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyGateway.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyGateway.java
index 2e8f9bba4..c5570af74 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyGateway.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyGatewayImpl.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyGatewayImpl.java
index 351b9b351..c10e5dc8b 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyGatewayImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyGatewayImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionFieldsGetter.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionFieldsGetter.java
index 7ba1c1535..89330354e 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionFieldsGetter.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionFieldsGetter.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
index c7172554d..141821958 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyService.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyService.java
index 987b85d8c..556e35032 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyService.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
index 499d4cd0e..fba43c18a 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java b/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
index 4c43f3900..529ec6334 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java b/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java
index bee4157d0..ec0859cb7 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/SimpleReadinessCheck.java b/src/policy/src/main/java/eu/teraflow/policy/SimpleReadinessCheck.java
index 0fe0c43b0..7bbfd38c3 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/SimpleReadinessCheck.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/SimpleReadinessCheck.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclAction.java b/src/policy/src/main/java/eu/teraflow/policy/acl/AclAction.java
index 66771968c..eb2fdc33b 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclAction.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/acl/AclAction.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclEntry.java b/src/policy/src/main/java/eu/teraflow/policy/acl/AclEntry.java
index a85aff9e6..08ff7b0ad 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclEntry.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/acl/AclEntry.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclForwardActionEnum.java b/src/policy/src/main/java/eu/teraflow/policy/acl/AclForwardActionEnum.java
index be2a896b4..b42fe12e6 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclForwardActionEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/acl/AclForwardActionEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclLogActionEnum.java b/src/policy/src/main/java/eu/teraflow/policy/acl/AclLogActionEnum.java
index e0ff362e7..df814f35d 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclLogActionEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/acl/AclLogActionEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclMatch.java b/src/policy/src/main/java/eu/teraflow/policy/acl/AclMatch.java
index 89528a58d..b6ec8ff76 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclMatch.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/acl/AclMatch.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleSet.java b/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleSet.java
index 4eec8e7a3..584ae6097 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleSet.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleSet.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleTypeEnum.java b/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleTypeEnum.java
index 0dc112771..70788feda 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleTypeEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleTypeEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/common/Util.java b/src/policy/src/main/java/eu/teraflow/policy/common/Util.java
index 2fe37e47e..504b44d94 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/common/Util.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/common/Util.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 package eu.teraflow.policy.common;
 
 import java.util.List;
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGateway.java b/src/policy/src/main/java/eu/teraflow/policy/context/ContextGateway.java
index cc33227ef..de2d32772 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGateway.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/ContextGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java b/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java
index bd3eef2a9..3b4754c8a 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextService.java b/src/policy/src/main/java/eu/teraflow/policy/context/ContextService.java
index 0da218b43..20574e8af 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextService.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/ContextService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/context/ContextServiceImpl.java
index e54f14ca8..7e52ade3c 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextServiceImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/ContextServiceImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigActionEnum.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigActionEnum.java
index 6cc8e8441..c2de24402 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigActionEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigActionEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRule.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRule.java
index 38b2aa29b..60ffba562 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRule.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRule.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleAcl.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleAcl.java
index ab05331c7..9a022a9c6 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleAcl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleAcl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleCustom.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleCustom.java
index 004628617..c8e64f192 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleCustom.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleCustom.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleType.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleType.java
index 6b7daa128..2cd3528bf 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleType.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeAcl.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeAcl.java
index 3a93cc7f3..35c63468d 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeAcl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeAcl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeCustom.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeCustom.java
index c98df91c4..5d6ac1246 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeCustom.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeCustom.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Constraint.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/Constraint.java
index a7097bc0b..7403a94f4 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Constraint.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/Constraint.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintCustom.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintCustom.java
index 3fe3443cc..d5b196d3d 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintCustom.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintCustom.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintEndPointLocation.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintEndPointLocation.java
index 12e6ec41c..0852f2fe2 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintEndPointLocation.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintEndPointLocation.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSchedule.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSchedule.java
index b374c022c..a450d2244 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSchedule.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSchedule.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaAvailability.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaAvailability.java
index c8a69f312..9daf6e31a 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaAvailability.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaAvailability.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaCapacity.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaCapacity.java
index 3d3f9a25b..db3bc1cdd 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaCapacity.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaCapacity.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaIsolationLevel.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaIsolationLevel.java
index d965e2f42..7d8736942 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaIsolationLevel.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaIsolationLevel.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaLatency.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaLatency.java
index 0f0c8fe20..ef28227bd 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaLatency.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaLatency.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintType.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintType.java
index e582859e6..0202399ad 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintType.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeCustom.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeCustom.java
index 94d0052a9..447a3edd3 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeCustom.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeCustom.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeEndPointLocation.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeEndPointLocation.java
index 197bea58a..b35832b7d 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeEndPointLocation.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeEndPointLocation.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSchedule.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSchedule.java
index 20169427a..3120d376c 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSchedule.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSchedule.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaAvailability.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaAvailability.java
index 10a60e8dc..1486c83be 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaAvailability.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaAvailability.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaCapacity.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaCapacity.java
index c43cc5948..dd3fd7037 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaCapacity.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaCapacity.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaIsolationLevel.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaIsolationLevel.java
index 572df6e45..7cf05a416 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaIsolationLevel.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaIsolationLevel.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaLatency.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaLatency.java
index 2ff80daa5..20a285902 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaLatency.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaLatency.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Device.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/Device.java
index 8b36eaed1..06c6d4c5c 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Device.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/Device.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceConfig.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceConfig.java
index e6fa702dd..815589b55 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceConfig.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceConfig.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java
index ee1ebcbcf..daee299dd 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceOperationalStatus.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceOperationalStatus.java
index 2efe9052e..4a7dc438c 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceOperationalStatus.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceOperationalStatus.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Empty.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/Empty.java
index d19dd9776..a81bed099 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Empty.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/Empty.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPoint.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPoint.java
index b40952b85..6e1056408 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPoint.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPoint.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPointId.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPointId.java
index e9a3cbeb0..834081e59 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPointId.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPointId.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Event.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/Event.java
index 67da36b5c..05ba64513 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Event.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/Event.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/EventTypeEnum.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/EventTypeEnum.java
index 2a45a89a7..cde7e1885 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/EventTypeEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/EventTypeEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/GpsPosition.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/GpsPosition.java
index f5d7b4884..14bd2cb99 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/GpsPosition.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/GpsPosition.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/IsolationLevelEnum.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/IsolationLevelEnum.java
index f7c3a1267..4b6e129d1 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/IsolationLevelEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/IsolationLevelEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Location.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/Location.java
index 692e1f01b..c6a00a6a7 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Location.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/Location.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationType.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationType.java
index 49bf9e9af..f88d30db7 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationType.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java
index 4bc44cc4e..aa3ff9a27 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 package eu.teraflow.policy.context.model;
 
 public class LocationTypeGpsPosition implements LocationType<GpsPosition> {
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeRegion.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeRegion.java
index f857aa507..94b88ca7a 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeRegion.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeRegion.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Service.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/Service.java
index 0ff697932..e3456b326 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Service.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/Service.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceConfig.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceConfig.java
index e2e9c8e24..a99c949d1 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceConfig.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceConfig.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceId.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceId.java
index 6229c1de7..81763a9de 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceId.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceId.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatus.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatus.java
index e936f635c..5fd6dfa26 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatus.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatus.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatusEnum.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatusEnum.java
index e39e2fa2c..0a9115acd 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatusEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatusEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceTypeEnum.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceTypeEnum.java
index f13a408f9..45215ca00 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceTypeEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceTypeEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/SliceId.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/SliceId.java
index 57dbe5ff9..ee1dc7d2f 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/SliceId.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/SliceId.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/TopologyId.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/TopologyId.java
index 95157ba8c..5997291d1 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/TopologyId.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/TopologyId.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java
index 02550446d..bd2487fe5 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGatewayImpl.java b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGatewayImpl.java
index 21f679e01..3cb88fe08 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGatewayImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGatewayImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceService.java b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceService.java
index 25fa7e73c..4e7419a6a 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceService.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceServiceImpl.java
index 4c747af3d..c7bae1214 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceServiceImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceServiceImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java b/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java
index 1bedde352..382579677 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/BooleanOperator.java b/src/policy/src/main/java/eu/teraflow/policy/model/BooleanOperator.java
index 7231c02e5..1c8208ebd 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/BooleanOperator.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/BooleanOperator.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/NumericalOperator.java b/src/policy/src/main/java/eu/teraflow/policy/model/NumericalOperator.java
index 48029e550..3d59ac0a7 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/NumericalOperator.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/NumericalOperator.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRule.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRule.java
index 7f135fdf8..177bf85f6 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRule.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRule.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleAction.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleAction.java
index 2a22538a4..2c9bcae09 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleAction.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleAction.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java
index 1c8651038..d3907391b 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 package eu.teraflow.policy.model;
 
 public class PolicyRuleActionConfig {
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionEnum.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionEnum.java
index 7d9354a05..432c3834c 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java
index ff0273ebd..9b6c32828 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleCondition.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleCondition.java
index a19fc0da4..9b7de240d 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleCondition.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleCondition.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleDevice.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleDevice.java
index fdc32549b..516cc9690 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleDevice.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleDevice.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleService.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleService.java
index a480b6111..9d362919a 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleService.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
index 29911fec8..1102e4778 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleStateEnum.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleStateEnum.java
index f447cf210..749ca389e 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleStateEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleStateEnum.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleType.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleType.java
index 93886aab4..b3389f6a9 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleType.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeDevice.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeDevice.java
index c987a5c4c..d262f254b 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeDevice.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeDevice.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeService.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeService.java
index 2b1db9ffb..54978476f 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeService.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java
index 9fa2ba41d..89e9152c6 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java
index 3c248bb54..cc6c97f32 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java
index e9d71918f..6010ec04a 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java
index 0bafcaca8..a3f9f223b 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java
index fe8c038b1..090237f94 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmResponse.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmResponse.java
index 0e744280d..a92ae4dec 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmResponse.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmResponse.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmSubscription.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmSubscription.java
index 166d791cc..532eed608 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmSubscription.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmSubscription.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/BooleanKpiValue.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/BooleanKpiValue.java
index 07152f0e3..c93aeb520 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/BooleanKpiValue.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/BooleanKpiValue.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/FloatKpiValue.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/FloatKpiValue.java
index 93ffdf4fd..2e19b2b2b 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/FloatKpiValue.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/FloatKpiValue.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/IntegerKpiValue.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/IntegerKpiValue.java
index 2161084d0..cc3f92111 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/IntegerKpiValue.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/IntegerKpiValue.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java
index 98b8c510d..92439d01f 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiDescriptor.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiDescriptor.java
index 107c10335..0f7aeca64 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiDescriptor.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiDescriptor.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValue.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValue.java
index 5c3c4c390..0a4418d65 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValue.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValue.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValueRange.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValueRange.java
index 74e92dba2..6a0bba6c6 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValueRange.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValueRange.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/LongKpiValue.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/LongKpiValue.java
index 00752ca7d..c57e605ff 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/LongKpiValue.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/LongKpiValue.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/MonitorKpiRequest.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/MonitorKpiRequest.java
index 61e0e209c..30aaad2e8 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/MonitorKpiRequest.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/MonitorKpiRequest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/StringKpiValue.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/StringKpiValue.java
index 52f26356f..649d06cee 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/StringKpiValue.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/StringKpiValue.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java
index 101d784c3..96569bbc7 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsResponse.java b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsResponse.java
index c0679fe1e..b4a2b16a6 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsResponse.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsResponse.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGateway.java b/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGateway.java
index d8b338f4f..a7483f4f6 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGateway.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGatewayImpl.java b/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGatewayImpl.java
index b69994ce4..d59330fd2 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGatewayImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGatewayImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceService.java b/src/policy/src/main/java/eu/teraflow/policy/service/ServiceService.java
index e6ab0871f..bbf91aff0 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceService.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/service/ServiceService.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceServiceImpl.java b/src/policy/src/main/java/eu/teraflow/policy/service/ServiceServiceImpl.java
index 921560e0f..74728924f 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceServiceImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/service/ServiceServiceImpl.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/main/resources/application.yml b/src/policy/src/main/resources/application.yml
index fa7dff7b2..e908f5e36 100644
--- a/src/policy/src/main/resources/application.yml
+++ b/src/policy/src/main/resources/application.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java b/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java
index faaa49c34..2a32fc076 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java b/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java
index 6389a3599..9dc97b4a1 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java b/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java
index 4c113dc95..72501b3c6 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java b/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java
index d89d62c63..cc4813c76 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java
index d73a5ad37..6e0f22053 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java
index 635876dcb..fb7cb38ab 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java
index e2687945a..aaaea41f8 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java
index ba0fd174d..057906d65 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
index 9334ca422..eb7f4b960 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java b/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
index 7e6967e0c..d284840b8 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index 51ed10e4a..02cdf3ca8 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -1,3 +1,17 @@
+# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+#
+# 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.
+
 ---
 apiVersion: v1
 kind: Service
diff --git a/src/policy/util/set_version.sh b/src/policy/util/set_version.sh
old mode 100755
new mode 100644
index 0d73a243e..d0b5a26c9
--- a/src/policy/util/set_version.sh
+++ b/src/policy/util/set_version.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/.gitlab-ci.yml b/src/service/.gitlab-ci.yml
index c6d4b185f..c9ff94ac9 100644
--- a/src/service/.gitlab-ci.yml
+++ b/src/service/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/Config.py b/src/service/Config.py
index 70a332512..1549d9811 100644
--- a/src/service/Config.py
+++ b/src/service/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/Dockerfile b/src/service/Dockerfile
index e469898e5..5988374e0 100644
--- a/src/service/Dockerfile
+++ b/src/service/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/__init__.py b/src/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/__init__.py
+++ b/src/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/client/ServiceClient.py b/src/service/client/ServiceClient.py
index 8168f818b..30ff4f483 100644
--- a/src/service/client/ServiceClient.py
+++ b/src/service/client/ServiceClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/client/__init__.py b/src/service/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/client/__init__.py
+++ b/src/service/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/requirements.in b/src/service/requirements.in
index 245ddb7a7..83b6342c0 100644
--- a/src/service/requirements.in
+++ b/src/service/requirements.in
@@ -1,3 +1,18 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
+
 anytree==2.8.0
 networkx==2.6.3
 pydot==1.4.2
diff --git a/src/service/service/ServiceService.py b/src/service/service/ServiceService.py
index 2f44fe018..d0afcff03 100644
--- a/src/service/service/ServiceService.py
+++ b/src/service/service/ServiceService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/ServiceServiceServicerImpl.py b/src/service/service/ServiceServiceServicerImpl.py
index 7d9ddeffb..622abeee8 100644
--- a/src/service/service/ServiceServiceServicerImpl.py
+++ b/src/service/service/ServiceServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/__init__.py b/src/service/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/__init__.py
+++ b/src/service/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/__main__.py b/src/service/service/__main__.py
index 04cf00b06..d755348ad 100644
--- a/src/service/service/__main__.py
+++ b/src/service/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handler_api/AnyTreeTools.py b/src/service/service/service_handler_api/AnyTreeTools.py
index 24aaa2424..5757fc963 100644
--- a/src/service/service/service_handler_api/AnyTreeTools.py
+++ b/src/service/service/service_handler_api/AnyTreeTools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handler_api/Exceptions.py b/src/service/service/service_handler_api/Exceptions.py
index f3344c97a..91802d6a0 100644
--- a/src/service/service/service_handler_api/Exceptions.py
+++ b/src/service/service/service_handler_api/Exceptions.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handler_api/FilterFields.py b/src/service/service/service_handler_api/FilterFields.py
index afc15795c..a73ec53f3 100644
--- a/src/service/service/service_handler_api/FilterFields.py
+++ b/src/service/service/service_handler_api/FilterFields.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handler_api/ServiceHandlerFactory.py b/src/service/service/service_handler_api/ServiceHandlerFactory.py
index 00f9535bf..6aa21b499 100644
--- a/src/service/service/service_handler_api/ServiceHandlerFactory.py
+++ b/src/service/service/service_handler_api/ServiceHandlerFactory.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handler_api/SettingsHandler.py b/src/service/service/service_handler_api/SettingsHandler.py
index 4df24cee0..85dd3a128 100644
--- a/src/service/service/service_handler_api/SettingsHandler.py
+++ b/src/service/service/service_handler_api/SettingsHandler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handler_api/Tools.py b/src/service/service/service_handler_api/Tools.py
index 90fa60983..222cd8968 100644
--- a/src/service/service/service_handler_api/Tools.py
+++ b/src/service/service/service_handler_api/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handler_api/_ServiceHandler.py b/src/service/service/service_handler_api/_ServiceHandler.py
index a5042a504..8c5ede37d 100644
--- a/src/service/service/service_handler_api/_ServiceHandler.py
+++ b/src/service/service/service_handler_api/_ServiceHandler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handler_api/__init__.py b/src/service/service/service_handler_api/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/service_handler_api/__init__.py
+++ b/src/service/service/service_handler_api/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/__init__.py b/src/service/service/service_handlers/__init__.py
index 78978cc6c..4c9059779 100644
--- a/src/service/service/service_handlers/__init__.py
+++ b/src/service/service/service_handlers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l2nm_emulated/ConfigRules.py b/src/service/service/service_handlers/l2nm_emulated/ConfigRules.py
index 61fa08a26..c2ea6e213 100644
--- a/src/service/service/service_handlers/l2nm_emulated/ConfigRules.py
+++ b/src/service/service/service_handlers/l2nm_emulated/ConfigRules.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l2nm_emulated/L2NMEmulatedServiceHandler.py b/src/service/service/service_handlers/l2nm_emulated/L2NMEmulatedServiceHandler.py
index 0d4a097cf..9de6c607b 100644
--- a/src/service/service/service_handlers/l2nm_emulated/L2NMEmulatedServiceHandler.py
+++ b/src/service/service/service_handlers/l2nm_emulated/L2NMEmulatedServiceHandler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l2nm_emulated/__init__.py b/src/service/service/service_handlers/l2nm_emulated/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/service_handlers/l2nm_emulated/__init__.py
+++ b/src/service/service/service_handlers/l2nm_emulated/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l2nm_openconfig/ConfigRules.py b/src/service/service/service_handlers/l2nm_openconfig/ConfigRules.py
index 61fa08a26..c2ea6e213 100644
--- a/src/service/service/service_handlers/l2nm_openconfig/ConfigRules.py
+++ b/src/service/service/service_handlers/l2nm_openconfig/ConfigRules.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l2nm_openconfig/L2NMOpenConfigServiceHandler.py b/src/service/service/service_handlers/l2nm_openconfig/L2NMOpenConfigServiceHandler.py
index b8b30ad74..6eb139dbd 100644
--- a/src/service/service/service_handlers/l2nm_openconfig/L2NMOpenConfigServiceHandler.py
+++ b/src/service/service/service_handlers/l2nm_openconfig/L2NMOpenConfigServiceHandler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l2nm_openconfig/__init__.py b/src/service/service/service_handlers/l2nm_openconfig/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/service_handlers/l2nm_openconfig/__init__.py
+++ b/src/service/service/service_handlers/l2nm_openconfig/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l3nm_emulated/ConfigRules.py b/src/service/service/service_handlers/l3nm_emulated/ConfigRules.py
index 847967094..903ad8cd5 100644
--- a/src/service/service/service_handlers/l3nm_emulated/ConfigRules.py
+++ b/src/service/service/service_handlers/l3nm_emulated/ConfigRules.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l3nm_emulated/L3NMEmulatedServiceHandler.py b/src/service/service/service_handlers/l3nm_emulated/L3NMEmulatedServiceHandler.py
index 412023a69..47de9c94f 100644
--- a/src/service/service/service_handlers/l3nm_emulated/L3NMEmulatedServiceHandler.py
+++ b/src/service/service/service_handlers/l3nm_emulated/L3NMEmulatedServiceHandler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l3nm_emulated/__init__.py b/src/service/service/service_handlers/l3nm_emulated/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/service_handlers/l3nm_emulated/__init__.py
+++ b/src/service/service/service_handlers/l3nm_emulated/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
index 847967094..903ad8cd5 100644
--- a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
+++ b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l3nm_openconfig/L3NMOpenConfigServiceHandler.py b/src/service/service/service_handlers/l3nm_openconfig/L3NMOpenConfigServiceHandler.py
index 7c75ff1c7..e3af6302d 100644
--- a/src/service/service/service_handlers/l3nm_openconfig/L3NMOpenConfigServiceHandler.py
+++ b/src/service/service/service_handlers/l3nm_openconfig/L3NMOpenConfigServiceHandler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/l3nm_openconfig/__init__.py b/src/service/service/service_handlers/l3nm_openconfig/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/service_handlers/l3nm_openconfig/__init__.py
+++ b/src/service/service/service_handlers/l3nm_openconfig/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/microwave/MicrowaveServiceHandler.py b/src/service/service/service_handlers/microwave/MicrowaveServiceHandler.py
index bfc212222..ee64d2fa4 100644
--- a/src/service/service/service_handlers/microwave/MicrowaveServiceHandler.py
+++ b/src/service/service/service_handlers/microwave/MicrowaveServiceHandler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/microwave/__init__.py b/src/service/service/service_handlers/microwave/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/service_handlers/microwave/__init__.py
+++ b/src/service/service/service_handlers/microwave/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/p4/__init__.py b/src/service/service/service_handlers/p4/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/service/service/service_handlers/p4/__init__.py
+++ b/src/service/service/service_handlers/p4/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/p4/p4_service_handler.py b/src/service/service/service_handlers/p4/p4_service_handler.py
index 48b9715b7..500c50378 100644
--- a/src/service/service/service_handlers/p4/p4_service_handler.py
+++ b/src/service/service/service_handlers/p4/p4_service_handler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/tapi_tapi/TapiServiceHandler.py b/src/service/service/service_handlers/tapi_tapi/TapiServiceHandler.py
index 6b1c4a657..8abd12b2a 100644
--- a/src/service/service/service_handlers/tapi_tapi/TapiServiceHandler.py
+++ b/src/service/service/service_handlers/tapi_tapi/TapiServiceHandler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/service_handlers/tapi_tapi/__init__.py b/src/service/service/service_handlers/tapi_tapi/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/service_handlers/tapi_tapi/__init__.py
+++ b/src/service/service/service_handlers/tapi_tapi/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/ConnectionExpander.py b/src/service/service/task_scheduler/ConnectionExpander.py
index 39c91b1ba..fa51c36ce 100644
--- a/src/service/service/task_scheduler/ConnectionExpander.py
+++ b/src/service/service/task_scheduler/ConnectionExpander.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/TaskExecutor.py b/src/service/service/task_scheduler/TaskExecutor.py
index 7c96eb665..932c56e2b 100644
--- a/src/service/service/task_scheduler/TaskExecutor.py
+++ b/src/service/service/task_scheduler/TaskExecutor.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/TaskScheduler.py b/src/service/service/task_scheduler/TaskScheduler.py
index 6f2bdba3e..f55527e47 100644
--- a/src/service/service/task_scheduler/TaskScheduler.py
+++ b/src/service/service/task_scheduler/TaskScheduler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/__init__.py b/src/service/service/task_scheduler/__init__.py
index 70bfa5118..9d49eb5e7 100644
--- a/src/service/service/task_scheduler/__init__.py
+++ b/src/service/service/task_scheduler/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/tasks/Task_ConnectionConfigure.py b/src/service/service/task_scheduler/tasks/Task_ConnectionConfigure.py
index cfafd54e5..5a47005b3 100644
--- a/src/service/service/task_scheduler/tasks/Task_ConnectionConfigure.py
+++ b/src/service/service/task_scheduler/tasks/Task_ConnectionConfigure.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/tasks/Task_ConnectionDeconfigure.py b/src/service/service/task_scheduler/tasks/Task_ConnectionDeconfigure.py
index 4c8b75b2f..5736054fe 100644
--- a/src/service/service/task_scheduler/tasks/Task_ConnectionDeconfigure.py
+++ b/src/service/service/task_scheduler/tasks/Task_ConnectionDeconfigure.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/tasks/Task_ServiceDelete.py b/src/service/service/task_scheduler/tasks/Task_ServiceDelete.py
index 15da1ffed..6a4e11b54 100644
--- a/src/service/service/task_scheduler/tasks/Task_ServiceDelete.py
+++ b/src/service/service/task_scheduler/tasks/Task_ServiceDelete.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/tasks/Task_ServiceSetStatus.py b/src/service/service/task_scheduler/tasks/Task_ServiceSetStatus.py
index 163954f1b..815cb33c3 100644
--- a/src/service/service/task_scheduler/tasks/Task_ServiceSetStatus.py
+++ b/src/service/service/task_scheduler/tasks/Task_ServiceSetStatus.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/tasks/_Task.py b/src/service/service/task_scheduler/tasks/_Task.py
index c36f92973..c2dbcdf65 100644
--- a/src/service/service/task_scheduler/tasks/_Task.py
+++ b/src/service/service/task_scheduler/tasks/_Task.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/task_scheduler/tasks/__init__.py b/src/service/service/task_scheduler/tasks/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/task_scheduler/tasks/__init__.py
+++ b/src/service/service/task_scheduler/tasks/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/tools/ContextGetters.py b/src/service/service/tools/ContextGetters.py
index 79ccf956b..9b1d6224d 100644
--- a/src/service/service/tools/ContextGetters.py
+++ b/src/service/service/tools/ContextGetters.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/tools/EndpointIdFormatters.py b/src/service/service/tools/EndpointIdFormatters.py
index 2435df42c..ff1d50816 100644
--- a/src/service/service/tools/EndpointIdFormatters.py
+++ b/src/service/service/tools/EndpointIdFormatters.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/tools/ObjectKeys.py b/src/service/service/tools/ObjectKeys.py
index e58d8bd3e..14c4cdf3a 100644
--- a/src/service/service/tools/ObjectKeys.py
+++ b/src/service/service/tools/ObjectKeys.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/service/tools/__init__.py b/src/service/service/tools/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/service/tools/__init__.py
+++ b/src/service/service/tools/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/CommonObjects.py b/src/service/tests/CommonObjects.py
index b84846ca4..4cd233349 100644
--- a/src/service/tests/CommonObjects.py
+++ b/src/service/tests/CommonObjects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/MockService_Dependencies.py b/src/service/tests/MockService_Dependencies.py
index 3774e2208..eb3059d5a 100644
--- a/src/service/tests/MockService_Dependencies.py
+++ b/src/service/tests/MockService_Dependencies.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/PrepareTestScenario.py b/src/service/tests/PrepareTestScenario.py
index bcf3cd156..e4609ec41 100644
--- a/src/service/tests/PrepareTestScenario.py
+++ b/src/service/tests/PrepareTestScenario.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/ServiceHandler_L3NM_EMU.py b/src/service/tests/ServiceHandler_L3NM_EMU.py
index 45df80e42..3df27b439 100644
--- a/src/service/tests/ServiceHandler_L3NM_EMU.py
+++ b/src/service/tests/ServiceHandler_L3NM_EMU.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/ServiceHandler_L3NM_OC.py b/src/service/tests/ServiceHandler_L3NM_OC.py
index 717536f6d..a8f1e315a 100644
--- a/src/service/tests/ServiceHandler_L3NM_OC.py
+++ b/src/service/tests/ServiceHandler_L3NM_OC.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/ServiceHandlersToTest.py b/src/service/tests/ServiceHandlersToTest.py
index 43f2a2eb2..c50a0b457 100644
--- a/src/service/tests/ServiceHandlersToTest.py
+++ b/src/service/tests/ServiceHandlersToTest.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/__init__.py b/src/service/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/service/tests/__init__.py
+++ b/src/service/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/test_unitary.py b/src/service/tests/test_unitary.py
index e12ec2bc4..f99f9b191 100644
--- a/src/service/tests/test_unitary.py
+++ b/src/service/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/service/tests/test_unitary_task_scheduler.py b/src/service/tests/test_unitary_task_scheduler.py
index 020386d76..cd77934f6 100644
--- a/src/service/tests/test_unitary_task_scheduler.py
+++ b/src/service/tests/test_unitary_task_scheduler.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/.gitlab-ci.yml b/src/slice/.gitlab-ci.yml
index c1b2eb487..39edd20b3 100644
--- a/src/slice/.gitlab-ci.yml
+++ b/src/slice/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/Config.py b/src/slice/Config.py
index 70a332512..1549d9811 100644
--- a/src/slice/Config.py
+++ b/src/slice/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/Dockerfile b/src/slice/Dockerfile
index 7dadc477f..4c434e212 100644
--- a/src/slice/Dockerfile
+++ b/src/slice/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/__init__.py b/src/slice/__init__.py
index 70a332512..1549d9811 100644
--- a/src/slice/__init__.py
+++ b/src/slice/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/client/SliceClient.py b/src/slice/client/SliceClient.py
index 520f00e6c..a3e5d6490 100644
--- a/src/slice/client/SliceClient.py
+++ b/src/slice/client/SliceClient.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/client/__init__.py b/src/slice/client/__init__.py
index 70a332512..1549d9811 100644
--- a/src/slice/client/__init__.py
+++ b/src/slice/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/old_code/ConstraintsChecker.py b/src/slice/old_code/ConstraintsChecker.py
index f87dab65f..a9e244f76 100644
--- a/src/slice/old_code/ConstraintsChecker.py
+++ b/src/slice/old_code/ConstraintsChecker.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/old_code/SliceCheckers.py b/src/slice/old_code/SliceCheckers.py
index 660a522d0..a4412065f 100644
--- a/src/slice/old_code/SliceCheckers.py
+++ b/src/slice/old_code/SliceCheckers.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/old_code/SliceStatus.py b/src/slice/old_code/SliceStatus.py
index d97b39449..2104c4dbe 100644
--- a/src/slice/old_code/SliceStatus.py
+++ b/src/slice/old_code/SliceStatus.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from enum import Enum
 
 class SliceStatus(Enum):
diff --git a/src/slice/old_code/Tools.py b/src/slice/old_code/Tools.py
index 08323f935..8260a8177 100644
--- a/src/slice/old_code/Tools.py
+++ b/src/slice/old_code/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/old_code/Tools_2.py b/src/slice/old_code/Tools_2.py
index c29a11a06..fffc9eed3 100644
--- a/src/slice/old_code/Tools_2.py
+++ b/src/slice/old_code/Tools_2.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/requirements.in b/src/slice/requirements.in
index 0a2c39895..daef740da 100644
--- a/src/slice/requirements.in
+++ b/src/slice/requirements.in
@@ -1 +1,16 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
+
 #deepdiff==5.8.*
diff --git a/src/slice/service/SliceService.py b/src/slice/service/SliceService.py
index 7a404d188..4289e5e81 100644
--- a/src/slice/service/SliceService.py
+++ b/src/slice/service/SliceService.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/service/SliceServiceServicerImpl.py b/src/slice/service/SliceServiceServicerImpl.py
index 413750662..21d820089 100644
--- a/src/slice/service/SliceServiceServicerImpl.py
+++ b/src/slice/service/SliceServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/service/__init__.py b/src/slice/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/slice/service/__init__.py
+++ b/src/slice/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/service/__main__.py b/src/slice/service/__main__.py
index b2f453650..aef1c4b82 100644
--- a/src/slice/service/__main__.py
+++ b/src/slice/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/tests/__init__.py b/src/slice/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/slice/tests/__init__.py
+++ b/src/slice/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/slice/tests/test_unitary.py b/src/slice/tests/test_unitary.py
index 1fd5a75b4..a61ccbcd6 100644
--- a/src/slice/tests/test_unitary.py
+++ b/src/slice/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/start.sh b/src/start.sh
old mode 100755
new mode 100644
index dc9db79d2..32a016cc0
--- a/src/start.sh
+++ b/src/start.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/start_webui_dev_mode.sh b/src/start_webui_dev_mode.sh
old mode 100755
new mode 100644
index 8c45cd89e..fe2587c1a
--- a/src/start_webui_dev_mode.sh
+++ b/src/start_webui_dev_mode.sh
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/.gitlab-ci.yml b/src/tests/.gitlab-ci.yml
index 6fcac6480..db44b9e4a 100644
--- a/src/tests/.gitlab-ci.yml
+++ b/src/tests/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/Fixtures.py b/src/tests/Fixtures.py
index 25b73e1de..ecb44a758 100644
--- a/src/tests/Fixtures.py
+++ b/src/tests/Fixtures.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/__init__.py b/src/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/__init__.py
+++ b/src/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/automation/ZtpAdd.js b/src/tests/benchmark/automation/ZtpAdd.js
index 0f649b8cc..d7740ad32 100644
--- a/src/tests/benchmark/automation/ZtpAdd.js
+++ b/src/tests/benchmark/automation/ZtpAdd.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 import grpc from 'k6/net/grpc';
 import exec from "k6/execution";
 import { check, sleep } from 'k6';
diff --git a/src/tests/benchmark/automation/ZtpDelete.js b/src/tests/benchmark/automation/ZtpDelete.js
index 58af9f25d..b1b7f3a09 100644
--- a/src/tests/benchmark/automation/ZtpDelete.js
+++ b/src/tests/benchmark/automation/ZtpDelete.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 import grpc from 'k6/net/grpc';
 import exec from "k6/execution";
 import { check, sleep } from 'k6';
diff --git a/src/tests/benchmark/automation/ZtpUpdate.js b/src/tests/benchmark/automation/ZtpUpdate.js
old mode 100755
new mode 100644
index 39135ec58..c274d2286
--- a/src/tests/benchmark/automation/ZtpUpdate.js
+++ b/src/tests/benchmark/automation/ZtpUpdate.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 import grpc from 'k6/net/grpc';
 import exec from "k6/execution";
 import { check, sleep } from 'k6';
diff --git a/src/tests/benchmark/automation/__init__.py b/src/tests/benchmark/automation/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/benchmark/automation/__init__.py
+++ b/src/tests/benchmark/automation/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/automation/run_test_01_bootstrap.sh b/src/tests/benchmark/automation/run_test_01_bootstrap.sh
old mode 100755
new mode 100644
index dee173927..2382521b2
--- a/src/tests/benchmark/automation/run_test_01_bootstrap.sh
+++ b/src/tests/benchmark/automation/run_test_01_bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/automation/run_test_02_cleanup.sh b/src/tests/benchmark/automation/run_test_02_cleanup.sh
old mode 100755
new mode 100644
index 8f68302d6..56965d200
--- a/src/tests/benchmark/automation/run_test_02_cleanup.sh
+++ b/src/tests/benchmark/automation/run_test_02_cleanup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/automation/tests/Fixtures.py b/src/tests/benchmark/automation/tests/Fixtures.py
index 3b35a12e2..89dda54cf 100644
--- a/src/tests/benchmark/automation/tests/Fixtures.py
+++ b/src/tests/benchmark/automation/tests/Fixtures.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/automation/tests/Objects.py b/src/tests/benchmark/automation/tests/Objects.py
index 1e8072f8f..8558d1fe7 100644
--- a/src/tests/benchmark/automation/tests/Objects.py
+++ b/src/tests/benchmark/automation/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/automation/tests/__init__.py b/src/tests/benchmark/automation/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/benchmark/automation/tests/__init__.py
+++ b/src/tests/benchmark/automation/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/automation/tests/test_functional_bootstrap.py b/src/tests/benchmark/automation/tests/test_functional_bootstrap.py
index 3d5888015..f61125a8c 100644
--- a/src/tests/benchmark/automation/tests/test_functional_bootstrap.py
+++ b/src/tests/benchmark/automation/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/automation/tests/test_functional_cleanup.py b/src/tests/benchmark/automation/tests/test_functional_cleanup.py
index 9b6e51c3e..4b0c52dd4 100644
--- a/src/tests/benchmark/automation/tests/test_functional_cleanup.py
+++ b/src/tests/benchmark/automation/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/PolicyAddService.js b/src/tests/benchmark/policy/PolicyAddService.js
index 708209ba0..d76570997 100644
--- a/src/tests/benchmark/policy/PolicyAddService.js
+++ b/src/tests/benchmark/policy/PolicyAddService.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 import grpc from 'k6/net/grpc';
 import exec from "k6/execution";
 import { check, sleep } from 'k6';
diff --git a/src/tests/benchmark/policy/PolicyDelete.js b/src/tests/benchmark/policy/PolicyDelete.js
index 85946837e..6ec85a6a3 100644
--- a/src/tests/benchmark/policy/PolicyDelete.js
+++ b/src/tests/benchmark/policy/PolicyDelete.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 import grpc from 'k6/net/grpc';
 import exec from "k6/execution";
 import { check, sleep } from 'k6';
diff --git a/src/tests/benchmark/policy/PolicyUpdateService.js b/src/tests/benchmark/policy/PolicyUpdateService.js
index a3774f9da..ddf7836b5 100644
--- a/src/tests/benchmark/policy/PolicyUpdateService.js
+++ b/src/tests/benchmark/policy/PolicyUpdateService.js
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+ */
+
 import grpc from 'k6/net/grpc';
 import exec from "k6/execution";
 import { check, sleep } from 'k6';
diff --git a/src/tests/benchmark/policy/__init__.py b/src/tests/benchmark/policy/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/benchmark/policy/__init__.py
+++ b/src/tests/benchmark/policy/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/deploy_specs.sh b/src/tests/benchmark/policy/deploy_specs.sh
index ffd91da35..12a45ef92 100644
--- a/src/tests/benchmark/policy/deploy_specs.sh
+++ b/src/tests/benchmark/policy/deploy_specs.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/tests/benchmark/policy/run_test_01_bootstrap.sh b/src/tests/benchmark/policy/run_test_01_bootstrap.sh
old mode 100755
new mode 100644
index 10b18257b..a60f962c8
--- a/src/tests/benchmark/policy/run_test_01_bootstrap.sh
+++ b/src/tests/benchmark/policy/run_test_01_bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/run_test_02_create_service.sh b/src/tests/benchmark/policy/run_test_02_create_service.sh
old mode 100755
new mode 100644
index 69ef34ff9..d899a1455
--- a/src/tests/benchmark/policy/run_test_02_create_service.sh
+++ b/src/tests/benchmark/policy/run_test_02_create_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/run_test_03_delete_service.sh b/src/tests/benchmark/policy/run_test_03_delete_service.sh
old mode 100755
new mode 100644
index 01eb52131..2cfe25eff
--- a/src/tests/benchmark/policy/run_test_03_delete_service.sh
+++ b/src/tests/benchmark/policy/run_test_03_delete_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/run_test_04_cleanup.sh b/src/tests/benchmark/policy/run_test_04_cleanup.sh
old mode 100755
new mode 100644
index a2be265de..d93f798cb
--- a/src/tests/benchmark/policy/run_test_04_cleanup.sh
+++ b/src/tests/benchmark/policy/run_test_04_cleanup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/tests/Fixtures.py b/src/tests/benchmark/policy/tests/Fixtures.py
index 3b35a12e2..89dda54cf 100644
--- a/src/tests/benchmark/policy/tests/Fixtures.py
+++ b/src/tests/benchmark/policy/tests/Fixtures.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/tests/Objects.py b/src/tests/benchmark/policy/tests/Objects.py
index 7bfbe9fce..887407bf4 100644
--- a/src/tests/benchmark/policy/tests/Objects.py
+++ b/src/tests/benchmark/policy/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/tests/__init__.py b/src/tests/benchmark/policy/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/benchmark/policy/tests/__init__.py
+++ b/src/tests/benchmark/policy/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/tests/test_functional_bootstrap.py b/src/tests/benchmark/policy/tests/test_functional_bootstrap.py
index 71deb9d59..65c46b4eb 100644
--- a/src/tests/benchmark/policy/tests/test_functional_bootstrap.py
+++ b/src/tests/benchmark/policy/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/tests/test_functional_cleanup.py b/src/tests/benchmark/policy/tests/test_functional_cleanup.py
index be807eaa0..e00c5ceee 100644
--- a/src/tests/benchmark/policy/tests/test_functional_cleanup.py
+++ b/src/tests/benchmark/policy/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/tests/test_functional_create_service.py b/src/tests/benchmark/policy/tests/test_functional_create_service.py
index e606d060d..919f81979 100644
--- a/src/tests/benchmark/policy/tests/test_functional_create_service.py
+++ b/src/tests/benchmark/policy/tests/test_functional_create_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/benchmark/policy/tests/test_functional_delete_service.py b/src/tests/benchmark/policy/tests/test_functional_delete_service.py
index 48c2a0d5a..6f6ca6029 100644
--- a/src/tests/benchmark/policy/tests/test_functional_delete_service.py
+++ b/src/tests/benchmark/policy/tests/test_functional_delete_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/__init__.py b/src/tests/ecoc22/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/ecoc22/__init__.py
+++ b/src/tests/ecoc22/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/deploy_specs.sh b/src/tests/ecoc22/deploy_specs.sh
index 1318aefa6..874774e1c 100644
--- a/src/tests/ecoc22/deploy_specs.sh
+++ b/src/tests/ecoc22/deploy_specs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/redeploy.sh b/src/tests/ecoc22/redeploy.sh
old mode 100755
new mode 100644
index 793328463..740546128
--- a/src/tests/ecoc22/redeploy.sh
+++ b/src/tests/ecoc22/redeploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/run_test_01_bootstrap.sh b/src/tests/ecoc22/run_test_01_bootstrap.sh
old mode 100755
new mode 100644
index 73ebfcae8..1d20cb98b
--- a/src/tests/ecoc22/run_test_01_bootstrap.sh
+++ b/src/tests/ecoc22/run_test_01_bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/run_test_02_create_service.sh b/src/tests/ecoc22/run_test_02_create_service.sh
old mode 100755
new mode 100644
index 36190e911..bc8a53fea
--- a/src/tests/ecoc22/run_test_02_create_service.sh
+++ b/src/tests/ecoc22/run_test_02_create_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/run_test_03_delete_service.sh b/src/tests/ecoc22/run_test_03_delete_service.sh
old mode 100755
new mode 100644
index cde05d6fc..4c30511d9
--- a/src/tests/ecoc22/run_test_03_delete_service.sh
+++ b/src/tests/ecoc22/run_test_03_delete_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/run_test_04_cleanup.sh b/src/tests/ecoc22/run_test_04_cleanup.sh
old mode 100755
new mode 100644
index bede60962..fc8c13f61
--- a/src/tests/ecoc22/run_test_04_cleanup.sh
+++ b/src/tests/ecoc22/run_test_04_cleanup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/run_tests.sh b/src/tests/ecoc22/run_tests.sh
old mode 100755
new mode 100644
index 38a113902..a97ed9eca
--- a/src/tests/ecoc22/run_tests.sh
+++ b/src/tests/ecoc22/run_tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/Fixtures.py b/src/tests/ecoc22/tests/Fixtures.py
index 3b35a12e2..89dda54cf 100644
--- a/src/tests/ecoc22/tests/Fixtures.py
+++ b/src/tests/ecoc22/tests/Fixtures.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/Objects.py b/src/tests/ecoc22/tests/Objects.py
index cbed872f7..4fbd5508e 100644
--- a/src/tests/ecoc22/tests/Objects.py
+++ b/src/tests/ecoc22/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/Tools.py b/src/tests/ecoc22/tests/Tools.py
index 33205da9b..26a3eda71 100644
--- a/src/tests/ecoc22/tests/Tools.py
+++ b/src/tests/ecoc22/tests/Tools.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from typing import Dict, List, Tuple
 from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id
 from common.tools.object_factory.Link import json_link, json_link_id
diff --git a/src/tests/ecoc22/tests/__init__.py b/src/tests/ecoc22/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/ecoc22/tests/__init__.py
+++ b/src/tests/ecoc22/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/old_code/BuildDescriptors.py b/src/tests/ecoc22/tests/old_code/BuildDescriptors.py
index b0075c063..b6a26a4a0 100644
--- a/src/tests/ecoc22/tests/old_code/BuildDescriptors.py
+++ b/src/tests/ecoc22/tests/old_code/BuildDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/old_code/LoadDescriptors.py b/src/tests/ecoc22/tests/old_code/LoadDescriptors.py
index bd7e48366..5041d854e 100644
--- a/src/tests/ecoc22/tests/old_code/LoadDescriptors.py
+++ b/src/tests/ecoc22/tests/old_code/LoadDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/old_code/Objects_BigNet.py b/src/tests/ecoc22/tests/old_code/Objects_BigNet.py
index b9e70517c..fb9691467 100644
--- a/src/tests/ecoc22/tests/old_code/Objects_BigNet.py
+++ b/src/tests/ecoc22/tests/old_code/Objects_BigNet.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_OLS.py b/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_OLS.py
index 37ceeae6a..522c25d6b 100644
--- a/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_OLS.py
+++ b/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_OLS.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_TN.py b/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_TN.py
index f29999d6c..c02f5d0c8 100644
--- a/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_TN.py
+++ b/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_TN.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_TN_OLS.py b/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_TN_OLS.py
index d6a0dad6d..6c34ec01d 100644
--- a/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_TN_OLS.py
+++ b/src/tests/ecoc22/tests/old_code/Objects_DC_CSGW_TN_OLS.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/test_functional_bootstrap.py b/src/tests/ecoc22/tests/test_functional_bootstrap.py
index aa260d727..3b7b5009c 100644
--- a/src/tests/ecoc22/tests/test_functional_bootstrap.py
+++ b/src/tests/ecoc22/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/test_functional_cleanup.py b/src/tests/ecoc22/tests/test_functional_cleanup.py
index 34333fb4d..3e8b5ea65 100644
--- a/src/tests/ecoc22/tests/test_functional_cleanup.py
+++ b/src/tests/ecoc22/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/test_functional_create_service.py b/src/tests/ecoc22/tests/test_functional_create_service.py
index 42fc886c2..6dd4eb827 100644
--- a/src/tests/ecoc22/tests/test_functional_create_service.py
+++ b/src/tests/ecoc22/tests/test_functional_create_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ecoc22/tests/test_functional_delete_service.py b/src/tests/ecoc22/tests/test_functional_delete_service.py
index 43241f40e..5cfdc3473 100644
--- a/src/tests/ecoc22/tests/test_functional_delete_service.py
+++ b/src/tests/ecoc22/tests/test_functional_delete_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/__init__.py b/src/tests/oeccpsc22/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/oeccpsc22/__init__.py
+++ b/src/tests/oeccpsc22/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/deploy_in_kubernetes.sh b/src/tests/oeccpsc22/deploy_in_kubernetes.sh
old mode 100755
new mode 100644
index fffce0b76..53b6e76a8
--- a/src/tests/oeccpsc22/deploy_in_kubernetes.sh
+++ b/src/tests/oeccpsc22/deploy_in_kubernetes.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/dump_logs.sh b/src/tests/oeccpsc22/dump_logs.sh
old mode 100755
new mode 100644
index 196002a5f..a2180f6df
--- a/src/tests/oeccpsc22/dump_logs.sh
+++ b/src/tests/oeccpsc22/dump_logs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/expose_services_teraflow_1.yaml b/src/tests/oeccpsc22/expose_services_teraflow_1.yaml
index f2b8de0b1..d956db1a7 100644
--- a/src/tests/oeccpsc22/expose_services_teraflow_1.yaml
+++ b/src/tests/oeccpsc22/expose_services_teraflow_1.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/expose_services_teraflow_2.yaml b/src/tests/oeccpsc22/expose_services_teraflow_2.yaml
index 8254c00aa..d8acb9653 100644
--- a/src/tests/oeccpsc22/expose_services_teraflow_2.yaml
+++ b/src/tests/oeccpsc22/expose_services_teraflow_2.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/run_test_01_bootstrap.sh b/src/tests/oeccpsc22/run_test_01_bootstrap.sh
old mode 100755
new mode 100644
index e8df6ffb6..23a569d4d
--- a/src/tests/oeccpsc22/run_test_01_bootstrap.sh
+++ b/src/tests/oeccpsc22/run_test_01_bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/run_test_02_create_interdomain_slice.sh b/src/tests/oeccpsc22/run_test_02_create_interdomain_slice.sh
old mode 100755
new mode 100644
index b9ab66cb3..e438a2915
--- a/src/tests/oeccpsc22/run_test_02_create_interdomain_slice.sh
+++ b/src/tests/oeccpsc22/run_test_02_create_interdomain_slice.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/run_test_03_delete_interdomain_slice.sh b/src/tests/oeccpsc22/run_test_03_delete_interdomain_slice.sh
old mode 100755
new mode 100644
index b0080ce37..6816ac815
--- a/src/tests/oeccpsc22/run_test_03_delete_interdomain_slice.sh
+++ b/src/tests/oeccpsc22/run_test_03_delete_interdomain_slice.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/run_test_04_cleanup.sh b/src/tests/oeccpsc22/run_test_04_cleanup.sh
old mode 100755
new mode 100644
index d0420820c..763c5b67e
--- a/src/tests/oeccpsc22/run_test_04_cleanup.sh
+++ b/src/tests/oeccpsc22/run_test_04_cleanup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/show_deploy.sh b/src/tests/oeccpsc22/show_deploy.sh
old mode 100755
new mode 100644
index 90d691489..d5e9346e5
--- a/src/tests/oeccpsc22/show_deploy.sh
+++ b/src/tests/oeccpsc22/show_deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/tests/Objects_Domain_1.py b/src/tests/oeccpsc22/tests/Objects_Domain_1.py
index 3f0f680df..2f35aa76e 100644
--- a/src/tests/oeccpsc22/tests/Objects_Domain_1.py
+++ b/src/tests/oeccpsc22/tests/Objects_Domain_1.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/tests/Objects_Domain_2.py b/src/tests/oeccpsc22/tests/Objects_Domain_2.py
index e8a537253..0e5065c3b 100644
--- a/src/tests/oeccpsc22/tests/Objects_Domain_2.py
+++ b/src/tests/oeccpsc22/tests/Objects_Domain_2.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/tests/Objects_Service.py b/src/tests/oeccpsc22/tests/Objects_Service.py
index a9ffadc0f..3cbe7725c 100644
--- a/src/tests/oeccpsc22/tests/Objects_Service.py
+++ b/src/tests/oeccpsc22/tests/Objects_Service.py
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 from .Objects_Domain_1 import D1_DEVICE_D1R1_UUID, D1_ENDPOINT_IDS
 from .Objects_Domain_2 import D2_DEVICE_D2R4_UUID, D2_ENDPOINT_IDS
 from .Tools import compose_bearer, compose_service_endpoint_id
diff --git a/src/tests/oeccpsc22/tests/Tools.py b/src/tests/oeccpsc22/tests/Tools.py
index 9fcc2b79c..30333b6f4 100644
--- a/src/tests/oeccpsc22/tests/Tools.py
+++ b/src/tests/oeccpsc22/tests/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/tests/__init__.py b/src/tests/oeccpsc22/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/oeccpsc22/tests/__init__.py
+++ b/src/tests/oeccpsc22/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/tests/test_functional_bootstrap.py b/src/tests/oeccpsc22/tests/test_functional_bootstrap.py
index 452394c01..921b4a4e9 100644
--- a/src/tests/oeccpsc22/tests/test_functional_bootstrap.py
+++ b/src/tests/oeccpsc22/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/tests/test_functional_cleanup.py b/src/tests/oeccpsc22/tests/test_functional_cleanup.py
index eb78a5850..7d2c37779 100644
--- a/src/tests/oeccpsc22/tests/test_functional_cleanup.py
+++ b/src/tests/oeccpsc22/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/tests/test_functional_create_interdomain_slice.py b/src/tests/oeccpsc22/tests/test_functional_create_interdomain_slice.py
index b31e86874..8c568cc78 100644
--- a/src/tests/oeccpsc22/tests/test_functional_create_interdomain_slice.py
+++ b/src/tests/oeccpsc22/tests/test_functional_create_interdomain_slice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/oeccpsc22/tests/test_functional_delete_interdomain_slice.py b/src/tests/oeccpsc22/tests/test_functional_delete_interdomain_slice.py
index 45296d107..929267f78 100644
--- a/src/tests/oeccpsc22/tests/test_functional_delete_interdomain_slice.py
+++ b/src/tests/oeccpsc22/tests/test_functional_delete_interdomain_slice.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/__init__.py b/src/tests/ofc22/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/ofc22/__init__.py
+++ b/src/tests/ofc22/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/deploy_specs.sh b/src/tests/ofc22/deploy_specs.sh
index 1318aefa6..874774e1c 100644
--- a/src/tests/ofc22/deploy_specs.sh
+++ b/src/tests/ofc22/deploy_specs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/redeploy.sh b/src/tests/ofc22/redeploy.sh
old mode 100755
new mode 100644
index f0262c0b8..e4e24aa80
--- a/src/tests/ofc22/redeploy.sh
+++ b/src/tests/ofc22/redeploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/run_test_01_bootstrap.sh b/src/tests/ofc22/run_test_01_bootstrap.sh
old mode 100755
new mode 100644
index 1b5bed63e..cf57eb977
--- a/src/tests/ofc22/run_test_01_bootstrap.sh
+++ b/src/tests/ofc22/run_test_01_bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/run_test_02_create_service.sh b/src/tests/ofc22/run_test_02_create_service.sh
old mode 100755
new mode 100644
index c82606cc1..7a86e1a38
--- a/src/tests/ofc22/run_test_02_create_service.sh
+++ b/src/tests/ofc22/run_test_02_create_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/run_test_03_delete_service.sh b/src/tests/ofc22/run_test_03_delete_service.sh
old mode 100755
new mode 100644
index 19540de05..9981f9e3a
--- a/src/tests/ofc22/run_test_03_delete_service.sh
+++ b/src/tests/ofc22/run_test_03_delete_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/run_test_04_cleanup.sh b/src/tests/ofc22/run_test_04_cleanup.sh
old mode 100755
new mode 100644
index c84d656ed..b08edee18
--- a/src/tests/ofc22/run_test_04_cleanup.sh
+++ b/src/tests/ofc22/run_test_04_cleanup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/run_tests.sh b/src/tests/ofc22/run_tests.sh
old mode 100755
new mode 100644
index 8edc1a431..fe87a2c54
--- a/src/tests/ofc22/run_tests.sh
+++ b/src/tests/ofc22/run_tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/Fixtures.py b/src/tests/ofc22/tests/Fixtures.py
index 3b35a12e2..89dda54cf 100644
--- a/src/tests/ofc22/tests/Fixtures.py
+++ b/src/tests/ofc22/tests/Fixtures.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/Objects.py b/src/tests/ofc22/tests/Objects.py
index 79536dc6c..2d2d88419 100644
--- a/src/tests/ofc22/tests/Objects.py
+++ b/src/tests/ofc22/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/ObjectsXr.py b/src/tests/ofc22/tests/ObjectsXr.py
index f743e7a81..9871a50b8 100644
--- a/src/tests/ofc22/tests/ObjectsXr.py
+++ b/src/tests/ofc22/tests/ObjectsXr.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/__init__.py b/src/tests/ofc22/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/ofc22/tests/__init__.py
+++ b/src/tests/ofc22/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/test_functional_bootstrap.py b/src/tests/ofc22/tests/test_functional_bootstrap.py
index 0a104679f..ad2d5703a 100644
--- a/src/tests/ofc22/tests/test_functional_bootstrap.py
+++ b/src/tests/ofc22/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/test_functional_cleanup.py b/src/tests/ofc22/tests/test_functional_cleanup.py
index 381a88a6a..d38b653b2 100644
--- a/src/tests/ofc22/tests/test_functional_cleanup.py
+++ b/src/tests/ofc22/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/test_functional_create_service.py b/src/tests/ofc22/tests/test_functional_create_service.py
index 2ff8f34eb..92e0a74f9 100644
--- a/src/tests/ofc22/tests/test_functional_create_service.py
+++ b/src/tests/ofc22/tests/test_functional_create_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/test_functional_create_service_xr.py b/src/tests/ofc22/tests/test_functional_create_service_xr.py
index 6008eaa10..435098589 100644
--- a/src/tests/ofc22/tests/test_functional_create_service_xr.py
+++ b/src/tests/ofc22/tests/test_functional_create_service_xr.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/test_functional_delete_service.py b/src/tests/ofc22/tests/test_functional_delete_service.py
index 1c47f8b31..1811f219a 100644
--- a/src/tests/ofc22/tests/test_functional_delete_service.py
+++ b/src/tests/ofc22/tests/test_functional_delete_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/ofc22/tests/test_functional_delete_service_xr.py b/src/tests/ofc22/tests/test_functional_delete_service_xr.py
index 546a8781b..6de788ebd 100644
--- a/src/tests/ofc22/tests/test_functional_delete_service_xr.py
+++ b/src/tests/ofc22/tests/test_functional_delete_service_xr.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/__init__.py b/src/tests/p4/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/p4/__init__.py
+++ b/src/tests/p4/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/deploy_specs.sh b/src/tests/p4/deploy_specs.sh
index b486474e2..b988123d5 100644
--- a/src/tests/p4/deploy_specs.sh
+++ b/src/tests/p4/deploy_specs.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/tests/p4/mininet/1switch1path.py b/src/tests/p4/mininet/1switch1path.py
old mode 100755
new mode 100644
diff --git a/src/tests/p4/mininet/2switch1path.py b/src/tests/p4/mininet/2switch1path.py
old mode 100755
new mode 100644
diff --git a/src/tests/p4/mininet/4switch2path.py b/src/tests/p4/mininet/4switch2path.py
old mode 100755
new mode 100644
diff --git a/src/tests/p4/mininet/6switch2path.py b/src/tests/p4/mininet/6switch2path.py
old mode 100755
new mode 100644
diff --git a/src/tests/p4/run_test_01_bootstrap.sh b/src/tests/p4/run_test_01_bootstrap.sh
old mode 100755
new mode 100644
index a58fd50a7..c08b95b7e
--- a/src/tests/p4/run_test_01_bootstrap.sh
+++ b/src/tests/p4/run_test_01_bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/run_test_02_create_service.sh b/src/tests/p4/run_test_02_create_service.sh
old mode 100755
new mode 100644
index 203c0d5a6..a972b66c0
--- a/src/tests/p4/run_test_02_create_service.sh
+++ b/src/tests/p4/run_test_02_create_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/run_test_03_delete_service.sh b/src/tests/p4/run_test_03_delete_service.sh
old mode 100755
new mode 100644
index 8ac52c6f6..4b4dfbfaa
--- a/src/tests/p4/run_test_03_delete_service.sh
+++ b/src/tests/p4/run_test_03_delete_service.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/run_test_04_cleanup.sh b/src/tests/p4/run_test_04_cleanup.sh
old mode 100755
new mode 100644
index 64cd60f95..b1f2735c2
--- a/src/tests/p4/run_test_04_cleanup.sh
+++ b/src/tests/p4/run_test_04_cleanup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/setup.sh b/src/tests/p4/setup.sh
old mode 100755
new mode 100644
index 3ff7e0393..78e7f7372
--- a/src/tests/p4/setup.sh
+++ b/src/tests/p4/setup.sh
@@ -1,4 +1,18 @@
 #! /bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 export POD_NAME=$(kubectl get pods -n=tfs | grep device | awk '{print $1}')
 
diff --git a/src/tests/p4/tests/BuildDescriptors.py b/src/tests/p4/tests/BuildDescriptors.py
index 5c5419190..98b788633 100644
--- a/src/tests/p4/tests/BuildDescriptors.py
+++ b/src/tests/p4/tests/BuildDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/tests/LoadDescriptors.py b/src/tests/p4/tests/LoadDescriptors.py
index 33bc699af..b232935f4 100644
--- a/src/tests/p4/tests/LoadDescriptors.py
+++ b/src/tests/p4/tests/LoadDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/tests/Objects.py b/src/tests/p4/tests/Objects.py
index 544fe35ee..29f01cd61 100644
--- a/src/tests/p4/tests/Objects.py
+++ b/src/tests/p4/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/tests/__init__.py b/src/tests/p4/tests/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/p4/tests/__init__.py
+++ b/src/tests/p4/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/tests/test_functional_bootstrap.py b/src/tests/p4/tests/test_functional_bootstrap.py
index 793d80c7b..11b24adf1 100644
--- a/src/tests/p4/tests/test_functional_bootstrap.py
+++ b/src/tests/p4/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/tests/test_functional_cleanup.py b/src/tests/p4/tests/test_functional_cleanup.py
index 3dab4f84f..852f2a655 100644
--- a/src/tests/p4/tests/test_functional_cleanup.py
+++ b/src/tests/p4/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/tests/test_functional_create_service.py b/src/tests/p4/tests/test_functional_create_service.py
index 96d16a299..f160d3c6f 100644
--- a/src/tests/p4/tests/test_functional_create_service.py
+++ b/src/tests/p4/tests/test_functional_create_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/p4/tests/test_functional_delete_service.py b/src/tests/p4/tests/test_functional_delete_service.py
index 8630686c8..4d637cf88 100644
--- a/src/tests/p4/tests/test_functional_delete_service.py
+++ b/src/tests/p4/tests/test_functional_delete_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/scenario2/__init__.py b/src/tests/scenario2/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/scenario2/__init__.py
+++ b/src/tests/scenario2/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/scenario2/delete_all.sh b/src/tests/scenario2/delete_all.sh
old mode 100755
new mode 100644
index 5d3e55831..6a838d985
--- a/src/tests/scenario2/delete_all.sh
+++ b/src/tests/scenario2/delete_all.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 # Delete old namespaces
 kubectl delete namespace tfs-dom1 tfs-dom2 tfs-dom3 tfs-dom4 tfs-bchain
diff --git a/src/tests/scenario2/deploy_all.sh b/src/tests/scenario2/deploy_all.sh
old mode 100755
new mode 100644
index 582a97ac5..19ea0e6db
--- a/src/tests/scenario2/deploy_all.sh
+++ b/src/tests/scenario2/deploy_all.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 # Delete old namespaces
 kubectl delete namespace tfs-dom1 tfs-dom2 tfs-dom3 tfs-dom4
diff --git a/src/tests/scenario2/deploy_specs_dom1.sh b/src/tests/scenario2/deploy_specs_dom1.sh
index 06d32e005..cfe8a3bf6 100644
--- a/src/tests/scenario2/deploy_specs_dom1.sh
+++ b/src/tests/scenario2/deploy_specs_dom1.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/tests/scenario2/deploy_specs_dom2.sh b/src/tests/scenario2/deploy_specs_dom2.sh
index df1726cd3..7034c22cd 100644
--- a/src/tests/scenario2/deploy_specs_dom2.sh
+++ b/src/tests/scenario2/deploy_specs_dom2.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/tests/scenario2/deploy_specs_dom3.sh b/src/tests/scenario2/deploy_specs_dom3.sh
index 027762e3e..044301418 100644
--- a/src/tests/scenario2/deploy_specs_dom3.sh
+++ b/src/tests/scenario2/deploy_specs_dom3.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/tests/scenario2/deploy_specs_dom4.sh b/src/tests/scenario2/deploy_specs_dom4.sh
index a09e9fa89..9e26ace47 100644
--- a/src/tests/scenario2/deploy_specs_dom4.sh
+++ b/src/tests/scenario2/deploy_specs_dom4.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/tests/scenario2/dump_logs.sh b/src/tests/scenario2/dump_logs.sh
old mode 100755
new mode 100644
index c2298fd8e..7b1dc9d17
--- a/src/tests/scenario2/dump_logs.sh
+++ b/src/tests/scenario2/dump_logs.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 rm -rf tmp/exec
 
diff --git a/src/tests/scenario2/fast_redeploy.sh b/src/tests/scenario2/fast_redeploy.sh
index c4880a5af..87eef3651 100644
--- a/src/tests/scenario2/fast_redeploy.sh
+++ b/src/tests/scenario2/fast_redeploy.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 kubectl delete namespace tfs-dom1 tfs-dom2 tfs-dom3 tfs-dom4
 
diff --git a/src/tests/scenario2/nginx-ingress-controller-dom1.yaml b/src/tests/scenario2/nginx-ingress-controller-dom1.yaml
index 1aa1ba48b..1815bfbaa 100644
--- a/src/tests/scenario2/nginx-ingress-controller-dom1.yaml
+++ b/src/tests/scenario2/nginx-ingress-controller-dom1.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/src/tests/scenario2/nginx-ingress-controller-dom2.yaml b/src/tests/scenario2/nginx-ingress-controller-dom2.yaml
index 2dac1ecd2..dede03285 100644
--- a/src/tests/scenario2/nginx-ingress-controller-dom2.yaml
+++ b/src/tests/scenario2/nginx-ingress-controller-dom2.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/src/tests/scenario2/nginx-ingress-controller-dom3.yaml b/src/tests/scenario2/nginx-ingress-controller-dom3.yaml
index 06eb6b753..10896ddd0 100644
--- a/src/tests/scenario2/nginx-ingress-controller-dom3.yaml
+++ b/src/tests/scenario2/nginx-ingress-controller-dom3.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/src/tests/scenario2/nginx-ingress-controller-dom4.yaml b/src/tests/scenario2/nginx-ingress-controller-dom4.yaml
index c5c2e2f70..07df5b163 100644
--- a/src/tests/scenario2/nginx-ingress-controller-dom4.yaml
+++ b/src/tests/scenario2/nginx-ingress-controller-dom4.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/src/tests/scenario2/reset.sh b/src/tests/scenario2/reset.sh
old mode 100755
new mode 100644
index 2bf2cd055..5f4a3b8e5
--- a/src/tests/scenario2/reset.sh
+++ b/src/tests/scenario2/reset.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 
 kubectl --namespace tfs-dom1 scale --replicas=0 \
     deployment/contextservice deployment/deviceservice deployment/pathcompservice deployment/serviceservice \
diff --git a/src/tests/scenario2/show_deploy.sh b/src/tests/scenario2/show_deploy.sh
old mode 100755
new mode 100644
index 081b5d3f9..2aa8de873
--- a/src/tests/scenario2/show_deploy.sh
+++ b/src/tests/scenario2/show_deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/scenario2/tfs-ingress-dom1.yaml b/src/tests/scenario2/tfs-ingress-dom1.yaml
index bf2e40352..c638377ee 100644
--- a/src/tests/scenario2/tfs-ingress-dom1.yaml
+++ b/src/tests/scenario2/tfs-ingress-dom1.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
diff --git a/src/tests/scenario2/tfs-ingress-dom2.yaml b/src/tests/scenario2/tfs-ingress-dom2.yaml
index 40d9480d7..d07b73ee2 100644
--- a/src/tests/scenario2/tfs-ingress-dom2.yaml
+++ b/src/tests/scenario2/tfs-ingress-dom2.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
diff --git a/src/tests/scenario2/tfs-ingress-dom3.yaml b/src/tests/scenario2/tfs-ingress-dom3.yaml
index 28668b424..1c28c0eba 100644
--- a/src/tests/scenario2/tfs-ingress-dom3.yaml
+++ b/src/tests/scenario2/tfs-ingress-dom3.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
diff --git a/src/tests/scenario2/tfs-ingress-dom4.yaml b/src/tests/scenario2/tfs-ingress-dom4.yaml
index 3774c327c..48718d775 100644
--- a/src/tests/scenario2/tfs-ingress-dom4.yaml
+++ b/src/tests/scenario2/tfs-ingress-dom4.yaml
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
diff --git a/src/tests/tools/__init__.py b/src/tests/tools/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/tools/__init__.py
+++ b/src/tests/tools/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/load_scenario/__init__.py b/src/tests/tools/load_scenario/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/tools/load_scenario/__init__.py
+++ b/src/tests/tools/load_scenario/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/load_scenario/__main__.py b/src/tests/tools/load_scenario/__main__.py
index f2cd11919..3559f778d 100644
--- a/src/tests/tools/load_scenario/__main__.py
+++ b/src/tests/tools/load_scenario/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/load_scenario/run.sh b/src/tests/tools/load_scenario/run.sh
old mode 100755
new mode 100644
index 0ec0c3725..98ebc6c17
--- a/src/tests/tools/load_scenario/run.sh
+++ b/src/tests/tools/load_scenario/run.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/mock_osm/Constants.py b/src/tests/tools/mock_osm/Constants.py
index 44d74169f..8d4145e89 100644
--- a/src/tests/tools/mock_osm/Constants.py
+++ b/src/tests/tools/mock_osm/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/mock_osm/MockOSM.py b/src/tests/tools/mock_osm/MockOSM.py
index b4e629d58..338db0e19 100644
--- a/src/tests/tools/mock_osm/MockOSM.py
+++ b/src/tests/tools/mock_osm/MockOSM.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/mock_osm/Tools.py b/src/tests/tools/mock_osm/Tools.py
index 25a8b6111..45dfa23c9 100644
--- a/src/tests/tools/mock_osm/Tools.py
+++ b/src/tests/tools/mock_osm/Tools.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/mock_osm/__init__.py b/src/tests/tools/mock_osm/__init__.py
index 70a332512..1549d9811 100644
--- a/src/tests/tools/mock_osm/__init__.py
+++ b/src/tests/tools/mock_osm/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/mock_sdn_ctrl/MockMWSdnCtrl.py b/src/tests/tools/mock_sdn_ctrl/MockMWSdnCtrl.py
index 61eec6fe6..63be214b6 100644
--- a/src/tests/tools/mock_sdn_ctrl/MockMWSdnCtrl.py
+++ b/src/tests/tools/mock_sdn_ctrl/MockMWSdnCtrl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/tools/mock_sdn_ctrl/microwave_deploy.sh b/src/tests/tools/mock_sdn_ctrl/microwave_deploy.sh
index 2da884899..fb0629dc4 100644
--- a/src/tests/tools/mock_sdn_ctrl/microwave_deploy.sh
+++ b/src/tests/tools/mock_sdn_ctrl/microwave_deploy.sh
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 # Set the URL of your local Docker registry where the images will be uploaded to.
 export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
 
diff --git a/src/webui/.gitlab-ci.yml b/src/webui/.gitlab-ci.yml
index e939d8347..26af10f4e 100644
--- a/src/webui/.gitlab-ci.yml
+++ b/src/webui/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/Config.py b/src/webui/Config.py
index f7573f681..9f104e8d3 100644
--- a/src/webui/Config.py
+++ b/src/webui/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/Dockerfile b/src/webui/Dockerfile
index f0ab35629..7c718890f 100644
--- a/src/webui/Dockerfile
+++ b/src/webui/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/__init__.py b/src/webui/__init__.py
index 70a332512..1549d9811 100644
--- a/src/webui/__init__.py
+++ b/src/webui/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/requirements.in b/src/webui/requirements.in
index fc13bdc5d..b4a158d39 100644
--- a/src/webui/requirements.in
+++ b/src/webui/requirements.in
@@ -1,3 +1,17 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
 Flask==2.1.3
 Flask-WTF==1.0.0
 flask-healthz==0.0.3
diff --git a/src/webui/service/__init__.py b/src/webui/service/__init__.py
index 94bc91429..d5b40b486 100644
--- a/src/webui/service/__init__.py
+++ b/src/webui/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/__main__.py b/src/webui/service/__main__.py
index ddbda9c51..f07056d50 100644
--- a/src/webui/service/__main__.py
+++ b/src/webui/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/context/__init__.py b/src/webui/service/context/__init__.py
index 70a332512..1549d9811 100644
--- a/src/webui/service/context/__init__.py
+++ b/src/webui/service/context/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/context/routes.py b/src/webui/service/context/routes.py
index 29910cbc3..7c45f136d 100644
--- a/src/webui/service/context/routes.py
+++ b/src/webui/service/context/routes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/device/__init__.py b/src/webui/service/device/__init__.py
index 70a332512..1549d9811 100644
--- a/src/webui/service/device/__init__.py
+++ b/src/webui/service/device/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/device/forms.py b/src/webui/service/device/forms.py
index e0af206b2..e496c4d43 100644
--- a/src/webui/service/device/forms.py
+++ b/src/webui/service/device/forms.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/device/routes.py b/src/webui/service/device/routes.py
index baff30348..ce3edcfda 100644
--- a/src/webui/service/device/routes.py
+++ b/src/webui/service/device/routes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/js/__init__.py b/src/webui/service/js/__init__.py
index 70a332512..1549d9811 100644
--- a/src/webui/service/js/__init__.py
+++ b/src/webui/service/js/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/js/routes.py b/src/webui/service/js/routes.py
index fee4109df..68e0af893 100644
--- a/src/webui/service/js/routes.py
+++ b/src/webui/service/js/routes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/link/__init__.py b/src/webui/service/link/__init__.py
index e69de29bb..355dcdb04 100644
--- a/src/webui/service/link/__init__.py
+++ b/src/webui/service/link/__init__.py
@@ -0,0 +1,14 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+
diff --git a/src/webui/service/link/routes.py b/src/webui/service/link/routes.py
index 0fc598d65..9324ad0be 100644
--- a/src/webui/service/link/routes.py
+++ b/src/webui/service/link/routes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/load_gen/__init__.py b/src/webui/service/load_gen/__init__.py
index 70a332512..1549d9811 100644
--- a/src/webui/service/load_gen/__init__.py
+++ b/src/webui/service/load_gen/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/load_gen/routes.py b/src/webui/service/load_gen/routes.py
index fc091f3b4..3118b6de0 100644
--- a/src/webui/service/load_gen/routes.py
+++ b/src/webui/service/load_gen/routes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/main/__init__.py b/src/webui/service/main/__init__.py
index 70a332512..1549d9811 100644
--- a/src/webui/service/main/__init__.py
+++ b/src/webui/service/main/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/main/forms.py b/src/webui/service/main/forms.py
index b138592fc..9d628e072 100644
--- a/src/webui/service/main/forms.py
+++ b/src/webui/service/main/forms.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/main/routes.py b/src/webui/service/main/routes.py
index 30ed52911..38d13aad5 100644
--- a/src/webui/service/main/routes.py
+++ b/src/webui/service/main/routes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/service/__init__.py b/src/webui/service/service/__init__.py
index 70a332512..1549d9811 100644
--- a/src/webui/service/service/__init__.py
+++ b/src/webui/service/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/service/routes.py b/src/webui/service/service/routes.py
index c3b33df1e..ee9b092ae 100644
--- a/src/webui/service/service/routes.py
+++ b/src/webui/service/service/routes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/slice/__init__.py b/src/webui/service/slice/__init__.py
index 70a332512..1549d9811 100644
--- a/src/webui/service/slice/__init__.py
+++ b/src/webui/service/slice/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/slice/routes.py b/src/webui/service/slice/routes.py
index a3dfc99ea..222508418 100644
--- a/src/webui/service/slice/routes.py
+++ b/src/webui/service/slice/routes.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/base.html b/src/webui/service/templates/base.html
index bee98ee82..0aa022f14 100644
--- a/src/webui/service/templates/base.html
+++ b/src/webui/service/templates/base.html
@@ -1,7 +1,7 @@
 
   <!doctype html>
   <!--
-   Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+   Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/context/home.html b/src/webui/service/templates/context/home.html
index 9e1d1cd53..ca02588e9 100644
--- a/src/webui/service/templates/context/home.html
+++ b/src/webui/service/templates/context/home.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/device/add.html b/src/webui/service/templates/device/add.html
index 1acbc7e48..6b11a1920 100644
--- a/src/webui/service/templates/device/add.html
+++ b/src/webui/service/templates/device/add.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/device/addconfig.html b/src/webui/service/templates/device/addconfig.html
index c6a17e0a5..7be1bc406 100644
--- a/src/webui/service/templates/device/addconfig.html
+++ b/src/webui/service/templates/device/addconfig.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/device/detail.html b/src/webui/service/templates/device/detail.html
index f21cbbcf0..de8bb4a81 100644
--- a/src/webui/service/templates/device/detail.html
+++ b/src/webui/service/templates/device/detail.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+    Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/device/home.html b/src/webui/service/templates/device/home.html
index ef4345b36..53434196f 100644
--- a/src/webui/service/templates/device/home.html
+++ b/src/webui/service/templates/device/home.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/device/update.html b/src/webui/service/templates/device/update.html
index 8c474f525..9fe53fa02 100644
--- a/src/webui/service/templates/device/update.html
+++ b/src/webui/service/templates/device/update.html
@@ -1,3 +1,19 @@
+<!--
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+-->
+
 {% extends 'base.html' %}
 
 {% block content %}
diff --git a/src/webui/service/templates/device/updateconfig.html b/src/webui/service/templates/device/updateconfig.html
index de217733d..84df4e51c 100644
--- a/src/webui/service/templates/device/updateconfig.html
+++ b/src/webui/service/templates/device/updateconfig.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/js/site.js b/src/webui/service/templates/js/site.js
index 1cd015f17..06e6ff0a3 100644
--- a/src/webui/service/templates/js/site.js
+++ b/src/webui/service/templates/js/site.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/js/topology.js b/src/webui/service/templates/js/topology.js
index 47c246614..50486d2a6 100644
--- a/src/webui/service/templates/js/topology.js
+++ b/src/webui/service/templates/js/topology.js
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/link/detail.html b/src/webui/service/templates/link/detail.html
index d247527de..acac4a553 100644
--- a/src/webui/service/templates/link/detail.html
+++ b/src/webui/service/templates/link/detail.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+    Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/link/home.html b/src/webui/service/templates/link/home.html
index 6a14e60dd..ca96a59b5 100644
--- a/src/webui/service/templates/link/home.html
+++ b/src/webui/service/templates/link/home.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+    Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/main/about.html b/src/webui/service/templates/main/about.html
index 80d61891c..7f2e5cf09 100644
--- a/src/webui/service/templates/main/about.html
+++ b/src/webui/service/templates/main/about.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/main/debug.html b/src/webui/service/templates/main/debug.html
index 1ab3be251..11a868fdf 100644
--- a/src/webui/service/templates/main/debug.html
+++ b/src/webui/service/templates/main/debug.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/main/home.html b/src/webui/service/templates/main/home.html
index 43b066cc0..d8bc050f2 100644
--- a/src/webui/service/templates/main/home.html
+++ b/src/webui/service/templates/main/home.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/service/detail.html b/src/webui/service/templates/service/detail.html
index f453b2f2d..b21606951 100644
--- a/src/webui/service/templates/service/detail.html
+++ b/src/webui/service/templates/service/detail.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/service/home.html b/src/webui/service/templates/service/home.html
index 785012422..79b55c962 100644
--- a/src/webui/service/templates/service/home.html
+++ b/src/webui/service/templates/service/home.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/slice/detail.html b/src/webui/service/templates/slice/detail.html
index 92be94849..390f882d7 100644
--- a/src/webui/service/templates/slice/detail.html
+++ b/src/webui/service/templates/slice/detail.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/service/templates/slice/home.html b/src/webui/service/templates/slice/home.html
index 59ad1750b..df98d5f6c 100644
--- a/src/webui/service/templates/slice/home.html
+++ b/src/webui/service/templates/slice/home.html
@@ -1,5 +1,5 @@
 <!--
- Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+ Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/tests/__init__.py b/src/webui/tests/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/webui/tests/__init__.py
+++ b/src/webui/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/tests/test_unitary.py b/src/webui/tests/test_unitary.py
index 11cc77a46..a1e4f9f6f 100644
--- a/src/webui/tests/test_unitary.py
+++ b/src/webui/tests/test_unitary.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/utils/__init__.py b/src/webui/utils/__init__.py
index 9953c8205..38d04994f 100644
--- a/src/webui/utils/__init__.py
+++ b/src/webui/utils/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/webui/utils/form_validators.py b/src/webui/utils/form_validators.py
index 59c5cf998..9048fc7fa 100644
--- a/src/webui/utils/form_validators.py
+++ b/src/webui/utils/form_validators.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/update_tfs_runtime_env_vars.sh b/update_tfs_runtime_env_vars.sh
old mode 100755
new mode 100644
index db68e17ea..320b2ce0a
--- a/update_tfs_runtime_env_vars.sh
+++ b/update_tfs_runtime_env_vars.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-- 
GitLab


From cf5c2780328c5e668f38ac2cc18c0dd2a069f9e1 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 1 Feb 2023 17:25:53 +0000
Subject: [PATCH 3/4] Policy component:

- Solved format violation
---
 .../java/eu/teraflow/policy/common/Util.java  | 28 +++++++++----------
 .../policy/model/PolicyRuleActionConfig.java  | 28 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/policy/src/main/java/eu/teraflow/policy/common/Util.java b/src/policy/src/main/java/eu/teraflow/policy/common/Util.java
index 504b44d94..889f44fee 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/common/Util.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/common/Util.java
@@ -1,18 +1,18 @@
 /*
- * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
- */
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+*/
 
 package eu.teraflow.policy.common;
 
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java
index d3907391b..871fd933a 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java
@@ -1,18 +1,18 @@
 /*
- * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
- */
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+*/
 
 package eu.teraflow.policy.model;
 
-- 
GitLab


From 29d1d75d2d39355c73cde07eacb8d986215a7b0c Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 1 Feb 2023 17:47:51 +0000
Subject: [PATCH 4/4] Policy component:

- Solved format violation
---
 .../model/LocationTypeGpsPosition.java        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java
index aa3ff9a27..f01002413 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java
@@ -1,18 +1,18 @@
 /*
- * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
- */
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
+*/
 
 package eu.teraflow.policy.context.model;
 
-- 
GitLab