Merge "decrease OLM timers in functional tests"

[transportpce.git] / olm / src / main / java / org / opendaylight / transportpce / olm / util / OlmUtils.java

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
index 60915e233cdd8597c563a1bc49a877d3e2f93024..0bafe5e7a6966ed6fe4e695803590d3fc10974ac 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
@@ -34,6 +34,8 @@ public final class OlmUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(OlmUtils.class);
     private static long DATABROKER_READ_TIMEOUT_SECONDS = 120;
+    public static long OLM_TIMER_1 = 120000; //#FUNCTESTVAL= 3000;
+    public static long OLM_TIMER_2 = 20000;  //#FUNCTESTVAL= 2000;
     private static final InstanceIdentifier<Topology> NETCONF_TOPO_IID =
         InstanceIdentifier
             .create(NetworkTopology.class)
@@ -74,18 +76,20 @@ public final class OlmUtils {
      *            Input parameter from the olm yang model get-pm rpc
      * @param deviceTransactionManager
      *            Device tx manager
+     * @param openRoadmVersion
+     *            OpenRoadm version number
      *
      * @return Result of the request list of PM readings
      */
     public static GetPmOutputBuilder pmFetch(GetPmInput input, DeviceTransactionManager deviceTransactionManager,
                                              Nodes.OpenroadmVersion openRoadmVersion) {
-        LOG.debug("Getting PM Data for NodeId: {} ResourceType: {} ResourceName: {}", input.getNodeId(),
+        LOG.info("Getting PM Data for NodeId: {} ResourceType: {} ResourceName: {}", input.getNodeId(),
             input.getResourceType(), input.getResourceIdentifier());
         GetPmOutputBuilder pmOutputBuilder = new GetPmOutputBuilder();
         if (openRoadmVersion.equals(Nodes.OpenroadmVersion._121)) {
-            pmOutputBuilder = OlmUtils1_2_1.pmFetch(input, deviceTransactionManager);
+            pmOutputBuilder = OlmUtils121.pmFetch(input, deviceTransactionManager);
         } else {
-            pmOutputBuilder = OlmUtils2_2.pmFetch(input, deviceTransactionManager);
+            pmOutputBuilder = OlmUtils22.pmFetch(input, deviceTransactionManager);
         }
         return pmOutputBuilder;
     }