Merge pull request #11 from cisco-system-traffic-generator/master

rebase

Author: Emil-Gustafsson

.travis.yml

@@ -0,0 +1 @@
+language: java

src/e2e-test/java/com/cisco/trex/stateless/TRexClientUtilTest.java

@@ -0,0 +1,13 @@
+package com.cisco.trex.stateless;
+
+import com.cisco.trex.util.TRexClientUtil;
+import com.cisco.trex.util.TRexServerMode;
+import org.junit.Test;
+
+public class TRexClientUtilTest {
+    @Test
+    public void getModeTest() {
+        TRexServerMode mode = TRexClientUtil.getMode("trex-host", "4501");
+        System.out.println(mode);
+    }
+}

src/main/java/com/cisco/trex/ClientBase.java

@@ -13,6 +13,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import com.cisco.trex.util.Constants;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +50,6 @@
 public abstract class ClientBase {
 
     protected static final Logger LOGGER = LoggerFactory.getLogger(ClientBase.class);
-    protected static final String JSON_RPC_VERSION = "2.0";
     protected static final Gson GSON = buildGson();
     protected String host;
     protected String port;
@@ -74,7 +74,7 @@ private String buildRequest(String methodName, Map<String, Object> payload) {
         }
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("id", "aggogxls");
-        parameters.put("jsonrpc", JSON_RPC_VERSION);
+        parameters.put("jsonrpc", Constants.JSON_RPC_VERSION);
         parameters.put("method", methodName);
         payload.put("api_h", apiH);
         parameters.put("params", payload);
@@ -232,7 +232,7 @@ public TRexCommand buildCommand(String methodName, Map<String, Object> parameter
         Map<String, Object> payload = new HashMap<>();
         int cmdId = randomizer.nextInt() & Integer.MAX_VALUE; //get a positive random value
         payload.put("id", cmdId);
-        payload.put("jsonrpc", JSON_RPC_VERSION);
+        payload.put("jsonrpc", Constants.JSON_RPC_VERSION);
         payload.put("method", methodName);
         if (!StringUtils.isEmpty(this.masterHandler)) {
             payload.put("handler", this.masterHandler);
@@ -314,6 +314,21 @@ public TRexClientResult<PortStatus> getPortStatus(int portIdx) {
         return callMethod("get_port_status", parameters, PortStatus.class);
     }
 
+    /**
+     * Get Port Status including profile transmitting state
+     *
+     * @param portIdx
+     * @param profileId
+     * @return PortStatus
+     */
+    public TRexClientResult<PortStatus> getPortStatus(int portIdx, String profileId) {
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("port_id", portIdx);
+        parameters.put("profile_id", profileId);
+        parameters.put("block", false);
+        return callMethod("get_port_status", parameters, PortStatus.class);
+    }
+
     /**
      * @param portIndex
      * @return PortStatistics
@@ -525,6 +540,14 @@ protected Map<String, Object> createPayload(int portIndex) {
         }
         return payload;
     }
+    
+    protected Map<String, Object> createPayload(int portIndex, String profileId) {
+        Map<String, Object> payload = createPayload(portIndex);
+        if (profileId != null && !profileId.isEmpty()) {
+            payload.put("profile_id", profileId);
+        }
+        return payload;
+    }
 
     protected abstract void serverAPISync() throws TRexConnectionException;
 

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;
+    }
+}