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

Emil-Gustafsson · web-flow · commit 8e78b8ec8ea3 · 2019-10-23T13:49:07.000+02:00
add service mode check
diff --git a/src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java b/src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java
@@ -172,8 +172,12 @@ public EthernetPacket sendIcmpV6Echo(
     return icmpUnicastReply;
   }
 
-  public EthernetPacket sendNeighborSolicitation(int portIdx, int timeout, String dstIp) {
+  public EthernetPacket sendNeighborSolicitation(int portIdx, int timeout, String dstIp)
+      throws ServiceModeRequiredException {
     PortStatus portStatus = tRexClient.getPortStatus(portIdx).get();
+    if (!portStatus.getService()) {
+      throw new ServiceModeRequiredException();
+    }
     String srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();
     return sendNeighborSolicitation(portIdx, timeout, srcMac, dstIp);
   }

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,12 @@ public EthernetPacket sendIcmpV6Echo(`
`172`	`172`	`return icmpUnicastReply;`
`173`	`173`	`}`
`174`	`174`
`175`		`- public EthernetPacket sendNeighborSolicitation(int portIdx, int timeout, String dstIp) {`
	`175`	`+ public EthernetPacket sendNeighborSolicitation(int portIdx, int timeout, String dstIp)`
	`176`	`+ throws ServiceModeRequiredException {`
`176`	`177`	`PortStatus portStatus = tRexClient.getPortStatus(portIdx).get();`
	`178`	`+ if (!portStatus.getService()) {`
	`179`	`+ throw new ServiceModeRequiredException();`
	`180`	`+ }`
`177`	`181`	`String srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();`
`178`	`182`	`return sendNeighborSolicitation(portIdx, timeout, srcMac, dstIp);`
`179`	`183`	`}`