Merge changes I74e9bee3,Ia1ad6f9c,Ic47363f6,I2bba2b18,I507097db, ...

* changes:
  Refactor SH RendererListenerImpl class
  Refactor DeviceRenderingTask classes
  Refactor RendererServiceOperationsImpl step 2
  Refactor OtnDeviceRendereringResult class
  Refactor OtnDeviceRendererServiceImpl class
  Refactor Renderer DeviceRenderingResult class
  Refactor Renderer DeviceRendererServiceImpl class
  Refactor Renderer ModelMappingUtils class
  Refactor RendererServiceOperationsImpl class
  Refactor common serviceType affectation
  Refactor PCE graph PostAlgoPathValidator class
  Refactor PCE calculation class

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 d569e6dedf5745d7412ecaa523df629c2eb8149f..31a56d8ac51622a8705fa3c216a5024de22a284e 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
@@ -332,12 +332,13 @@ public class PowerMgmtImpl implements PowerMgmt {
                             LOG.info("Success Value is {}", setXconnPowerSuccessVal);
                             if (setXconnPowerSuccessVal) {
                                 LOG.info("Roadm-connection: {} updated ", connectionNumber);
-                                //The value recommended by the white paper is 20 seconds and not 60.
-                                //TODO - commented code because one vendor is not supporting
-                                //GainLoss with target-output-power
-                                Thread.sleep(OlmUtils.OLM_TIMER_1);
+                                Thread.sleep(OlmUtils.OLM_TIMER_2);
                                 crossConnect.setPowerLevel(nodeId, OpticalControlMode.GainLoss.getName(), powerValue,
                                         connectionNumber);
+                                //TODO make this timer value configurable via OSGi blueprint
+                                // although the value recommended by the white paper is 20 seconds.
+                                // At least one vendor product needs 60 seconds
+                                // because it is not supporting GainLoss with target-output-power.
                             } else {
                                 LOG.info("Set Power failed for Roadm-connection: {} on Node: {}", connectionNumber,
                                         nodeId);