Merge pull request #74 from cisco-system-traffic-generator/dummy-interfaces-support

EgorBlagov · web-flow · commit ebaf8409132e · 2018-03-30T16:45:06.000+07:00
Dummy interfaces support
diff --git a/src/main/java/com/cisco/trex/stl/gui/controllers/dashboard/ports/PortsController.java b/src/main/java/com/cisco/trex/stl/gui/controllers/dashboard/ports/PortsController.java
@@ -60,7 +60,7 @@ private void buildPortStatTable() {
         statTableContainer.getChildren().add(
                 statsTableGenerator.getPortStatTable(
                         StatsLoader.getInstance().getShadowStatsList(),
-                        portsManager.getPortList().size(),
+                        portsManager.getPortIndexes(),
                         true,
                         150,
                         portsSelector.getSelectedPortIndexes()
diff --git a/src/main/java/com/exalttech/trex/ui/PortsManager.java b/src/main/java/com/exalttech/trex/ui/PortsManager.java
@@ -81,7 +81,7 @@ public void removePortServiceModeChangedListener(final PortServiceModeChangedLis
     public PortModel getPortModel(int portIndex) {
         PortModel model = portModels.get(portIndex);
         if (model == null) {
-            model = PortModel.createModelFrom(portList.get(portIndex));
+            model = PortModel.createModelFrom(getPortByIndex(portIndex));
             model.serviceModeProperty().addListener((observable, oldVal, newVal) -> {
                 synchronized (portServiceModeChangedListeners) {
                     portServiceModeChangedListeners.forEach(PortServiceModeChangedListener::serviceModeChanged);
@@ -118,6 +118,21 @@ public void setPortList(List<Port> portList) {
         this.portList = portList;
     }
 
+    /**
+     * Get port with specified index
+     * @param portIndex index of needed port
+     * @return if port exists, returns acutal port with index portIndex , otherwise returns new empty port
+     */
+    public Port getPortByIndex(int portIndex) {
+        if (this.portList.stream().noneMatch(p -> p.getIndex() == portIndex)) {
+            logger.error(String.format("Port with index %s was not found. Returning empty port", portIndex));
+        }
+        return this.portList.stream()
+                .filter(p -> p.getIndex() == portIndex)
+                .findFirst()
+                .orElse(new Port());
+    }
+
     /**
      * Set port handler
      *
@@ -220,7 +235,7 @@ public String getActivePort() {
      * @return
      */
     public boolean isCurrentUserOwner(int portIndex) {
-        return portList.get(portIndex).getOwner().equals(ConnectionManager.getInstance().getClientName());
+        return getPortByIndex(portIndex).getOwner().equalsIgnoreCase(ConnectionManager.getInstance().getClientName());
     }
 
     /**
@@ -237,7 +252,7 @@ private boolean hasPorts() {
      * @return
      */
     public boolean isPortFree(int portIndex) {
-        return Util.isNullOrEmpty(portList.get(portIndex).getOwner());
+        return Util.isNullOrEmpty(getPortByIndex(portIndex).getOwner());
     }
 
     /**
diff --git a/src/main/java/com/exalttech/trex/ui/controllers/MainViewController.java b/src/main/java/com/exalttech/trex/ui/controllers/MainViewController.java
@@ -287,17 +287,6 @@ public void initialize(URL url, ResourceBundle rb) {
                             portManager.updatedPorts(Arrays.asList(portModel.getIndex()));
                             onPortListUpdated(true);
                         });
-                        boolean isAllPortsStopped = true;
-                        for (final Port port : portManager.getPortList()) {
-                            if (port.getIndex() == port.getIndex()) {
-                                continue;
-                            }
-                            final String portStatus = port.getStatus();
-                            if (portStatus.equals("TX") || portStatus.equals("PAUSE")) {
-                                isAllPortsStopped = false;
-                                break;
-                            }
-                        }
                     }
                     break;
                 case SERVER_STOPPED:
@@ -559,7 +548,7 @@ private void updateCurrentProfile() { //TODO get rid of this method and implemen
     private void updateContextMenuState() {
         int portId = getSelectedPortIndex();
         if (portId != -1) {
-            Port port = portManager.getPortList().get(portId);
+            Port port = portManager.getPortByIndex(portId);
 
             boolean isOwned = port.getOwner().equals(ConnectionManager.getInstance().getClientName());
 
@@ -954,7 +943,7 @@ public void handleDuplicateProfile(ActionEvent ev) {
             int portID = getSelectedPortIndex();
 
             if (portID > -1) {
-                if (PortState.getPortStatus(portManager.getPortList().get(portID).getStatus()) == PortState.PAUSE
+                if (PortState.getPortStatus(portManager.getPortByIndex(portID).getStatus()) == PortState.PAUSE
                     && !Util.isNullOrEmpty(duplicatedProfileName)) {
                     profileListBox.getSelectionModel().select(duplicatedProfileName);
                 }
@@ -1125,7 +1114,7 @@ public void startTransitBtnCLicked(MouseEvent event) {
     private void doStartResume(int portID) {
         // disable start button to avoid another quick click
         startStream.setDisable(true);
-        if (PortState.getPortStatus(portManager.getPortList().get(portID).getStatus()) == PortState.PAUSE) {
+        if (PortState.getPortStatus(portManager.getPortByIndex(portID).getStatus()) == PortState.PAUSE) {
             serverRPCMethods.resumeTraffic(portID);
         } else {
             startTraffic(portID);
@@ -1226,7 +1215,7 @@ public void pauseTransitBtnCLicked(MouseEvent event) {
         int portID = getSelectedPortIndex();
         LOG.trace("Clicked on the Pause Transit Button with selectedPort [" + portID + "]");
         if (portID > -1) {
-            if (PortState.getPortStatus(portManager.getPortList().get(portID).getStatus()) == PortState.PAUSE) {
+            if (PortState.getPortStatus(portManager.getPortByIndex(portID).getStatus()) == PortState.PAUSE) {
                 serverRPCMethods.resumeTraffic(portID);
             } else {
                 enableUpdateBtn(false, false);
@@ -1460,7 +1449,7 @@ private void updateHeaderBtnStat() {
         int portIndex = getSelectedPortIndex();
         resetBtnState();
         if (portIndex != -1) {
-            Port port = portManager.getPortList().get(portIndex);
+            Port port = portManager.getPortByIndex(portIndex);
             PortState state = PortState.getPortStatus(port.getStatus());
 
             // enable state btn btn according to owner 
diff --git a/src/main/java/com/exalttech/trex/ui/controllers/ports/tabs/PortHardwareCounters.java b/src/main/java/com/exalttech/trex/ui/controllers/ports/tabs/PortHardwareCounters.java
@@ -60,7 +60,7 @@ public void bindModel(PortModel model, boolean runPolling) {
         if (refreshingService.isRunning()) {
             refreshingService.cancel();
         }
-        port = portManager.getPortList().get(model.getIndex());
+        port = portManager.getPortByIndex(model.getIndex());
 
         if (runPolling) {
             startPolling();
diff --git a/src/main/java/com/exalttech/trex/ui/views/statistics/StatsTableGenerator.java b/src/main/java/com/exalttech/trex/ui/views/statistics/StatsTableGenerator.java
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -89,7 +90,7 @@ public StatsTableGenerator() {
      */
     public GridPane getPortStatTable(
             Map<String, String> cached,
-            int portIndex,
+            List<Integer> portIndices,
             boolean isMultiPort,
             double columnWidth,
             Set<Integer> visiblePorts
@@ -99,12 +100,6 @@ public GridPane getPortStatTable(
         this.prevTotalValues = totalValues;
         this.cachedStatsList = cached;
 
-        int startPortIndex = portIndex;
-        int endPortIndex = portIndex + 1;
-        if (isMultiPort) {
-            startPortIndex = 0;
-            endPortIndex = portIndex;
-        }
         rowIndex = 0;
         totalValues = new HashMap<>();
         statTable.getChildren().clear();
@@ -116,10 +111,10 @@ public GridPane getPortStatTable(
         double tx_bps_l1_total = 0;
         double rx_bps_l1_total = 0;
         int columnIndex = 1;
-        for (int i = startPortIndex; i < endPortIndex; i++) {
+        for (int i : portIndices) {
             rowIndex = 0;
             odd = true;
-            Port port = PortsManager.getInstance().getPortList().get(i);
+            Port port = PortsManager.getInstance().getPortByIndex(i);
             if (visiblePorts == null || visiblePorts.contains(port.getIndex())) {
                 // add owner and port status
                 addPortInfoCells(port, columnWidth, columnIndex);

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public void bindModel(PortModel model, boolean runPolling) {`
`60`	`60`	`if (refreshingService.isRunning()) {`
`61`	`61`	`refreshingService.cancel();`
`62`	`62`	`}`
`63`		`- port = portManager.getPortList().get(model.getIndex());`
	`63`	`+ port = portManager.getPortByIndex(model.getIndex());`
`64`	`64`
`65`	`65`	`if (runPolling) {`
`66`	`66`	`startPolling();`