add some classReset methods and some construct methods

Author: StanleyWu51

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

@@ -17,12 +17,12 @@ public class AstfGlobalInfoPerTemplate implements AstfGlobalInfoBase {
 
     @Override
     public AstfGlobalInfoBase scheduler(SchedulerParam schedulerParam, int value) {
-        throw new IllegalStateException("unsupported method in this class");
+        throw new IllegalStateException("unsupported method in AstfGlobalInfoPerTemplate class");
     }
 
     @Override
     public AstfGlobalInfoBase ipv6(Ipv6Param ipv6Param, int value) {
-        throw new IllegalStateException("unsupported method in this class");
+        throw new IllegalStateException("unsupported method in AstfGlobalInfoPerTemplate class");
     }
 
     @Override

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

@@ -132,6 +132,13 @@ public static JsonArray clssToJson() {
         return jsonArray;
     }
 
+    /**
+     * class reset, clear all cached data
+     */
+    public static void classReset() {
+        inList.clear();
+    }
+
     /**
      * Inner class
      */

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

@@ -23,6 +23,16 @@ public class AstfProfile {
     private List<AstfTemplate> astfTemplateList;
     private List<AstfCapInfo> astfCapInfoList;
 
+    /**
+     * construct
+     *
+     * @param defaultIpGen
+     * @param astfTemplateList
+     */
+    public AstfProfile(AstfIpGen defaultIpGen, List<AstfTemplate> astfTemplateList) {
+        this(defaultIpGen, null, null, astfTemplateList, null);
+    }
+
     /**
      * construct
      *
@@ -90,6 +100,15 @@ public JsonObject toJson() {
         return json;
     }
 
+    /**
+     * clear all cache data.
+     */
+    public static void clearCache() {
+        AstfProgram.classReset();
+        AstfIpGenDist.classReset();
+        AstfTemplateBase.classReset();
+    }
+
     /**
      * print stats
      */

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

@@ -18,14 +18,13 @@
  * Emulation L7 program
  *
  * @<code> ASTFProgram progServer =new ASTFProgram()
- * progServer.recv(len(http_req))
+ * progServer.recv(http_req.length())
  * progServer.send(http_response)
  * progServer.delay(10)
  * progServer.reset()
  * </code>
  */
 public class AstfProgram {
-
     private static final int MIN_DELAY = 50;
     private static final int MAX_DELAY = 700000;
     private static final int MAX_KEEPALIVE = 500000;
@@ -363,7 +362,7 @@ public static JsonArray classToJson() {
     }
 
     /**
-     * class reset, clear all cached buffer
+     * class reset, clear all cached data
      */
     public static void classReset() {
         bufList = new BufferList();

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

@@ -33,6 +33,39 @@ public class AstfTcpClientTemplate extends AstfClientTemplate {
     private AstfGlobalInfoPerTemplate globalInfoPerTemplate;
     private int limit;
 
+    /**
+     * construct
+     *
+     * @param astfProgram
+     * @param iPGen
+     */
+    public AstfTcpClientTemplate(AstfProgram astfProgram, AstfIpGen iPGen) {
+        this(astfProgram, iPGen, 0);
+    }
+
+    /**
+     * construct
+     *
+     * @param astfProgram
+     * @param iPGen
+     * @param limit
+     */
+    public AstfTcpClientTemplate(AstfProgram astfProgram, AstfIpGen iPGen, int limit) {
+        this(astfProgram, iPGen, 80, limit);
+    }
+
+    /**
+     * construct
+     *
+     * @param astfProgram
+     * @param iPGen
+     * @param port
+     * @param limit
+     */
+    public AstfTcpClientTemplate(AstfProgram astfProgram, AstfIpGen iPGen, int port, int limit) {
+        this(astfProgram, iPGen, null, port, 1, null, limit);
+    }
+
     /**
      * construct
      *

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

@@ -9,6 +9,15 @@ public class AstfTcpServerTemplate extends AstfTemplateBase {
     private AstfGlobalInfoPerTemplate globalInfo;
     private AstfAssociation assoc;
 
+    /**
+     * construct
+     *
+     * @param astfProgram
+     */
+    public AstfTcpServerTemplate(AstfProgram astfProgram) {
+        this(astfProgram, null, null);
+    }
+
     /**
      * construct
      *

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

@@ -45,22 +45,14 @@ public static int getTotalSendBytes(int index) {
      * @param astfProgram
      * @return program index in the program List
      */
-    public int addProgram(AstfProgram astfProgram) {
+    public static int addProgram(AstfProgram astfProgram) {
         if (programHash.containsKey(astfProgram)) {
             return programHash.get(astfProgram);
         }
         programList.add(astfProgram);
-        programIndex = programList.size() - 1;
-        programHash.put(astfProgram, programIndex);
-        return programIndex;
-    }
-
-    /**
-     * clear all cached program
-     */
-    public void clearCache() {
-        programList.clear();
-        programHash.clear();
+        int index = programList.size() - 1;
+        programHash.put(astfProgram, index);
+        return index;
     }
 
     /**
@@ -90,6 +82,14 @@ public JsonObject toJson() {
         return fields;
     }
 
+    /**
+     * clear all cached data
+     */
+    public static void classReset() {
+        programList.clear();
+        programHash.clear();
+    }
+
     /**
      * including all cached astf template json string
      *