Merge remote-tracking branch 'stanley/master'

- Removed unused imports in conflicting file

Author: Egor Blagov

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

@@ -0,0 +1,59 @@
+package com.cisco.trex.stateful;
+
+import com.google.gson.JsonArray;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Astf Association
+ */
+public class AstfAssociation {
+
+    private List<AstfAssociationRule> astfAssociationRuleList;
+
+    /**
+     * construct
+     *
+     * @param astfAssociationRuleList
+     */
+    public AstfAssociation(List<AstfAssociationRule> astfAssociationRuleList) {
+        this.astfAssociationRuleList = astfAssociationRuleList;
+    }
+
+    /**
+     * construct
+     *
+     * @param astfAssociationRule
+     */
+    public AstfAssociation(AstfAssociationRule astfAssociationRule) {
+        astfAssociationRuleList = new ArrayList();
+        astfAssociationRuleList.add(astfAssociationRule);
+    }
+
+    /**
+     * to json format
+     *
+     * @return JsonArray
+     */
+    public JsonArray toJson() {
+        JsonArray jsonArray = new JsonArray();
+        for (AstfAssociationRule rule : astfAssociationRuleList) {
+            jsonArray.add(rule.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

@@ -0,0 +1,57 @@
+package com.cisco.trex.stateful;
+
+import com.google.gson.JsonObject;
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Astf Association Rule
+ */
+public class AstfAssociationRule {
+    private JsonObject fields = new JsonObject();
+    private int port;
+
+    /**
+     * construct
+     *
+     * @param ipStart
+     * @param ipEnd
+     * @param port
+     */
+    public AstfAssociationRule(String ipStart, String ipEnd, int port) {
+        this.port = port;
+        fields.addProperty("port", port);
+        if (!StringUtils.isEmpty(ipStart)) {
+            fields.addProperty("ip_start", ipStart);
+        }
+        if (!StringUtils.isEmpty(ipStart)) {
+            fields.addProperty("ip_end", ipEnd);
+        }
+    }
+
+    /**
+     * construct
+     *
+     * @param port
+     */
+    public AstfAssociationRule(int port) {
+        this(null, null, port);
+    }
+
+    /**
+     * get port
+     *
+     * @return port
+     */
+    public int getPort() {
+        return this.port;
+    }
+
+    /**
+     * to json format
+     *
+     * @return JsonObject
+     */
+    public JsonObject toJson() {
+        return fields;
+    }
+}

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

@@ -0,0 +1,206 @@
+package com.cisco.trex.stateful;
+
+/**
+ * Astf Cap Info,for pcap file usage
+ */
+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 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 int limit;//Limit the number of flows
+
+    private AstfCapInfo(AstfCapInfoBuilder builder) {
+        filePath = builder.filePath;
+        cps = builder.cps;
+        assoc = builder.assoc;
+        astfIpGen = builder.astfIpGen;
+        port = builder.port;
+        l7Percent = builder.l7Percent;
+        serverGlobInfo = builder.serverGlobInfo;
+        clientGlobInfo = builder.clientGlobInfo;
+        limit = builder.limit;
+        paramCheck();
+    }
+
+    /**
+     * new AstfCapInfo builder
+     *
+     * @return new builder
+     */
+    public static AstfCapInfoBuilder newBuilder() {
+        return new AstfCapInfoBuilder();
+    }
+
+    private void paramCheck() {
+        if (l7Percent > 0) {
+            if (cps > 0) {
+                throw new IllegalStateException(String.format("bad param combination,l7Percent %s ,cps %s ", l7Percent, cps));
+            }
+            l7Percent = l7Percent;
+            cps = cps;
+        } else {
+            if (cps > 0) {
+                cps = cps;
+            } else {
+                cps = 1;
+            }
+        }
+        if (assoc == null) {
+            if (port > 0) {
+                assoc = new AstfAssociation(new AstfAssociationRule(port));
+            } else {
+                assoc = null;
+            }
+        }
+    }
+
+    /**
+     * getFilePath
+     *
+     * @return filePath
+     */
+    public String getFilePath() {
+        return filePath;
+    }
+
+    /**
+     * getCps
+     *
+     * @return cps
+     */
+    public float getCps() {
+        return cps;
+    }
+
+    /**
+     * getAssoc
+     *
+     * @return assoc
+     */
+    public AstfAssociation getAssoc() {
+        return assoc;
+    }
+
+    /**
+     * getAstfIpGen
+     *
+     * @return astfIpGen
+     */
+    public AstfIpGen getAstfIpGen() {
+        return astfIpGen;
+    }
+
+    /**
+     * getPort
+     *
+     * @return port
+     */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * getL7Percent
+     *
+     * @return l7Percent
+     */
+    public float getL7Percent() {
+        return l7Percent;
+    }
+
+    /**
+     * getServerGlobInfo
+     *
+     * @return serverGlobInfo
+     */
+    public AstfGlobalInfoPerTemplate getServerGlobInfo() {
+        return serverGlobInfo;
+    }
+
+    /**
+     * getClientGlobInfo
+     *
+     * @return clientGlobInfo
+     */
+    public AstfGlobalInfoPerTemplate getClientGlobInfo() {
+        return clientGlobInfo;
+    }
+
+    /**
+     * getLimit
+     *
+     * @return limit
+     */
+    public int getLimit() {
+        return limit;
+    }
+
+    /**
+     * AstfCapInfo builder
+     */
+    public static final class AstfCapInfoBuilder {
+        private String filePath;
+        private float cps;
+        private AstfAssociation assoc;
+        private AstfIpGen astfIpGen;
+        private int port;
+        private float l7Percent;
+        private AstfGlobalInfoPerTemplate serverGlobInfo;
+        private AstfGlobalInfoPerTemplate clientGlobInfo;
+        private int limit;
+
+        public AstfCapInfoBuilder filePath(String val) {
+            filePath = val;
+            return this;
+        }
+
+        public AstfCapInfoBuilder cps(float val) {
+            cps = val;
+            return this;
+        }
+
+        public AstfCapInfoBuilder assoc(AstfAssociation val) {
+            assoc = val;
+            return this;
+        }
+
+        public AstfCapInfoBuilder astfIpGen(AstfIpGen val) {
+            astfIpGen = val;
+            return this;
+        }
+
+        public AstfCapInfoBuilder port(int val) {
+            port = val;
+            return this;
+        }
+
+        public AstfCapInfoBuilder l7Percent(float val) {
+            l7Percent = val;
+            return this;
+        }
+
+        public AstfCapInfoBuilder serverGlobInfo(AstfGlobalInfoPerTemplate val) {
+            serverGlobInfo = val;
+            return this;
+        }
+
+        public AstfCapInfoBuilder clientGlobInfo(AstfGlobalInfoPerTemplate val) {
+            clientGlobInfo = val;
+            return this;
+        }
+
+        public AstfCapInfoBuilder limit(int val) {
+            limit = val;
+            return this;
+        }
+
+        public AstfCapInfo build() {
+            return new AstfCapInfo(this);
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.cisco.trex.stateful;
+
+import com.google.gson.JsonObject;
+
+/**
+ * abstract Astf Client Template class
+ */
+abstract class AstfClientTemplate extends AstfTemplateBase {
+    private AstfCluster astfCluster;
+    private AstfIpGen iPGen;
+    private AstfProgram astfProgram;
+
+    /**
+     * construct
+     *
+     * @param iPGen
+     * @param astfCluster
+     * @param astfProgram
+     */
+    public AstfClientTemplate(AstfIpGen iPGen, AstfCluster astfCluster, AstfProgram astfProgram) {
+        super(astfProgram);
+        this.iPGen = iPGen;
+        this.astfCluster = astfCluster == null ? new AstfCluster() : astfCluster;
+        this.astfProgram = astfProgram;
+    }
+
+    /**
+     * to json format
+     *
+     * @return JsonObject
+     */
+    @Override
+    public JsonObject toJson() {
+        JsonObject json = super.toJson();
+        json.add("ip_gen", iPGen.toJson());
+        json.add("cluster", astfCluster.toJson());
+        return json;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.cisco.trex.stateful;
+
+import com.google.gson.JsonObject;
+
+/**
+ * for future use
+ */
+public class AstfCluster {
+
+    /**
+     * to json format
+     *
+     * @return JsonObject
+     */
+    public JsonObject toJson() {
+        return new JsonObject();
+    }
+}