Pre-merge code cleanup

src/device/service/drivers/qkd/QKDDriver.py

@@ -166,4 +166,3 @@ class QKDDriver(_Driver):
         # TODO: QKD API Driver does not support monitoring by now
         LOGGER.info(f'GetState {self.address} called')
         return []
-

src/device/service/drivers/qkd/__init__.py

@@ -24,4 +24,4 @@ RESOURCE_KEY_MAPPINGS = {
     RESOURCE_APPS             : 'apps',
     RESOURCE_CAPABILITES      : 'capabilities',
     RESOURCE_NODE             : 'node'
-}
+}
\ No newline at end of file

src/device/tests/qkd/integration/test_external_qkd_retrieve_information.py

@@ -16,8 +16,8 @@ import pytest
 import requests
 import json
 import os
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
-from src.device.service.drivers.qkd.Tools2 import (
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
+from device.service.drivers.qkd.Tools2 import (
     RESOURCE_INTERFACES, 
     RESOURCE_LINKS, 
     RESOURCE_CAPABILITES, 

src/device/tests/qkd/unit/test_application_deployment.py

@@ -14,7 +14,7 @@
 
 import pytest
 import json
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
 
 MOCK_QKD_ADDRRESS = '127.0.0.1'
 MOCK_PORT = 11111

src/device/tests/qkd/unit/test_qkd_configuration.py

@@ -15,9 +15,9 @@
 import pytest
 import json
 from requests.exceptions import HTTPError
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
 import requests
-from src.device.service.drivers.qkd.Tools2 import (
+from device.service.drivers.qkd.Tools2 import (
     RESOURCE_INTERFACES, 
     RESOURCE_LINKS, 
     RESOURCE_ENDPOINTS, 

src/device/tests/qkd/unit/test_qkd_error_hanling.py

@@ -12,11 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
-from requests.exceptions import HTTPError
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
-from requests.exceptions import ConnectionError, Timeout
-import requests
+import pytest, requests
+from requests.exceptions import ConnectionError, HTTPError, Timeout
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
 
 MOCK_QKD_ADDRRESS = '127.0.0.1'
 MOCK_PORT = 11111

src/device/tests/qkd/unit/test_qkd_mock_connectivity.py

@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
+import pytest, requests
 from unittest.mock import patch
-from src.device.service.drivers.qkd.QKDDriver import QKDDriver
-import requests
+from device.service.drivers.qkd.QKDDriver import QKDDriver
 
 MOCK_QKD_ADDRRESS = '127.0.0.1'
 MOCK_PORT = 11111
@@ -34,7 +33,7 @@ def test_qkd_driver_invalid_connection():
     assert qkd_driver.Connect() is False
 
 # Deliverable Test ID: SBI_Test_10
-@patch('src.device.service.drivers.qkd.QKDDriver2.requests.get')
+@patch('device.service.drivers.qkd.QKDDriver2.requests.get')
 def test_qkd_driver_timeout_connection(mock_get, qkd_driver):
     mock_get.side_effect = requests.exceptions.Timeout
     qkd_driver.timeout = 0.001  # Simulate very short timeout

src/device/tests/qkd/unit/test_qkd_performance.py

@@ -14,9 +14,8 @@
 
 # tests/unit/test_qkd_performance.py
 
-import pytest
-import time
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
+import pytest, time
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
 
 MOCK_QKD_ADDRRESS = '127.0.0.1'
 MOCK_PORT = 11111

src/device/tests/qkd/unit/test_qkd_security.py

@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
 import json
 import os
-from requests.exceptions import HTTPError
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
-from src.device.service.drivers.qkd.Tools2 import RESOURCE_CAPABILITES
+import pytest
 import requests
+from requests.exceptions import HTTPError
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
+from device.service.drivers.qkd.Tools2 import RESOURCE_CAPABILITES
 
 # Helper function to print data in a formatted JSON style for debugging
 def print_data(label, data):

src/device/tests/qkd/unit/test_qkd_subscription.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import pytest
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
 from typing import List, Tuple
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
 
 MOCK_QKD_ADDRRESS = '127.0.0.1'
 MOCK_PORT = 11111

src/device/tests/qkd/unit/test_qkd_unsubscription.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import pytest
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
 from typing import List, Tuple
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
 
 MOCK_QKD_ADDRRESS = '127.0.0.1'
 MOCK_PORT = 11111

src/device/tests/qkd/unit/test_set_new configuration.py → src/device/tests/qkd/unit/test_set_new_configuration.py

@@ -12,12 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
-import requests
+import pytest, requests, uuid
 from requests.exceptions import HTTPError
-from src.device.service.drivers.qkd.QKDDriver2 import QKDDriver
-from src.device.service.drivers.qkd.Tools2 import RESOURCE_APPS
-import uuid
+from device.service.drivers.qkd.QKDDriver2 import QKDDriver
+from device.service.drivers.qkd.Tools2 import RESOURCE_APPS
 
 MOCK_QKD1_ADDRRESS = '127.0.0.1'
 MOCK_PORT1 = 11111