Commit 5a5fdbcb authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'fix/release-2' into 'develop' 

Minor improvements

See merge request !49
parents e12677e6 63d185a3

src/automation/src/main/java/eu/teraflow/automation/AutomationServiceImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import org.jboss.logging.Logger; 
@ApplicationScoped

public class AutomationServiceImpl implements AutomationService {

    private static final Logger LOGGER = Logger.getLogger(AutomationServiceImpl.class);

    private static final String MESSAGE = "Retrieved %s";

    //private static final String MESSAGE = "Retrieved %s";



    private final DeviceService deviceService;

    private final ContextService contextService;
@@ -61,7 +61,7 @@ public class AutomationServiceImpl implements AutomationService { 
                                return;

                            }



                            LOGGER.infof(MESSAGE, device);

                            //LOGGER.infof(MESSAGE, device);



                            final var initialConfiguration =

                                    deviceService.getInitialConfiguration(device.getDeviceId());
@@ -114,7 +114,7 @@ public class AutomationServiceImpl implements AutomationService { 
                            device.disableDevice();

                            LOGGER.infof("Disabled device [%s]", id);



                            LOGGER.infof(MESSAGE, device);

                            //LOGGER.infof(MESSAGE, device);



                            final var empty = deviceService.deleteDevice(device.getDeviceId());
@@ -150,7 +150,7 @@ public class AutomationServiceImpl implements AutomationService { 
                                return;

                            }



                            LOGGER.infof(MESSAGE, device);

                            //LOGGER.infof(MESSAGE, device);

                            device.setDeviceConfiguration(deviceConfig);

                            final var updatedDeviceIdUni = deviceService.configureDevice(device);

src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ class KDisjointPathAlgorithm(_Algorithm): 
            _request = PathCompRequest()

            for service_key, service_details in self.services_details.items():

                service_type, constraints, endpoints = service_details

                _service = _request.services.add()

                _service = _request.services.add()  # pylint: disable=no-member

                _service.service_id.context_id.context_uuid.uuid = service_key[0]

                _service.service_id.service_uuid.uuid = service_key[1]

                _service.service_type = service_type