Merge pull request #112 from cisco-system-traffic-generator/acquirePort2

acquire port only when it is not already acquired
cisco-system-traffic-generator · Dec 10, 2019 · 0e0f79e · 0e0f79e
2 parents 4f1c355 + bb95bbc
commit 0e0f79e
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/com/cisco/trex/stateless/TRexClient.java b/src/main/java/com/cisco/trex/stateless/TRexClient.java
@@ -123,13 +123,17 @@ protected void serverAPISync() throws TRexConnectionException {
   }
 
   public PortStatus acquirePort(int portIndex, Boolean force) {
-    Map<String, Object> payload = createPayload(portIndex);
-    payload.put("session_id", SESSON_ID);
-    payload.put("user", userName);
-    payload.put("force", force);
-    String json = callMethod("acquire", payload);
-    String handler = getResultFromResponse(json).getAsString();
-    portHandlers.put(portIndex, handler);
+    if (!portHandlers.containsKey(portIndex)) {
+      Map<String, Object> payload = createPayload(portIndex);
+      payload.put("session_id", SESSON_ID);
+      payload.put("user", userName);
+      payload.put("force", force);
+      String json = callMethod("acquire", payload);
+      String handler = getResultFromResponse(json).getAsString();
+      portHandlers.put(portIndex, handler);
+    } else {
+      LOGGER.debug("Port already acquired, continueing");
+    }
     return getPortStatus(portIndex).get();
   }