Commit db3083e4 authored by Andrea Sgambelluri's avatar Andrea Sgambelluri
Browse files

Device: tolerate dropped NETCONF sessions on device deletion

DeleteDevice failed with "Not connected to NETCONF server" when the
device had already dropped the NETCONF session: the OC driver's
disconnect() always called close_session(), and DriverInstanceCache
did not catch the error, so the device was never removed from Context.

- OCDriver: only close the session if it is still alive; log instead
  of raising otherwise.
- DriverInstanceCache.delete(): a failed Disconnect() no longer blocks
  device deletion (same handling as terminate()).
- ofc24 CI: re-enable the bidirectional create/delete service tests.

Co-Authored-By: default avatarClaude Opus 5.5 <noreply@anthropic.com>
parent 4541fc62
Loading
Loading
Loading
Loading
+6 −0
Changes for src/device/service/driver_api/DriverInstanceCache.py: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -65,7 +65,13 @@ class DriverInstanceCache:
        with self._lock:
            device_driver = self._device_uuid__to__driver_instance.pop(device_uuid, None)
            if device_driver is None: return
            try:
                device_driver.Disconnect()
            except: # pylint: disable=bare-except
                # The driver is already out of the cache; a failed disconnect (e.g. the device
                # dropped the session) must not prevent the device from being deleted.
                msg = 'Error disconnecting Driver({:s}) from device. Removing it anyway...'
                LOGGER.exception(msg.format(device_uuid))

    def terminate(self) -> None:
        self._terminate.set()
+9 −0
Changes for src/device/service/drivers/oc_driver/OCDriver.py: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -98,7 +98,16 @@ class NetconfSessionHandler:
    def disconnect(self):
        if not self.__connected.is_set(): return
        with self.__lock:
            self.__connected.clear()
            # The device may already have dropped the session; closing it then raises
            # "Not connected to NETCONF server", which must not block device removal.
            if self.__manager is None or not self.__manager.connected: return
            try:
                self.__manager.close_session()
            except Exception:   # pylint: disable=broad-except
                logging.warning(
                    'Unable to close NETCONF session to {:s}:{:d}; dropping it'.format(self.__address, self.__port),
                    exc_info=True)

    @property
    def use_candidate(self): return self.__candidate_supported and not self.__force_running
+2 −3
Changes for src/tests/ofc24/Dockerfile: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -95,9 +95,8 @@ export PYTHONPATH=/var/teraflow
pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_bootstrap.py             --junitxml=/opt/results/report_bootstrap.xml
pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_unidir.py --junitxml=/opt/results/report_create_service_unidir.xml
pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_delete_service_unidir.py --junitxml=/opt/results/report_delete_service_unidir.xml
# TODO: review bidirectional code. For now, test is disabled til reworked.
#pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_bidir.py  --junitxml=/opt/results/report_create_service_bidir.xml
#pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_delete_service_bidir.py  --junitxml=/opt/results/report_delete_service_bidir.xml
pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_create_service_bidir.py  --junitxml=/opt/results/report_create_service_bidir.xml
pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_delete_service_bidir.py  --junitxml=/opt/results/report_delete_service_bidir.xml
pytest --verbose --log-level=INFO /var/teraflow/tests/ofc24/tests/test_functional_cleanup.py               --junitxml=/opt/results/report_cleanup.xml
EOF
RUN chmod ug+x ./run_tests.sh