Merge branch 'release-1.156.0'

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 
-## v1.155.0 (12/02/2024)
+## v1.156.0 (26/02/2024)
+
+
+
+### Improvements:
+-  [#5584](https://github.com/telstra/open-kilda/pull/5584) Remove "draft" tag from HA-flow API in swagger. (Issue: [#5061](https://github.com/telstra/open-kilda/issues/5061))
+-  [#5586](https://github.com/telstra/open-kilda/pull/5586) [TEST]: Flaky tests: Connected devices [**tests**]
+-  [#5581](https://github.com/telstra/open-kilda/pull/5581) [TEST]: Improvement: Fixing occurred discrepancies after refactoring [**tests**]
+
+
+For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.155.0...v1.156.0).
+
+---
+
+## v1.155.0 (14/02/2024)
 
 ### Features:
 -  [#5000](https://github.com/telstra/open-kilda/pull/5000) Added design for long mirror with join traffic [**docs**]

src-java/northbound-service/northbound/src/main/java/org/openkilda/northbound/config/SwaggerConfig.java

@@ -25,7 +25,6 @@
 import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.Tag;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -35,8 +34,6 @@
 @Configuration
 @EnableSwagger2
 public class SwaggerConfig {
-    public static final String DRAFT_API_TAG = "DRAFT";
-
     private final ParameterBuilder correlationIdParameter = new ParameterBuilder()
                 .name(CORRELATION_ID)
                 .description("Request's unique identifier")
@@ -83,7 +80,6 @@ public Docket apiV2() {
                 .globalOperationParameters(Collections.singletonList(correlationIdParameter.required(true).build()))
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("org.openkilda.northbound.controller.v2"))
-                .build()
-                .tags(new Tag(DRAFT_API_TAG, "This API is still under development and may be changed in the future"));
+                .build();
     }
 }

src-java/northbound-service/northbound/src/main/java/org/openkilda/northbound/controller/v2/HaFlowControllerV2.java

@@ -15,8 +15,6 @@
 
 package org.openkilda.northbound.controller.v2;
 
-import static org.openkilda.northbound.config.SwaggerConfig.DRAFT_API_TAG;
-
 import org.openkilda.messaging.payload.history.HaFlowHistoryEntry;
 import org.openkilda.northbound.controller.BaseController;
 import org.openkilda.northbound.dto.v2.haflows.HaFlow;
@@ -34,7 +32,6 @@
 import org.openkilda.northbound.utils.flowhistory.FlowHistoryHelper;
 import org.openkilda.northbound.utils.flowhistory.FlowHistoryRangeConstraints;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +54,6 @@
 import java.util.concurrent.CompletableFuture;
 import javax.validation.Valid;
 
-@Api(tags = {DRAFT_API_TAG})
 @RestController
 @RequestMapping("/v2/ha-flows")
 public class HaFlowControllerV2 extends BaseController {

src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/flows/ConnectedDevicesSpec.groovy

@@ -1,5 +1,7 @@
 package org.openkilda.functionaltests.spec.flows
 
+import org.openkilda.northbound.dto.v1.flows.PingInput
+
 import static org.junit.jupiter.api.Assumptions.assumeTrue
 import static org.openkilda.functionaltests.extension.tags.Tag.HARDWARE
 import static org.openkilda.functionaltests.extension.tags.Tag.SMOKE
@@ -564,12 +566,19 @@ srcDevices=#newSrcEnabled, dstDevices=#newDstEnabled"() {
         }
         flowHelperV2.addFlow(flow)
 
+        and: "Flow is valid and pingable"
+        northbound.validateFlow(flow.flowId).each { assert it.asExpected }
+        verifyAll(northbound.pingFlow(flow.flowId, new PingInput())) {
+            assert it.forward.pingSuccess
+            assert it.reverse.pingSuccess
+        }
+
         and: "Device sends an lldp+arp packet into a flow port on that switch (with a correct flow vlan)"
         device.sendLldp(lldpData)
         device.sendArp(arpData)
 
         then: "LLDP and ARP devices are registered as flow devices"
-        Wrappers.wait(WAIT_OFFSET) {
+        Wrappers.wait(WAIT_OFFSET * 2) {
             verifyAll(northbound.getFlowConnectedDevices(flow.flowId)) {
                 it.source.lldp.size() == 1
                 verifyEquals(it.source.lldp.first(), lldpData)

src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/server42/Server42FlowRttSpec.groovy

@@ -509,7 +509,7 @@ class Server42FlowRttSpec extends HealthCheckSpecification {
     @Tags(HARDWARE) //not supported on a local env (the 'stub' service doesn't send real traffic through a switch)
     def "Flow rtt stats are still available after updating a #data.flowDescription flow"() {
         given: "Two active switches, connected to the server42"
-        def switchPair = data.switchPair
+        def switchPair = data.switchPair()
         assumeTrue(switchPair != null, "Was not able to find a switchPair with a server42 connection")
 
         and: "server42FlowRtt toggle is set to true"

src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/switches/LagPortSpec.groovy

@@ -449,7 +449,7 @@ occupied by other LAG group\(s\)./).matches(exc)
         switchHelper.synchronizeAndCollectFixedDiscrepancies(sw.dpId)
 
         then: "LAG port is reinstalled"
-        switchHelper.validateAndCollectFoundDiscrepancies(sw.dpId).get().logicalPorts.missing.empty
+        !switchHelper.validateAndCollectFoundDiscrepancies(sw.dpId).isPresent()
 
         cleanup:
         lagPort && northboundV2.deleteLagLogicalPort(sw.dpId, lagPort)