Abort power setup if setting gainloss fails

Currently, if changing control mode from power to gainloss fails on a
device, e.g. because it becomes disconnected, power setup just
continues with the next node.

This changes behaviour so that power setup is aborted instead and
service creation is rolled back.

JIRA: TRNSPRTPCE-798
Change-Id: I85f03f318c66a524ac91d62cf7459d01e9a5d021
Signed-off-by: Jonas Mårtensson <jonas.martensson@smartoptics.com>

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java
index dda3592b2009a2f8af1404e7c4385e8dd87de256..3237e3a0ed407153aa95a60cee432799a485802e 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java
@@ -206,9 +206,8 @@ public class PowerMgmtImpl implements PowerMgmt {
                     try {
                         if (!crossConnect.setPowerLevel(nodeId, OpticalControlMode.Power.getName(), powerValue,
                                 connectionNumber)) {
-                            LOG.info("Set Power failed for Roadm-connection: {} on Node: {}",
+                            LOG.error("Set Power failed for Roadm-connection: {} on Node: {}",
                                     connectionNumber, nodeId);
-                            // FIXME shouldn't it be LOG.error
                             return false;
                         }
                         LOG.info("Roadm-connection: {} updated ", connectionNumber);
@@ -220,9 +219,9 @@ public class PowerMgmtImpl implements PowerMgmt {
 
                         if (!crossConnect.setPowerLevel(nodeId, OpticalControlMode.GainLoss.getName(), powerValue,
                                 connectionNumber)) {
-                            LOG.warn("Setting power-control mode off failed for Roadm-connection: {}",
-                                connectionNumber);
-                            // FIXME no return false in that case?
+                            LOG.error("Set GainLoss failed for Roadm-connection: {} on Node: {}",
+                                    connectionNumber, nodeId);
+                            return false;
                         }
                     } catch (InterruptedException e) {
                         LOG.error("Olm-setPower wait failed :", e);