Merge pull request #85 from cisco-system-traffic-generator/astf-cleanup

Emil-Gustafsson · web-flow · commit 2a625103d7d5 · 2020-02-28T07:08:15.000+01:00
Astf cleanup
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ build/
 .settings/
 /bin/
 target/
+pom.xml
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFAssociation.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFAssociation.java
@@ -24,7 +24,7 @@ public ASTFAssociation(List<ASTFAssociationRule> astfAssociationRuleList) {
    * @param astfAssociationRule
    */
   public ASTFAssociation(ASTFAssociationRule astfAssociationRule) {
-    astfAssociationRuleList = new ArrayList();
+    astfAssociationRuleList = new ArrayList<>();
     astfAssociationRuleList.add(astfAssociationRule);
   }
 
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCapInfo.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCapInfo.java
@@ -15,7 +15,7 @@ public class ASTFCapInfo {
   private ASTFGlobalInfoPerTemplate clientGlobInfo; // client global param
   private int limit; // Limit the number of flows
 
-  private ASTFCapInfo(AstfCapInfoBuilder builder) {
+  ASTFCapInfo(AstfCapInfoBuilder builder) {
     filePath = builder.filePath;
     cps = builder.cps;
     assoc = builder.assoc;
@@ -43,12 +43,9 @@ private void paramCheck() {
         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 {
+      if (cps <= 0) {
         cps = 1;
       }
     }
@@ -145,15 +142,15 @@ public int getLimit() {
   /** 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;
+    String filePath;
+    float cps;
+    ASTFAssociation assoc;
+    ASTFIpGen astfIpGen;
+    int port;
+    float l7Percent;
+    ASTFGlobalInfoPerTemplate serverGlobInfo;
+    ASTFGlobalInfoPerTemplate clientGlobInfo;
+    int limit;
 
     public AstfCapInfoBuilder filePath(String val) {
       filePath = val;
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFClientTemplate.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFClientTemplate.java
@@ -9,7 +9,6 @@
 abstract class ASTFClientTemplate extends ASTFTemplateBase {
   private ASTFCluster astfCluster;
   private ASTFIpGen iPGen;
-  private ASTFProgram astfProgram;
 
   /**
    * construct
@@ -22,7 +21,6 @@ public ASTFClientTemplate(ASTFIpGen iPGen, ASTFCluster astfCluster, ASTFProgram
     super(astfProgram);
     this.iPGen = iPGen;
     this.astfCluster = astfCluster == null ? new ASTFCluster() : astfCluster;
-    this.astfProgram = astfProgram;
   }
 
   /**
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdSend.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdSend.java
@@ -60,7 +60,7 @@ public String buf() {
     return base64Buf;
   }
 
-  private String encodeBase64(byte[] bytes) {
+  private static String encodeBase64(byte[] bytes) {
     Base64.Encoder encoder = Base64.getEncoder();
     return encoder.encodeToString(bytes);
   }
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdTxPkt.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdTxPkt.java
@@ -65,7 +65,7 @@ public int bufLen() {
     return bufLen;
   }
 
-  private String encodeBase64(byte[] bytes) {
+  private static String encodeBase64(byte[] bytes) {
     Base64.Encoder encoder = Base64.getEncoder();
     return encoder.encodeToString(bytes);
   }
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFGlobalInfoPerTemplate.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFGlobalInfoPerTemplate.java
@@ -10,7 +10,7 @@ public class ASTFGlobalInfoPerTemplate implements ASTFGlobalInfoBase {
   private JsonObject tcp = new JsonObject();
   private JsonObject ip = new JsonObject();
   private static final Set<String> tcpParamSet =
-      new HashSet(Arrays.asList("initwnd", "mss", "no_delay", "rxbufsize", "txbufsize"));
+      new HashSet<>(Arrays.asList("initwnd", "mss", "no_delay", "rxbufsize", "txbufsize"));
 
   @Override
   public ASTFGlobalInfoBase scheduler(SchedulerParam schedulerParam, int value) {
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFIpGen.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFIpGen.java
@@ -4,10 +4,6 @@
 
 /** Java implementation for TRex python sdk ASTFIpGen class */
 public class ASTFIpGen {
-  private ASTFIpGenDist distClient;
-  private ASTFIpGenDist distServer;
-  private ASTFIpGenGlobal ipGenGlobal;
-
   private JsonObject fields = new JsonObject();
 
   /**
@@ -19,9 +15,6 @@ public class ASTFIpGen {
    */
   public ASTFIpGen(
       ASTFIpGenDist distClient, ASTFIpGenDist distServer, ASTFIpGenGlobal ipGenGlobal) {
-    this.distClient = distClient;
-    this.distServer = distServer;
-    this.ipGenGlobal = ipGenGlobal;
 
     this.fields.add("dist_client", distClient.toJson());
     distClient.setDirection("c");
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFProfile.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFProfile.java
@@ -17,15 +17,11 @@ public class ASTFProfile {
 
   private static final String L7_PRECENT = "l7_percent";
   private static final String CPS = "cps";
-
-  private ASTFIpGen astfIpGen;
   private ASTFGlobalInfo astfClientGlobalInfo;
   private ASTFGlobalInfo astfServerGlobalInfo;
   private List<ASTFTemplate> astfTemplateList;
-  private List<ASTFCapInfo> astfCapInfoList;
-
-  private Map<String, Integer> tgName2TgId =
-      new LinkedHashMap<>(); // template group name -> template group id
+  private Map<String, Integer> tgName2TgId = new LinkedHashMap<>(); // template group name ->
+  // template group id
 
   /**
    * construct
@@ -57,11 +53,9 @@ public ASTFProfile(
 
     if (astfTemplateList == null && astfCapInfoList == null) {
       throw new IllegalStateException(
-          String.format(
-              "bad param combination,AstfTemplate and AstfCapInfo should not be null at the same time "));
+          "bad param combination,AstfTemplate and AstfCapInfo should not be null at the same time ");
     }
     this.astfTemplateList = astfTemplateList;
-    this.astfCapInfoList = astfCapInfoList;
 
     for (ASTFTemplate template : astfTemplateList) {
       if (template.getTgName() == null) {
@@ -77,10 +71,10 @@ public ASTFProfile(
     }
 
     /** for pcap file parse scenario */
-    if (astfCapInfoList != null && astfCapInfoList.size() != 0) {
+    if (astfCapInfoList != null && !astfCapInfoList.isEmpty()) {
       String mode = null;
-      List<Map<String, Object>> allCapInfo = new ArrayList();
-      List<Integer> dPorts = new ArrayList();
+      List<Map<String, Object>> allCapInfo = new ArrayList<>();
+      List<Integer> dPorts = new ArrayList<>();
       int totalPayload = 0;
       for (ASTFCapInfo capInfo : astfCapInfoList) {
         String capFile = capInfo.getFilePath();
@@ -128,7 +122,7 @@ public ASTFProfile(
         dPorts.add(dPort);
 
         /** add param to cap info map */
-        HashMap<String, Object> map = new HashMap();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("ip_gen", ipGen);
         map.put("prog_c", progC);
         map.put("prog_s", progS);
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFProgram.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFProgram.java
@@ -113,7 +113,7 @@ private void createCmdFromCap(
         newCmds.add(new ASTFCmdConnect());
       }
 
-      ASTFCmd newCmd = null;
+      ASTFCmd newCmd;
       for (int i = 0; i < cmds.size(); i++) {
         SideType dir = dirs.get(i);
         CPacketData cmd = cmds.get(i);
@@ -625,7 +625,7 @@ private static boolean isNumber(String str) {
 
   /** cached Buffer class for inner use */
   static class BufferList {
-    List<String> bufList = new ArrayList<>();
+    List<String> list = new ArrayList<>();
     Map<String, Integer> bufHash = new HashMap<>();
 
     /**
@@ -634,7 +634,7 @@ static class BufferList {
      * @return buf list length
      */
     public int getLen() {
-      return bufList.size();
+      return list.size();
     }
 
     /**
@@ -648,8 +648,8 @@ public int add(String base64Buf) {
       if (bufHash.containsKey(sha256Buf)) {
         return bufHash.get(sha256Buf);
       }
-      bufList.add(base64Buf);
-      int newIndex = bufList.size() - 1;
+      list.add(base64Buf);
+      int newIndex = list.size() - 1;
       bufHash.put(sha256Buf, newIndex);
       return newIndex;
     }
@@ -661,7 +661,7 @@ public int add(String base64Buf) {
      */
     public JsonArray toJson() {
       JsonArray jsonArray = new JsonArray();
-      for (String buf : bufList) {
+      for (String buf : list) {
         jsonArray.add(buf);
       }
       return jsonArray;
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFTCPServerTemplate.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFTCPServerTemplate.java
@@ -39,6 +39,7 @@ public ASTFTCPServerTemplate(
    *
    * @return JsonObject
    */
+  @Override
   public JsonObject toJson() {
     JsonObject json = super.toJson();
     json.add("assoc", assoc.toJson());
diff --git a/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFTemplateBase.java b/src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFTemplateBase.java
@@ -13,11 +13,10 @@
  * <p>abstract AstfTemplateBase class
  */
 abstract class ASTFTemplateBase {
-  private static List<ASTFProgram> programList = new ArrayList();
-  private static Map<ASTFProgram, Integer> programHash = new HashMap();
+  private static List<ASTFProgram> programList = new ArrayList<>();
+  private static Map<ASTFProgram, Integer> programHash = new HashMap<>();
 
   private JsonObject fields = new JsonObject();
-  private int programIndex;
   private boolean isStream;
 
   /**
diff --git a/src/main/java/com/cisco/trex/stateful/model/stats/AstfStatistics.java b/src/main/java/com/cisco/trex/stateful/model/stats/AstfStatistics.java
@@ -82,7 +82,7 @@ public AstfStatistics setCounterNames(MetaData metaData) {
     return this;
   }
 
-  private String getCounterName(int id, MetaData metaData) {
+  private static String getCounterName(int id, MetaData metaData) {
     for (CounterMeta meta : metaData.getData()) {
       if (meta.getId() == id) {
         return meta.getName();
diff --git a/src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java b/src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java
@@ -13,7 +13,6 @@
 import com.cisco.trex.stateless.model.port.PortVlan;
 import com.cisco.trex.stateless.model.vm.VMInstruction;
 import com.google.common.collect.Lists;
-import com.google.common.net.InetAddresses;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -129,8 +128,12 @@ public Map<String, Ipv6Node> scan(int portIdx, int timeDuration, String dstIP, S
         .filter(
             ipv6Node -> {
               if (dstIP != null) {
-                return InetAddresses.forString(dstIP)
-                    .equals(InetAddresses.forString(ipv6Node.getIp()));
+                try {
+                  return InetAddress.getAllByName(dstIP)
+                      .equals(InetAddress.getAllByName(ipv6Node.getIp()));
+                } catch (UnknownHostException e) {
+                  return false;
+                }
               }
               return true;
             })
diff --git a/src/main/java/com/cisco/trex/stateless/TRexClient.java b/src/main/java/com/cisco/trex/stateless/TRexClient.java
@@ -19,7 +19,6 @@
 import com.cisco.trex.stateless.model.stats.PGIdStatsRPCResult;
 import com.cisco.trex.stateless.model.vm.VMInstruction;
 import com.cisco.trex.util.Constants;
-import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -580,7 +579,9 @@ private static EthernetPacket buildArpPkt(
 
   private static AbstractMap.SimpleEntry<EtherType, Packet.Builder> buildVlan(
       ArpPacket.Builder arpBuilder, PortVlan vlan) {
-    Queue<Integer> vlanTags = new LinkedList<>(Lists.reverse(vlan.getTags()));
+    List<Integer> tags = vlan.getTags();
+    Collections.reverse(tags);
+    Queue<Integer> vlanTags = new LinkedList<>(tags);
     Packet.Builder resultPayloadBuilder = arpBuilder;
     EtherType resultEtherType = EtherType.ARP;
 
@@ -756,8 +757,8 @@ private static EthernetPacket buildIcmpV4Request(
         .tos(IpV4Rfc791Tos.newInstance((byte) 0))
         .ttl((byte) 64)
         .protocol(IpNumber.ICMPV4)
-        .srcAddr((Inet4Address) Inet4Address.getByName(srcIp))
-        .dstAddr((Inet4Address) Inet4Address.getByName(dstIp))
+        .srcAddr((Inet4Address) InetAddress.getByName(srcIp))
+        .dstAddr((Inet4Address) InetAddress.getByName(dstIp))
         .correctChecksumAtBuild(true)
         .correctLengthAtBuild(true)
         .payloadBuilder(icmpv4CommonPacketBuilder);
diff --git a/src/main/java/com/cisco/trex/stateless/model/Request.java b/src/main/java/com/cisco/trex/stateless/model/Request.java
diff --git a/src/main/java/com/cisco/trex/stateless/util/DoubleAsIntDeserializer.java b/src/main/java/com/cisco/trex/stateless/util/DoubleAsIntDeserializer.java
@@ -1,6 +1,11 @@
 package com.cisco.trex.stateless.util;
 
-import com.google.gson.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 import com.google.gson.internal.LinkedTreeMap;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -13,22 +18,21 @@ public class DoubleAsIntDeserializer implements JsonDeserializer<Map<String, Obj
   @Override
   @SuppressWarnings("unchecked")
   public Map<String, Object> deserialize(
-      JsonElement json, Type typeOfT, JsonDeserializationContext context)
-      throws JsonParseException {
+      JsonElement json, Type typeOfT, JsonDeserializationContext context) {
     return (Map<String, Object>) read(json);
   }
 
   public Object read(JsonElement in) {
 
     if (in.isJsonArray()) {
-      List<Object> list = new ArrayList<Object>();
+      List<Object> list = new ArrayList<>();
       JsonArray arr = in.getAsJsonArray();
       for (JsonElement anArr : arr) {
         list.add(read(anArr));
       }
       return list;
     } else if (in.isJsonObject()) {
-      Map<String, Object> map = new LinkedTreeMap<String, Object>();
+      Map<String, Object> map = new LinkedTreeMap<>();
       JsonObject obj = in.getAsJsonObject();
       Set<Map.Entry<String, JsonElement>> entitySet = obj.entrySet();
       for (Map.Entry<String, JsonElement> entry : entitySet) {
diff --git a/src/main/java/com/cisco/trex/util/Constants.java b/src/main/java/com/cisco/trex/util/Constants.java
@@ -3,8 +3,8 @@
 /** Class for constants */
 public final class Constants {
   public static final String JSON_RPC_VERSION = "2.0";
-  public static Integer ASTF_API_VERSION_MAJOR = 1;
-  public static Integer ASTF_API_VERSION_MINOR = 7;
-  public static Integer STL_API_VERSION_MAJOR = 4;
-  public static Integer STL_API_VERSION_MINOR = 6;
+  public static final int ASTF_API_VERSION_MAJOR = 1;
+  public static final int ASTF_API_VERSION_MINOR = 7;
+  public static final int STL_API_VERSION_MAJOR = 4;
+  public static final int STL_API_VERSION_MINOR = 6;
 }
diff --git a/src/main/java/com/cisco/trex/util/TRexClientUtil.java b/src/main/java/com/cisco/trex/util/TRexClientUtil.java

-Original file line number
+Diff line change
 .settings/
 /bin/
 target/
 +pom.xml
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public ASTFAssociation(List<ASTFAssociationRule> astfAssociationRuleList) {`
`24`	`24`	`* @param astfAssociationRule`
`25`	`25`	`*/`
`26`	`26`	`public ASTFAssociation(ASTFAssociationRule astfAssociationRule) {`
`27`		`- astfAssociationRuleList = new ArrayList();`
	`27`	`+ astfAssociationRuleList = new ArrayList<>();`
`28`	`28`	`astfAssociationRuleList.add(astfAssociationRule);`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public String buf() {`
`60`	`60`	`return base64Buf;`
`61`	`61`	`}`
`62`	`62`
`63`		`- private String encodeBase64(byte[] bytes) {`
	`63`	`+ private static String encodeBase64(byte[] bytes) {`
`64`	`64`	`Base64.Encoder encoder = Base64.getEncoder();`
`65`	`65`	`return encoder.encodeToString(bytes);`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public int bufLen() {`
`65`	`65`	`return bufLen;`
`66`	`66`	`}`
`67`	`67`
`68`		`- private String encodeBase64(byte[] bytes) {`
	`68`	`+ private static String encodeBase64(byte[] bytes) {`
`69`	`69`	`Base64.Encoder encoder = Base64.getEncoder();`
`70`	`70`	`return encoder.encodeToString(bytes);`
`71`	`71`	`}`