Merge pull request #91 from cisco-system-traffic-generator/ipv6ns-option

add src mac option to ipv6 ns

Author: Emil-Gustafsson

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

@@ -49,7 +49,6 @@
 public class IPv6NeighborDiscoveryService {
 
   private TRexClient tRexClient;
-  private String srcMac;
 
   public IPv6NeighborDiscoveryService(TRexClient tRexClient) {
     this.tRexClient = tRexClient;
@@ -67,7 +66,7 @@ public Map<String, Ipv6Node> scan(int portIdx, int timeDuration, String dstIP, S
       throw new ServiceModeRequiredException();
     }
 
-    srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();
+    String srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();
 
     Packet pingPkt =
         buildICMPV6EchoReq(
@@ -92,8 +91,8 @@ public Map<String, Ipv6Node> scan(int portIdx, int timeDuration, String dstIP, S
                 String nodeIp = ipV6Packet.getHeader().getSrcAddr().toString().substring(1);
                 String nodeMac = getLinkLayerAddress(ipV6Packet);
 
-                nsNaStreams.add(buildStream(buildICMPV6NSPkt(nodeMac, nodeIp, srcIP)));
-                nsNaStreams.add(buildStream(buildICMPV6NAPkt(nodeMac, nodeIp, srcIP)));
+                nsNaStreams.add(buildStream(buildICMPV6NSPkt(srcMac, nodeMac, nodeIp, srcIP)));
+                nsNaStreams.add(buildStream(buildICMPV6NAPkt(srcMac, nodeMac, nodeIp, srcIP)));
               });
     }
 
@@ -134,8 +133,15 @@ private Ipv6Node toIpv6Node(EthernetPacket ethernetPacket) {
 
   public EthernetPacket sendIcmpV6Echo(
       int portIdx, String dstIp, int icmpId, int icmpSeq, int timeOut) {
+    PortStatus portStatus = tRexClient.getPortStatus(portIdx).get();
+    String srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();
+    return sendIcmpV6Echo(portIdx, srcMac, dstIp, icmpId, icmpSeq, timeOut);
+  }
+
+  public EthernetPacket sendIcmpV6Echo(
+      int portIdx, String srcMac, String dstIp, int icmpId, int icmpSeq, int timeOut) {
     Map<String, EthernetPacket> stringEthernetPacketMap =
-        sendNSandIcmpV6Req(portIdx, timeOut, dstIp);
+        sendNSandIcmpV6Req(portIdx, timeOut, srcMac, dstIp);
 
     Optional<Map.Entry<String, EthernetPacket>> icmpMulticastResponse =
         stringEthernetPacketMap.entrySet().stream().findFirst();
@@ -167,12 +173,17 @@ public EthernetPacket sendIcmpV6Echo(
   }
 
   public EthernetPacket sendNeighborSolicitation(int portIdx, int timeout, String dstIp) {
-    long endTs = System.currentTimeMillis() + timeout * 1000;
     PortStatus portStatus = tRexClient.getPortStatus(portIdx).get();
+    String srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();
+    return sendNeighborSolicitation(portIdx, timeout, srcMac, dstIp);
+  }
 
-    srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();
+  public EthernetPacket sendNeighborSolicitation(
+      int portIdx, int timeout, String srcMac, String dstIp) {
+    long endTs = System.currentTimeMillis() + timeout * 1000;
 
-    Packet icmpv6NSPkt = buildICMPV6NSPkt(multicastMacFromIPv6(dstIp).toString(), dstIp, null);
+    Packet icmpv6NSPkt =
+        buildICMPV6NSPkt(srcMac, multicastMacFromIPv6(dstIp).toString(), dstIp, null);
 
     tRexClient.startStreamsIntermediate(portIdx, Arrays.asList(buildStream(icmpv6NSPkt)));
 
@@ -221,15 +232,13 @@ public EthernetPacket sendNeighborSolicitation(int portIdx, int timeout, String
   }
 
   private Map<String, EthernetPacket> sendNSandIcmpV6Req(
-      int portIdx, int timeDuration, String dstIp) {
+      int portIdx, int timeDuration, String srcMac, String dstIp) {
     long endTs = System.currentTimeMillis() + timeDuration * 1000;
     TRexClientResult<PortStatus> portStatusResult = tRexClient.getPortStatus(portIdx);
-    PortStatus portStatus = portStatusResult.get();
-
-    srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();
 
     Packet pingPkt = buildICMPV6EchoReq(null, srcMac, null, dstIp);
-    Packet icmpv6NSPkt = buildICMPV6NSPkt(multicastMacFromIPv6(dstIp).toString(), dstIp, null);
+    Packet icmpv6NSPkt =
+        buildICMPV6NSPkt(srcMac, multicastMacFromIPv6(dstIp).toString(), dstIp, null);
 
     List<com.cisco.trex.stateless.model.Stream> stlStreams =
         Stream.of(buildStream(pingPkt), buildStream(icmpv6NSPkt)).collect(Collectors.toList());
@@ -300,7 +309,7 @@ private com.cisco.trex.stateless.model.Stream buildStream(Packet pkt) {
         null);
   }
 
-  private Packet buildICMPV6NSPkt(String dstMac, String dstIp, String srcIp) {
+  private Packet buildICMPV6NSPkt(String srcMac, String dstMac, String dstIp, String srcIp) {
     EthernetPacket.Builder ethBuilder = new EthernetPacket.Builder();
     try {
 
@@ -379,7 +388,7 @@ private static String getLinkLayerAddress(IpV6Packet pkt) {
     return ByteArrays.toHexString(linkLayerAddress, ":");
   }
 
-  private Packet buildICMPV6NAPkt(String dstMac, String dstIp, String srcIP) {
+  private Packet buildICMPV6NAPkt(String srcMac, String dstMac, String dstIp, String srcIP) {
     final String specifiedSrcIP = srcIP != null ? srcIP : generateIPv6AddrFromMAC(srcMac);
 
     EthernetPacket.Builder ethBuilder = new EthernetPacket.Builder();

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

@@ -599,7 +599,7 @@ private static Stream build1PktSingleBurstStream(Packet pkt) {
         -1);
   }
 
-  public String resolveIpv6(int portIndex, String dstIp) throws ServiceModeRequiredException {
+  public String resolveIpv6(int portIndex, String dstIp) {
     removeRxQueue(portIndex);
     setRxQueue(portIndex, 1000);
 
@@ -612,6 +612,20 @@ public String resolveIpv6(int portIndex, String dstIp) throws ServiceModeRequire
     return null;
   }
 
+  public String resolveIpv6(int portIndex, String srcMac, String dstIp) {
+    removeRxQueue(portIndex);
+    setRxQueue(portIndex, 1000);
+
+    EthernetPacket naPacket =
+        new IPv6NeighborDiscoveryService(this)
+            .sendNeighborSolicitation(portIndex, 5, srcMac, dstIp);
+    if (naPacket != null) {
+      return naPacket.getHeader().getSrcAddr().toString();
+    }
+
+    return null;
+  }
+
   public List<EthernetPacket> getRxQueue(int portIndex, Predicate<EthernetPacket> filter) {
     Map<String, Object> payload = createPayload(portIndex);
     String json = callMethod("get_rx_queue_pkts", payload);
@@ -687,7 +701,7 @@ public EthernetPacket sendIcmpEcho(
   }
 
   // TODO: move to upper layer
-  private EthernetPacket buildIcmpV4Request(
+  private static EthernetPacket buildIcmpV4Request(
       String srcMac, String dstMac, String srcIp, String dstIp, int reqId, int seqNumber)
       throws UnknownHostException {
 
@@ -745,8 +759,7 @@ public Map<String, Ipv6Node> scanIPv6(int portIndex) throws ServiceModeRequiredE
   }
 
   public EthernetPacket sendIcmpV6Echo(
-      int portIndex, String dstIp, int icmpId, int icmpSeq, int timeOut)
-      throws ServiceModeRequiredException {
+      int portIndex, String dstIp, int icmpId, int icmpSeq, int timeOut) {
     return new IPv6NeighborDiscoveryService(this)
         .sendIcmpV6Echo(portIndex, dstIp, icmpId, icmpSeq, timeOut);
   }