Merge pull request #96 from cisco-system-traffic-generator/linux-stac…

…k-based-support

linux_based stack support

src/main/java/com/exalttech/trex/core/ConnectionManager.java

@@ -24,6 +24,7 @@
 import com.exalttech.trex.remote.exceptions.InvalidRPCResponseException;
 import com.exalttech.trex.remote.models.common.RPCError;
 import com.exalttech.trex.remote.models.common.RPCRequest;
+import com.exalttech.trex.remote.models.params.GetPortStatusParams;
 import com.exalttech.trex.remote.models.params.Params;
 import com.exalttech.trex.remote.models.profiles.Profile;
 import com.exalttech.trex.ui.models.Port;
@@ -383,8 +384,7 @@ public String sendPortStatusRequest(List<Port> portList) throws JsonProcessingEx
         for (Port port : portList) {
             rpcRequest.setId(Util.getRandomID(Constants.RPC_REQUEST_ID_LENGTH));
             rpcRequest.setMethod(Constants.PORT_STATUS_METHOD);
-            rpcRequest.setParams(port.getPortParam());
-
+            rpcRequest.setParams(new GetPortStatusParams(port.getIndex(), false));
             jsonRequestString = mapper.writeValueAsString(rpcRequest);
             jsonRequestString = Util.tuneJSONParams(jsonRequestString, port.getPortParam(), apiH);
             addStreamCommandList.add(jsonRequestString);

src/main/java/com/exalttech/trex/core/RPCMethods.java

@@ -411,7 +411,7 @@ public boolean setSetL2(int portID, String dst_mac) throws Exception {
         LogsController.getInstance().appendText(LogType.INFO, logstr);
 
         String handler = (String) connectionHandler.get(portID);
-        L2Params l2params = new L2Params(portID, handler, dst_mac);
+        L2Params l2params = new L2Params(portID, handler, dst_mac, false);
 
         String response = serverConnectionManager.sendRPCRequest(Constants.SET_L2_METHOD, l2params);
 
@@ -425,7 +425,7 @@ public boolean setSetL3(int portID, String dst_ipv4, String src_ipv4) throws Exc
         LogsController.getInstance().appendText(LogType.INFO, logstr);
 
         String handler = (String) connectionHandler.get(portID);
-        L3Params l3params = new L3Params(portID, handler, dst_ipv4, src_ipv4);
+        L3Params l3params = new L3Params(portID, handler, dst_ipv4, src_ipv4, false);
 
         String response = serverConnectionManager.sendRPCRequest(Constants.SET_L3_METHOD, l3params);
 

src/main/java/com/exalttech/trex/remote/models/params/GetPortStatusParams.java

@@ -0,0 +1,43 @@
+package com.exalttech.trex.remote.models.params;
+
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "port_id",
+        "block"
+})
+public class GetPortStatusParams extends Params {
+    @JsonProperty("port_id")
+    private Integer portId;
+    @JsonProperty("block")
+    private Boolean block;
+
+    public GetPortStatusParams(Integer portId, Boolean block) {
+        this.portId = portId;
+        this.block = block;
+    }
+
+    @JsonProperty("block")
+    public Boolean getBlock() {
+        return block;
+    }
+
+    @JsonProperty("block")
+    public void setBlock(Boolean block) {
+        this.block = block;
+    }
+
+    @JsonProperty("port_id")
+    public Integer getPortId() {
+        return portId;
+    }
+
+    @JsonProperty("port_id")
+    public void setPortId(Integer portId) {
+        this.portId = portId;
+    }
+}

src/main/java/com/exalttech/trex/remote/models/params/L2Params.java

@@ -27,7 +27,8 @@
 @JsonPropertyOrder({
         "dst_mac",
         "handler",
-        "port_id"
+        "port_id",
+        "block"
 })
 public class L2Params extends Params {
 
@@ -37,11 +38,14 @@ public class L2Params extends Params {
     private String handler;
     @JsonProperty("port_id")
     private Integer portId;
+    @JsonProperty("block")
+    private Boolean block;
 
-    public L2Params(Integer portId, String handler, String dst_mac) {
+    public L2Params(Integer portId, String handler, String dst_mac, Boolean block) {
         this.handler = handler;
         this.portId = portId;
         this.dst_mac = dst_mac;
+        this.block = block;
     }
 
     @JsonProperty("dst_mac")
@@ -74,4 +78,13 @@ public void setPortId(Integer portId) {
         this.portId = portId;
     }
 
+    @JsonProperty("block")
+    public Boolean getBlock() {
+        return block;
+    }
+
+    @JsonProperty("block")
+    public void setBlock(Boolean block) {
+        this.block = block;
+    }
 }

src/main/java/com/exalttech/trex/remote/models/params/L3Params.java

@@ -28,7 +28,8 @@
         "dst_addr",
         "src_addr",
         "handler",
-        "port_id"
+        "port_id",
+        "block"
 })
 public class L3Params extends Params {
 
@@ -40,12 +41,16 @@ public class L3Params extends Params {
     private String handler;
     @JsonProperty("port_id")
     private Integer portId;
+    @JsonProperty("block")
+    private Boolean block;
 
-    public L3Params(Integer portId, String handler, String dst_addr, String src_addr) {
+    public L3Params(Integer portId, String handler, String dst_addr, String src_addr, Boolean block) {
         this.handler = handler;
         this.portId = portId;
         this.dst_addr = dst_addr;
         this.src_addr = src_addr;
+        this.block = block;
+
     }
 
     @JsonProperty("dst_addr")
@@ -88,4 +93,14 @@ public void setPortId(Integer portId) {
         this.portId = portId;
     }
 
+    @JsonProperty("block")
+    public Boolean getBlock() {
+        return block;
+    }
+
+    @JsonProperty("block")
+    public void setBlock(Boolean block) {
+        this.block = block;
+    }
+
 }