Merge remote-tracking branch 'origin/release-1.138.0'

telstra · Jul 10, 2023 · 183aca7 · 183aca7
2 parents d0bf1af + 49aaa77
commit 183aca7
Show file tree

Hide file tree

Showing 24 changed files with 765 additions and 351 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## v1.138.0 (06/07/2023)
+
+### Bug Fixes:
+-  [#5245](https://github.com/telstra/open-kilda/pull/5245) [Kilda GUI] wrong port information on switch port page (Issue: [#4922](https://github.com/telstra/open-kilda/issues/4922))
+
+### Improvements:
+
+-  [#5253](https://github.com/telstra/open-kilda/pull/5253) [Kilda GUI] GUI Switch details page sends one API request per each switch port (Issue: [#5153](https://github.com/telstra/open-kilda/issues/5248))
+-  [#5246](https://github.com/telstra/open-kilda/pull/5246) [Kilda GUI] Adding ticket reference field in isl detail (Issue: [#5072](https://github.com/telstra/open-kilda/issues/5072))
+
+For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.137.0...v1.138.0).
+
+### Affected Components:
+Kilda GUI
+
+---
+
 ## v1.137.0 (29/06/2023)
 
 ### Features:

diff --git a/src-gui/src/main/java/org/openkilda/constants/IConstants.java b/src-gui/src/main/java/org/openkilda/constants/IConstants.java
@@ -179,6 +179,7 @@ private NorthBoundUrl() {
         public static final String FLOW_PING = GET_FLOW + "/{flow_id}/ping";
         public static final String UPDATE_SWITCH_UNDER_MAINTENANCE = GET_SWITCHES + "/{switch_id}/under-maintenance";
         public static final String GET_SWITCH_FLOWS = GET_SWITCHES + "/{switch_id}/flows";
+        public static final String GET_SWITCH_FLOWS_BY_PORTS = VERSION_TWO + "/switches/{switch_id}/flows-by-port";
         public static final String GET_SWITCH_PORT_FLOWS = GET_SWITCHES + "/{switch_id}/flows?port={port}";
         public static final String UPDATE_LINK_UNDER_MAINTENANCE = GET_LINKS + "/under-maintenance";
         public static final String UPDATE_LINK_MAINTENANCE = GET_LINKS + "/under-maintenance";

diff --git a/src-gui/src/main/java/org/openkilda/controller/SwitchController.java b/src-gui/src/main/java/org/openkilda/controller/SwitchController.java
@@ -31,6 +31,7 @@
 import org.openkilda.model.LinkParametersDto;
 import org.openkilda.model.LinkProps;
 import org.openkilda.model.LinkUnderMaintenanceDto;
+import org.openkilda.model.SwitchFlowsInfoPerPort;
 import org.openkilda.model.SwitchInfo;
 import org.openkilda.model.SwitchLocation;
 import org.openkilda.model.SwitchMeter;
@@ -71,7 +72,7 @@ public class SwitchController {
 
     @Autowired
     private ActivityLogger activityLogger;
-    
+
     @Autowired
     private ServerContext serverContext;
 
@@ -88,9 +89,9 @@ public class SwitchController {
     @ResponseStatus(HttpStatus.OK)
     @Permissions(values = { IConstants.Permission.MENU_SWITCHES })
     public @ResponseBody List<SwitchInfo> getSwitchesDetail(
-            @RequestParam(value = "storeConfigurationStatus", required = false) 
+            @RequestParam(value = "storeConfigurationStatus", required = false)
             final boolean storeConfigurationStatus,
-            @RequestParam(value = "controller", required = false) 
+            @RequestParam(value = "controller", required = false)
             final boolean controller) {
         return serviceSwitch.getSwitches(storeConfigurationStatus, controller);
     }
@@ -104,12 +105,12 @@ public class SwitchController {
     @ResponseStatus(HttpStatus.OK)
     @Permissions(values = { IConstants.Permission.MENU_SWITCHES })
     public @ResponseBody SwitchInfo getSwitchDetail(@PathVariable final String switchId,
-            @RequestParam(value = "controller", required = false) 
+            @RequestParam(value = "controller", required = false)
             final boolean controller) {
         return serviceSwitch.getSwitch(switchId, controller);
     }
 
-    
+
     /**
      * Save or update switch name.
      *
@@ -148,7 +149,7 @@ public class SwitchController {
             required = false) final String dstPort) {
         return serviceSwitch.getIslLinks(srcSwitch, srcPort, dstSwitch, dstPort);
     }
-    
+
     /**
      * Delete Isl.
      *
@@ -201,7 +202,7 @@ public class SwitchController {
                     value = "dst_port", required = true) final String dstPort) {
         return serviceSwitch.getLinkProps(srcSwitch, srcPort, dstSwitch, dstPort);
     }
-    
+
     /**
      * Updates the link max bandwidth.
      *
@@ -218,7 +219,7 @@ public class SwitchController {
             @RequestParam(value = "src_switch", required = true) final String srcSwitch,
             @RequestParam(value = "src_port", required = true) final String srcPort, @RequestParam(
                     value = "dst_switch", required = true) final String dstSwitch, @RequestParam(
-                    value = "dst_port", required = true) final String dstPort, 
+                    value = "dst_port", required = true) final String dstPort,
                     @RequestBody LinkMaxBandwidth linkMaxBandwidth) {
         activityLogger.log(ActivityType.UPDATE_ISL_BANDWIDTH, linkMaxBandwidth.toString());
         return serviceSwitch.updateLinkBandwidth(srcSwitch, srcPort, dstSwitch, dstPort, linkMaxBandwidth);
@@ -238,7 +239,7 @@ public class SwitchController {
         activityLogger.log(ActivityType.UPDATE_ISL_BFD_FLAG, linkParametersDto.toString());
         return serviceSwitch.updateLinkBfdFlag(linkParametersDto);
     }
-    
+
     /**
      * Get Link Props.
      *
@@ -288,7 +289,7 @@ public class SwitchController {
         activityLogger.log(ActivityType.CONFIGURE_SWITCH_PORT, "SW_" + switchId + ", P_" + port);
         return serviceSwitch.configurePort(switchId, port, configuration);
     }
-    
+
     /**
      * Gets Port flows.
      *
@@ -300,11 +301,26 @@ public class SwitchController {
     @RequestMapping(path = "/{switchId}/flows", method = RequestMethod.GET)
     @ResponseStatus(HttpStatus.OK)
     public @ResponseBody ResponseEntity<List<?>> getPortFlows(@PathVariable final String switchId,
-            @RequestParam(value = "port", required = false) final String port, 
+            @RequestParam(value = "port", required = false) final String port,
             @RequestParam(value = "inventory", required = false) final boolean inventory) throws AccessDeniedException {
         return serviceSwitch.getPortFlows(switchId, port, inventory);
     }
 
+    /**
+     * Gets flows by ports.
+     *
+     * @param switchId the switch id
+     * @param portIds the ports list
+     * @return the customers detail
+     */
+    @RequestMapping(path = "/{switchId}/flows-by-port", method = RequestMethod.GET)
+    @ResponseStatus(HttpStatus.OK)
+    public @ResponseBody ResponseEntity<SwitchFlowsInfoPerPort> getFlowsByPort(
+            @PathVariable final String switchId,
+            @RequestParam(value = "ports", required = false) List<Integer> portIds) {
+        return serviceSwitch.getFlowsByPorts(switchId, portIds);
+    }
+
     /**
      * Gets Isl flows.
      *
@@ -352,7 +368,7 @@ public class SwitchController {
         activityLogger.log(ActivityType.SWITCH_MAINTENANCE, switchId);
         return serviceSwitch.updateMaintenanceStatus(switchId, switchInfo);
     }
-    
+
     /**
      * Delete Switch.
      *
@@ -368,7 +384,7 @@ public class SwitchController {
         activityLogger.log(ActivityType.DELETE_SWITCH, switchId);
         return serviceSwitch.deleteSwitch(switchId, force);
     }
-    
+
     /**
      * Updates the switch port properties.
      *
@@ -377,25 +393,25 @@ public class SwitchController {
     @RequestMapping(value = "/{switchId}/ports/{port}/properties", method = RequestMethod.PUT)
     @ResponseStatus(HttpStatus.OK)
     @Permissions(values = { IConstants.Permission.SW_UPDATE_PORT_PROPERTIES })
-    public @ResponseBody SwitchProperty updateSwitchPortProperty(@PathVariable final String switchId, 
+    public @ResponseBody SwitchProperty updateSwitchPortProperty(@PathVariable final String switchId,
             @PathVariable final String port, @RequestBody SwitchProperty switchProperty) {
         activityLogger.log(ActivityType.UPDATE_SW_PORT_PROPERTIES, switchId);
         return serviceSwitch.updateSwitchPortProperty(switchId, port, switchProperty);
     }
-    
+
     /**
      * Gets the switch port properties.
      *
      * @return the SwitchProperty
-     * 
+     *
      */
     @RequestMapping(value = "/{switchId}/ports/{port}/properties", method = RequestMethod.GET)
     @ResponseStatus(HttpStatus.OK)
-    public @ResponseBody SwitchProperty getSwitchPortProperty(@PathVariable final String switchId, 
+    public @ResponseBody SwitchProperty getSwitchPortProperty(@PathVariable final String switchId,
             @PathVariable final String port) {
         return serviceSwitch.getSwitchPortProperty(switchId, port);
     }
-    
+
 
     /**
      * Updates switch location.
@@ -412,7 +428,7 @@ public class SwitchController {
         activityLogger.log(ActivityType.UPDATE_SWITCH_LOCATION, switchId);
         return serviceSwitch.updateSwitchLocation(switchId, switchLocation);
     }
-    
+
     /**
      * Gets the link BFD properties.
      *
@@ -431,7 +447,7 @@ public class SwitchController {
             required = false) final String dstPort) {
         return serviceSwitch.getLinkBfdProperties(srcSwitch, srcPort, dstSwitch, dstPort);
     }
-    
+
     /**
      * Updates the link BFD properties.
      *