diff --git a/src/automation/target/kubernetes/kubernetes.yml b/src/automation/target/kubernetes/kubernetes.yml
index c6c61db72ec7d289a41a5fe21cecc940c954c3c1..4dacf3998c3991a441dc374ca6c6abc29e8d3b80 100644
--- a/src/automation/target/kubernetes/kubernetes.yml
+++ b/src/automation/target/kubernetes/kubernetes.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/service/DeviceServiceServicerImpl.py b/src/device/service/DeviceServiceServicerImpl.py
index 1f4b202eb1b43d40eea21d3dd5d460744f8c3869..513ca4714cdd698fdc1dc9d82fa1b74a096e9097 100644
--- a/src/device/service/DeviceServiceServicerImpl.py
+++ b/src/device/service/DeviceServiceServicerImpl.py
@@ -22,13 +22,14 @@ from common.proto.device_pb2_grpc import DeviceServiceServicer
from common.tools.context_queries.Device import get_device
from common.tools.mutex_queues.MutexQueues import MutexQueues
from context.client.ContextClient import ContextClient
-from device.service.Errors import ERROR_MISSING_DRIVER, ERROR_MISSING_KPI
from .driver_api._Driver import _Driver
from .driver_api.DriverInstanceCache import DriverInstanceCache, get_driver
from .monitoring.MonitoringLoops import MonitoringLoops
+from .ErrorMessages import ERROR_MISSING_DRIVER, ERROR_MISSING_KPI
from .Tools import (
check_connect_rules, check_no_endpoints, compute_rules_to_add_delete, configure_rules, deconfigure_rules,
- populate_config_rules, populate_endpoint_monitoring_resources, populate_endpoints, populate_initial_config_rules, subscribe_kpi, unsubscribe_kpi, update_endpoints)
+ populate_config_rules, populate_endpoint_monitoring_resources, populate_endpoints, populate_initial_config_rules,
+ subscribe_kpi, unsubscribe_kpi, update_endpoints)
LOGGER = logging.getLogger(__name__)
@@ -108,9 +109,9 @@ class DeviceServiceServicerImpl(DeviceServiceServicer):
if device is None:
raise NotFoundException('Device', device_uuid, extra_details='loading in ConfigureDevice')
- driver : _Driver = self.driver_instance_cache.get(device_uuid)
+ driver : _Driver = get_driver(self.driver_instance_cache, device)
if driver is None:
- msg = ERROR_MISSING_DRIVER.format(str(device_uuid))
+ msg = ERROR_MISSING_DRIVER.format(device_uuid=str(device_uuid))
raise OperationFailedException('ConfigureDevice', extra_details=msg)
if DeviceDriverEnum.DEVICEDRIVER_P4 in device.device_drivers:
@@ -152,6 +153,11 @@ class DeviceServiceServicerImpl(DeviceServiceServicer):
self.mutex_queues.wait_my_turn(device_uuid)
try:
context_client = ContextClient()
+ device = get_device(context_client, device_uuid, rw_copy=False)
+ if device is None:
+ raise NotFoundException('Device', device_uuid, extra_details='loading in DeleteDevice')
+ device_uuid = device.device_id.device_uuid.uuid
+
self.monitoring_loops.remove_device(device_uuid)
self.driver_instance_cache.delete(device_uuid)
context_client.RemoveDevice(request)
@@ -165,9 +171,14 @@ class DeviceServiceServicerImpl(DeviceServiceServicer):
self.mutex_queues.wait_my_turn(device_uuid)
try:
- driver : _Driver = self.driver_instance_cache.get(device_uuid)
+ context_client = ContextClient()
+ device = get_device(context_client, device_uuid, rw_copy=False)
+ if device is None:
+ raise NotFoundException('Device', device_uuid, extra_details='loading in DeleteDevice')
+
+ driver : _Driver = get_driver(self.driver_instance_cache, device)
if driver is None:
- msg = ERROR_MISSING_DRIVER.format(str(device_uuid))
+ msg = ERROR_MISSING_DRIVER.format(device_uuid=str(device_uuid))
raise OperationFailedException('GetInitialConfig', extra_details=msg)
device_config = DeviceConfig()
@@ -193,15 +204,20 @@ class DeviceServiceServicerImpl(DeviceServiceServicer):
kpi_uuid = request.kpi_id.kpi_id.uuid
kpi_details = self.monitoring_loops.get_kpi_by_uuid(kpi_uuid)
if kpi_details is None:
- msg = ERROR_MISSING_KPI.format(str(kpi_uuid))
+ msg = ERROR_MISSING_KPI.format(kpi_uuid=str(kpi_uuid))
raise OperationFailedException('MonitorDeviceKpi', extra_details=msg)
device_uuid = kpi_details[0]
self.mutex_queues.wait_my_turn(device_uuid)
try:
- driver : _Driver = self.driver_instance_cache.get(device_uuid)
+ context_client = ContextClient()
+ device = get_device(context_client, device_uuid, rw_copy=False)
+ if device is None:
+ raise NotFoundException('Device', device_uuid, extra_details='loading in DeleteDevice')
+
+ driver : _Driver = get_driver(self.driver_instance_cache, device)
if driver is None:
- msg = ERROR_MISSING_DRIVER.format(str(device_uuid))
+ msg = ERROR_MISSING_DRIVER.format(device_uuid=str(device_uuid))
raise OperationFailedException('MonitorDeviceKpi', extra_details=msg)
errors = manage_kpi_method(request, driver, self.monitoring_loops)
diff --git a/src/device/service/ErrorMessages.py b/src/device/service/ErrorMessages.py
new file mode 100644
index 0000000000000000000000000000000000000000..1fbea721fdc52bdf759581c0525b30b1206ae844
--- /dev/null
+++ b/src/device/service/ErrorMessages.py
@@ -0,0 +1,39 @@
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.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.
+
+_DEVICE_ID = 'DeviceId({device_uuid:s})'
+_ENDPOINT_ID = 'EndpointId({endpoint_uuid:s})'
+_ENDPOINT_DATA = 'EndpointId({endpoint_data:s})'
+_KPI = 'Kpi({kpi_uuid:s})'
+_DEVICE_ENDPOINT_ID = _DEVICE_ID + '/' + _ENDPOINT_ID
+_RESOURCE_KEY = 'Resource(key={resource_key:s})'
+_RESOURCE_KEY_VALUE = 'Resource(key={resource_key:s}, value={resource_value:s})'
+_SUBSCRIPTION = 'Subscription(key={subscr_key:s}, duration={subscr_duration:s}, interval={subscr_interval:s})'
+_SAMPLE_TYPE = 'SampleType({sample_type_id:s}/{sample_type_name:s})'
+_ERROR = 'Error({error:s})'
+
+ERROR_MISSING_DRIVER = _DEVICE_ID + ' has not been added to this Device instance'
+ERROR_MISSING_KPI = _KPI + ' not found'
+
+ERROR_BAD_ENDPOINT = _DEVICE_ID + ': GetConfig retrieved malformed ' + _ENDPOINT_DATA
+
+ERROR_GET = _DEVICE_ID + ': Unable to Get ' + _RESOURCE_KEY + '; ' + _ERROR
+ERROR_GET_INIT = _DEVICE_ID + ': Unable to Get Initial ' + _RESOURCE_KEY + '; ' + _ERROR
+ERROR_DELETE = _DEVICE_ID + ': Unable to Delete ' + _RESOURCE_KEY_VALUE + '; ' + _ERROR
+ERROR_SET = _DEVICE_ID + ': Unable to Set ' + _RESOURCE_KEY_VALUE + '; ' + _ERROR
+
+ERROR_SAMPLETYPE = _DEVICE_ENDPOINT_ID + ': ' + _SAMPLE_TYPE + ' not supported'
+
+ERROR_SUBSCRIBE = _DEVICE_ID + ': Unable to Subscribe ' + _SUBSCRIPTION + '; ' + _ERROR
+ERROR_UNSUBSCRIBE = _DEVICE_ID + ': Unable to Unsubscribe ' + _SUBSCRIPTION + '; ' + _ERROR
diff --git a/src/device/service/Errors.py b/src/device/service/Errors.py
deleted file mode 100644
index a29a70f05a79ba1517d0bd305dd94afa76703cac..0000000000000000000000000000000000000000
--- a/src/device/service/Errors.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.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.
-
-ERROR_MISSING_DRIVER = 'Device({:s}) has not been added to this Device instance'
-ERROR_MISSING_KPI = 'Kpi({:s}) not found'
-
-ERROR_BAD_ENDPOINT = 'Device({:s}): GetConfig retrieved malformed Endpoint({:s})'
-
-ERROR_GET = 'Device({:s}): Unable to Get resource(key={:s}); error({:s})'
-ERROR_GET_INIT = 'Device({:s}): Unable to Get Initial resource(key={:s}); error({:s})'
-ERROR_DELETE = 'Device({:s}): Unable to Delete resource(key={:s}, value={:s}); error({:s})'
-ERROR_SET = 'Device({:s}): Unable to Set resource(key={:s}, value={:s}); error({:s})'
-
-ERROR_SAMPLETYPE = 'Device({:s})/EndPoint({:s}): SampleType({:s}/{:s}) not supported'
-
-ERROR_SUBSCRIBE = 'Device({:s}): Unable to Subscribe subscription(key={:s}, duration={:s}, interval={:s}); '+\
- 'error({:s})'
-ERROR_UNSUBSCRIBE = 'Device({:s}): Unable to Unsubscribe subscription(key={:s}, duration={:s}, interval={:s}); '+\
- 'error({:s})'
diff --git a/src/device/service/Tools.py b/src/device/service/Tools.py
index 45ab0de1bebc6ebab47acecdea2d3a10030cdcb0..b3ede887f1f9017924255d8b2179154912051fef 100644
--- a/src/device/service/Tools.py
+++ b/src/device/service/Tools.py
@@ -23,9 +23,10 @@ from common.tools.grpc.ConfigRules import update_config_rule_custom
from common.tools.grpc.Tools import grpc_message_to_json
from .driver_api._Driver import _Driver, RESOURCE_ENDPOINTS
from .monitoring.MonitoringLoops import MonitoringLoops
-from .Errors import (
+from .ErrorMessages import (
ERROR_BAD_ENDPOINT, ERROR_DELETE, ERROR_GET, ERROR_GET_INIT, ERROR_MISSING_KPI, ERROR_SAMPLETYPE, ERROR_SET,
- ERROR_SUBSCRIBE, ERROR_UNSUBSCRIBE)
+ ERROR_SUBSCRIBE, ERROR_UNSUBSCRIBE
+)
LOGGER = logging.getLogger(__name__)
@@ -85,12 +86,13 @@ def populate_endpoints(device : Device, driver : _Driver, monitoring_loops : Mon
errors : List[str] = list()
for endpoint in results_getconfig:
if len(endpoint) != 2:
- errors.append(ERROR_BAD_ENDPOINT.format(device_uuid, str(endpoint)))
+ errors.append(ERROR_BAD_ENDPOINT.format(device_uuid=device_uuid, endpoint_data=str(endpoint)))
continue
resource_key, resource_value = endpoint
if isinstance(resource_value, Exception):
- errors.append(ERROR_GET.format(device_uuid, str(resource_key), str(resource_value)))
+ errors.append(ERROR_GET.format(
+ device_uuid=device_uuid, resource_key=str(resource_key), error=str(resource_value)))
continue
if resource_value is None:
continue
@@ -134,7 +136,9 @@ def _raw_config_rules_to_grpc(
for resource_key, resource_value in raw_config_rules:
if isinstance(resource_value, Exception):
- errors.append(error_template.format(device_uuid, str(resource_key), str(resource_value)))
+ errors.append(error_template.format(
+ device_uuid=device_uuid, resource_key=str(resource_key), resource_value=str(resource_value),
+ error=str(resource_value)))
continue
if resource_value is None: continue
@@ -226,7 +230,8 @@ def subscribe_kpi(request : MonitoringSettings, driver : _Driver, monitoring_loo
if resource_key is None:
kpi_sample_type_name = KpiSampleType.Name(kpi_sample_type).upper().replace('KPISAMPLETYPE_', '')
MSG = ERROR_SAMPLETYPE.format(
- str(device_uuid), str(endpoint_uuid), str(kpi_sample_type), str(kpi_sample_type_name)
+ device_uuid=str(device_uuid), endpoint_uuid=str(endpoint_uuid), sample_type_id=str(kpi_sample_type),
+ sample_type_name=str(kpi_sample_type_name)
)
LOGGER.warning('{:s} Supported Device-Endpoint-KpiSampleType items: {:s}'.format(
MSG, str(monitoring_loops.get_all_resource_keys())))
@@ -242,7 +247,8 @@ def subscribe_kpi(request : MonitoringSettings, driver : _Driver, monitoring_loo
for (resource_key, duration, interval), result in zip(resources_to_subscribe, results_subscribestate):
if isinstance(result, Exception):
errors.append(ERROR_SUBSCRIBE.format(
- str(device_uuid), str(resource_key), str(duration), str(interval), str(result)
+ device_uuid=str(device_uuid), subscr_key=str(resource_key), subscr_duration=str(duration),
+ subscr_interval=str(interval), error=str(result)
))
continue
@@ -256,7 +262,7 @@ def unsubscribe_kpi(request : MonitoringSettings, driver : _Driver, monitoring_l
kpi_details = monitoring_loops.get_kpi_by_uuid(kpi_uuid)
if kpi_details is None:
- return [ERROR_MISSING_KPI.format(str(kpi_uuid))]
+ return [ERROR_MISSING_KPI.format(kpi_uuid=str(kpi_uuid))]
device_uuid, resource_key, sampling_duration, sampling_interval = kpi_details
@@ -267,7 +273,9 @@ def unsubscribe_kpi(request : MonitoringSettings, driver : _Driver, monitoring_l
for (resource_key, duration, interval), result in zip(resources_to_unsubscribe, results_unsubscribestate):
if isinstance(result, Exception):
errors.append(ERROR_UNSUBSCRIBE.format(
- device_uuid, str(resource_key), str(duration), str(interval), str(result)))
+ device_uuid=str(device_uuid), subscr_key=str(resource_key), subscr_duration=str(duration),
+ subscr_interval=str(interval), error=str(result)
+ ))
continue
monitoring_loops.remove_kpi(kpi_uuid)
diff --git a/src/device/service/drivers/openconfig/templates/Acl.py b/src/device/service/drivers/openconfig/templates/Acl.py
index 6cd90f373427e2ab55550985929c4cfcd8798702..c316772a56fefc1a7a27eef526f8c4f5a2e0aa83 100644
--- a/src/device/service/drivers/openconfig/templates/Acl.py
+++ b/src/device/service/drivers/openconfig/templates/Acl.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under 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/templates/EndPoints.py b/src/device/service/drivers/openconfig/templates/EndPoints.py
index e831d7738b3a09ae99773e1b882650554cfe5d78..02fda8f0e195c267fddb1109f184c8a06e4a6787 100644
--- a/src/device/service/drivers/openconfig/templates/EndPoints.py
+++ b/src/device/service/drivers/openconfig/templates/EndPoints.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under 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/templates/Interfaces.py b/src/device/service/drivers/openconfig/templates/Interfaces.py
index 3f5b104f2de01137c2424e776dc60b8416088de6..fbe5cfd22eb29131a601aa360ca82ef88c144d8e 100644
--- a/src/device/service/drivers/openconfig/templates/Interfaces.py
+++ b/src/device/service/drivers/openconfig/templates/Interfaces.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under 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/templates/Namespace.py b/src/device/service/drivers/openconfig/templates/Namespace.py
index 94af95566f33751a25fb1cb1c817cbffa910eec4..eede865502b043b7936d763c980be80a7ea817f8 100644
--- a/src/device/service/drivers/openconfig/templates/Namespace.py
+++ b/src/device/service/drivers/openconfig/templates/Namespace.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under 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/templates/NetworkInstances.py b/src/device/service/drivers/openconfig/templates/NetworkInstances.py
index 8399402fa76b8b6b00829493cc8ebd28fd6018f4..a5ba0de23612b69ef5e3d33fa1a89573c7c63e97 100644
--- a/src/device/service/drivers/openconfig/templates/NetworkInstances.py
+++ b/src/device/service/drivers/openconfig/templates/NetworkInstances.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under 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/templates/RoutingPolicy.py b/src/device/service/drivers/openconfig/templates/RoutingPolicy.py
index 068ca5430d9135e784dbe9a07f80d81472cbf5cc..1c2efa6122b617243de26b009b0c890fad80cf19 100644
--- a/src/device/service/drivers/openconfig/templates/RoutingPolicy.py
+++ b/src/device/service/drivers/openconfig/templates/RoutingPolicy.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under 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/templates/Tools.py b/src/device/service/drivers/openconfig/templates/Tools.py
index 67b6ee89fb051b35afee34d7b35057cce5239d96..67d267b7d8c0b773f818052e01c3f2720f071902 100644
--- a/src/device/service/drivers/openconfig/templates/Tools.py
+++ b/src/device/service/drivers/openconfig/templates/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/templates/__init__.py b/src/device/service/drivers/openconfig/templates/__init__.py
index 5e77b25fe3206407db9427085de70b95342d370a..c415bfd25725ca950c018e9f0eedfcde6e0df379 100644
--- a/src/device/service/drivers/openconfig/templates/__init__.py
+++ b/src/device/service/drivers/openconfig/templates/__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/gateway/Dockerfile b/src/dlt/gateway/Dockerfile
index 92ef8e425f40eaf718c4562c836517128dbb2d6f..351f21c9361a5a1313a6d857b41acd4155afc0cd 100644
--- a/src/dlt/gateway/Dockerfile
+++ b/src/dlt/gateway/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/gateway/settings.gradle.kts b/src/dlt/gateway/settings.gradle.kts
index 9c09bb933a23509312b8dfac226caed41f55b053..77fa0f0b22918cf306f0e5f07506a35e492142b4 100644
--- a/src/dlt/gateway/settings.gradle.kts
+++ b/src/dlt/gateway/settings.gradle.kts
@@ -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 02cdf3ca8d00d3ea10862488d54177aa163056b8..40516e5cc3fdd1fb993a1248ad36ea7551edfc40 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.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.