move all low level api classes to separate package

rename all low level api classes to align with python class names

Author: leomaatEric

.gitignore

@@ -5,3 +5,4 @@ build/
 .classpath
 .project
 .settings/
+/bin/

src/main/java/com/cisco/trex/stateful/AstfAssociation.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFAssociation.java

@@ -1,23 +1,23 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 import com.google.gson.JsonArray;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Astf Association
+ * Java implementation for TRex python sdk ASTFAssociation class
  */
-public class AstfAssociation {
+public class ASTFAssociation {
 
-    private List<AstfAssociationRule> astfAssociationRuleList;
+    private List<ASTFAssociationRule> astfAssociationRuleList;
 
     /**
      * construct
      *
      * @param astfAssociationRuleList
      */
-    public AstfAssociation(List<AstfAssociationRule> astfAssociationRuleList) {
+    public ASTFAssociation(List<ASTFAssociationRule> astfAssociationRuleList) {
         this.astfAssociationRuleList = astfAssociationRuleList;
     }
 
@@ -26,7 +26,7 @@ public AstfAssociation(List<AstfAssociationRule> astfAssociationRuleList) {
      *
      * @param astfAssociationRule
      */
-    public AstfAssociation(AstfAssociationRule astfAssociationRule) {
+    public ASTFAssociation(ASTFAssociationRule astfAssociationRule) {
         astfAssociationRuleList = new ArrayList();
         astfAssociationRuleList.add(astfAssociationRule);
     }
@@ -38,7 +38,7 @@ public AstfAssociation(AstfAssociationRule astfAssociationRule) {
      */
     public JsonArray toJson() {
         JsonArray jsonArray = new JsonArray();
-        for (AstfAssociationRule rule : astfAssociationRuleList) {
+        for (ASTFAssociationRule rule : astfAssociationRuleList) {
             jsonArray.add(rule.toJson());
         }
         return jsonArray;

src/main/java/com/cisco/trex/stateful/AstfAssociationRule.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFAssociationRule.java

@@ -1,12 +1,12 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 import com.google.gson.JsonObject;
 import org.apache.commons.lang3.StringUtils;
 
 /**
- * Astf Association Rule
+ * Java implementation for TRex python sdk ASTFAssociationRule class
  */
-public class AstfAssociationRule {
+public class ASTFAssociationRule {
     private JsonObject fields = new JsonObject();
     private int port;
 
@@ -17,7 +17,7 @@ public class AstfAssociationRule {
      * @param ipEnd
      * @param port
      */
-    public AstfAssociationRule(String ipStart, String ipEnd, int port) {
+    public ASTFAssociationRule(String ipStart, String ipEnd, int port) {
         this.port = port;
         fields.addProperty("port", port);
         if (!StringUtils.isEmpty(ipStart)) {
@@ -33,7 +33,7 @@ public AstfAssociationRule(String ipStart, String ipEnd, int port) {
      *
      * @param port
      */
-    public AstfAssociationRule(int port) {
+    public ASTFAssociationRule(int port) {
         this(null, null, port);
     }
 

src/main/java/com/cisco/trex/stateful/AstfCapInfo.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCapInfo.java

@@ -1,20 +1,20 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 /**
- * Astf Cap Info,for pcap file usage
+ * Java implementation for TRex python sdk ASTFCapInfo class
  */
-public class AstfCapInfo {
+public class ASTFCapInfo {
     private String filePath;//pcap file name. Filesystem directory location is relative to the profile file in case it is not start with
     private float cps;//new connection per second rate
-    private AstfAssociation assoc;//rule for server association in default take the destination port from pcap file
-    private AstfIpGen astfIpGen;//tuple generator for this template
+    private ASTFAssociation assoc;//rule for server association in default take the destination port from pcap file
+    private ASTFIpGen astfIpGen;//tuple generator for this template
     private int port;//Override destination port, by default is taken from pcap
     private float l7Percent;//L7 stream bandwidth percent
-    private AstfGlobalInfoPerTemplate serverGlobInfo;//server global param
-    private AstfGlobalInfoPerTemplate clientGlobInfo;//client global param
+    private ASTFGlobalInfoPerTemplate serverGlobInfo;//server global param
+    private ASTFGlobalInfoPerTemplate clientGlobInfo;//client global param
     private int limit;//Limit the number of flows
 
-    private AstfCapInfo(AstfCapInfoBuilder builder) {
+    private ASTFCapInfo(AstfCapInfoBuilder builder) {
         filePath = builder.filePath;
         cps = builder.cps;
         assoc = builder.assoc;
@@ -52,7 +52,7 @@ private void paramCheck() {
         }
         if (assoc == null) {
             if (port > 0) {
-                assoc = new AstfAssociation(new AstfAssociationRule(port));
+                assoc = new ASTFAssociation(new ASTFAssociationRule(port));
             } else {
                 assoc = null;
             }
@@ -82,7 +82,7 @@ public float getCps() {
      *
      * @return assoc
      */
-    public AstfAssociation getAssoc() {
+    public ASTFAssociation getAssoc() {
         return assoc;
     }
 
@@ -91,7 +91,7 @@ public AstfAssociation getAssoc() {
      *
      * @return astfIpGen
      */
-    public AstfIpGen getAstfIpGen() {
+    public ASTFIpGen getAstfIpGen() {
         return astfIpGen;
     }
 
@@ -118,7 +118,7 @@ public float getL7Percent() {
      *
      * @return serverGlobInfo
      */
-    public AstfGlobalInfoPerTemplate getServerGlobInfo() {
+    public ASTFGlobalInfoPerTemplate getServerGlobInfo() {
         return serverGlobInfo;
     }
 
@@ -127,7 +127,7 @@ public AstfGlobalInfoPerTemplate getServerGlobInfo() {
      *
      * @return clientGlobInfo
      */
-    public AstfGlobalInfoPerTemplate getClientGlobInfo() {
+    public ASTFGlobalInfoPerTemplate getClientGlobInfo() {
         return clientGlobInfo;
     }
 
@@ -146,12 +146,12 @@ public int getLimit() {
     public static final class AstfCapInfoBuilder {
         private String filePath;
         private float cps;
-        private AstfAssociation assoc;
-        private AstfIpGen astfIpGen;
+        private ASTFAssociation assoc;
+        private ASTFIpGen astfIpGen;
         private int port;
         private float l7Percent;
-        private AstfGlobalInfoPerTemplate serverGlobInfo;
-        private AstfGlobalInfoPerTemplate clientGlobInfo;
+        private ASTFGlobalInfoPerTemplate serverGlobInfo;
+        private ASTFGlobalInfoPerTemplate clientGlobInfo;
         private int limit;
 
         public AstfCapInfoBuilder filePath(String val) {
@@ -164,12 +164,12 @@ public AstfCapInfoBuilder cps(float val) {
             return this;
         }
 
-        public AstfCapInfoBuilder assoc(AstfAssociation val) {
+        public AstfCapInfoBuilder assoc(ASTFAssociation val) {
             assoc = val;
             return this;
         }
 
-        public AstfCapInfoBuilder astfIpGen(AstfIpGen val) {
+        public AstfCapInfoBuilder astfIpGen(ASTFIpGen val) {
             astfIpGen = val;
             return this;
         }
@@ -184,12 +184,12 @@ public AstfCapInfoBuilder l7Percent(float val) {
             return this;
         }
 
-        public AstfCapInfoBuilder serverGlobInfo(AstfGlobalInfoPerTemplate val) {
+        public AstfCapInfoBuilder serverGlobInfo(ASTFGlobalInfoPerTemplate val) {
             serverGlobInfo = val;
             return this;
         }
 
-        public AstfCapInfoBuilder clientGlobInfo(AstfGlobalInfoPerTemplate val) {
+        public AstfCapInfoBuilder clientGlobInfo(ASTFGlobalInfoPerTemplate val) {
             clientGlobInfo = val;
             return this;
         }
@@ -199,8 +199,8 @@ public AstfCapInfoBuilder limit(int val) {
             return this;
         }
 
-        public AstfCapInfo build() {
-            return new AstfCapInfo(this);
+        public ASTFCapInfo build() {
+            return new ASTFCapInfo(this);
         }
     }
 }

src/main/java/com/cisco/trex/stateful/AstfClientTemplate.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFClientTemplate.java

@@ -1,14 +1,14 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 import com.google.gson.JsonObject;
 
 /**
- * abstract Astf Client Template class
+ * Java implementation for TRex python sdk _ASTFClientTemplate class, the abstract Astf Client Template class
  */
-abstract class AstfClientTemplate extends AstfTemplateBase {
-    private AstfCluster astfCluster;
-    private AstfIpGen iPGen;
-    private AstfProgram astfProgram;
+abstract class ASTFClientTemplate extends ASTFTemplateBase {
+    private ASTFCluster astfCluster;
+    private ASTFIpGen iPGen;
+    private ASTFProgram astfProgram;
 
     /**
      * construct
@@ -17,10 +17,10 @@ abstract class AstfClientTemplate extends AstfTemplateBase {
      * @param astfCluster
      * @param astfProgram
      */
-    public AstfClientTemplate(AstfIpGen iPGen, AstfCluster astfCluster, AstfProgram astfProgram) {
+    public ASTFClientTemplate(ASTFIpGen iPGen, ASTFCluster astfCluster, ASTFProgram astfProgram) {
         super(astfProgram);
         this.iPGen = iPGen;
-        this.astfCluster = astfCluster == null ? new AstfCluster() : astfCluster;
+        this.astfCluster = astfCluster == null ? new ASTFCluster() : astfCluster;
         this.astfProgram = astfProgram;
     }
 

src/main/java/com/cisco/trex/stateful/AstfCluster.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCluster.java

@@ -1,11 +1,11 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 import com.google.gson.JsonObject;
 
 /**
- * for future use
+ * Java implementation for TRex python sdk ASTFCluster class
  */
-public class AstfCluster {
+public class ASTFCluster {
 
     /**
      * to json format

src/main/java/com/cisco/trex/stateful/AstfCmd.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmd.java

@@ -1,11 +1,11 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 import com.google.gson.JsonObject;
 
 /**
- * Abstract Astf Cmd class
+ * Java implementation for TRex python sdk ASTFCmd class, the abstract Astf Cmd class,
  */
-public abstract class AstfCmd {
+public abstract class ASTFCmd {
 
     protected JsonObject fields;
     protected Boolean stream = null;
@@ -14,7 +14,7 @@ public abstract class AstfCmd {
     /**
      * construct
      */
-    public AstfCmd() {
+    public ASTFCmd() {
         fields = new JsonObject();
     }
 

src/main/java/com/cisco/trex/stateful/AstfCmdCloseMsg.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdCloseMsg.java

@@ -1,15 +1,15 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 /**
- * Astf Cmd Close Msg
+ * Java implementation for TRex python sdk ASTFCmdCloseMsg class
  */
-public class AstfCmdCloseMsg extends AstfCmd {
+public class ASTFCmdCloseMsg extends ASTFCmd {
     private static final String NAME = "close_msg";
 
     /**
      * construct
      */
-    public AstfCmdCloseMsg() {
+    public ASTFCmdCloseMsg() {
         super();
         fields.addProperty("name", NAME);
         stream = false;

src/main/java/com/cisco/trex/stateful/AstfCmdConnect.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdConnect.java

@@ -1,15 +1,15 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 /**
- * Astf Cmd Connect
+ * Java implementation for TRex python sdk ASTFCmdConnect class
  */
-public class AstfCmdConnect extends AstfCmd {
+public class ASTFCmdConnect extends ASTFCmd {
     private static final String NAME = "connect";
 
     /**
      * construct
      */
-    public AstfCmdConnect() {
+    public ASTFCmdConnect() {
         fields.addProperty("name", NAME);
         stream = true;
     }

src/main/java/com/cisco/trex/stateful/AstfCmdDelay.java renamed to src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdDelay.java

@@ -1,17 +1,17 @@
-package com.cisco.trex.stateful;
+package com.cisco.trex.stateful.api.lowlevel;
 
 /**
- * Astf Cmd Delay
+ * Java implementation for TRex python sdk ASTFCmdDelay class
  */
-public class AstfCmdDelay extends AstfCmd {
+public class ASTFCmdDelay extends ASTFCmd {
     private static final String NAME = "delay";
 
     /**
      * construct
      *
      * @param usec
      */
-    public AstfCmdDelay(int usec) {
+    public ASTFCmdDelay(int usec) {
         super();
         fields.addProperty("name", NAME);
         fields.addProperty("usec", usec);