support new feature about pcap file parse and fix a bug

Author: StanleyWu51

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

@@ -44,4 +44,16 @@ public JsonArray toJson() {
         return jsonArray;
     }
 
+    /**
+     * get Port
+     *
+     * @return port
+     */
+    public int getPort() {
+        if (astfAssociationRuleList.size() != 1) {
+            throw new IllegalStateException(String.format("rule list size should be 1, but it's %s now", astfAssociationRuleList.size()));
+        }
+        return astfAssociationRuleList.get(0).getPort();
+    }
+
 }

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

@@ -7,8 +7,6 @@
  * Astf Association Rule
  */
 public class AstfAssociationRule {
-    private String ipStart;
-    private String ipEnd;
     private JsonObject fields = new JsonObject();
     private int port;
 
@@ -21,8 +19,6 @@ public class AstfAssociationRule {
      */
     public AstfAssociationRule(String ipStart, String ipEnd, int port) {
         this.port = port;
-        this.ipStart = ipStart;
-        this.ipEnd = ipEnd;
         fields.addProperty("port", port);
         if (!StringUtils.isEmpty(ipStart)) {
             fields.addProperty("ip_start", ipStart);

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

@@ -8,8 +8,8 @@
 public abstract class AstfCmd {
 
     protected JsonObject fields;
-    protected boolean stream = false;
-    protected boolean buffer = false;
+    protected Boolean stream = null;
+    protected Boolean buffer = null;
 
     /**
      * construct
@@ -30,7 +30,7 @@ public AstfCmd() {
      *
      * @return true if it's stream
      */
-    public boolean isStream() {
+    public Boolean isStream() {
         return stream;
     }
 
@@ -48,7 +48,7 @@ public JsonObject toJson() {
      *
      * @return true if it's buffer
      */
-    public boolean isBuffer() {
+    public Boolean isBuffer() {
         return buffer;
     }
 

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

@@ -22,8 +22,8 @@ public AstfCmdTxPkt(byte[] asciiBuf) {
         fields.addProperty("name", NAME);
         fields.addProperty("buf_index", -1);
         this.bufLen = asciiBuf.length;
-        buffer = true;
         stream = false;
+        buffer = true;
     }
 
     /**
@@ -58,11 +58,6 @@ public String getName() {
         return NAME;
     }
 
-    @Override
-    public boolean isBuffer() {
-        return true;
-    }
-
     /**
      * get buf length
      *

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

@@ -15,7 +15,10 @@
  * ASTF profile
  */
 public class AstfProfile {
-    protected static final Logger LOGGER = LoggerFactory.getLogger(AstfProfile.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AstfProfile.class);
+
+    private static final String L7_PRECENT = "l7_percent";
+    private static final String CPS = "cps";
 
     private AstfIpGen astfIpGen;
     private AstfGlobalInfo astfClientGlobalInfo;
@@ -53,26 +56,90 @@ public AstfProfile(AstfIpGen defaultIpGen, AstfGlobalInfo astfClientGlobalInfo,
         this.astfCapInfoList = astfCapInfoList;
 
         /**
-         * for pcap file scenario
-         * TODO: need to be implemented in the future
+         * for pcap file parse scenario
          */
         if (astfCapInfoList != null && astfCapInfoList.size() != 0) {
-
             String mode = null;
-            Map<String, Object> allCapInfo = new HashMap();
+            List<Map<String, Object>> allCapInfo = new ArrayList();
             List<Integer> dPorts = new ArrayList();
             int totalPayload = 0;
             for (AstfCapInfo capInfo : astfCapInfoList) {
                 String capFile = capInfo.getFilePath();
                 AstfIpGen ipGen = capInfo.getAstfIpGen() != null ? capInfo.getAstfIpGen() : defaultIpGen;
                 AstfGlobalInfoPerTemplate globC = capInfo.getClientGlobInfo();
                 AstfGlobalInfoPerTemplate globS = capInfo.getServerGlobInfo();
-                AstfProgram progC = new AstfProgram(new File(capFile), AstfProgram.SideType.Client, null, true);
-                AstfProgram progS = new AstfProgram(new File(capFile), AstfProgram.SideType.Server, null, true);
+                AstfProgram progC = new AstfProgram(capFile, AstfProgram.SideType.Client);
+                AstfProgram progS = new AstfProgram(capFile, AstfProgram.SideType.Server);
                 progC.updateKeepAlive(progS);
-                //TODO: analysis pcap file data.
+
+                AstfTcpInfo tcpC = new AstfTcpInfo(capFile);
+                int tcpCPort = tcpC.getPort();
+                float cps = capInfo.getCps();
+                float l7Percent = capInfo.getL7Percent();
+                if (mode == null) {
+                    if (l7Percent > 0) {
+                        mode = L7_PRECENT;
+                    } else {
+                        mode = CPS;
+                    }
+                } else {
+                    if (mode.equals(L7_PRECENT) && l7Percent == 0) {
+                        throw new IllegalStateException("If one cap specifies l7_percent, then all should specify it");
+                    }
+                    if (mode.equals(CPS) && l7Percent > 0) {
+                        throw new IllegalStateException("Can't mix specifications of cps and l7_percent in same cap list");
+                    }
+                }
+                totalPayload += progC.getPayloadLen();
+
+                int dPort;
+                AstfAssociation myAssoc;
+                if (capInfo.getAssoc() == null) {
+                    dPort = tcpCPort;
+                    myAssoc = new AstfAssociation(new AstfAssociationRule(dPort));
+                } else {
+                    dPort = capInfo.getAssoc().getPort();
+                    myAssoc = capInfo.getAssoc();
+                    throw new IllegalStateException(String.format("More than one cap use dest port %s. This is currently not supported.", dPort));
+                }
+                dPorts.add(dPort);
+
+                /**
+                 * add param to cap info map
+                 */
+                HashMap<String, Object> map = new HashMap();
+                map.put("ip_gen", ipGen);
+                map.put("prog_c", progC);
+                map.put("prog_s", progS);
+                map.put("glob_c", globC);
+                map.put("glob_s", globS);
+                map.put("cps", cps);
+                map.put("d_port", dPort);
+                map.put("my_assoc", myAssoc);
+                map.put("limit", capInfo.getLimit());
+                allCapInfo.add(map);
+            }
+
+            //calculate cps from l7 percent
+            if (mode.equals(L7_PRECENT)) {
+                float percentSum = 0;
+                for (Map<String, Object> map : allCapInfo) {
+                    float newCps = ((AstfProgram) map.get("prog_c")).getPayloadLen() * 100.0f / totalPayload;
+                    map.put("cps", newCps);
+                    percentSum += newCps;
+                }
+                if (percentSum != 100) {
+                    throw new IllegalStateException("l7_percent values must sum up to 100");
+                }
             }
 
+            for (Map<String, Object> map : allCapInfo) {
+                AstfTcpClientTemplate tempC = new AstfTcpClientTemplate((AstfProgram) map.get("prog_c"), (AstfIpGen) map.get("ip_gen"), null,
+                        (int) map.get("d_port"), (float) map.get("cps"), (AstfGlobalInfoPerTemplate) map.get("glob_c"), (int) map.get("limit"));
+                AstfTcpServerTemplate tempS = new AstfTcpServerTemplate((AstfProgram) map.get("prog_s"), (AstfAssociation) map.get("my_assoc"), (AstfGlobalInfoPerTemplate) map.get("glob_s"));
+                AstfTemplate template = new AstfTemplate(tempC, tempS);
+                astfTemplateList.add(template);
+            }
         }
     }