Uplift api version

Author: ningning-chen

src/main/java/com/cisco/trex/stateful/TRexAstfClient.java

@@ -18,15 +18,10 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import org.apache.commons.lang3.StringUtils;
@@ -59,6 +54,20 @@ protected void serverAPISync() throws TRexConnectionException {
     apiVers.put("name", ASTF);
     TRexClientResult<ApiVersionHandler> result =
         callMethod("api_sync_v2", apiVers, ApiVersionHandler.class);
+
+    if (!StringUtils.isBlank(result.getError()) && result.getError().contains("Version mismatch")) {
+      String regrexString = "server: '([0-9]*)\\.([0-9]*)', client: '([0-9]*)\\.([0-9]*)'";
+      Pattern pattern = Pattern.compile(regrexString);
+      Matcher matcher = pattern.matcher(result.getError());
+      if (matcher.find()) {
+        Constants.ASTF_API_VERSION_MAJOR = Integer.parseInt(matcher.group(1));
+        Constants.ASTF_API_VERSION_MINOR = Integer.parseInt(matcher.group(2));
+        apiVers.put("major", Constants.ASTF_API_VERSION_MAJOR);
+        apiVers.put("minor", Constants.ASTF_API_VERSION_MINOR);
+        result = callMethod("api_sync_v2", apiVers, ApiVersionHandler.class);
+      }
+    }
+
     if (result.get() == null) {
       TRexConnectionException e =
           new TRexConnectionException(
@@ -226,6 +235,7 @@ public void updateLatencyTrafficRate(int mult) {
    */
   public void acquirePorts(Boolean force) {
     Map<String, Object> payload = createPayload();
+    payload.put("session_id", new Random().nextInt(Integer.MAX_VALUE - 1) + 1);
     payload.put("user", userName);
     payload.put("force", force);
     String json = callMethod("acquire", payload);

src/main/java/com/cisco/trex/stateless/TRexClient.java

@@ -38,8 +38,11 @@
 import java.util.Queue;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
+import org.apache.commons.lang3.StringUtils;
 import org.pcap4j.packet.ArpPacket;
 import org.pcap4j.packet.Dot1qVlanTagPacket;
 import org.pcap4j.packet.EthernetPacket;
@@ -107,6 +110,19 @@ protected void serverAPISync() throws TRexConnectionException {
     TRexClientResult<ApiVersionHandler> result =
         callMethod("api_sync_v2", parameters, ApiVersionHandler.class);
 
+    if (!StringUtils.isBlank(result.getError()) && result.getError().contains("Version mismatch")) {
+      String regrexString = "server: '([0-9]*)\\.([0-9]*)', client: '([0-9]*)\\.([0-9]*)'";
+      Pattern pattern = Pattern.compile(regrexString);
+      Matcher matcher = pattern.matcher(result.getError());
+      if (matcher.find()) {
+        Constants.STL_API_VERSION_MAJOR = Integer.parseInt(matcher.group(1));
+        Constants.STL_API_VERSION_MINOR = Integer.parseInt(matcher.group(2));
+        parameters.put("major", Constants.STL_API_VERSION_MAJOR);
+        parameters.put("minor", Constants.STL_API_VERSION_MINOR);
+        result = callMethod("api_sync_v2", parameters, ApiVersionHandler.class);
+      }
+    }
+
     if (result.get() == null) {
       TRexConnectionException e =
           new TRexConnectionException(

src/main/java/com/cisco/trex/util/Constants.java

@@ -3,8 +3,8 @@
 /** Class for constants */
 public final class Constants {
   public static final String JSON_RPC_VERSION = "2.0";
-  public static final int ASTF_API_VERSION_MAJOR = 1;
-  public static final int ASTF_API_VERSION_MINOR = 7;
-  public static final int STL_API_VERSION_MAJOR = 4;
-  public static final int STL_API_VERSION_MINOR = 6;
+  public static int ASTF_API_VERSION_MAJOR = 2;
+  public static int ASTF_API_VERSION_MINOR = 0;
+  public static int STL_API_VERSION_MAJOR = 5;
+  public static int STL_API_VERSION_MINOR = 0;
 }

src/main/java/com/cisco/trex/util/TRexClientUtil.java

@@ -7,7 +7,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,7 +29,24 @@ public static TRexServerMode getMode(String host, String port) {
     parameters.put("minor", Constants.ASTF_API_VERSION_MINOR);
     RPCResponse response = null;
     try {
-      response = transport.sendCommand(buildCommand("api_sync_v2", parameters));
+      TRexCommand command = buildCommand("api_sync_v2", parameters);
+      response = transport.sendCommand(command);
+
+      String errorMessage =
+          response.getError() == null ? null : response.getError().getSpecificErr();
+      if (!StringUtils.isBlank(errorMessage) && errorMessage.contains("Version mismatch")) {
+        String regrexString = "server: '([0-9]*)\\.([0-9]*)', client: '([0-9]*)\\.([0-9]*)'";
+        Pattern pattern = Pattern.compile(regrexString);
+        Matcher matcher = pattern.matcher(errorMessage);
+        if (matcher.find()) {
+          Constants.ASTF_API_VERSION_MAJOR = Integer.parseInt(matcher.group(1));
+          Constants.ASTF_API_VERSION_MINOR = Integer.parseInt(matcher.group(2));
+          parameters.put("major", Constants.ASTF_API_VERSION_MAJOR);
+          parameters.put("minor", Constants.ASTF_API_VERSION_MINOR);
+          command = buildCommand("api_sync_v2", parameters);
+          response = transport.sendCommand(command);
+        }
+      }
     } catch (IOException | NullPointerException e) {
       LOGGER.debug("Unable to sync client with TRex server .", e);
       return TRexServerMode.UNKNOWN;