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

send more IPv6NS packets

Author: Emil-Gustafsson

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

@@ -53,13 +53,14 @@
 import org.pcap4j.packet.namednumber.IpVersion;
 import org.pcap4j.util.ByteArrays;
 import org.pcap4j.util.MacAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class IPv6NeighborDiscoveryService {
 
   private static final EtherType QInQ =
       new EtherType((short) 0x88a8, "802.1Q Provider Bridge (Q-in-Q)");
-  private static final int L3LENGTH = 40;
-  private static final int L2LENGTH = 14;
+  private static final Logger LOGGER = LoggerFactory.getLogger(IPv6NeighborDiscoveryService.class);
   private TRexClient tRexClient;
 
   public IPv6NeighborDiscoveryService(TRexClient tRexClient) {
@@ -212,11 +213,10 @@ public EthernetPacket sendNeighborSolicitation(
       String dstIp) {
     long endTs = System.currentTimeMillis() + timeout * 1000;
 
-    if (dstMac == null) {
-      dstMac = multicastMacFromIPv6(dstIp).toString();
-    }
+    final String multicastMac = dstMac != null ? dstMac : multicastMacFromIPv6(dstIp).toString();
 
-    Packet icmpv6NSPkt = buildICMPV6NSPkt(vlan, srcMac, dstMac, dstIp, srcIp);
+    Packet icmpv6NSPkt = buildICMPV6NSPkt(vlan, srcMac, multicastMac, dstIp, srcIp);
+    LOGGER.trace("Sending IPv6 Neighbor Solicitation packet:\n{}", icmpv6NSPkt);
     tRexClient.startStreamsIntermediate(portIdx, Arrays.asList(buildStream(icmpv6NSPkt)));
 
     Predicate<EthernetPacket> ipV6NAPktFilter =
@@ -360,8 +360,8 @@ private static com.cisco.trex.stateless.model.Stream buildStream(
         0,
         0.0,
         new StreamMode(
-            2,
-            2,
+            10,
+            10,
             5,
             1.0,
             new StreamModeRate(StreamModeRate.Type.percentage, 100.0),
@@ -375,7 +375,7 @@ private static com.cisco.trex.stateless.model.Stream buildStream(
         null);
   }
 
-  private static Packet buildICMPV6NSPkt(
+  static Packet buildICMPV6NSPkt(
       PortVlan vlan, String srcMac, String dstMac, String dstIp, String srcIp) {
     EthernetPacket.Builder ethBuilder = new EthernetPacket.Builder();
     try {

src/test/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryServiceTest.java

@@ -1,8 +1,13 @@
 package com.cisco.trex.stateless;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+import com.cisco.trex.stateless.model.port.PortVlan;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.Test;
+import org.pcap4j.packet.Packet;
 import org.pcap4j.util.MacAddress;
 
 public class IPv6NeighborDiscoveryServiceTest {
@@ -16,7 +21,25 @@ public void generateIPv6AddrFromMACTest() {
   @Test
   public void generateMulticastMacFromIPv6Test() {
     MacAddress multicastMac =
-        IPv6NeighborDiscoveryService.multicastMacFromIPv6("fe80::4a5d:60ff:fee8:658f");
-    assertEquals("33:33:ff:e8:65:8f", multicastMac.toString());
+        IPv6NeighborDiscoveryService.multicastMacFromIPv6("fe80::4a5d:60ff:fee8:8f");
+    assertEquals("33:33:ff:e8:00:8f", multicastMac.toString());
+    multicastMac =
+        IPv6NeighborDiscoveryService.multicastMacFromIPv6(
+            "2001:FF00:0099:0000:0000:0010:EEEE:0011");
+    assertEquals("33:33:ff:ee:00:11", multicastMac.toString());
+  }
+
+  @Test
+  public void buildICMPV6NSPktTest() {
+    PortVlan vlan = new PortVlan();
+    List<Integer> vlans = new ArrayList<>();
+    vlans.add(10);
+    vlan.setTags(vlans);
+    String srcMac = "00:01:44:ff:01:01";
+    String dstIp = "2001:FF00:0099:0000:0000:0010:EEEE:0011";
+    String srcIp = "2001:FF00:0099:0000:0000:0010:EEEE:0010";
+    final String dstMac = IPv6NeighborDiscoveryService.multicastMacFromIPv6(dstIp).toString();
+    Packet pkt = IPv6NeighborDiscoveryService.buildICMPV6NSPkt(vlan, srcMac, dstMac, dstIp, srcIp);
+    assertTrue(pkt.toString().contains("Checksum: 0x154a"));
   }
 }