Merge pull request #133 from leomaatEric/master

Remove "rx_stats" parameters which are already deprecated and replaced by "flow_stats"

Author: leomaatEric

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

@@ -711,7 +711,6 @@ public static Stream buildStream(Packet pkt) {
         createStreamMode(),
         -1,
         pkt,
-        new StreamRxStats(true, true, true, STREAM_ID),
         new StreamVM("", Collections.<VMInstruction>emptyList()),
         true,
         false,
@@ -727,7 +726,6 @@ public static Stream buildFlowStatsStream(Packet pkt, int id, boolean isLatencyS
         createStreamMode(),
         -1,
         pkt,
-        null,
         new StreamVM("", Collections.<VMInstruction>emptyList()),
         true,
         true,

src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java

@@ -7,7 +7,6 @@
 import com.cisco.trex.stateless.model.PortStatus;
 import com.cisco.trex.stateless.model.StreamMode;
 import com.cisco.trex.stateless.model.StreamModeRate;
-import com.cisco.trex.stateless.model.StreamRxStats;
 import com.cisco.trex.stateless.model.StreamVM;
 import com.cisco.trex.stateless.model.TRexClientResult;
 import com.cisco.trex.stateless.model.port.PortVlan;
@@ -370,7 +369,6 @@ private static com.cisco.trex.stateless.model.Stream buildStream(
             StreamMode.Type.single_burst),
         -1,
         pkt,
-        new StreamRxStats(false, false, true, streamId),
         new StreamVM("", instructions),
         true,
         false,

src/main/java/com/cisco/trex/stateless/TRexClient.java

@@ -10,7 +10,6 @@
 import com.cisco.trex.stateless.model.Stream;
 import com.cisco.trex.stateless.model.StreamMode;
 import com.cisco.trex.stateless.model.StreamModeRate;
-import com.cisco.trex.stateless.model.StreamRxStats;
 import com.cisco.trex.stateless.model.StreamVM;
 import com.cisco.trex.stateless.model.TRexClientResult;
 import com.cisco.trex.stateless.model.port.PortVlan;
@@ -693,7 +692,6 @@ private static Stream build1PktSingleBurstStream(Packet pkt) {
             StreamMode.Type.single_burst),
         -1,
         pkt,
-        new StreamRxStats(true, true, true, streamId),
         new StreamVM("", Collections.<VMInstruction>emptyList()),
         true,
         false,

src/main/java/com/cisco/trex/stateless/model/Stream.java

@@ -17,7 +17,6 @@ public class Stream {
   private StreamMode mode;
   private Integer next_stream_id;
   private StreamPacket packet;
-  private StreamRxStats rx_stats;
   private StreamVM vm;
   private Boolean self_start;
   private Map<String, Object> flow_stats = new HashMap<>();
@@ -30,7 +29,6 @@ public Stream(
       StreamMode mode,
       Integer next_stream_id,
       Packet packet,
-      StreamRxStats rx_stats,
       StreamVM vm,
       Boolean self_start,
       boolean use_flow_stats,
@@ -45,7 +43,6 @@ public Stream(
     this.next_stream_id = next_stream_id;
     String pkt = Base64.getEncoder().encodeToString(packet.getRawData());
     this.packet = new StreamPacket(pkt);
-    this.rx_stats = rx_stats;
     this.vm = vm;
     this.self_start = self_start;
     flow_stats.put("enabled", use_flow_stats);
@@ -63,7 +60,6 @@ public Stream(
       StreamMode mode,
       Integer next_stream_id,
       Packet packet,
-      StreamRxStats rx_stats,
       StreamVM vm,
       Boolean self_start,
       boolean use_flow_stats,
@@ -76,7 +72,6 @@ public Stream(
         mode,
         next_stream_id,
         packet,
-        rx_stats,
         vm,
         self_start,
         use_flow_stats,
@@ -92,7 +87,6 @@ public Stream(
       StreamMode mode,
       Integer next_stream_id,
       Packet packet,
-      StreamRxStats rx_stats,
       StreamVM vm,
       Boolean self_start) {
     this(
@@ -103,7 +97,6 @@ public Stream(
         mode,
         next_stream_id,
         packet,
-        rx_stats,
         vm,
         self_start,
         true,
@@ -139,10 +132,6 @@ public StreamPacket getPacket() {
     return packet;
   }
 
-  public StreamRxStats getRx_stats() {
-    return rx_stats;
-  }
-
   public StreamVM getVm() {
     return vm;
   }
@@ -177,7 +166,6 @@ public boolean equals(Object obj) {
         && Objects.equals(this.mode, s2.mode)
         && Objects.equals(this.next_stream_id, s2.next_stream_id)
         && Objects.equals(this.packet, s2.packet)
-        && Objects.equals(this.rx_stats, s2.rx_stats)
         && Objects.equals(this.vm, s2.vm)
         && Objects.equals(this.self_start, s2.self_start)
         && Objects.equals(this.flow_stats, s2.flow_stats);