Merge pull request #84 from cisco-system-traffic-generator/capture-on-disconnect-fixes

Capture on disconnect fixes

Author: EgorBlagov

src/main/java/com/cisco/trex/stl/gui/services/capture/PktCaptureService.java

@@ -20,8 +20,6 @@ public class PktCaptureService extends ScheduledService<CapturedPackets> {
 
     private int currentActiveMonitorId = 0;
 
-    private TRexClient tRexClient = ConnectionManager.getInstance().getTrexClient();
-    
     @Override
     protected Task<CapturedPackets> createTask() {
         return new Task<CapturedPackets>() {
@@ -49,7 +47,7 @@ public int startMonitor(
             List<Integer> tx,
             String filter,
             boolean serviceEnable) throws PktCaptureServiceException {
-        TRexClientResult<CaptureMonitor> result = tRexClient.captureMonitorStart(rx, tx, filter);
+        TRexClientResult<CaptureMonitor> result = getTrexClient().captureMonitorStart(rx, tx, filter);
         guardNotFailed(result);
         int captureId = result.get().getCaptureId();
         if (serviceEnable) {
@@ -59,13 +57,17 @@ public int startMonitor(
         return captureId;
     }
 
+    private TRexClient getTrexClient() {
+        return ConnectionManager.getInstance().getTrexClient();
+    }
+
     public int updateMonitor(
             List<Integer> rx,
             List<Integer> tx,
             String filter) throws PktCaptureServiceException {
-        tRexClient.captureMonitorStop(currentActiveMonitorId);
-        tRexClient.captureMonitorRemove(currentActiveMonitorId);
-        TRexClientResult<CaptureMonitor> result = tRexClient.captureMonitorStart(rx, tx, filter);
+        getTrexClient().captureMonitorStop(currentActiveMonitorId);
+        getTrexClient().captureMonitorRemove(currentActiveMonitorId);
+        TRexClientResult<CaptureMonitor> result = getTrexClient().captureMonitorStart(rx, tx, filter);
         guardNotFailed(result);
         int captureId = result.get().getCaptureId();
         currentActiveMonitorId = captureId;
@@ -76,12 +78,12 @@ synchronized public void stopMonitor(int captureId) {
         if (currentActiveMonitorId == captureId) {
             currentActiveMonitorId = 0;
         }
-        tRexClient.captureMonitorStop(captureId);
-        tRexClient.captureMonitorRemove(captureId);
+        getTrexClient().captureMonitorStop(captureId);
+        getTrexClient().captureMonitorRemove(captureId);
     }
 
     public CaptureMonitorStop stopRecorder(int caputureId) throws PktCaptureServiceException {
-        TRexClientResult<CaptureMonitorStop> result = tRexClient.captureMonitorStop(caputureId);
+        TRexClientResult<CaptureMonitorStop> result = getTrexClient().captureMonitorStop(caputureId);
         if (result.isFailed()) {
             LOG.error("Unable to stop monitor. "+result.getError());
             throw new PktCaptureServiceException(result.getError());
@@ -90,23 +92,23 @@ public CaptureMonitorStop stopRecorder(int caputureId) throws PktCaptureServiceE
     }
 
     synchronized public CapturedPackets fetchCapturedPkts(int captureId, int chunkSize) throws PktCaptureServiceException {
-        TRexClientResult<CapturedPackets> result = tRexClient.captureFetchPkts(captureId, chunkSize);
+        TRexClientResult<CapturedPackets> result = getTrexClient().captureFetchPkts(captureId, chunkSize);
         guardNotFailed(result);
         return result.get();
     }
 
     public CaptureMonitor addRecorder(List<Integer> rx, List<Integer> tx, String filter, int bufferSize) throws PktCaptureServiceException {
-        TRexClientResult<CaptureMonitor> result = tRexClient.captureRecorderStart(rx, tx, filter, bufferSize);
+        TRexClientResult<CaptureMonitor> result = getTrexClient().captureRecorderStart(rx, tx, filter, bufferSize);
         guardNotFailed(result);
         return result.get();
     }
 
     public boolean removeRecorder(int recorderId) {
-        return tRexClient.captureMonitorRemove(recorderId);
+        return getTrexClient().captureMonitorRemove(recorderId);
     }
 
     public List<CaptureInfo> getActiveCaptures() throws PktCaptureServiceException {
-        TRexClientResult<CaptureInfo[]> result = tRexClient.getActiveCaptures();
+        TRexClientResult<CaptureInfo[]> result = getTrexClient().getActiveCaptures();
         guardNotFailed(result);
         return Arrays.stream(result.get()).collect(Collectors.toList());
     }

src/main/java/com/exalttech/trex/ui/controllers/ports/tabs/PortLayerConfiguration.java

@@ -344,6 +344,7 @@ public Optional<String> call() {
                 }
 
                 AsyncResponseManager.getInstance().suppressIncomingEvents(true);
+                boolean serviceModeBeforeResolve = model.getServiceMode();
                 trexClient.serviceMode(model.getIndex(), true);
 
                 TRexClientResult<StubResult> vlanConfigResult = trexClient.setVlan(model.getIndex(), vlanIds);
@@ -432,7 +433,7 @@ public Optional<String> call() {
                         logger.error("Failed to set L3 mode: " + e.getMessage());
                         guiLogger.appendText(LogType.ERROR, "Failed to set L3 mode: " + e.getMessage());
                     } finally {
-                        trexClient.serviceMode(model.getIndex(), false);
+                        trexClient.serviceMode(model.getIndex(), serviceModeBeforeResolve);
                         AsyncResponseManager.getInstance().suppressIncomingEvents(false);
                         AsyncResponseManager.getInstance().unmuteLogger();
                     }

src/main/java/com/exalttech/trex/ui/models/PortModel.java

@@ -57,15 +57,13 @@ public class PortModel {
 
     private BooleanProperty isOwnedProperty = new SimpleBooleanProperty(false);
     private RPCMethods serverRPCMethods;
-    private TRexClient trexClient;
     private LogsController guiLogger;
     private boolean streamLoaded;
     private BooleanProperty isTransmitProperty = new SimpleBooleanProperty(false);
 
     private PortModel() {
         guiLogger = LogsController.getInstance();
         serverRPCMethods = TrexApp.injector.getInstance(RPCMethods.class);
-        trexClient = ConnectionManager.getInstance().getTrexClient();
         supportCapabilities.put("link", linkControlSupport);
         supportCapabilities.put("led", ledControlSupport);
         supportCapabilities.put("flowControl", flowControlSupport);
@@ -190,7 +188,7 @@ private void initHandlers(Port port) {
             if (!isOwnedProperty.get()) {
                 return;
             }
-            com.cisco.trex.stateless.model.PortStatus status = trexClient.serviceMode(portIndex, newValue);
+            com.cisco.trex.stateless.model.PortStatus status = ConnectionManager.getInstance().getTrexClient().serviceMode(portIndex, newValue);
             if (!newValue.equals(status.service)) {
                 guiLogger.appendText(LogType.ERROR, "Filed to change service mode for port " + portIndex+". Check active capturing mode or enabled rx queues.");
                 Platform.runLater(() -> serviceModeProperty.set(oldValue));