add dump_interval for astf traffic start

Signed-off-by: Leo Ma <[email protected]>

Author: leomaatEric

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

@@ -1,6 +1,8 @@
 package com.cisco.trex.stateful;
 
 import com.cisco.trex.ClientBase;
+import com.cisco.trex.stateful.model.FlowInfoData;
+import com.cisco.trex.stateful.model.FlowInfoResult;
 import com.cisco.trex.stateful.model.ServerStatus;
 import com.cisco.trex.stateful.model.stats.AstfStatistics;
 import com.cisco.trex.stateful.model.stats.LatencyPortData;
@@ -17,6 +19,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -154,21 +157,46 @@ public void startTraffic(
    * @param mult
    * @param nc
    */
+  public void startTraffic(
+          String profileId,
+          long clientMask,
+          double duration,
+          boolean ipv6,
+          int latencyPps,
+          int mult,
+          boolean nc) {
+    startTraffic(profileId, clientMask, duration, ipv6, latencyPps, mult, nc, 0);
+  }
+
+  /**
+   * start traffic on all ports on loaded profile associated with specified profile id
+   *
+   * @param profileId
+   * @param clientMask
+   * @param duration
+   * @param ipv6
+   * @param latencyPps
+   * @param mult
+   * @param nc
+   * @param dumpInterval
+   */
   public void startTraffic(
       String profileId,
       long clientMask,
       double duration,
       boolean ipv6,
       int latencyPps,
       int mult,
-      boolean nc) {
+      boolean nc,
+      float dumpInterval) {
     Map<String, Object> payload = createPayload(profileId);
     payload.put("client_mask", clientMask);
     payload.put("duration", duration);
     payload.put("ipv6", ipv6);
     payload.put("latency_pps", latencyPps);
     payload.put("mult", mult);
     payload.put("nc", nc);
+    payload.put("dump_interval", dumpInterval);
     this.callMethod("start", payload);
   }
 
@@ -521,7 +549,7 @@ public Map<String, AstfStatistics> getTemplateGroupStatistics(
   /**
    * get template group statistics
    *
-   * @return Map key:tgName, value:AstfStatistics
+   * @return ServerStatus
    */
   public ServerStatus syncWithServer() {
     Map<String, Object> payload = createPayload("*");
@@ -548,4 +576,38 @@ private Map<String, Integer> translateNames2Ids(String profileId, List<String> t
 
     return name2Id;
   }
+
+  /**
+   *  Get flow information for a profile
+   *
+   * @param profileId
+   * @return FlowInfo
+   */
+  public List<FlowInfoResult> getProfileInfo(String profileId) {
+    List<FlowInfoResult> results = new ArrayList<>();
+
+    Map<String, Object> payload = createPayload(profileId);
+    String json = callMethod("get_flow_info", payload);
+    JsonArray jsonArray = getResultFromResponse(json).getAsJsonArray();
+    Iterator<JsonElement> iterator = jsonArray.iterator();
+    BigInteger index = null;
+    Map<String, FlowInfoData> flowInfoDataMap;
+    while (iterator.hasNext()) {
+      flowInfoDataMap = new HashMap<>();
+      JsonObject flowInfoJsonObject = iterator.next().getAsJsonObject();
+      for (Map.Entry<String, JsonElement> info : flowInfoJsonObject.entrySet()) {
+
+        if (info.getKey().equals("index")) {
+          index = new BigInteger(info.getValue().getAsString());
+        } else {
+          FlowInfoData flowInfoData = GSON.fromJson(info.getValue(), FlowInfoData.class);
+          flowInfoDataMap.put(info.getKey(), flowInfoData);
+        }
+      }
+      FlowInfoResult flowResult = new FlowInfoResult(index, flowInfoDataMap);
+      results.add(flowResult);
+    }
+
+    return results;
+  }
 }

src/main/java/com/cisco/trex/stateful/model/FlowInfoData.java

@@ -0,0 +1,154 @@
+package com.cisco.trex.stateful.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/** counters for flow info */
+public class FlowInfoData {
+
+    @JsonProperty("duration")
+    private double duration;
+
+    @JsonProperty("last_data_recv")
+    private long lastDataRecv;
+
+    @JsonProperty("options")
+    private String options;
+
+    @JsonProperty("origin")
+    private String origin;
+
+    @JsonProperty("rcv_mss")
+    private long rcvMss;
+
+    @JsonProperty("rcv_nxt")
+    private long rcvNxt;
+
+    @JsonProperty("rcv_ooopack")
+    private long rcvOoopack;
+
+    @JsonProperty("rcv_space")
+    private long rcvSpace;
+
+    @JsonProperty("rcv_wscale")
+    private short rcvWscale;
+
+    @JsonProperty("rto")
+    private long rto;
+
+    @JsonProperty("rtt")
+    private long rtt;
+
+    @JsonProperty("rttvar")
+    private long rttvar;
+
+    @JsonProperty("snd_cwnd")
+    private long sndCwnd;
+
+    @JsonProperty("snd_mss")
+    private long sndMss;
+
+    @JsonProperty("snd_nxt")
+    private long sndNxt;
+
+    @JsonProperty("snd_rexmitpack")
+    private long sndRexmitpack;
+
+    @JsonProperty("snd_ssthresh")
+    private long sndSsthresh;
+
+    @JsonProperty("snd_wnd")
+    private long sndWnd;
+
+    @JsonProperty("snd_wscale")
+    private short sndWscale;
+
+    @JsonProperty("snd_zerowin")
+    private long sndZerowin;
+
+    @JsonProperty("state")
+    private long state;
+
+    public double getDuration() {
+        return duration;
+    }
+
+    public long getLastDataRecv() {
+        return lastDataRecv;
+    }
+
+    public String getOptions() {
+        return options;
+    }
+
+    public String getOrigin() {
+        return origin;
+    }
+
+    public long getRcvMss() {
+        return rcvMss;
+    }
+
+    public long getRcvNxt() {
+        return rcvNxt;
+    }
+
+    public long getRcvOoopack() {
+        return rcvOoopack;
+    }
+
+    public long getRcvSpace() {
+        return rcvSpace;
+    }
+
+    public short getRcvWscale() {
+        return rcvWscale;
+    }
+
+    public long getRto() {
+        return rto;
+    }
+
+    public long getRtt() {
+        return rtt;
+    }
+
+    public long getRttvar() {
+        return rttvar;
+    }
+
+    public long getSndCwnd() {
+        return sndCwnd;
+    }
+
+    public long getSndMss() {
+        return sndMss;
+    }
+
+    public long getSndNxt() {
+        return sndNxt;
+    }
+
+    public long getSndRexmitpack() {
+        return sndRexmitpack;
+    }
+
+    public long getSndSsthresh() {
+        return sndSsthresh;
+    }
+
+    public long getSndWnd() {
+        return sndWnd;
+    }
+
+    public short getSndWscale() {
+        return sndWscale;
+    }
+
+    public long getSndZerowin() {
+        return sndZerowin;
+    }
+
+    public long getState() {
+        return state;
+    }
+}

src/main/java/com/cisco/trex/stateful/model/FlowInfoResult.java

@@ -0,0 +1,38 @@
+package com.cisco.trex.stateful.model;
+
+import java.math.BigInteger;
+import java.util.Map;
+
+/** Data returned from get_flow_info API */
+public class FlowInfoResult {
+
+    private BigInteger index;
+    private Map<String, FlowInfoData> flowInfoDataMap;
+
+    public FlowInfoResult(BigInteger index,
+            Map<String, FlowInfoData> flowInfoDataMap) {
+        this.index = index;
+        this.flowInfoDataMap = flowInfoDataMap;
+    }
+
+    /**
+     * Get base index in memory
+     *
+     * @return
+     */
+    public BigInteger getIndex() {
+        return index;
+    }
+
+    /**
+     * Get flow info data map, as format of <string to present traffic direction , a flowInfoData object containsing flow info counters>
+     * ex.,
+     * key is "1.1.1.1:41668-1.1.2.1:20"
+     * value is flowInfoData object refer to {@link FlowInfoData}
+     *
+     * @return
+     */
+    public Map<String, FlowInfoData> getFlowInfoDataMap() {
+        return flowInfoDataMap;
+    }
+}